From 1cf3638c049a7028862c112c2ea7a33c6be0d3d3 Mon Sep 17 00:00:00 2001
From: Vikram Raman <vikram.raman@gmail.com>
Date: Tue, 5 Jun 2018 07:48:07 -0700
Subject: [PATCH 001/161] pyformance/direct ingestion/delta support (#28)

* pyformance/direct ingestion/delta support

* Added README/docs

* Added proxy reconnection fix, readme improvements
---
 .gitignore                                    |   5 +
 wavefront_pyformance/README.md                |  55 +++++++
 wavefront_pyformance/delta.py                 |  54 ++++++
 wavefront_pyformance/example.py               |  52 ++++++
 wavefront_pyformance/tests/__init__.py        |   0
 .../tests/test_wavefront_pyformance.py        |  86 ++++++++++
 wavefront_pyformance/wavefront_reporter.py    | 154 ++++++++++++++++++
 7 files changed, 406 insertions(+)
 create mode 100644 wavefront_pyformance/README.md
 create mode 100644 wavefront_pyformance/delta.py
 create mode 100644 wavefront_pyformance/example.py
 create mode 100644 wavefront_pyformance/tests/__init__.py
 create mode 100644 wavefront_pyformance/tests/test_wavefront_pyformance.py
 create mode 100644 wavefront_pyformance/wavefront_reporter.py

diff --git a/.gitignore b/.gitignore
index a655050..a21238f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,8 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# IntelliJ
+.idea/*
+*.iml
+.DS_Store
diff --git a/wavefront_pyformance/README.md b/wavefront_pyformance/README.md
new file mode 100644
index 0000000..db47910
--- /dev/null
+++ b/wavefront_pyformance/README.md
@@ -0,0 +1,55 @@
+# wavefront_pyformance
+
+This is a plugin for [pyformance](https://github.com/omergertel/pyformance) which adds Wavefront reporters (via proxy or direct ingestion) and a simple abstraction that supports tagging at the host level. It also includes support for Wavefront delta counters.
+
+## Requirements
+Python 2.7+ and Python 3.x are supported.
+
+```
+pip install pyformance
+pip install requests
+```
+
+## Usage
+
+### Wavefront Reporter
+
+The Wavefront Reporters support tagging at the host level. Tags passed to a reporter will be applied to every metric before being sent to Wavefront.
+
+You can create a `WavefrontProxyReporter` or `WavefrontDirectReporter`:
+
+```Python
+from pyformance import MetricsRegistry
+from wavefront_reporter import WavefrontProxyReporter, WavefrontDirectReporter
+
+reg = MetricsRegistry()
+
+# report metrics to a Wavefront proxy every 10s
+wf_proxy_reporter = WavefrontProxyReporter(host=host, port=2878, registry=reg,
+                                           source="wavefront-pyformance-example",
+                                           tags={"key1":"val1", "key2":"val2"},
+                                           prefix="python.proxy.",
+                                           reporting_interval=10)
+wf_proxy_reporter.start()
+
+# report metrics directly to a Wavefront server every 10s
+wf_direct_reporter = WavefrontDirectReporter(server=server, token=token, registry=reg,
+                                             source="wavefront-pyformance-exmaple",
+                                             tags={"key1":"val1", "key2": "val2"},
+                                             prefix="python.direct.",
+                                             reporting_interval=10)
+wf_direct_reporter.start()
+```
+
+### Delta Counter
+
+To create a Wavefront delta counter:
+
+```Python
+from pyformance import MetricsRegistry
+import delta
+
+reg = MetricsRegistry()
+d1 = delta.delta_counter(reg, "requests_delta")
+d1.inc(10)
+```
diff --git a/wavefront_pyformance/delta.py b/wavefront_pyformance/delta.py
new file mode 100644
index 0000000..4187227
--- /dev/null
+++ b/wavefront_pyformance/delta.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+from pyformance.meters import Counter
+
+
+def delta_counter(registry, name):
+    """
+    Registers a DeltaCounter with the given registry and returns the instance.
+
+    The given name is prefixed with DeltaCounter.DELTA_PREFIX for registering.
+
+    :param registry: the metrics registry to register with
+    :param name: the delta counter name
+    :return: the registered DeltaCounter instance
+    """
+    if not name:
+        raise ValueError("invalid counter name")
+
+    name = name if _has_delta_prefix(name) else DeltaCounter.DELTA_PREFIX + name
+    try:
+        ret_counter = DeltaCounter()
+        registry.add(name, ret_counter)
+        return ret_counter
+    except LookupError:
+        return registry.counter(name)
+
+
+def is_delta_counter(name, registry):
+    counter = registry.counter(name)
+    return counter and isinstance(counter, DeltaCounter)
+
+
+def get_delta_name(prefix, name, value_key):
+    """
+    returns the name of the delta metric name of the form: ∆prefix.name.value_key
+    """
+    return "%s%s.%s" % (DeltaCounter.DELTA_PREFIX + prefix, name[1:], value_key)
+
+
+def _has_delta_prefix(name):
+    return name and name.startswith(DeltaCounter.DELTA_PREFIX) or name.startswith(DeltaCounter.ALT_DELTA_PREFIX)
+
+
+class DeltaCounter(Counter):
+    """
+    A counter for Wavefront delta metrics.
+
+    Differs from a counter in that it is reset in the WavefrontReporter every time the value is reported.
+    """
+
+    DELTA_PREFIX = u"\u2206"
+    ALT_DELTA_PREFIX = u"\u0394"
+
+    def __init__(self):
+        super(DeltaCounter, self).__init__()
diff --git a/wavefront_pyformance/example.py b/wavefront_pyformance/example.py
new file mode 100644
index 0000000..5046846
--- /dev/null
+++ b/wavefront_pyformance/example.py
@@ -0,0 +1,52 @@
+from pyformance import MetricsRegistry
+from wavefront_reporter import WavefrontReporter, WavefrontProxyReporter, WavefrontDirectReporter
+import delta
+import time
+import sys
+
+
+def report_metrics(host, server, token):
+    reg = MetricsRegistry()
+
+    wf_proxy_reporter = WavefrontProxyReporter(host=host, port=2878, registry=reg, source="wavefront-pyformance-example", tags={"key1":"val1", "key2":"val2"}, prefix="python.proxy.")
+    wf_direct_reporter = WavefrontDirectReporter(server=server, token=token, registry=reg, source="wavefront-pyformance-exmaple", tags={"key1":"val1", "key2": "val2"}, prefix="python.direct.")
+
+    # counter
+    c1 = reg.counter("foo_count")
+    c1.inc()
+
+    # delta counter
+    d1 = delta.delta_counter(reg, "foo_delta_count")
+    d1.inc()
+    d1.inc()
+
+    # gauge
+    g1 = reg.gauge("foo_gauge")
+    g1.set_value(2)
+
+    # meter
+    m1 = reg.meter("foo_meter")
+    m1.mark()
+
+    # timer
+    t1 = reg.timer("foo_timer")
+    timer_ctx = t1.time()
+    time.sleep(3)
+    timer_ctx.stop()
+
+    # histogram
+    h1 = reg.histogram("foo_histogram")
+    h1.add(1.0)
+    h1.add(1.5)
+
+    wf_proxy_reporter.report_now()
+    wf_proxy_reporter.stop()
+    wf_direct_reporter.report_now()
+
+
+if __name__ == "__main__":
+    # python example.py proxy_host server_url server_token
+    host = sys.argv[1]
+    server = sys.argv[2]
+    token = sys.argv[3]
+    report_metrics(host, server, token)
diff --git a/wavefront_pyformance/tests/__init__.py b/wavefront_pyformance/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/wavefront_pyformance/tests/test_wavefront_pyformance.py b/wavefront_pyformance/tests/test_wavefront_pyformance.py
new file mode 100644
index 0000000..b250a6e
--- /dev/null
+++ b/wavefront_pyformance/tests/test_wavefront_pyformance.py
@@ -0,0 +1,86 @@
+from unittest import TestCase
+import unittest
+from pyformance import MetricsRegistry
+import delta
+from wavefront_reporter import WavefrontReporter, WavefrontProxyReporter, WavefrontDirectReporter
+import time
+
+
+def get_base_reporter(registry=None):
+    return WavefrontReporter(registry=registry, source="python-test", tags={"key1":"val1"}, prefix="python.test.")
+
+def get_direct_reporter(registry=None):
+    return WavefrontDirectReporter(server="https://foo.wavefront.com", token="token",
+                                   registry=registry, source="python-test", prefix="python.direct.", tags={"key1":"val1"})
+
+
+class TestReporter(TestCase):
+    def test_collect_metrics(self):
+        # should return a list of point lines
+        reg = MetricsRegistry()
+        reg.counter("foo_counter_1")
+        reg.counter("foo_counter_2")
+
+        wf_reporter = get_base_reporter(reg)
+        lines = wf_reporter._collect_metrics(reg)
+        assert(len(lines) == 2) # equals no. of registered counters
+
+        delta.delta_counter(reg, "foo_delta_1")
+        delta.delta_counter(reg, "foo_delta_2")
+        lines = wf_reporter._collect_metrics(reg)
+        assert(len(lines) == 4) # added two more counters
+
+    def test_delta_reset(self):
+        reg = MetricsRegistry()
+        counter = delta.delta_counter(reg, "foo_delta_1")
+        counter.inc(10)
+        wf_reporter = get_base_reporter(reg)
+        wf_reporter._collect_metrics(reg)
+        assert(counter.get_count() == 0) # delta decremented by count
+
+    def test_get_metric_line(self):
+        wf_reporter = get_base_reporter()
+        out = wf_reporter._get_metric_line("foo", 10, timestamp=None)
+        assert(out == 'foo 10 source=\"python-test\" \"key1\"=\"val1\"') # w/o timestamp
+
+        out = wf_reporter._get_metric_line("foo", 10, timestamp=123456)
+        assert(out == 'foo 10 123456 source=\"python-test\" \"key1\"=\"val1\"') # with timestamp
+
+    def test_chunking(self):
+        l = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        wf_reporter = get_direct_reporter()
+        chunks = wf_reporter._get_chunks(l, 2)
+        for chunk in chunks:
+            assert(len(chunk) == 2)
+        chunks = wf_reporter._get_chunks(l, 100)
+        for chunk in chunks:
+            assert(len(chunk) == 10)
+
+
+class TestDelta(TestCase):
+    def test_delta_counter(self):
+        reg = MetricsRegistry()
+        counter = delta.delta_counter(reg, "foo")
+        assert(isinstance(counter, delta.DeltaCounter))
+
+        # test duplicate (should return previously registered counter)
+        duplicate_counter = delta.delta_counter(reg, "foo")
+        assert(counter == duplicate_counter)
+        assert(delta.is_delta_counter(delta.DeltaCounter.DELTA_PREFIX + "foo", reg))
+
+        different_counter = delta.delta_counter(reg, "foobar")
+        assert(counter != different_counter)
+
+    def test_has_delta_prefix(self):
+        assert(delta._has_delta_prefix(delta.DeltaCounter.DELTA_PREFIX + "foo")) # valid prefix
+        assert(delta._has_delta_prefix(delta.DeltaCounter.ALT_DELTA_PREFIX + "foo")) # valid prefix
+        assert(delta._has_delta_prefix("foo") is False) # invalid prefix
+
+    def test_get_delta_name(self):
+        d = delta.get_delta_name('delta.prefix', delta.DeltaCounter.DELTA_PREFIX + 'foo', 'count')
+        assert(d.startswith(delta.DeltaCounter.DELTA_PREFIX))
+
+
+if __name__ == '__main__':
+    # run 'python -m unittest discover' from toplevel to run tests
+    unittest.main()
\ No newline at end of file
diff --git a/wavefront_pyformance/wavefront_reporter.py b/wavefront_pyformance/wavefront_reporter.py
new file mode 100644
index 0000000..178a4cb
--- /dev/null
+++ b/wavefront_pyformance/wavefront_reporter.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+from __future__ import print_function
+import sys
+import socket
+import requests
+from pyformance.reporters.reporter import Reporter
+import delta
+
+if sys.version_info[0] > 2:
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
+
+
+class WavefrontReporter(Reporter):
+    """
+    Base reporter for reporting data in Wavefront format.
+    """
+
+    def __init__(self, source="wavefront-pyformance", registry=None, reporting_interval=10, clock=None, prefix="", tags={}):
+        super(WavefrontReporter, self).__init__(registry=registry,
+                                                reporting_interval=reporting_interval,
+                                                clock=clock)
+        self.source = source
+        self.prefix = prefix
+        tags = tags or {}
+        self.tagStr = ' '.join(['\"%s\"=\"%s\"' % (k,v) for (k,v) in tags.items()])
+
+    def report_now(self, registry=None, timestamp=None):
+        raise NotImplementedError('use WavefrontProxyReporter or WavefrontDirectReporter')
+
+    def _collect_metrics(self, registry, timestamp=None):
+        metrics = registry.dump_metrics()
+        metrics_data = []
+        for key in metrics.keys():
+            is_delta = delta.is_delta_counter(key, registry)
+            for value_key in metrics[key].keys():
+                if is_delta:
+                    registry.counter(key).dec(metrics[key][value_key]) # decrement delta counter
+                metric_name = self._get_metric_name(self.prefix, key, value_key, is_delta=is_delta)
+                metric_line = self._get_metric_line(metric_name, metrics[key][value_key], timestamp)
+                metrics_data.append(metric_line)
+        return metrics_data
+
+    def _get_metric_line(self, name, value, timestamp):
+        if timestamp:
+            return "%s %s %s source=\"%s\" %s" % (name, value, timestamp, self.source, self.tagStr)
+        else:
+            return "%s %s source=\"%s\" %s" % (name, value, self.source, self.tagStr)
+
+    def _get_metric_name(self, prefix, name, value_key, is_delta=False):
+        return delta.get_delta_name(prefix, name, value_key) if is_delta else "%s%s.%s" % (prefix, name, value_key)
+
+
+class WavefrontProxyReporter(WavefrontReporter):
+    """
+    This reporter requires a host and port to report data to a Wavefront proxy.
+    """
+
+    def __init__(self, host, port=2878, source="wavefront-pyformance", registry=None, reporting_interval=10, clock=None,
+                 prefix="proxy.", tags={}):
+        super(WavefrontProxyReporter, self).__init__(source=source,
+                                                     registry=registry,
+                                                     reporting_interval=reporting_interval,
+                                                     clock=clock,
+                                                     prefix=prefix,
+                                                     tags=tags)
+        self.host = host
+        self.port = port
+        self.socket_factory = socket.socket
+        self.proxy_socket = None
+
+    def report_now(self, registry=None, timestamp=None):
+        timestamp = timestamp or int(round(self.clock.time()))
+        metrics = self._collect_metrics(registry or self.registry, timestamp)
+        if metrics:
+            self._report_points(metrics)
+
+    def stop(self):
+        super(WavefrontProxyReporter, self).stop()
+        if self.proxy_socket:
+            self.proxy_socket.close()
+
+    def _report_points(self, metrics, reconnect=True):
+        try:
+            if not self.proxy_socket:
+                self._connect()
+            for line in metrics:
+                self.proxy_socket.send(line.encode('utf-8') + "\n")
+            print("reporting successful")
+        except socket.error as e:
+            if reconnect:
+                self.proxy_socket = None
+                self._report_points(metrics, reconnect=False)
+            else:
+                print("error reporting to wavefront proxy:", e, file=sys.stderr)
+        except Exception as e:
+            print("error reporting to wavefront proxy:", e, file=sys.stderr)
+
+    def _connect(self):
+        self.proxy_socket = self.socket_factory(socket.AF_INET, socket.SOCK_STREAM)
+        self.proxy_socket.connect((self.host, self.port))
+
+
+class WavefrontDirectReporter(WavefrontReporter):
+    """
+    This reporter requires a server and a token to report data directly to a Wavefront server.
+    """
+
+    def __init__(self, server, token, source="wavefront-pyformance", registry=None, reporting_interval=10, clock=None,
+                 prefix="direct.", tags={}):
+        super(WavefrontDirectReporter, self).__init__(source=source,
+                                                      registry=registry,
+                                                      reporting_interval=reporting_interval,
+                                                      clock=clock,
+                                                      prefix=prefix,
+                                                      tags=tags)
+        self.server = self._validate_url(server)
+        self.token = token
+        self.batch_size = 10000
+        self.headers = {'Content-Type': 'text/plain',
+                             'Authorization': 'Bearer ' + token}
+        self.params = {'f': 'graphite_v2'}
+
+    def _validate_url(self, server):
+        parsed_url = urlparse(server)
+        if not all([parsed_url.scheme, parsed_url.netloc]):
+            raise ValueError("invalid server url")
+        return server
+
+    def report_now(self, registry=None, timestamp=None):
+        metrics = self._collect_metrics(registry or self.registry)
+        if metrics:
+            # limit to batch_size per api call
+            chunks = self._get_chunks(metrics, self.batch_size)
+            for chunk in chunks:
+                metrics_str = u'\n'.join(chunk).encode('utf-8')
+                self._report_points(metrics_str)
+
+    def _get_chunks(self, metrics, chunk_size):
+        """
+        returns a lazy list generator
+        """
+        for i in range(0, len(metrics), chunk_size):
+            yield metrics[i:i+chunk_size]
+
+    def _report_points(self, points):
+        try:
+            r = requests.post(self.server+'/report', params=self.params, headers=self.headers, data=points)
+            r.raise_for_status()
+        except Exception as e:
+            print(e, file=sys.stderr)
+
+

From 9527d61291b23f2ac77a4388a3bc032257c59ef3 Mon Sep 17 00:00:00 2001
From: Vikram Raman <vikram@wavefront.com>
Date: Tue, 5 Jun 2018 14:02:09 -0700
Subject: [PATCH 002/161] refactored to build pypi distribution

(cherry picked from commit 6d32b4a2a0adfb6ec9e61ba179e551d11b436134)
---
 setup.py                                      |  2 +-
 wavefront_pyformance/README.md                |  7 ++--
 wavefront_pyformance/example.py               |  4 +-
 wavefront_pyformance/setup.py                 | 40 +++++++++++++++++++
 .../wavefront_pyformance/__init__.py          |  1 +
 .../{ => wavefront_pyformance}/delta.py       |  0
 .../tests/__init__.py                         |  0
 .../tests/test_wavefront_pyformance.py        |  0
 .../wavefront_reporter.py                     |  1 -
 9 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 wavefront_pyformance/setup.py
 create mode 100644 wavefront_pyformance/wavefront_pyformance/__init__.py
 rename wavefront_pyformance/{ => wavefront_pyformance}/delta.py (100%)
 rename wavefront_pyformance/{ => wavefront_pyformance}/tests/__init__.py (100%)
 rename wavefront_pyformance/{ => wavefront_pyformance}/tests/test_wavefront_pyformance.py (100%)
 rename wavefront_pyformance/{ => wavefront_pyformance}/wavefront_reporter.py (99%)

diff --git a/setup.py b/setup.py
index 50e6fe1..13c5cc6 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@
     url="https://github.com/wavefrontHQ/python-client",
     keywords=["Swagger", "Wavefront Public API"],
     install_requires=REQUIRES,
-    packages=find_packages(),
+    packages=find_packages(exclude=["wavefront_pyformance","*.tests"]),
     include_package_data=True,
     long_description="""\
     &lt;p&gt;The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.&lt;/p&gt;&lt;p&gt;When you make API calls outside the Wavefront API documentation you must add the header \&quot;Authorization: Bearer &amp;lt;&amp;lt;API-TOKEN&amp;gt;&amp;gt;\&quot; to your HTTP requests.&lt;/p&gt;&lt;p&gt;For legacy versions of the Wavefront API, see the &lt;a href&#x3D;\&quot;/api-docs/ui/deprecated\&quot;&gt;legacy API documentation&lt;/a&gt;.&lt;/p&gt;  # noqa: E501
diff --git a/wavefront_pyformance/README.md b/wavefront_pyformance/README.md
index db47910..190d72e 100644
--- a/wavefront_pyformance/README.md
+++ b/wavefront_pyformance/README.md
@@ -6,8 +6,7 @@ This is a plugin for [pyformance](https://github.com/omergertel/pyformance) whic
 Python 2.7+ and Python 3.x are supported.
 
 ```
-pip install pyformance
-pip install requests
+pip install wavefront_pyformance
 ```
 
 ## Usage
@@ -20,7 +19,7 @@ You can create a `WavefrontProxyReporter` or `WavefrontDirectReporter`:
 
 ```Python
 from pyformance import MetricsRegistry
-from wavefront_reporter import WavefrontProxyReporter, WavefrontDirectReporter
+from wavefront_pyformance.wavefront_reporter import WavefrontProxyReporter, WavefrontDirectReporter
 
 reg = MetricsRegistry()
 
@@ -47,7 +46,7 @@ To create a Wavefront delta counter:
 
 ```Python
 from pyformance import MetricsRegistry
-import delta
+from wavefront_pyformance import delta
 
 reg = MetricsRegistry()
 d1 = delta.delta_counter(reg, "requests_delta")
diff --git a/wavefront_pyformance/example.py b/wavefront_pyformance/example.py
index 5046846..cf8737b 100644
--- a/wavefront_pyformance/example.py
+++ b/wavefront_pyformance/example.py
@@ -1,6 +1,6 @@
 from pyformance import MetricsRegistry
-from wavefront_reporter import WavefrontReporter, WavefrontProxyReporter, WavefrontDirectReporter
-import delta
+from wavefront_pyformance.wavefront_reporter import WavefrontReporter, WavefrontProxyReporter, WavefrontDirectReporter
+from wavefront_pyformance import delta
 import time
 import sys
 
diff --git a/wavefront_pyformance/setup.py b/wavefront_pyformance/setup.py
new file mode 100644
index 0000000..68de3b9
--- /dev/null
+++ b/wavefront_pyformance/setup.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront Pyformance Library
+
+    <p>The Wavefront Pyformance library provides Wavefront reporters (via proxy and direct ingestion) and a simple abstraction for tagging at the host level. It also includes support for Wavefront delta counters.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from setuptools import setup, find_packages  # noqa: H301
+
+NAME = "wavefront_pyformance"
+VERSION = "0.9.1"
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = ["pyformance >= 0.4", "requests >= 2.18.4"]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="Wavefront Pyformance Library",
+    author_email="",
+    url="https://github.com/wavefrontHQ/python-client/tree/master/wavefront_pyformance",
+    keywords=["Wavefront Pyformance", "Wavefront"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    include_package_data=True,
+    long_description="""\
+    The Wavefront Pyformance library provides Wavefront reporters (via proxy and direct ingestion) and a simple abstraction for tagging at the host level. It also includes support for Wavefront delta counters.
+    """
+)
diff --git a/wavefront_pyformance/wavefront_pyformance/__init__.py b/wavefront_pyformance/wavefront_pyformance/__init__.py
new file mode 100644
index 0000000..e4e49b3
--- /dev/null
+++ b/wavefront_pyformance/wavefront_pyformance/__init__.py
@@ -0,0 +1 @@
+__version__ = '0.9.0'
diff --git a/wavefront_pyformance/delta.py b/wavefront_pyformance/wavefront_pyformance/delta.py
similarity index 100%
rename from wavefront_pyformance/delta.py
rename to wavefront_pyformance/wavefront_pyformance/delta.py
diff --git a/wavefront_pyformance/tests/__init__.py b/wavefront_pyformance/wavefront_pyformance/tests/__init__.py
similarity index 100%
rename from wavefront_pyformance/tests/__init__.py
rename to wavefront_pyformance/wavefront_pyformance/tests/__init__.py
diff --git a/wavefront_pyformance/tests/test_wavefront_pyformance.py b/wavefront_pyformance/wavefront_pyformance/tests/test_wavefront_pyformance.py
similarity index 100%
rename from wavefront_pyformance/tests/test_wavefront_pyformance.py
rename to wavefront_pyformance/wavefront_pyformance/tests/test_wavefront_pyformance.py
diff --git a/wavefront_pyformance/wavefront_reporter.py b/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
similarity index 99%
rename from wavefront_pyformance/wavefront_reporter.py
rename to wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
index 178a4cb..dadb984 100644
--- a/wavefront_pyformance/wavefront_reporter.py
+++ b/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
@@ -87,7 +87,6 @@ def _report_points(self, metrics, reconnect=True):
                 self._connect()
             for line in metrics:
                 self.proxy_socket.send(line.encode('utf-8') + "\n")
-            print("reporting successful")
         except socket.error as e:
             if reconnect:
                 self.proxy_socket = None

From 1924391825d91cea2788c07a649e4faf5d3d0622 Mon Sep 17 00:00:00 2001
From: Vikram Raman <vikram@wavefront.com>
Date: Thu, 7 Jun 2018 13:53:46 -0700
Subject: [PATCH 003/161] Fix import for Python 2/3 compatibility

---
 wavefront_pyformance/setup.py                                   | 2 +-
 wavefront_pyformance/wavefront_pyformance/__init__.py           | 2 +-
 wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wavefront_pyformance/setup.py b/wavefront_pyformance/setup.py
index 68de3b9..0af8103 100644
--- a/wavefront_pyformance/setup.py
+++ b/wavefront_pyformance/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront_pyformance"
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_pyformance/wavefront_pyformance/__init__.py b/wavefront_pyformance/wavefront_pyformance/__init__.py
index e4e49b3..1f04780 100644
--- a/wavefront_pyformance/wavefront_pyformance/__init__.py
+++ b/wavefront_pyformance/wavefront_pyformance/__init__.py
@@ -1 +1 @@
-__version__ = '0.9.0'
+__version__ = '0.9.2'
diff --git a/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py b/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
index dadb984..844a6ee 100644
--- a/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
+++ b/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
@@ -4,7 +4,7 @@
 import socket
 import requests
 from pyformance.reporters.reporter import Reporter
-import delta
+from . import delta
 
 if sys.version_info[0] > 2:
     from urllib.parse import urlparse

From 2d1a0f668608ec9403b1b6e01ef0752c772e419a Mon Sep 17 00:00:00 2001
From: Anil Krishna Kodali <38334031+akodali18@users.noreply.github.com>
Date: Tue, 26 Jun 2018 15:03:24 -0700
Subject: [PATCH 004/161] AWS Lambda integration : Add wavefront python wrapper
 (#30)

* AWS Lambda integration : Add wavefront python wrapper to report standard lambda metrics directly to wavefront.
---
 setup.py                                      |   4 +-
 wavefront_lambda/README.md                    |  54 ++++++++
 wavefront_lambda/example.py                   |  20 +++
 wavefront_lambda/setup.py                     |  36 ++++++
 wavefront_lambda/wavefront_lambda/__init__.py | 116 ++++++++++++++++++
 .../wavefront_lambda/tests/__init__.py        |   0
 .../tests/test_wavefront_lambda_wrapper.py    |  19 +++
 7 files changed, 247 insertions(+), 2 deletions(-)
 create mode 100644 wavefront_lambda/README.md
 create mode 100644 wavefront_lambda/example.py
 create mode 100644 wavefront_lambda/setup.py
 create mode 100644 wavefront_lambda/wavefront_lambda/__init__.py
 create mode 100644 wavefront_lambda/wavefront_lambda/tests/__init__.py
 create mode 100644 wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py

diff --git a/setup.py b/setup.py
index 13c5cc6..793468b 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,7 +32,7 @@
     url="https://github.com/wavefrontHQ/python-client",
     keywords=["Swagger", "Wavefront Public API"],
     install_requires=REQUIRES,
-    packages=find_packages(exclude=["wavefront_pyformance","*.tests"]),
+    packages=find_packages(exclude=["wavefront_lambda","wavefront_pyformance","*.tests"]),
     include_package_data=True,
     long_description="""\
     &lt;p&gt;The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.&lt;/p&gt;&lt;p&gt;When you make API calls outside the Wavefront API documentation you must add the header \&quot;Authorization: Bearer &amp;lt;&amp;lt;API-TOKEN&amp;gt;&amp;gt;\&quot; to your HTTP requests.&lt;/p&gt;&lt;p&gt;For legacy versions of the Wavefront API, see the &lt;a href&#x3D;\&quot;/api-docs/ui/deprecated\&quot;&gt;legacy API documentation&lt;/a&gt;.&lt;/p&gt;  # noqa: E501
diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
new file mode 100644
index 0000000..9712b16
--- /dev/null
+++ b/wavefront_lambda/README.md
@@ -0,0 +1,54 @@
+# wavefront_lambda
+
+This is a Wavefront python wrapper for AWS Lambda python function handler to send metrics directly to wavefront.
+
+## Requirements
+Python 2.7 or 3.6.
+
+## Installation
+To install from PyPi
+```
+pip install wavefront_lambda
+```
+
+## Environmental variables
+WAVEFRONT_URL = https://\<INSTANCE>.wavefront.com  
+WAVEFRONT_API_TOKEN = Wavefront API token with Direct Data Ingestion permission.  
+IS_REPORT_STANDARD_METRICS = Set to False to not report standard lambda metrics directly to wavefront.  
+
+## Usage
+
+Decorate your AWS Lambda handler function with @wavefront_lambda.wrapper.
+
+```Python
+import wavefront_lambda
+
+@wavefront_lambda.wrapper
+def handler(event, context):
+    # your code
+
+```
+
+## Standard Lambda Metrics reported by Wavefront Lambda wrapper
+
+The Lambda wrapper sends the following standard lambda metrics to wavefront:
+
+| Metric Name                       |  Type              | Description                                                             |
+| ----------------------------------|:------------------:| ----------------------------------------------------------------------- |
+| aws.lambda.wf.invocations.count   | Delta Counter      | Count of number of lambda function invocations aggregated at the server.|
+| aws.lambda.wf.errors.count        | Delta Counter      | Count of number of errors aggregated at the server.                     |
+| aws.lambda.wf.coldstarts.count    | Delta Counter      | Count of number of cold starts aggregated at the server.                |
+| aws.lambda.wf.coldstarts_raw.count| Counter            | Count of number of cold starts.                                         |
+| aws.lambda.wf.duration.value      | Gauge              | Execution time of the Lambda handler function in milliseconds.          |
+
+The Lambda wrapper adds the following point tags to all metrics sent to wavefront:
+
+| Point Tag             | Description                                                                   |
+| --------------------- | ----------------------------------------------------------------------------- |
+| LambdaArn             | ARN(Amazon Resource Name) of the Lambda function.                             |
+| Region                | AWS Region of the Lambda function.                                            |
+| accountId             | AWS Account ID from which the Lambda function was invoked.                    |
+| ExecutedVersion       | The version of Lambda function.                                               |
+| FunctionName          | The name of Lambda function.                                                  |
+| Resource              | Execution time of the Lambda.                                                 |
+| EventSourceMappings   | AWS Function Name (In case of an event source mapping Lambda invocation only,)|
diff --git a/wavefront_lambda/example.py b/wavefront_lambda/example.py
new file mode 100644
index 0000000..825ac65
--- /dev/null
+++ b/wavefront_lambda/example.py
@@ -0,0 +1,20 @@
+import wavefront_lambda
+from wavefront_pyformance import delta
+
+
+@wavefront_lambda.wrapper
+def lambda_handler(event, context):
+    # Get registry to report metrics.
+    registry = wavefront_lambda.get_registry()
+
+    # Report Delta Counters
+    delta_counter = delta.delta_counter(registry, "deltaCounter")
+    delta_counter.inc()
+
+    # Report Counters
+    counter = registry.counter("counter")
+    counter.inc()
+
+    # Report Gauge
+    gauge_value = registry.gauge("gaugeValue")
+    gauge_value.set_value(5.5)
diff --git a/wavefront_lambda/setup.py b/wavefront_lambda/setup.py
new file mode 100644
index 0000000..5c18b84
--- /dev/null
+++ b/wavefront_lambda/setup.py
@@ -0,0 +1,36 @@
+# coding: utf-8
+
+"""
+    Wavefront AWS Lambda Wrapper
+
+    <p>This is a Wavefront python wrapper for AWS Lambda python function handler to send metrics directly to wavefront.</p>  # noqa: E501
+"""
+
+
+from setuptools import setup, find_packages  # noqa: H301
+
+NAME = "wavefront_lambda"
+VERSION = "0.9.0"
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = ["wavefront-pyformance >= 0.9.2"]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="Wavefront Python Wrapper for AWS Lambda",
+    author_email="",
+    url="https://github.com/wavefrontHQ/python-client/tree/master/wavefront_lambda",
+    keywords=["Wavefront Lambda", "Wavefront"],
+    install_requires=REQUIRES,
+    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
+    include_package_data=True,
+    long_description="""\
+    This is a Wavefront python wrapper for AWS Lambda python function handler to send metrics directly to wavefront.
+    """
+)
diff --git a/wavefront_lambda/wavefront_lambda/__init__.py b/wavefront_lambda/wavefront_lambda/__init__.py
new file mode 100644
index 0000000..bf2b497
--- /dev/null
+++ b/wavefront_lambda/wavefront_lambda/__init__.py
@@ -0,0 +1,116 @@
+from wavefront_pyformance.wavefront_reporter import WavefrontDirectReporter
+from pyformance import MetricsRegistry
+import os
+from datetime import datetime
+from wavefront_pyformance import delta
+
+is_cold_start = True
+reg = None
+
+
+def wrapper(func):
+    """
+    Returns the Wavefront Lambda wrapper. The wrapper collects aws lambda's
+    standard metrics and reports it directly to the set wavefront url. It
+    requires the following Environmental variables to be set:
+    1.WAVEFRONT_URL : https://<INSTANCE>.wavefront.com
+    2.WAVEFRONT_API_TOKEN : Wavefront API token with Direct Data Ingestion permission
+    3.IS_REPORT_STANDARD_METRICS : Set to False to not report standard lambda
+                                   metrics directly to wavefront.
+
+    """
+    def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
+        # Set cold start counter
+        global is_cold_start
+        if is_cold_start:
+            aws_cold_starts_counter = delta.delta_counter(reg, "coldstarts")
+            aws_cold_starts_counter.inc()
+            aws_cold_starts_normal_counter = reg.counter("coldstarts_raw")
+            aws_cold_starts_normal_counter.inc()
+            is_cold_start = False
+        # Set invocations counter
+        aws_lambda_invocations_counter = delta.delta_counter(reg, "invocations")
+        aws_lambda_invocations_counter.inc()
+        time_start = datetime.now()
+        try:
+            result = func(*args, **kwargs)
+            return result
+        except:
+            # Set error counter
+            aws_lambda_errors_counter = delta.delta_counter(reg, "errors")
+            aws_lambda_errors_counter.inc()
+            raise
+        finally:
+            time_taken = datetime.now() - time_start
+            # Set duration Gauge
+            aws_lambda_duration_gauge = reg.gauge("duration")
+            aws_lambda_duration_gauge.set_value(time_taken.total_seconds() * 1000)
+            wf_reporter.report_now(registry=reg)
+
+    def call_lambda_without_standard_metrics(wf_reporter, *args, **kwargs):
+        try:
+            result = func(*args, **kwargs)
+            return result
+        except:
+            raise
+        finally:
+            wf_reporter.report_now(registry=reg)
+
+    def wavefront_wrapper(*args, **kwargs):
+        server = os.environ.get('WAVEFRONT_URL')
+        if not server:
+            raise ValueError("Environmental variable WAVEFRONT_URL is not set.")
+        auth_token = os.environ.get('WAVEFRONT_API_TOKEN')
+        if not auth_token:
+            raise ValueError("Environmental variable WAVEFRONT_API_TOKEN is not set.")
+        is_report_standard_metrics = True
+        if os.environ.get('IS_REPORT_STANDARD_METRICS') in ['False', 'false']:
+            is_report_standard_metrics = False
+        # AWS lambda execution enviroment requires handler to consume two arguments
+        # 1. Event - input of json format
+        # 2. Context - The execution context object
+        context = args[1]
+        # Expected formats for Lambda ARN are:
+        # https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-lambda
+        invoked_function_arn = context.invoked_function_arn
+        split_arn = invoked_function_arn.split(':')
+        point_tags = {
+            'LambdaArn': invoked_function_arn,
+            'Region': split_arn[3],
+            'accountId': split_arn[4],
+            'ExecutedVersion': context.function_version
+        }
+        if split_arn[5] == 'function':
+            point_tags['FunctionName'] = split_arn[6]
+            point_tags['Resource'] = split_arn[6]
+            if len(split_arn) == 8 and split_arn[7] != context.function_version:
+                point_tags['Resource'] = point_tags['Resource'] + ":" + split_arn[7]
+        elif split_arn[5] == 'event-source-mappings':
+            point_tags['EventSourceMappings'] = split_arn[6]
+
+        # Initialize registry for each lambda invocation
+        global reg
+        reg = MetricsRegistry()
+
+        # Initialize the wavefront direct reporter
+        wf_direct_reporter = WavefrontDirectReporter(server=server,
+                                                     token=auth_token,
+                                                     registry=reg,
+                                                     source=point_tags['FunctionName'],
+                                                     tags=point_tags,
+                                                     prefix="aws.lambda.wf.")
+
+        if is_report_standard_metrics:
+            call_lambda_with_standard_metrics(wf_direct_reporter,
+                                              *args,
+                                              **kwargs)
+        else:
+            call_lambda_without_standard_metrics(wf_direct_reporter,
+                                                 *args,
+                                                 **kwargs)
+
+    return wavefront_wrapper
+
+
+def get_registry():
+    return reg
diff --git a/wavefront_lambda/wavefront_lambda/tests/__init__.py b/wavefront_lambda/wavefront_lambda/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py b/wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py
new file mode 100644
index 0000000..566fbc2
--- /dev/null
+++ b/wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py
@@ -0,0 +1,19 @@
+from unittest import TestCase
+from wavefront_pyformance.wavefront_reporter import WavefrontDirectReporter
+import unittest
+from pyformance import MetricsRegistry
+from __init__ import wrapper
+
+@wrapper
+def lambda_handler(event, context):
+    return True
+
+class TestWrapper(TestCase):
+    def test_wavefront_wrapper(self):
+        #reg = MetricsRegistry()
+        function_wrapper = wrapper(lambda_handler)
+        assert(function_wrapper.__name__ == "wavefront_wrapper")
+
+if __name__ == '__main__':
+    # run 'python -m unittest discover' from toplevel to run tests
+    unittest.main()

From 6498f01dd8871b8d6575630766baa6e061a0e73a Mon Sep 17 00:00:00 2001
From: Anil Krishna Kodali <38334031+akodali18@users.noreply.github.com>
Date: Thu, 5 Jul 2018 12:52:37 -0700
Subject: [PATCH 005/161] MONIT-9897/Fix for prefix not required for custom
 metrics. (#31)

* MONIT-9897/Fix for prefix not required for custom metrics.
* Modifying readme to inform users how to send custom metrics to wavefront
---
 wavefront_lambda/README.md                    |  7 ++++++-
 wavefront_lambda/wavefront_lambda/__init__.py | 13 +++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
index 9712b16..49ee3a9 100644
--- a/wavefront_lambda/README.md
+++ b/wavefront_lambda/README.md
@@ -14,7 +14,7 @@ pip install wavefront_lambda
 ## Environmental variables
 WAVEFRONT_URL = https://\<INSTANCE>.wavefront.com  
 WAVEFRONT_API_TOKEN = Wavefront API token with Direct Data Ingestion permission.  
-IS_REPORT_STANDARD_METRICS = Set to False to not report standard lambda metrics directly to wavefront.  
+IS_REPORT_STANDARD_METRICS = Set to False or false to not report standard lambda metrics directly to wavefront.  
 
 ## Usage
 
@@ -52,3 +52,8 @@ The Lambda wrapper adds the following point tags to all metrics sent to wavefron
 | FunctionName          | The name of Lambda function.                                                  |
 | Resource              | Execution time of the Lambda.                                                 |
 | EventSourceMappings   | AWS Function Name (In case of an event source mapping Lambda invocation only,)|
+
+## Custom Lambda Metrics
+
+The wavefront lambda wrapper reports custom business metrics via a metrics registry provided by the [pyformance plugin](https://github.com/wavefrontHQ/python-client/tree/master/wavefront_pyformance).  
+Please refer to the [code sample](https://github.com/wavefrontHQ/python-client/blob/master/wavefront_lambda/example.py) which shows how you can send custom business metrics to wavefront from your lambda function.
diff --git a/wavefront_lambda/wavefront_lambda/__init__.py b/wavefront_lambda/wavefront_lambda/__init__.py
index bf2b497..d236277 100644
--- a/wavefront_lambda/wavefront_lambda/__init__.py
+++ b/wavefront_lambda/wavefront_lambda/__init__.py
@@ -20,16 +20,17 @@ def wrapper(func):
 
     """
     def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
+        METRIC_PREFIX = "aws.lambda.wf."
         # Set cold start counter
         global is_cold_start
         if is_cold_start:
-            aws_cold_starts_counter = delta.delta_counter(reg, "coldstarts")
+            aws_cold_starts_counter = delta.delta_counter(reg, METRIC_PREFIX + "coldstarts")
             aws_cold_starts_counter.inc()
-            aws_cold_starts_normal_counter = reg.counter("coldstarts_raw")
+            aws_cold_starts_normal_counter = reg.counter(METRIC_PREFIX + "coldstarts_raw")
             aws_cold_starts_normal_counter.inc()
             is_cold_start = False
         # Set invocations counter
-        aws_lambda_invocations_counter = delta.delta_counter(reg, "invocations")
+        aws_lambda_invocations_counter = delta.delta_counter(reg, METRIC_PREFIX + "invocations")
         aws_lambda_invocations_counter.inc()
         time_start = datetime.now()
         try:
@@ -37,13 +38,13 @@ def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
             return result
         except:
             # Set error counter
-            aws_lambda_errors_counter = delta.delta_counter(reg, "errors")
+            aws_lambda_errors_counter = delta.delta_counter(reg, METRIC_PREFIX + "errors")
             aws_lambda_errors_counter.inc()
             raise
         finally:
             time_taken = datetime.now() - time_start
             # Set duration Gauge
-            aws_lambda_duration_gauge = reg.gauge("duration")
+            aws_lambda_duration_gauge = reg.gauge(METRIC_PREFIX + "duration")
             aws_lambda_duration_gauge.set_value(time_taken.total_seconds() * 1000)
             wf_reporter.report_now(registry=reg)
 
@@ -98,7 +99,7 @@ def wavefront_wrapper(*args, **kwargs):
                                                      registry=reg,
                                                      source=point_tags['FunctionName'],
                                                      tags=point_tags,
-                                                     prefix="aws.lambda.wf.")
+                                                     prefix="")
 
         if is_report_standard_metrics:
             call_lambda_with_standard_metrics(wf_direct_reporter,

From adecef658e588808c363f8a30b5aa01189389e0e Mon Sep 17 00:00:00 2001
From: akodali18 <akodali@vmware.com>
Date: Thu, 5 Jul 2018 13:24:23 -0700
Subject: [PATCH 006/161] udpating pypi version

---
 wavefront_lambda/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wavefront_lambda/setup.py b/wavefront_lambda/setup.py
index 5c18b84..59dc84e 100644
--- a/wavefront_lambda/setup.py
+++ b/wavefront_lambda/setup.py
@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront_lambda"
-VERSION = "0.9.0"
+VERSION = "0.9.1"
 # To install the library, run the following
 #
 # python setup.py install

From e7a530739d5252d25d3112cefaa14bf17e6ec5ab Mon Sep 17 00:00:00 2001
From: Anil Krishna Kodali <38334031+akodali18@users.noreply.github.com>
Date: Thu, 5 Jul 2018 17:17:10 -0700
Subject: [PATCH 007/161] Monit 9912/add invocation error raw counters (#34)

* Adding support to report invocations and Errors as regular counters. In case of Lambda functions, occurrence of an invocation or an error should be treated like an occurrence of an event which are reported with a counter set to 1.
---
 wavefront_lambda/README.md                    | 4 +++-
 wavefront_lambda/setup.py                     | 2 +-
 wavefront_lambda/wavefront_lambda/__init__.py | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
index 49ee3a9..7c83eb1 100644
--- a/wavefront_lambda/README.md
+++ b/wavefront_lambda/README.md
@@ -36,9 +36,11 @@ The Lambda wrapper sends the following standard lambda metrics to wavefront:
 | Metric Name                       |  Type              | Description                                                             |
 | ----------------------------------|:------------------:| ----------------------------------------------------------------------- |
 | aws.lambda.wf.invocations.count   | Delta Counter      | Count of number of lambda function invocations aggregated at the server.|
+| aws.lambda.wf.invocation_event.count   |  Counter      | Count of number of lambda function invocations.|
 | aws.lambda.wf.errors.count        | Delta Counter      | Count of number of errors aggregated at the server.                     |
+| aws.lambda.wf.error_event.count        |  Counter      | Count of number of errors.                     |
 | aws.lambda.wf.coldstarts.count    | Delta Counter      | Count of number of cold starts aggregated at the server.                |
-| aws.lambda.wf.coldstarts_raw.count| Counter            | Count of number of cold starts.                                         |
+| aws.lambda.wf.coldstart_event.count| Counter           | Count of number of cold starts.                                         |
 | aws.lambda.wf.duration.value      | Gauge              | Execution time of the Lambda handler function in milliseconds.          |
 
 The Lambda wrapper adds the following point tags to all metrics sent to wavefront:
diff --git a/wavefront_lambda/setup.py b/wavefront_lambda/setup.py
index 59dc84e..baf7275 100644
--- a/wavefront_lambda/setup.py
+++ b/wavefront_lambda/setup.py
@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront_lambda"
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_lambda/wavefront_lambda/__init__.py b/wavefront_lambda/wavefront_lambda/__init__.py
index d236277..929c087 100644
--- a/wavefront_lambda/wavefront_lambda/__init__.py
+++ b/wavefront_lambda/wavefront_lambda/__init__.py
@@ -21,17 +21,20 @@ def wrapper(func):
     """
     def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
         METRIC_PREFIX = "aws.lambda.wf."
+        METRIC_EVENT_SUFFIX = "_event"
         # Set cold start counter
         global is_cold_start
         if is_cold_start:
             aws_cold_starts_counter = delta.delta_counter(reg, METRIC_PREFIX + "coldstarts")
             aws_cold_starts_counter.inc()
-            aws_cold_starts_normal_counter = reg.counter(METRIC_PREFIX + "coldstarts_raw")
-            aws_cold_starts_normal_counter.inc()
+            aws_cold_start_event_counter = reg.counter(METRIC_PREFIX + "coldstart" + METRIC_EVENT_SUFFIX)
+            aws_cold_start_event_counter.inc()
             is_cold_start = False
         # Set invocations counter
         aws_lambda_invocations_counter = delta.delta_counter(reg, METRIC_PREFIX + "invocations")
         aws_lambda_invocations_counter.inc()
+        aws_lambda_invocation_event_counter = reg.counter(METRIC_PREFIX + "invocation" + METRIC_EVENT_SUFFIX)
+        aws_lambda_invocation_event_counter.inc()
         time_start = datetime.now()
         try:
             result = func(*args, **kwargs)
@@ -40,6 +43,8 @@ def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
             # Set error counter
             aws_lambda_errors_counter = delta.delta_counter(reg, METRIC_PREFIX + "errors")
             aws_lambda_errors_counter.inc()
+            aws_lambda_error_event_counter = reg.counter(METRIC_PREFIX + "error" + METRIC_EVENT_SUFFIX)
+            aws_lambda_error_event_counter.inc()
             raise
         finally:
             time_taken = datetime.now() - time_start

From e01cbe0bc5f68a3318633e4efc19cc23e1614b42 Mon Sep 17 00:00:00 2001
From: Anil Krishna Kodali <38334031+akodali18@users.noreply.github.com>
Date: Tue, 10 Jul 2018 16:02:01 -0700
Subject: [PATCH 008/161] Add clarification for naming convention when a Delta
 counter and Counter might be tracking the same functional metric (#35)

* Adding clarification regarding naming convention of Delta Counter and Counter tracking the same functional metric
---
 wavefront_lambda/README.md     | 3 +++
 wavefront_pyformance/README.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
index 7c83eb1..d73e2ec 100644
--- a/wavefront_lambda/README.md
+++ b/wavefront_lambda/README.md
@@ -43,6 +43,9 @@ The Lambda wrapper sends the following standard lambda metrics to wavefront:
 | aws.lambda.wf.coldstart_event.count| Counter           | Count of number of cold starts.                                         |
 | aws.lambda.wf.duration.value      | Gauge              | Execution time of the Lambda handler function in milliseconds.          |
 
+Note: Having the same metric name for any two types of metrics will result in only one time series at the server and thus cause collisions.
+In general, all metric names should be different. In case you have metrics that you want to track as both a Counter and Delta Counter, consider adding a relevant suffix to one of the metrics to differentiate one metric name from another.
+
 The Lambda wrapper adds the following point tags to all metrics sent to wavefront:
 
 | Point Tag             | Description                                                                   |
diff --git a/wavefront_pyformance/README.md b/wavefront_pyformance/README.md
index 190d72e..0d79ef2 100644
--- a/wavefront_pyformance/README.md
+++ b/wavefront_pyformance/README.md
@@ -52,3 +52,6 @@ reg = MetricsRegistry()
 d1 = delta.delta_counter(reg, "requests_delta")
 d1.inc(10)
 ```
+
+Note: Having the same metric name for any two types of metrics will result in only one time series at the server and thus cause collisions.
+In general, all metric names should be different. In case you have metrics that you want to track as both a Counter and Delta Counter, consider adding a relevant suffix to one of the metrics to differentiate one metric name from another.

From 3893fa34989ddc443ea07bfcf893979c3296ccb6 Mon Sep 17 00:00:00 2001
From: akodali18 <akodali@vmware.com>
Date: Thu, 12 Jul 2018 13:27:43 -0700
Subject: [PATCH 009/161] Modify to report relevant counters as 0, if there are
 no corresponding events.

This change modifies reporting of certain relevant counters and fixes the below things:
1.Modify point tags assignment in case of lambda invoked by via streams.
2.Modify README.md with correct description of Resource
---
 wavefront_lambda/README.md                    |  2 +-
 wavefront_lambda/wavefront_lambda/__init__.py | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
index d73e2ec..75b7ba4 100644
--- a/wavefront_lambda/README.md
+++ b/wavefront_lambda/README.md
@@ -55,7 +55,7 @@ The Lambda wrapper adds the following point tags to all metrics sent to wavefron
 | accountId             | AWS Account ID from which the Lambda function was invoked.                    |
 | ExecutedVersion       | The version of Lambda function.                                               |
 | FunctionName          | The name of Lambda function.                                                  |
-| Resource              | Execution time of the Lambda.                                                 |
+| Resource              | The name and version/alias of Lambda function. (Ex: DemoLambdaFunc:aliasProd) |
 | EventSourceMappings   | AWS Function Name (In case of an event source mapping Lambda invocation only,)|
 
 ## Custom Lambda Metrics
diff --git a/wavefront_lambda/wavefront_lambda/__init__.py b/wavefront_lambda/wavefront_lambda/__init__.py
index 929c087..6cd8441 100644
--- a/wavefront_lambda/wavefront_lambda/__init__.py
+++ b/wavefront_lambda/wavefront_lambda/__init__.py
@@ -11,7 +11,7 @@
 def wrapper(func):
     """
     Returns the Wavefront Lambda wrapper. The wrapper collects aws lambda's
-    standard metrics and reports it directly to the set wavefront url. It
+    standard metrics and reports it directly to the specified wavefront url. It
     requires the following Environmental variables to be set:
     1.WAVEFRONT_URL : https://<INSTANCE>.wavefront.com
     2.WAVEFRONT_API_TOKEN : Wavefront API token with Direct Data Ingestion permission
@@ -22,12 +22,13 @@ def wrapper(func):
     def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
         METRIC_PREFIX = "aws.lambda.wf."
         METRIC_EVENT_SUFFIX = "_event"
-        # Set cold start counter
+        # Register cold start counter
+        aws_cold_starts_counter = delta.delta_counter(reg, METRIC_PREFIX + "coldstarts")
+        aws_cold_start_event_counter = reg.counter(METRIC_PREFIX + "coldstart" + METRIC_EVENT_SUFFIX)
         global is_cold_start
         if is_cold_start:
-            aws_cold_starts_counter = delta.delta_counter(reg, METRIC_PREFIX + "coldstarts")
+            # Set cold start counter.
             aws_cold_starts_counter.inc()
-            aws_cold_start_event_counter = reg.counter(METRIC_PREFIX + "coldstart" + METRIC_EVENT_SUFFIX)
             aws_cold_start_event_counter.inc()
             is_cold_start = False
         # Set invocations counter
@@ -35,21 +36,23 @@ def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
         aws_lambda_invocations_counter.inc()
         aws_lambda_invocation_event_counter = reg.counter(METRIC_PREFIX + "invocation" + METRIC_EVENT_SUFFIX)
         aws_lambda_invocation_event_counter.inc()
+        # Register duration gauge.
+        aws_lambda_duration_gauge = reg.gauge(METRIC_PREFIX + "duration")
+        # Register error counter.
+        aws_lambda_errors_counter = delta.delta_counter(reg, METRIC_PREFIX + "errors")
+        aws_lambda_error_event_counter = reg.counter(METRIC_PREFIX + "error" + METRIC_EVENT_SUFFIX)
         time_start = datetime.now()
         try:
             result = func(*args, **kwargs)
             return result
         except:
             # Set error counter
-            aws_lambda_errors_counter = delta.delta_counter(reg, METRIC_PREFIX + "errors")
             aws_lambda_errors_counter.inc()
-            aws_lambda_error_event_counter = reg.counter(METRIC_PREFIX + "error" + METRIC_EVENT_SUFFIX)
             aws_lambda_error_event_counter.inc()
             raise
         finally:
             time_taken = datetime.now() - time_start
-            # Set duration Gauge
-            aws_lambda_duration_gauge = reg.gauge(METRIC_PREFIX + "duration")
+            # Set duration gauge
             aws_lambda_duration_gauge.set_value(time_taken.total_seconds() * 1000)
             wf_reporter.report_now(registry=reg)
 
@@ -82,14 +85,14 @@ def wavefront_wrapper(*args, **kwargs):
         split_arn = invoked_function_arn.split(':')
         point_tags = {
             'LambdaArn': invoked_function_arn,
+            'FunctionName' : context.function_name,
+            'ExecutedVersion': context.function_version,
             'Region': split_arn[3],
-            'accountId': split_arn[4],
-            'ExecutedVersion': context.function_version
+            'accountId': split_arn[4]
         }
         if split_arn[5] == 'function':
-            point_tags['FunctionName'] = split_arn[6]
             point_tags['Resource'] = split_arn[6]
-            if len(split_arn) == 8 and split_arn[7] != context.function_version:
+            if len(split_arn) == 8 :
                 point_tags['Resource'] = point_tags['Resource'] + ":" + split_arn[7]
         elif split_arn[5] == 'event-source-mappings':
             point_tags['EventSourceMappings'] = split_arn[6]

From 19480fbfc04c7ffd83fc932b328f13b474dacd09 Mon Sep 17 00:00:00 2001
From: Anil Krishna Kodali <38334031+akodali18@users.noreply.github.com>
Date: Wed, 18 Jul 2018 15:42:10 -0700
Subject: [PATCH 010/161] Moving note about naming convention of counters and
 delta counters into the custom metrics section (#38)

---
 wavefront_lambda/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
index 75b7ba4..87c13aa 100644
--- a/wavefront_lambda/README.md
+++ b/wavefront_lambda/README.md
@@ -43,9 +43,6 @@ The Lambda wrapper sends the following standard lambda metrics to wavefront:
 | aws.lambda.wf.coldstart_event.count| Counter           | Count of number of cold starts.                                         |
 | aws.lambda.wf.duration.value      | Gauge              | Execution time of the Lambda handler function in milliseconds.          |
 
-Note: Having the same metric name for any two types of metrics will result in only one time series at the server and thus cause collisions.
-In general, all metric names should be different. In case you have metrics that you want to track as both a Counter and Delta Counter, consider adding a relevant suffix to one of the metrics to differentiate one metric name from another.
-
 The Lambda wrapper adds the following point tags to all metrics sent to wavefront:
 
 | Point Tag             | Description                                                                   |
@@ -56,9 +53,12 @@ The Lambda wrapper adds the following point tags to all metrics sent to wavefron
 | ExecutedVersion       | The version of Lambda function.                                               |
 | FunctionName          | The name of Lambda function.                                                  |
 | Resource              | The name and version/alias of Lambda function. (Ex: DemoLambdaFunc:aliasProd) |
-| EventSourceMappings   | AWS Function Name (In case of an event source mapping Lambda invocation only,)|
+| EventSourceMappings   | AWS Event source mapping Id. (Set in case of Lambda invocation by AWS Poll-Based Services)|
 
 ## Custom Lambda Metrics
 
 The wavefront lambda wrapper reports custom business metrics via a metrics registry provided by the [pyformance plugin](https://github.com/wavefrontHQ/python-client/tree/master/wavefront_pyformance).  
 Please refer to the [code sample](https://github.com/wavefrontHQ/python-client/blob/master/wavefront_lambda/example.py) which shows how you can send custom business metrics to wavefront from your lambda function.
+
+Note: Having the same metric name for any two types of metrics will result in only one time series at the server and thus cause collisions.
+In general, all metric names should be different. In case you have metrics that you want to track as both a Counter and Delta Counter, consider adding a relevant suffix to one of the metrics to differentiate one metric name from another.

From 290cd1c1fcf3870ca8fab0a4d0315a96eca240c4 Mon Sep 17 00:00:00 2001
From: Anil Krishna Kodali <38334031+akodali18@users.noreply.github.com>
Date: Fri, 20 Jul 2018 15:23:50 -0700
Subject: [PATCH 011/161] Fix environment variable naming (#39)

---
 wavefront_lambda/README.md                    |  4 ++--
 wavefront_lambda/wavefront_lambda/__init__.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
index 87c13aa..3e81bd9 100644
--- a/wavefront_lambda/README.md
+++ b/wavefront_lambda/README.md
@@ -11,10 +11,10 @@ To install from PyPi
 pip install wavefront_lambda
 ```
 
-## Environmental variables
+## Environment variables
 WAVEFRONT_URL = https://\<INSTANCE>.wavefront.com  
 WAVEFRONT_API_TOKEN = Wavefront API token with Direct Data Ingestion permission.  
-IS_REPORT_STANDARD_METRICS = Set to False or false to not report standard lambda metrics directly to wavefront.  
+REPORT_STANDARD_METRICS = Set to False or false to not report standard lambda metrics directly to wavefront.  
 
 ## Usage
 
diff --git a/wavefront_lambda/wavefront_lambda/__init__.py b/wavefront_lambda/wavefront_lambda/__init__.py
index 6cd8441..b4774fc 100644
--- a/wavefront_lambda/wavefront_lambda/__init__.py
+++ b/wavefront_lambda/wavefront_lambda/__init__.py
@@ -12,10 +12,10 @@ def wrapper(func):
     """
     Returns the Wavefront Lambda wrapper. The wrapper collects aws lambda's
     standard metrics and reports it directly to the specified wavefront url. It
-    requires the following Environmental variables to be set:
+    requires the following Environment variables to be set:
     1.WAVEFRONT_URL : https://<INSTANCE>.wavefront.com
     2.WAVEFRONT_API_TOKEN : Wavefront API token with Direct Data Ingestion permission
-    3.IS_REPORT_STANDARD_METRICS : Set to False to not report standard lambda
+    3.REPORT_STANDARD_METRICS : Set to False to not report standard lambda
                                    metrics directly to wavefront.
 
     """
@@ -68,12 +68,12 @@ def call_lambda_without_standard_metrics(wf_reporter, *args, **kwargs):
     def wavefront_wrapper(*args, **kwargs):
         server = os.environ.get('WAVEFRONT_URL')
         if not server:
-            raise ValueError("Environmental variable WAVEFRONT_URL is not set.")
+            raise ValueError("Environment variable WAVEFRONT_URL is not set.")
         auth_token = os.environ.get('WAVEFRONT_API_TOKEN')
         if not auth_token:
-            raise ValueError("Environmental variable WAVEFRONT_API_TOKEN is not set.")
+            raise ValueError("Environment variable WAVEFRONT_API_TOKEN is not set.")
         is_report_standard_metrics = True
-        if os.environ.get('IS_REPORT_STANDARD_METRICS') in ['False', 'false']:
+        if os.environ.get('REPORT_STANDARD_METRICS') in ['False', 'false']:
             is_report_standard_metrics = False
         # AWS lambda execution enviroment requires handler to consume two arguments
         # 1. Event - input of json format

From eb87f65b3e42dc0bbfe546f57ff133db472443fb Mon Sep 17 00:00:00 2001
From: akodali18 <akodali@vmware.com>
Date: Fri, 20 Jul 2018 18:32:52 -0700
Subject: [PATCH 012/161] Updating pip dist version

---
 wavefront_lambda/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wavefront_lambda/setup.py b/wavefront_lambda/setup.py
index baf7275..f05ce72 100644
--- a/wavefront_lambda/setup.py
+++ b/wavefront_lambda/setup.py
@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront_lambda"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 # To install the library, run the following
 #
 # python setup.py install

From 6fea51c24bf594cc287b52c92f1b9a1ec9596bc9 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 10 Jul 2018 15:51:51 -0700
Subject: [PATCH 013/161] Allow Event's 'end_time' to be None.

This should fix the error thrown for ongoing events.

>>> import wavefront_api_client
>>> _config = wavefront_api_client.Configuration()
>>> _config.host = 'https://<your_host>.wavefront.com'
>>> event_api_client = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration=_config, header_name='Authorization', header_value='Bearer <YOUR_API_TOKEN>'))
>>> event_api_client.get_event('1525902632435:ongoing-test-event')  # an ongoing event id
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api/event_api.py", line 550, in get_event
    (data) = self.get_event_with_http_info(id, **kwargs)  # noqa: E501
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api/event_api.py", line 624, in get_event_with_http_info
    collection_formats=collection_formats)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 322, in call_api
    _preload_content, _request_timeout)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 161, in __call_api
    return_data = self.deserialize(response_data, response_type)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 233, in deserialize
    return self.__deserialize(data, response_type)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 272, in __deserialize
    return self.__deserialize_model(data, klass)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 613, in __deserialize_model
    kwargs[attr] = self.__deserialize(value, attr_type)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 272, in __deserialize
    return self.__deserialize_model(data, klass)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/api_client.py", line 615, in __deserialize_model
    instance = klass(**kwargs)
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/models/event.py", line 136, in __init__
    self.end_time = end_time
  File "/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/wavefront_api_client/models/event.py", line 527, in end_time
    raise ValueError("Invalid value for `end_time`, must not be `None`")  # noqa: E501
ValueError: Invalid value for `end_time`, must not be `None`
---
 wavefront_api_client/models/event.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 328c9f0..74ce3de 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -523,10 +523,8 @@ def end_time(self, end_time):
         :param end_time: The end_time of this Event.  # noqa: E501
         :type: int
         """
-        if end_time is None:
-            raise ValueError("Invalid value for `end_time`, must not be `None`")  # noqa: E501
-
-        self._end_time = end_time
+        if end_time is not None:
+            self._end_time = end_time
 
     @property
     def running_state(self):

From de38d4e9b3b9e8c0e50ba2d8bf7453bddefb71ad Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 14 Aug 2018 18:06:08 -0700
Subject: [PATCH 014/161] Version 2.3.2 Generated Using Latest Swagger Spec.
 (#43)

* Version 2.3.2 Generated Using Latest Swagger Spec.

Command Used:
```
$ java -jar ~/swagger-codegen-cli-2.3.1.jar generate -i https://mon.wavefront.com/api/v2/swagger.json -l python --git-user-id wavefrontHQ --git-repo-id python-client -D packageName=wavefront_api_client,packageVersion=2.3.2,packageUrl=https://github.com/wavefrontHQ/python-client
```

* Replace 'async' With 'async_req' for Python 3.7

Python 3.7 has added `async` as a reserved word.
Replaced `:%s/\<async\>/async_req/g` as needed.

Fixes #45

* Updated the README.md
---
 .swagger-codegen/VERSION                      |    1 +
 README.md                                     |  165 +--
 docs/Alert.md                                 |   46 +-
 docs/AlertApi.md                              |    8 +-
 docs/AvroBackedStandardizedDTO.md             |    2 +-
 docs/AzureBaseCredentials.md                  |    2 +-
 docs/AzureConfiguration.md                    |    2 +-
 docs/Chart.md                                 |    8 +-
 docs/ChartSettings.md                         |    4 +-
 docs/CloudIntegration.md                      |    7 +-
 docs/CloudTrailConfiguration.md               |    4 +-
 docs/CloudWatchConfiguration.md               |    4 +-
 docs/CustomerFacingUserObject.md              |    4 +-
 docs/Dashboard.md                             |   10 +-
 docs/DashboardParameterValue.md               |   12 +-
 docs/DerivedMetricApi.md                      |  684 +++++++++
 docs/DerivedMetricDefinition.md               |   24 +-
 docs/Event.md                                 |   14 +-
 docs/EventApi.md                              |    8 +-
 docs/EventSearchRequest.md                    |    2 +-
 docs/ExternalLink.md                          |    2 +-
 docs/GCPBillingConfiguration.md               |   12 +
 docs/GCPConfiguration.md                      |    4 +-
 docs/Integration.md                           |   10 +-
 docs/IntegrationAlias.md                      |    2 +-
 docs/IntegrationManifestGroup.md              |    4 +-
 docs/IntegrationMetrics.md                    |    4 +-
 docs/IteratorEntryStringJsonNode.md           |    9 +
 docs/IteratorJsonNode.md                      |    9 +
 docs/IteratorString.md                        |    9 +
 docs/LogicalType.md                           |   10 +
 docs/MaintenanceWindow.md                     |   20 +-
 docs/Message.md                               |    6 +-
 docs/Notificant.md                            |    9 +-
 docs/Number.md                                |    9 +
 docs/Proxy.md                                 |   16 +-
 docs/QueryResult.md                           |    4 +-
 docs/SavedSearch.md                           |    4 +-
 docs/SearchApi.md                             |   12 +-
 docs/Source.md                                |    6 +-
 docs/SourceLabelPair.md                       |    2 +-
 docs/SourceSearchRequestContainer.md          |    2 +-
 setup.py                                      |    4 +-
 wavefront_api_client/__init__.py              |    8 +-
 wavefront_api_client/api/__init__.py          |    2 +-
 wavefront_api_client/api/alert_api.py         |  278 ++--
 .../api/cloud_integration_api.py              |  144 +-
 wavefront_api_client/api/dashboard_api.py     |  216 +--
 .../api/derived_metric_api.py                 | 1226 +++++++++++++++++
 .../api/derived_metric_definition_api.py      |  216 +--
 wavefront_api_client/api/event_api.py         |  188 +--
 wavefront_api_client/api/external_link_api.py |   90 +-
 wavefront_api_client/api/integration_api.py   |  126 +-
 .../api/maintenance_window_api.py             |   90 +-
 wavefront_api_client/api/message_api.py       |   36 +-
 wavefront_api_client/api/metric_api.py        |   18 +-
 wavefront_api_client/api/notificant_api.py    |  108 +-
 wavefront_api_client/api/proxy_api.py         |   90 +-
 wavefront_api_client/api/query_api.py         |   36 +-
 wavefront_api_client/api/saved_search_api.py  |  108 +-
 wavefront_api_client/api/search_api.py        |  930 ++++++-------
 wavefront_api_client/api/source_api.py        |  198 +--
 wavefront_api_client/api/user_api.py          |  108 +-
 wavefront_api_client/api/webhook_api.py       |   90 +-
 wavefront_api_client/api_client.py            |   14 +-
 wavefront_api_client/configuration.py         |    2 +-
 wavefront_api_client/models/__init__.py       |    6 +
 wavefront_api_client/models/alert.py          | 1132 +++++++--------
 .../models/avro_backed_standardized_dto.py    |   54 +-
 .../models/azure_base_credentials.py          |   64 +-
 .../models/azure_configuration.py             |   54 +-
 wavefront_api_client/models/chart.py          |  198 +--
 wavefront_api_client/models/chart_settings.py |  112 +-
 .../models/cloud_integration.py               |  187 +--
 .../models/cloud_trail_configuration.py       |   90 +-
 .../models/cloud_watch_configuration.py       |  114 +-
 .../models/customer_facing_user_object.py     |  112 +-
 wavefront_api_client/models/dashboard.py      |  250 ++--
 .../models/dashboard_parameter_value.py       |  290 ++--
 .../models/derived_metric_definition.py       |  596 ++++----
 wavefront_api_client/models/event.py          |  295 ++--
 .../models/event_search_request.py            |    2 +
 wavefront_api_client/models/external_link.py  |   58 +-
 .../models/gcp_billing_configuration.py       |  173 +++
 .../models/gcp_configuration.py               |   68 +-
 wavefront_api_client/models/integration.py    |  254 ++--
 .../models/integration_alias.py               |   62 +-
 .../models/integration_manifest_group.py      |   70 +-
 .../models/integration_metrics.py             |  114 +-
 .../models/iterator_entry_string_json_node.py |   84 ++
 .../models/iterator_json_node.py              |   84 ++
 .../models/iterator_string.py                 |   84 ++
 wavefront_api_client/models/logical_type.py   |  112 ++
 .../models/maintenance_window.py              |  466 +++----
 wavefront_api_client/models/message.py        |  174 +--
 wavefront_api_client/models/notificant.py     |  214 +--
 wavefront_api_client/models/number.py         |   84 ++
 wavefront_api_client/models/proxy.py          |  350 ++---
 wavefront_api_client/models/query_result.py   |  118 +-
 wavefront_api_client/models/saved_search.py   |  128 +-
 wavefront_api_client/models/source.py         |  138 +-
 .../models/source_label_pair.py               |   54 +-
 .../models/source_search_request_container.py |    2 +
 103 files changed, 7309 insertions(+), 4640 deletions(-)
 create mode 100644 .swagger-codegen/VERSION
 create mode 100644 docs/DerivedMetricApi.md
 create mode 100644 docs/GCPBillingConfiguration.md
 create mode 100644 docs/IteratorEntryStringJsonNode.md
 create mode 100644 docs/IteratorJsonNode.md
 create mode 100644 docs/IteratorString.md
 create mode 100644 docs/LogicalType.md
 create mode 100644 docs/Number.md
 create mode 100644 wavefront_api_client/api/derived_metric_api.py
 create mode 100644 wavefront_api_client/models/gcp_billing_configuration.py
 create mode 100644 wavefront_api_client/models/iterator_entry_string_json_node.py
 create mode 100644 wavefront_api_client/models/iterator_json_node.py
 create mode 100644 wavefront_api_client/models/iterator_string.py
 create mode 100644 wavefront_api_client/models/logical_type.py
 create mode 100644 wavefront_api_client/models/number.py

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
new file mode 100644
index 0000000..a625450
--- /dev/null
+++ b/.swagger-codegen/VERSION
@@ -0,0 +1 @@
+2.3.1
\ No newline at end of file
diff --git a/README.md b/README.md
index 81b034a..4742320 100644
--- a/README.md
+++ b/README.md
@@ -1,97 +1,82 @@
 # Wavefront API Client
+<p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header `"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;"` to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>
 
-The Wavefront API allows you to perform various operations in Wavefront. The API can be used to automate commonly executed operations such as tagging sources automatically, sending events, and more.
+This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
-This Python package is automatically generated by the Swagger Codegen project.
+- API version: v2
+- Package version: 2.3.2
+- Build package: io.swagger.codegen.languages.PythonClientCodegen
 
-- Wavefront API version: 2
+## Requirements.
 
-If you're looking for the V1 API, the API client can be found in the api-v1 branch of this repository.
+Python 2.7 and 3.4+
 
-## Requirements
-
-- Python 2.7 or higher 
-- OpenSSL 1.0.1 or higher (TLSv1.2 support)
-
-**Note ("[Errno 54] Connection reset by peer" error)**:
-This is a known issue affecting Python 2.7 on most Macs. macOS ships with an outdated version of the OpenSSL library that only supports deprecated encryption protocols. As a result, Python 2.7 that ships with the system, doesn't support TLSv1.2. During SSL handshake it attempts to use TLSv1 encryption protocol, which is no longer considered secure, and Wavefront servers are terminating the connection, which results in a "Connection reset by peer" error.
-To work around this issue, the easiest way would be to install an updated version of Python 2.7 using Homebrew (https://brew.sh), which doesn't rely on the system-provided OpenSSL library, or switch to Python 3.
-
-**Note:** v2.2.x libraries require a minor code modification to be compatible with v2.1.x and earlier versions due to breaking changes introduced by swagger-codegen.
-Before:
-
-```python
-client = wave_api.ApiClient(host=base_url, header_name='Authorization', header_value='Bearer ' + api_key)
-```
-
-After:
-
-```python
-config = wave_api.Configuration()
-config.host = base_url
-client = wave_api.ApiClient(configuration=config, header_name='Authorization', header_value='Bearer ' + api_key)
-```
-
-## Setuptools
-You can install the bindings via [Setuptools](http://pypi.python.org/pypi/setuptools).
+## Installation & Usage
+### pip install
 
 ```sh
-python setup.py install
+pip install wavefront-api-client
 ```
 
-Or you can install from Github via pip:
-
+Or you can install the latest version directly from Github
 ```sh
-pip install git+https://github.com/wavefronthq/python-client.git
+pip install git+https://github.com/wavefrontHQ/python-client.git
 ```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/wavefrontHQ/python-client.git`)
 
-Or you can install from PyPi via pip:
-
-```sh
-pip install wavefront-api-client
+Then import the package:
+```python
+import wavefront_api_client 
 ```
 
+### Setuptools
 
-To use the bindings, import the package:
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
 
-```python
-import wavefront_api_client
+```sh
+python setup.py install --user
 ```
+(or `sudo python setup.py install` to install the package for all users)
 
-## Manual Installation
-If you do not want to use Setuptools, you can download the latest release.
-Then, to use the bindings, import the package:
-
+Then import the package:
 ```python
-import path.to.wavefront_api_client
+import wavefront_api_client
 ```
 
 ## Getting Started
 
-All API endpoints are documented at https://YOUR_INSTANCE.wavefront.com/api-docs/ui/. Below is a simple example demonstrating how to use the library to call the Source API. You can use this example as a starting point.
+Please follow the [installation procedure](#installation--usage) and then run the following:
 
 ```python
-import wavefront_api_client as wave_api
-
-base_url = 'https://YOUR_INSTANCE.wavefront.com'
-api_key = 'YOUR_API_TOKEN'
+from __future__ import print_function
 
-config = wave_api.Configuration()
-config.host = base_url
-client = wave_api.ApiClient(configuration=config, header_name='Authorization', header_value='Bearer ' + api_key)
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+_config = wavefront_api_client.Configuration()
+_config.host = 'https://YOUR_INSTANCE.wavefront.com'
+
+api_instance = wavefront_api_client.AlertApi(
+    wavefront_api_client.ApiClient(configuration=_config,
+                                   header_name='Authorization',
+                                   header_value='Bearer ' + 'YOUR_API_TOKEN'))
+id = 'id_example' # str | 
+tag_value = 'tag_value_example' # str | 
+
+try:
+    # Add a tag to a specific alert
+    api_response = api_instance.add_alert_tag(id, tag_value)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->add_alert_tag: %s\n" % e)
 
-# instantiate source API
-source_api = wave_api.SourceApi(client)
-sources = source_api.get_all_source()
-print sources
 ```
 
-## Troubleshooting
-
-If you encounter a bug or need help, feel free to leave an [issue](https://github.com/wavefrontHQ/python-client/issues) on this GitHub repository.
-
 ## Documentation for API Endpoints
 
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AlertApi* | [**add_alert_tag**](docs/AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
@@ -129,18 +114,18 @@ Class | Method | HTTP request | Description
 *DashboardApi* | [**set_dashboard_tags**](docs/DashboardApi.md#set_dashboard_tags) | **POST** /api/v2/dashboard/{id}/tag | Set all tags associated with a specific dashboard
 *DashboardApi* | [**undelete_dashboard**](docs/DashboardApi.md#undelete_dashboard) | **POST** /api/v2/dashboard/{id}/undelete | Undelete a specific dashboard
 *DashboardApi* | [**update_dashboard**](docs/DashboardApi.md#update_dashboard) | **PUT** /api/v2/dashboard/{id} | Update a specific dashboard
-*DerivedMetricDefinitionApi* | [**add_tag_to_derived_metric_definition**](docs/DerivedMetricDefinitionApi.md#add_tag_to_derived_metric_definition) | **PUT** /api/v2/derivedmetricdefinition/{id}/tag/{tagValue} | Add a tag to a specific Derived Metric Definition
-*DerivedMetricDefinitionApi* | [**create_derived_metric_definition**](docs/DerivedMetricDefinitionApi.md#create_derived_metric_definition) | **POST** /api/v2/derivedmetricdefinition | Create a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**delete_derived_metric_definition**](docs/DerivedMetricDefinitionApi.md#delete_derived_metric_definition) | **DELETE** /api/v2/derivedmetricdefinition/{id} | Delete a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**get_all_derived_metric_definitions**](docs/DerivedMetricDefinitionApi.md#get_all_derived_metric_definitions) | **GET** /api/v2/derivedmetricdefinition | Get all derived metric definitions for a customer
-*DerivedMetricDefinitionApi* | [**get_derived_metric_definition_by_version**](docs/DerivedMetricDefinitionApi.md#get_derived_metric_definition_by_version) | **GET** /api/v2/derivedmetricdefinition/{id}/history/{version} | Get a specific historical version of a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**get_derived_metric_definition_history**](docs/DerivedMetricDefinitionApi.md#get_derived_metric_definition_history) | **GET** /api/v2/derivedmetricdefinition/{id}/history | Get the version history of a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**get_derived_metric_definition_tags**](docs/DerivedMetricDefinitionApi.md#get_derived_metric_definition_tags) | **GET** /api/v2/derivedmetricdefinition/{id}/tag | Get all tags associated with a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**get_registered_query**](docs/DerivedMetricDefinitionApi.md#get_registered_query) | **GET** /api/v2/derivedmetricdefinition/{id} | Get a specific registered query
-*DerivedMetricDefinitionApi* | [**remove_tag_from_derived_metric_definition**](docs/DerivedMetricDefinitionApi.md#remove_tag_from_derived_metric_definition) | **DELETE** /api/v2/derivedmetricdefinition/{id}/tag/{tagValue} | Remove a tag from a specific Derived Metric Definition
-*DerivedMetricDefinitionApi* | [**set_derived_metric_definition_tags**](docs/DerivedMetricDefinitionApi.md#set_derived_metric_definition_tags) | **POST** /api/v2/derivedmetricdefinition/{id}/tag | Set all tags associated with a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**undelete_derived_metric_definition**](docs/DerivedMetricDefinitionApi.md#undelete_derived_metric_definition) | **POST** /api/v2/derivedmetricdefinition/{id}/undelete | Undelete a specific derived metric definition
-*DerivedMetricDefinitionApi* | [**update_derived_metric_definition**](docs/DerivedMetricDefinitionApi.md#update_derived_metric_definition) | **PUT** /api/v2/derivedmetricdefinition/{id} | Update a specific derived metric definition
+*DerivedMetricApi* | [**add_tag_to_derived_metric**](docs/DerivedMetricApi.md#add_tag_to_derived_metric) | **PUT** /api/v2/derivedmetric/{id}/tag/{tagValue} | Add a tag to a specific Derived Metric
+*DerivedMetricApi* | [**create_derived_metric**](docs/DerivedMetricApi.md#create_derived_metric) | **POST** /api/v2/derivedmetric | Create a specific derived metric definition
+*DerivedMetricApi* | [**delete_derived_metric**](docs/DerivedMetricApi.md#delete_derived_metric) | **DELETE** /api/v2/derivedmetric/{id} | Delete a specific derived metric definition
+*DerivedMetricApi* | [**get_all_derived_metrics**](docs/DerivedMetricApi.md#get_all_derived_metrics) | **GET** /api/v2/derivedmetric | Get all derived metric definitions for a customer
+*DerivedMetricApi* | [**get_derived_metric**](docs/DerivedMetricApi.md#get_derived_metric) | **GET** /api/v2/derivedmetric/{id} | Get a specific registered query
+*DerivedMetricApi* | [**get_derived_metric_by_version**](docs/DerivedMetricApi.md#get_derived_metric_by_version) | **GET** /api/v2/derivedmetric/{id}/history/{version} | Get a specific historical version of a specific derived metric definition
+*DerivedMetricApi* | [**get_derived_metric_history**](docs/DerivedMetricApi.md#get_derived_metric_history) | **GET** /api/v2/derivedmetric/{id}/history | Get the version history of a specific derived metric definition
+*DerivedMetricApi* | [**get_derived_metric_tags**](docs/DerivedMetricApi.md#get_derived_metric_tags) | **GET** /api/v2/derivedmetric/{id}/tag | Get all tags associated with a specific derived metric definition
+*DerivedMetricApi* | [**remove_tag_from_derived_metric**](docs/DerivedMetricApi.md#remove_tag_from_derived_metric) | **DELETE** /api/v2/derivedmetric/{id}/tag/{tagValue} | Remove a tag from a specific Derived Metric
+*DerivedMetricApi* | [**set_derived_metric_tags**](docs/DerivedMetricApi.md#set_derived_metric_tags) | **POST** /api/v2/derivedmetric/{id}/tag | Set all tags associated with a specific derived metric definition
+*DerivedMetricApi* | [**undelete_derived_metric**](docs/DerivedMetricApi.md#undelete_derived_metric) | **POST** /api/v2/derivedmetric/{id}/undelete | Undelete a specific derived metric definition
+*DerivedMetricApi* | [**update_derived_metric**](docs/DerivedMetricApi.md#update_derived_metric) | **PUT** /api/v2/derivedmetric/{id} | Update a specific derived metric definition
 *EventApi* | [**add_event_tag**](docs/EventApi.md#add_event_tag) | **PUT** /api/v2/event/{id}/tag/{tagValue} | Add a tag to a specific event
 *EventApi* | [**close_event**](docs/EventApi.md#close_event) | **POST** /api/v2/event/{id}/close | Close a specific event
 *EventApi* | [**create_event**](docs/EventApi.md#create_event) | **POST** /api/v2/event | Create a specific event
@@ -223,12 +208,12 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_proxy_entities**](docs/SearchApi.md#search_proxy_entities) | **POST** /api/v2/search/proxy | Search over a customer&#39;s non-deleted proxies
 *SearchApi* | [**search_proxy_for_facet**](docs/SearchApi.md#search_proxy_for_facet) | **POST** /api/v2/search/proxy/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted proxies
 *SearchApi* | [**search_proxy_for_facets**](docs/SearchApi.md#search_proxy_for_facets) | **POST** /api/v2/search/proxy/facets | Lists the values of one or more facets over the customer&#39;s non-deleted proxies
-*SearchApi* | [**search_registered_query_deleted_entities**](docs/SearchApi.md#search_registered_query_deleted_entities) | **POST** /api/v2/search/derivedmetricdefinition/deleted | Search over a customer&#39;s deleted derived metric definitions
-*SearchApi* | [**search_registered_query_deleted_for_facet**](docs/SearchApi.md#search_registered_query_deleted_for_facet) | **POST** /api/v2/search/derivedmetricdefinition/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted derived metric definitions
-*SearchApi* | [**search_registered_query_deleted_for_facets**](docs/SearchApi.md#search_registered_query_deleted_for_facets) | **POST** /api/v2/search/derivedmetricdefinition/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted derived metric definitions
-*SearchApi* | [**search_registered_query_entities**](docs/SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetricdefinition | Search over a customer&#39;s non-deleted derived metric definitions
-*SearchApi* | [**search_registered_query_for_facet**](docs/SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetricdefinition/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
-*SearchApi* | [**search_registered_query_for_facets**](docs/SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetricdefinition/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
+*SearchApi* | [**search_registered_query_deleted_entities**](docs/SearchApi.md#search_registered_query_deleted_entities) | **POST** /api/v2/search/derivedmetric/deleted | Search over a customer&#39;s deleted derived metric definitions
+*SearchApi* | [**search_registered_query_deleted_for_facet**](docs/SearchApi.md#search_registered_query_deleted_for_facet) | **POST** /api/v2/search/derivedmetric/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted derived metric definitions
+*SearchApi* | [**search_registered_query_deleted_for_facets**](docs/SearchApi.md#search_registered_query_deleted_for_facets) | **POST** /api/v2/search/derivedmetric/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted derived metric definitions
+*SearchApi* | [**search_registered_query_entities**](docs/SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetric | Search over a customer&#39;s non-deleted derived metric definitions
+*SearchApi* | [**search_registered_query_for_facet**](docs/SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetric/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
+*SearchApi* | [**search_registered_query_for_facets**](docs/SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetric/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
 *SearchApi* | [**search_report_event_entities**](docs/SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 *SearchApi* | [**search_report_event_for_facet**](docs/SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 *SearchApi* | [**search_report_event_for_facets**](docs/SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
@@ -294,6 +279,7 @@ Class | Method | HTTP request | Description
  - [FacetSearchRequestContainer](docs/FacetSearchRequestContainer.md)
  - [FacetsResponseContainer](docs/FacetsResponseContainer.md)
  - [FacetsSearchRequestContainer](docs/FacetsSearchRequestContainer.md)
+ - [GCPBillingConfiguration](docs/GCPBillingConfiguration.md)
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
@@ -303,13 +289,18 @@ Class | Method | HTTP request | Description
  - [IntegrationManifestGroup](docs/IntegrationManifestGroup.md)
  - [IntegrationMetrics](docs/IntegrationMetrics.md)
  - [IntegrationStatus](docs/IntegrationStatus.md)
+ - [IteratorEntryStringJsonNode](docs/IteratorEntryStringJsonNode.md)
+ - [IteratorJsonNode](docs/IteratorJsonNode.md)
+ - [IteratorString](docs/IteratorString.md)
  - [JsonNode](docs/JsonNode.md)
+ - [LogicalType](docs/LogicalType.md)
  - [MaintenanceWindow](docs/MaintenanceWindow.md)
  - [Message](docs/Message.md)
  - [MetricDetails](docs/MetricDetails.md)
  - [MetricDetailsResponse](docs/MetricDetailsResponse.md)
  - [MetricStatus](docs/MetricStatus.md)
  - [Notificant](docs/Notificant.md)
+ - [Number](docs/Number.md)
  - [PagedAlert](docs/PagedAlert.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
  - [PagedCloudIntegration](docs/PagedCloudIntegration.md)
@@ -387,3 +378,17 @@ Class | Method | HTTP request | Description
  - [WFTags](docs/WFTags.md)
 
 
+## Documentation For Authorization
+
+
+## api_key
+
+- **Type**: API key
+- **API key parameter name**: X-AUTH-TOKEN
+- **Location**: HTTP header
+
+
+## Author
+
+
+
diff --git a/docs/Alert.md b/docs/Alert.md
index f27e9ee..e042693 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -4,11 +4,18 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
+**created** | **int** | When this alert was created, in epoch millis | [optional] 
+**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
 **name** | **str** |  | 
 **id** | **str** |  | [optional] 
 **target** | **str** | The email address or integration endpoint (such as PagerDuty or webhook) to notify when the alert status changes | 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
+**event** | [**Event**](Event.md) |  | [optional] 
+**updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
+**update_user_id** | **str** | The user that last updated this alert | [optional] 
 **display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
@@ -17,40 +24,33 @@ Name | Type | Description | Notes
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
 **include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
 **severity** | **str** | Severity of the alert | 
-**creator_id** | **str** |  | [optional] 
-**additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
-**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
-**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
+**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
+**notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
+**alerts_last_day** | **int** |  | [optional] 
+**alerts_last_week** | **int** |  | [optional] 
+**alerts_last_month** | **int** |  | [optional] 
+**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
+**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
 **failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
+**active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
+**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
+**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
+**in_trash** | **bool** |  | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
+**create_user_id** | **str** |  | [optional] 
+**additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
+**creator_id** | **str** |  | [optional] 
+**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
+**updater_id** | **str** |  | [optional] 
 **last_failed_time** | **int** | The time of the last error encountered when running this alert&#39;s condition query, in epoch millis | [optional] 
 **last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the alert condition | [optional] 
 **hosts_used** | **list[str]** | Number of hosts checked by the alert condition | [optional] 
-**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
-**active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
-**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
-**notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
-**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
-**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
 **last_notification_millis** | **int** | When this alert last caused a notification, in epoch millis | [optional] 
 **notification_resend_frequency_minutes** | **int** | How often to re-trigger a continually failing alert. If absent or &lt;&#x3D; 0, no retriggering occurs | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**event** | [**Event**](Event.md) |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**created** | **int** | When this alert was created, in epoch millis | [optional] 
-**updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
-**update_user_id** | **str** | The user that last updated this alert | [optional] 
-**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
-**alerts_last_day** | **int** |  | [optional] 
-**alerts_last_week** | **int** |  | [optional] 
-**alerts_last_month** | **int** |  | [optional] 
-**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
-**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
-**in_trash** | **bool** |  | [optional] 
-**create_user_id** | **str** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 5d87f7c..ee1bbb6 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -100,7 +100,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.Alert() # Alert | Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"user@example.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\" }</pre> (optional)
+body = wavefront_api_client.Alert() # Alert | Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> (optional)
 
 try:
     # Create a specific alert
@@ -114,7 +114,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Alert**](Alert.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;user@example.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -813,7 +813,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.Alert() # Alert | Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"user@example.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\" }</pre> (optional)
+body = wavefront_api_client.Alert() # Alert | Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> (optional)
 
 try:
     # Update a specific alert
@@ -828,7 +828,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**Alert**](Alert.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;user@example.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/AvroBackedStandardizedDTO.md b/docs/AvroBackedStandardizedDTO.md
index c73c208..1131618 100644
--- a/docs/AvroBackedStandardizedDTO.md
+++ b/docs/AvroBackedStandardizedDTO.md
@@ -5,9 +5,9 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **str** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/AzureBaseCredentials.md b/docs/AzureBaseCredentials.md
index 116dabc..cf51c21 100644
--- a/docs/AzureBaseCredentials.md
+++ b/docs/AzureBaseCredentials.md
@@ -4,8 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **client_id** | **str** | Client Id for an Azure service account within your project. | 
-**tenant** | **str** | Tenant Id for an Azure service account within your project. | 
 **client_secret** | **str** | Client Secret for an Azure service account within your project. Use &#39;saved_secret&#39; to retain the client secret when updating. | 
+**tenant** | **str** | Tenant Id for an Azure service account within your project. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AzureConfiguration.md b/docs/AzureConfiguration.md
index 867dc72..f99d490 100644
--- a/docs/AzureConfiguration.md
+++ b/docs/AzureConfiguration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**base_credentials** | [**AzureBaseCredentials**](AzureBaseCredentials.md) |  | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**base_credentials** | [**AzureBaseCredentials**](AzureBaseCredentials.md) |  | [optional] 
 **category_filter** | **list[str]** | A list of Azure services (such as Microsoft.Compute/virtualMachines, Microsoft.Cache/redis etc) from which to pull metrics. | [optional] 
 **resource_group_filter** | **list[str]** | A list of Azure resource groups from which to pull metrics. | [optional] 
 
diff --git a/docs/Chart.md b/docs/Chart.md
index dad951c..c07c4f2 100644
--- a/docs/Chart.md
+++ b/docs/Chart.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
 **name** | **str** | Name of the source | 
 **description** | **str** | Description of the chart | [optional] 
 **sources** | [**list[ChartSourceQuery]**](ChartSourceQuery.md) | Query expression to plot on the chart | 
 **include_obsolete_metrics** | **bool** | Whether to show obsolete metrics.  Default: false | [optional] 
 **no_default_events** | **bool** | Whether to hide events related to the sources in the charts produced. Default false (i.e. shows events) | [optional] 
-**base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
-**units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
 **chart_attributes** | [**JsonNode**](JsonNode.md) | Experimental field for chart attributes | [optional] 
-**interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
-**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
 **summarization** | **str** | Summarization strategy for the chart.  MEAN is default | [optional] 
+**base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
+**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
+**interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index 5a4eec0..e2b75e2 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
 **min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
+**type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
 **max** | **float** | Max value of Y-axis.  Set to null or leave blank for auto | [optional] 
 **expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
-**plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
 **fixed_legend_enabled** | **bool** | Whether to enable a fixed tabular legend adjacent to the chart | [optional] 
 **fixed_legend_use_raw_stats** | **bool** | If true, the legend uses non-summarized stats instead of summarized | [optional] 
+**plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
 **line_type** | **str** | Plot interpolation type.  linear is default | [optional] 
 **stack_type** | **str** | Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y&#x3D;0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream | [optional] 
 **windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 88aaa43..2593a87 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -7,7 +7,10 @@ Name | Type | Description | Notes
 **name** | **str** | The human-readable name of this integration | 
 **id** | **str** |  | [optional] 
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
+**in_trash** | **bool** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+**last_error_event** | [**Event**](Event.md) |  | [optional] 
 **additional_tags** | **dict(str, str)** | A list of point tag key-values to add to every point ingested using this integration | [optional] 
 **last_received_data_point_ms** | **int** | Time that this integration last received a data point, in epoch millis | [optional] 
 **last_metric_count** | **int** | Number of metrics / events ingested by this integration the last time it ran | [optional] 
@@ -15,6 +18,7 @@ Name | Type | Description | Notes
 **cloud_trail** | [**CloudTrailConfiguration**](CloudTrailConfiguration.md) |  | [optional] 
 **ec2** | [**EC2Configuration**](EC2Configuration.md) |  | [optional] 
 **gcp** | [**GCPConfiguration**](GCPConfiguration.md) |  | [optional] 
+**gcp_billing** | [**GCPBillingConfiguration**](GCPBillingConfiguration.md) |  | [optional] 
 **tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **azure** | [**AzureConfiguration**](AzureConfiguration.md) |  | [optional] 
 **azure_activity_log** | [**AzureActivityLogConfiguration**](AzureActivityLogConfiguration.md) |  | [optional] 
@@ -26,9 +30,6 @@ Name | Type | Description | Notes
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
-**updater_id** | **str** |  | [optional] 
-**in_trash** | **bool** |  | [optional] 
-**last_error_event** | [**Event**](Event.md) |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/CloudTrailConfiguration.md b/docs/CloudTrailConfiguration.md
index 84c9bc2..46f257e 100644
--- a/docs/CloudTrailConfiguration.md
+++ b/docs/CloudTrailConfiguration.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
 **prefix** | **str** | The common prefix, if any, appended to all CloudTrail log files | [optional] 
-**base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
+**region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
 **bucket_name** | **str** | Name of the S3 bucket where CloudTrail logs are stored | 
+**base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **filter_rule** | **str** | Rule to filter cloud trail log event. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index 1cf1b1c..0288f92 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
+**namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
+**base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **volume_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
-**namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index 7302631..9176647 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** | The unique identifier of this user, which should be their valid email address | 
-**customer** | **str** | The id of the customer to which the user belongs | 
 **identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
+**id** | **str** | The unique identifier of this user, which should be their valid email address | 
 **groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
+**customer** | **str** | The id of the customer to which the user belongs | 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
 **_self** | **bool** | Whether this user is the one calling the API | 
 **escaped_identifier** | **str** | URL Escaped Identifier | [optional] 
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index c3fda50..ec31888 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -3,16 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**hidden** | **bool** |  | [optional] 
 **name** | **str** | Name of the dashboard | 
 **id** | **str** | Unique identifier, also URL slug, of the dashboard | 
 **parameters** | **dict(str, str)** | Deprecated.  An obsolete representation of dashboard parameters | [optional] 
+**description** | **str** | Human-readable description of the dashboard | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **customer** | **str** | id of the customer to which this dashboard belongs | [optional] 
-**description** | **str** | Human-readable description of the dashboard | [optional] 
 **url** | **str** | Unique identifier, also URL slug, of the dashboard | 
 **creator_id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **event_filter_type** | **str** | How charts belonging to this dashboard should display events.  BYCHART is default if unspecified | [optional] 
 **sections** | [**list[DashboardSection]**](DashboardSection.md) | Dashboard chart sections | 
@@ -30,12 +29,13 @@ Name | Type | Description | Notes
 **views_last_day** | **int** |  | [optional] 
 **views_last_week** | **int** |  | [optional] 
 **views_last_month** | **int** |  | [optional] 
-**hidden** | **bool** |  | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 **system_owned** | **bool** | Whether this dashboard is system-owned and not writeable | [optional] 
 **num_charts** | **int** |  | [optional] 
-**num_favorites** | **int** |  | [optional] 
 **favorite** | **bool** |  | [optional] 
+**num_favorites** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DashboardParameterValue.md b/docs/DashboardParameterValue.md
index f400b96..a623547 100644
--- a/docs/DashboardParameterValue.md
+++ b/docs/DashboardParameterValue.md
@@ -3,18 +3,18 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**label** | **str** |  | [optional] 
 **default_value** | **str** |  | [optional] 
 **description** | **str** |  | [optional] 
-**label** | **str** |  | [optional] 
+**parameter_type** | **str** |  | [optional] 
+**values_to_readable_strings** | **dict(str, str)** |  | [optional] 
+**dynamic_field_type** | **str** |  | [optional] 
 **query_value** | **str** |  | [optional] 
-**reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
 **hide_from_view** | **bool** |  | [optional] 
-**dynamic_field_type** | **str** |  | [optional] 
 **tag_key** | **str** |  | [optional] 
-**allow_all** | **bool** |  | [optional] 
-**parameter_type** | **str** |  | [optional] 
-**values_to_readable_strings** | **dict(str, str)** |  | [optional] 
 **multivalue** | **bool** |  | [optional] 
+**allow_all** | **bool** |  | [optional] 
+**reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DerivedMetricApi.md b/docs/DerivedMetricApi.md
new file mode 100644
index 0000000..94c227c
--- /dev/null
+++ b/docs/DerivedMetricApi.md
@@ -0,0 +1,684 @@
+# wavefront_api_client.DerivedMetricApi
+
+All URIs are relative to *https://localhost*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_tag_to_derived_metric**](DerivedMetricApi.md#add_tag_to_derived_metric) | **PUT** /api/v2/derivedmetric/{id}/tag/{tagValue} | Add a tag to a specific Derived Metric
+[**create_derived_metric**](DerivedMetricApi.md#create_derived_metric) | **POST** /api/v2/derivedmetric | Create a specific derived metric definition
+[**delete_derived_metric**](DerivedMetricApi.md#delete_derived_metric) | **DELETE** /api/v2/derivedmetric/{id} | Delete a specific derived metric definition
+[**get_all_derived_metrics**](DerivedMetricApi.md#get_all_derived_metrics) | **GET** /api/v2/derivedmetric | Get all derived metric definitions for a customer
+[**get_derived_metric**](DerivedMetricApi.md#get_derived_metric) | **GET** /api/v2/derivedmetric/{id} | Get a specific registered query
+[**get_derived_metric_by_version**](DerivedMetricApi.md#get_derived_metric_by_version) | **GET** /api/v2/derivedmetric/{id}/history/{version} | Get a specific historical version of a specific derived metric definition
+[**get_derived_metric_history**](DerivedMetricApi.md#get_derived_metric_history) | **GET** /api/v2/derivedmetric/{id}/history | Get the version history of a specific derived metric definition
+[**get_derived_metric_tags**](DerivedMetricApi.md#get_derived_metric_tags) | **GET** /api/v2/derivedmetric/{id}/tag | Get all tags associated with a specific derived metric definition
+[**remove_tag_from_derived_metric**](DerivedMetricApi.md#remove_tag_from_derived_metric) | **DELETE** /api/v2/derivedmetric/{id}/tag/{tagValue} | Remove a tag from a specific Derived Metric
+[**set_derived_metric_tags**](DerivedMetricApi.md#set_derived_metric_tags) | **POST** /api/v2/derivedmetric/{id}/tag | Set all tags associated with a specific derived metric definition
+[**undelete_derived_metric**](DerivedMetricApi.md#undelete_derived_metric) | **POST** /api/v2/derivedmetric/{id}/undelete | Undelete a specific derived metric definition
+[**update_derived_metric**](DerivedMetricApi.md#update_derived_metric) | **PUT** /api/v2/derivedmetric/{id} | Update a specific derived metric definition
+
+
+# **add_tag_to_derived_metric**
+> ResponseContainer add_tag_to_derived_metric(id, tag_value)
+
+Add a tag to a specific Derived Metric
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+tag_value = 'tag_value_example' # str | 
+
+try:
+    # Add a tag to a specific Derived Metric
+    api_response = api_instance.add_tag_to_derived_metric(id, tag_value)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->add_tag_to_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **tag_value** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_derived_metric**
+> ResponseContainerDerivedMetricDefinition create_derived_metric(body=body)
+
+Create a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.DerivedMetricDefinition() # DerivedMetricDefinition | Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derrivedMetricTag1\"     ]   } }</pre> (optional)
+
+try:
+    # Create a specific derived metric definition
+    api_response = api_instance.create_derived_metric(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->create_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Query Name\&quot;,   \&quot;query\&quot;: \&quot;aliasMetric(ts(~sample.cpu.loadavg.1m), \\\&quot;my.new.metric\\\&quot;)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;derrivedMetricTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_derived_metric**
+> ResponseContainerDerivedMetricDefinition delete_derived_metric(id)
+
+Delete a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a specific derived metric definition
+    api_response = api_instance.delete_derived_metric(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->delete_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_derived_metrics**
+> ResponseContainerPagedDerivedMetricDefinition get_all_derived_metrics(offset=offset, limit=limit)
+
+Get all derived metric definitions for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all derived metric definitions for a customer
+    api_response = api_instance.get_all_derived_metrics(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->get_all_derived_metrics: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedDerivedMetricDefinition**](ResponseContainerPagedDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_derived_metric**
+> ResponseContainerDerivedMetricDefinition get_derived_metric(id)
+
+Get a specific registered query
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific registered query
+    api_response = api_instance.get_derived_metric(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->get_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_derived_metric_by_version**
+> ResponseContainerDerivedMetricDefinition get_derived_metric_by_version(id, version)
+
+Get a specific historical version of a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+version = 789 # int | 
+
+try:
+    # Get a specific historical version of a specific derived metric definition
+    api_response = api_instance.get_derived_metric_by_version(id, version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->get_derived_metric_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_derived_metric_history**
+> ResponseContainerHistoryResponse get_derived_metric_history(id, offset=offset, limit=limit)
+
+Get the version history of a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of a specific derived metric definition
+    api_response = api_instance.get_derived_metric_history(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->get_derived_metric_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_derived_metric_tags**
+> ResponseContainerTagsResponse get_derived_metric_tags(id)
+
+Get all tags associated with a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get all tags associated with a specific derived metric definition
+    api_response = api_instance.get_derived_metric_tags(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->get_derived_metric_tags: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerTagsResponse**](ResponseContainerTagsResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_tag_from_derived_metric**
+> ResponseContainer remove_tag_from_derived_metric(id, tag_value)
+
+Remove a tag from a specific Derived Metric
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+tag_value = 'tag_value_example' # str | 
+
+try:
+    # Remove a tag from a specific Derived Metric
+    api_response = api_instance.remove_tag_from_derived_metric(id, tag_value)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->remove_tag_from_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **tag_value** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **set_derived_metric_tags**
+> ResponseContainer set_derived_metric_tags(id, body=body)
+
+Set all tags associated with a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
+
+try:
+    # Set all tags associated with a specific derived metric definition
+    api_response = api_instance.set_derived_metric_tags(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->set_derived_metric_tags: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**|  | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **undelete_derived_metric**
+> ResponseContainerDerivedMetricDefinition undelete_derived_metric(id)
+
+Undelete a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Undelete a specific derived metric definition
+    api_response = api_instance.undelete_derived_metric(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->undelete_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_derived_metric**
+> ResponseContainerDerivedMetricDefinition update_derived_metric(id, body=body)
+
+Update a specific derived metric definition
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.DerivedMetricDefinition() # DerivedMetricDefinition | Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre> (optional)
+
+try:
+    # Update a specific derived metric definition
+    api_response = api_instance.update_derived_metric(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DerivedMetricApi->update_derived_metric: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Query Name\&quot;,   \&quot;createUserId\&quot;: \&quot;user\&quot;,   \&quot;query\&quot;: \&quot;aliasMetric(ts(~sample.cpu.loadavg.1m), \\\&quot;my.new.metric\\\&quot;)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index 91e0730..4c7c27f 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -3,34 +3,34 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**created** | **int** | When this derived metric was created, in epoch millis | [optional] 
+**minutes** | **int** | How frequently the query generating the derived metric is run | 
 **name** | **str** |  | 
 **id** | **str** |  | [optional] 
 **query** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m). | 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **status** | **list[str]** | Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA | [optional] 
+**updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
+**process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
+**last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
+**update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
 **include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
-**creator_id** | **str** |  | [optional] 
-**additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
-**minutes** | **int** | How frequently the query generating the derived metric is run | 
+**last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
+**in_trash** | **bool** |  | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the query last ran | [optional] 
+**create_user_id** | **str** |  | [optional] 
+**additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
+**creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **last_failed_time** | **int** | The time of the last error encountered when running the query, in epoch millis | [optional] 
 **last_error_message** | **str** | The last error encountered when running the query | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the query | [optional] 
 **hosts_used** | **list[str]** | Number of hosts checked by the query | [optional] 
-**last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
-**process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
 **query_qb_enabled** | **bool** | Whether the query was created using the Query Builder. Default false | [optional] 
 **query_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**created** | **int** | When this derived metric was created, in epoch millis | [optional] 
-**updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
-**update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
-**last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
-**in_trash** | **bool** |  | [optional] 
-**create_user_id** | **str** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Event.md b/docs/Event.md
index 5551e28..66e4112 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -3,23 +3,23 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
+**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
 **name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **id** | **str** |  | [optional] 
 **table** | **str** | The customer to which the event belongs | [optional] 
 **tags** | **list[str]** | A list of event tags | [optional] 
-**hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
+**created_at** | **int** |  | [optional] 
+**is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
 **is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
 **creator_id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
+**hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
 **summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
 **updater_id** | **str** |  | [optional] 
 **updated_at** | **int** |  | [optional] 
-**created_at** | **int** |  | [optional] 
-**start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
-**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | 
+**created_epoch_millis** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
 **running_state** | **str** |  | [optional] 
 **can_delete** | **bool** |  | [optional] 
 **can_close** | **bool** |  | [optional] 
diff --git a/docs/EventApi.md b/docs/EventApi.md
index 724d97e..dbd0fdb 100644
--- a/docs/EventApi.md
+++ b/docs/EventApi.md
@@ -149,7 +149,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.Event() # Event | Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre> (optional)
+body = wavefront_api_client.Event() # Event | Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre> (optional)
 
 try:
     # Create a specific event
@@ -163,7 +163,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Event**](Event.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Event API Example\&quot;,   \&quot;annotations\&quot;: {     \&quot;severity\&quot;: \&quot;info\&quot;,     \&quot;type\&quot;: \&quot;event type\&quot;,     \&quot;details\&quot;: \&quot;description\&quot;   },   \&quot;startTime\&quot;: 1490000000000,   \&quot;endTime\&quot;: 1490000000001 }&lt;/pre&gt; | [optional] 
+ **body** | [**Event**](Event.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Event API Example\&quot;,   \&quot;annotations\&quot;: {     \&quot;severity\&quot;: \&quot;info\&quot;,     \&quot;type\&quot;: \&quot;event type\&quot;,     \&quot;details\&quot;: \&quot;description\&quot;   },   \&quot;tags\&quot; : [     \&quot;eventTag1\&quot;   ],   \&quot;startTime\&quot;: 1490000000000,   \&quot;endTime\&quot;: 1490000000001 }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -538,7 +538,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.Event() # Event | Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre> (optional)
+body = wavefront_api_client.Event() # Event | Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre> (optional)
 
 try:
     # Update a specific event
@@ -553,7 +553,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**Event**](Event.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Event API Example\&quot;,   \&quot;annotations\&quot;: {     \&quot;severity\&quot;: \&quot;info\&quot;,     \&quot;type\&quot;: \&quot;event type\&quot;,     \&quot;details\&quot;: \&quot;description\&quot;   },   \&quot;startTime\&quot;: 1490000000000,   \&quot;endTime\&quot;: 1490000000001 }&lt;/pre&gt; | [optional] 
+ **body** | [**Event**](Event.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Event API Example\&quot;,   \&quot;annotations\&quot;: {     \&quot;severity\&quot;: \&quot;info\&quot;,     \&quot;type\&quot;: \&quot;event type\&quot;,     \&quot;details\&quot;: \&quot;description\&quot;   },   \&quot;tags\&quot; : [     \&quot;eventTag1\&quot;   ],   \&quot;startTime\&quot;: 1490000000000,   \&quot;endTime\&quot;: 1490000000001 }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/EventSearchRequest.md b/docs/EventSearchRequest.md
index 550bacb..7d5983b 100644
--- a/docs/EventSearchRequest.md
+++ b/docs/EventSearchRequest.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cursor** | **str** | The id (exclusive) from which search results resume returning.  Users should supply an entity &#39;id&#39; to this property.  Its main purpose is to resume where a previous search left off because of the &#39;limit&#39; parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results | [optional] 
-**limit** | **int** |  | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results | [optional] 
 **time_range** | [**EventTimeRange**](EventTimeRange.md) |  | [optional] 
 **sort_time_ascending** | **bool** | Whether to sort event results ascending in start time.  Default: false | [optional] 
diff --git a/docs/ExternalLink.md b/docs/ExternalLink.md
index 74c9f54..05ff500 100644
--- a/docs/ExternalLink.md
+++ b/docs/ExternalLink.md
@@ -7,13 +7,13 @@ Name | Type | Description | Notes
 **id** | **str** |  | [optional] 
 **description** | **str** | Human-readable description for this external link | 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **template** | **str** | The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc | 
 **metric_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **source_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **point_tag_filter_regexes** | **dict(str, str)** | Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed | [optional] 
-**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GCPBillingConfiguration.md b/docs/GCPBillingConfiguration.md
new file mode 100644
index 0000000..f7f0fba
--- /dev/null
+++ b/docs/GCPBillingConfiguration.md
@@ -0,0 +1,12 @@
+# GCPBillingConfiguration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
+**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
+**gcp_api_key** | **str** | API key for Google Cloud Platform (GCP). Use &#39;saved_api_key&#39; to retain existing API key when updating | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index 6075015..d3d2abf 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. | 
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
+**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
 **categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Integration.md b/docs/Integration.md
index 8714555..d010bef 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -3,20 +3,20 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**icon** | **str** | URI path to the integration icon | 
+**version** | **str** | Integration version string | 
 **name** | **str** | Integration name | 
 **id** | **str** |  | [optional] 
+**metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
 **description** | **str** | Integration description | 
+**base_url** | **str** | Base URL for this integration&#39;s assets | [optional] 
 **status** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
 **creator_id** | **str** |  | [optional] 
-**version** | **str** | Integration version string | 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
-**base_url** | **str** | Base URL for this integration&#39;s assets | [optional] 
-**updater_id** | **str** |  | [optional] 
 **dashboards** | [**list[IntegrationDashboard]**](IntegrationDashboard.md) | A list of dashboards belonging to this integration | [optional] 
 **alias_of** | **str** | If set, designates this integration as an alias integration, of the integration whose id is specified. | [optional] 
-**icon** | **str** | URI path to the integration icon | 
 **alias_integrations** | [**list[IntegrationAlias]**](IntegrationAlias.md) | If set, a list of objects describing integrations that alias this one. | [optional] 
 **deleted** | **bool** |  | [optional] 
 **overview** | **str** | Descriptive text giving an overview of integration functionality | [optional] 
diff --git a/docs/IntegrationAlias.md b/docs/IntegrationAlias.md
index 7827b76..f3a72ba 100644
--- a/docs/IntegrationAlias.md
+++ b/docs/IntegrationAlias.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**icon** | **str** | Icon path of the alias Integration | [optional] 
 **name** | **str** | Name of the alias Integration | [optional] 
 **id** | **str** | ID of the alias Integration | [optional] 
 **description** | **str** | Description of the alias Integration | [optional] 
 **base_url** | **str** | Base URL of this alias Integration | [optional] 
-**icon** | **str** | Icon path of the alias Integration | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationManifestGroup.md b/docs/IntegrationManifestGroup.md
index 07e93c2..23954e8 100644
--- a/docs/IntegrationManifestGroup.md
+++ b/docs/IntegrationManifestGroup.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**subtitle** | **str** | Subtitle of this integration group | 
+**title** | **str** | Title of this integration group | 
 **integrations** | **list[str]** | A list of paths to JSON definitions for integrations in this group | 
 **integration_objs** | [**list[Integration]**](Integration.md) | Materialized JSONs for integrations belonging to this group, as referenced by &#x60;integrations&#x60; | [optional] 
-**title** | **str** | Title of this integration group | 
+**subtitle** | **str** | Subtitle of this integration group | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationMetrics.md b/docs/IntegrationMetrics.md
index 21a26b9..3829cd6 100644
--- a/docs/IntegrationMetrics.md
+++ b/docs/IntegrationMetrics.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**prefixes** | **list[str]** | Set of metric prefix namespaces belonging to this integration | 
 **display** | **list[str]** | Set of metrics that are displayed in the metric panel during integration setup | 
-**chart_objs** | [**list[Chart]**](Chart.md) | Chart JSONs materialized from the links in &#x60;charts&#x60; | [optional] 
 **charts** | **list[str]** | URLs for JSON definitions of charts that display info about this integration&#39;s metrics | 
+**chart_objs** | [**list[Chart]**](Chart.md) | Chart JSONs materialized from the links in &#x60;charts&#x60; | [optional] 
 **required** | **list[str]** | Set of \&quot;canary\&quot; metrics that define the \&quot;liveness\&quot; of this integration&#39;s metric ingestion | 
-**prefixes** | **list[str]** | Set of metric prefix namespaces belonging to this integration | 
 **pps_dimensions** | **list[str]** | For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/IteratorEntryStringJsonNode.md b/docs/IteratorEntryStringJsonNode.md
new file mode 100644
index 0000000..df72987
--- /dev/null
+++ b/docs/IteratorEntryStringJsonNode.md
@@ -0,0 +1,9 @@
+# IteratorEntryStringJsonNode
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IteratorJsonNode.md b/docs/IteratorJsonNode.md
new file mode 100644
index 0000000..f7a4115
--- /dev/null
+++ b/docs/IteratorJsonNode.md
@@ -0,0 +1,9 @@
+# IteratorJsonNode
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IteratorString.md b/docs/IteratorString.md
new file mode 100644
index 0000000..7e5bc24
--- /dev/null
+++ b/docs/IteratorString.md
@@ -0,0 +1,9 @@
+# IteratorString
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/LogicalType.md b/docs/LogicalType.md
new file mode 100644
index 0000000..adcc769
--- /dev/null
+++ b/docs/LogicalType.md
@@ -0,0 +1,10 @@
+# LogicalType
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index dd5a1f7..45fed30 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -3,24 +3,24 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** |  | [optional] 
 **reason** | **str** | The purpose of this maintenance window | 
+**id** | **str** |  | [optional] 
 **customer_id** | **str** |  | [optional] 
-**event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
+**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
+**title** | **str** | Title of this maintenance window | 
+**start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
+**end_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will end | 
+**relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
+**relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
-**relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
 **relevant_host_tags_anded** | **bool** | Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a source/host must contain one of the tags. Default: false | [optional] 
 **host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
-**updater_id** | **str** |  | [optional] 
-**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
-**title** | **str** | Title of this maintenance window | 
-**start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
-**end_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will end | 
-**running_state** | **str** |  | [optional] 
+**event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
 **sort_attr** | **int** | Numeric value used in default sorting | [optional] 
+**running_state** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Message.md b/docs/Message.md
index 58be457..b5cbf8d 100644
--- a/docs/Message.md
+++ b/docs/Message.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
+**attributes** | **dict(str, str)** | A string-&gt;string map of additional properties associated with this message | [optional] 
 **id** | **str** |  | [optional] 
 **target** | **str** | For scope&#x3D;CUSTOMER or scope&#x3D;USER, the individual customer or user id | [optional] 
-**attributes** | **dict(str, str)** | A string-&gt;string map of additional properties associated with this message | [optional] 
 **content** | **str** | Message content | 
 **scope** | **str** | The audience scope that this message should reach | 
+**title** | **str** | Title of this message | 
 **severity** | **str** | Message severity | 
-**source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
 **start_epoch_millis** | **int** | When this message will begin to be displayed, in epoch millis | 
 **end_epoch_millis** | **int** | When this message will stop being displayed, in epoch millis | 
 **display** | **str** | The form of display for this message | 
-**title** | **str** | Title of this message | 
 **read** | **bool** | A derived field for whether the current user has read this message | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Notificant.md b/docs/Notificant.md
index 8f190b1..febee10 100644
--- a/docs/Notificant.md
+++ b/docs/Notificant.md
@@ -5,19 +5,20 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **method** | **str** | The notification method used for notification target. | 
 **id** | **str** |  | [optional] 
-**customer_id** | **str** |  | [optional] 
+**content_type** | **str** | The value of the Content-Type header of the webhook POST request. | [optional] 
 **description** | **str** | Description | 
+**customer_id** | **str** |  | [optional] 
+**title** | **str** | Title | 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
-**updater_id** | **str** |  | [optional] 
-**title** | **str** | Title | 
 **triggers** | **list[str]** | A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED | 
 **recipient** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
 **custom_http_headers** | **dict(str, str)** | A string-&gt;string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook | [optional] 
 **email_subject** | **str** | The subject title of an email notification target | [optional] 
-**content_type** | **str** | The value of the Content-Type header of the webhook POST request. | [optional] 
+**is_html_content** | **bool** | Determine whether the email alert target content is sent as html or text. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Number.md b/docs/Number.md
new file mode 100644
index 0000000..ec2bc8a
--- /dev/null
+++ b/docs/Number.md
@@ -0,0 +1,9 @@
+# Number
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 2e4a0e1..d42d741 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -3,23 +3,23 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**version** | **str** |  | [optional] 
 **name** | **str** | Proxy name (modifiable) | 
 **id** | **str** |  | [optional] 
-**customer_id** | **str** |  | [optional] 
-**hostname** | **str** | Host name of the machine running the proxy | [optional] 
-**version** | **str** |  | [optional] 
 **status** | **str** | the proxy&#39;s status | [optional] 
-**ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
+**customer_id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
-**last_error_event** | [**Event**](Event.md) |  | [optional] 
-**ssh_agent** | **bool** | deprecated | [optional] 
+**hostname** | **str** | Host name of the machine running the proxy | [optional] 
+**last_known_error** | **str** | deprecated | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
+**last_error_event** | [**Event**](Event.md) |  | [optional] 
 **time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
 **bytes_left_for_buffer** | **int** | Number of bytes of space remaining in the persistent disk queue of this proxy | [optional] 
 **bytes_per_minute_for_buffer** | **int** | Bytes used per minute by the persistent disk queue of this proxy | [optional] 
 **local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
-**last_known_error** | **str** | deprecated | [optional] 
+**ssh_agent** | **bool** | deprecated | [optional] 
+**ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
+**last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **deleted** | **bool** |  | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
 
diff --git a/docs/QueryResult.md b/docs/QueryResult.md
index f54adf7..465ccc1 100644
--- a/docs/QueryResult.md
+++ b/docs/QueryResult.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**warnings** | **str** | The warnings incurred by this query | [optional] 
 **name** | **str** | The name of this query | [optional] 
 **query** | **str** | The query used to obtain this result | [optional] 
 **stats** | [**StatsModel**](StatsModel.md) |  | [optional] 
-**warnings** | **str** | The warnings incurred by this query | [optional] 
-**granularity** | **int** | The granularity of the returned results, in seconds | [optional] 
 **events** | [**list[QueryEvent]**](QueryEvent.md) |  | [optional] 
 **timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
+**granularity** | **int** | The granularity of the returned results, in seconds | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SavedSearch.md b/docs/SavedSearch.md
index 5e24421..56e86d6 100644
--- a/docs/SavedSearch.md
+++ b/docs/SavedSearch.md
@@ -5,12 +5,12 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **str** |  | [optional] 
 **query** | **dict(str, str)** | The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query | 
+**entity_type** | **str** | The Wavefront entity type over which to search | 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
 **user_id** | **str** | The user for whom this search is saved | [optional] 
-**entity_type** | **str** | The Wavefront entity type over which to search | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index e2d1e58..7770778 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -37,12 +37,12 @@ Method | HTTP request | Description
 [**search_proxy_entities**](SearchApi.md#search_proxy_entities) | **POST** /api/v2/search/proxy | Search over a customer&#39;s non-deleted proxies
 [**search_proxy_for_facet**](SearchApi.md#search_proxy_for_facet) | **POST** /api/v2/search/proxy/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted proxies
 [**search_proxy_for_facets**](SearchApi.md#search_proxy_for_facets) | **POST** /api/v2/search/proxy/facets | Lists the values of one or more facets over the customer&#39;s non-deleted proxies
-[**search_registered_query_deleted_entities**](SearchApi.md#search_registered_query_deleted_entities) | **POST** /api/v2/search/derivedmetricdefinition/deleted | Search over a customer&#39;s deleted derived metric definitions
-[**search_registered_query_deleted_for_facet**](SearchApi.md#search_registered_query_deleted_for_facet) | **POST** /api/v2/search/derivedmetricdefinition/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted derived metric definitions
-[**search_registered_query_deleted_for_facets**](SearchApi.md#search_registered_query_deleted_for_facets) | **POST** /api/v2/search/derivedmetricdefinition/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted derived metric definitions
-[**search_registered_query_entities**](SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetricdefinition | Search over a customer&#39;s non-deleted derived metric definitions
-[**search_registered_query_for_facet**](SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetricdefinition/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
-[**search_registered_query_for_facets**](SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetricdefinition/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
+[**search_registered_query_deleted_entities**](SearchApi.md#search_registered_query_deleted_entities) | **POST** /api/v2/search/derivedmetric/deleted | Search over a customer&#39;s deleted derived metric definitions
+[**search_registered_query_deleted_for_facet**](SearchApi.md#search_registered_query_deleted_for_facet) | **POST** /api/v2/search/derivedmetric/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted derived metric definitions
+[**search_registered_query_deleted_for_facets**](SearchApi.md#search_registered_query_deleted_for_facets) | **POST** /api/v2/search/derivedmetric/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted derived metric definitions
+[**search_registered_query_entities**](SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetric | Search over a customer&#39;s non-deleted derived metric definitions
+[**search_registered_query_for_facet**](SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetric/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
+[**search_registered_query_for_facets**](SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetric/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
 [**search_report_event_entities**](SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 [**search_report_event_for_facet**](SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 [**search_report_event_for_facets**](SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
diff --git a/docs/Source.md b/docs/Source.md
index afd45a4..18efb0b 100644
--- a/docs/Source.md
+++ b/docs/Source.md
@@ -3,14 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
 **hidden** | **bool** | A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things) | [optional] 
-**tags** | **dict(str, bool)** | A Map (String -&gt; boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true | [optional] 
+**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
 **description** | **str** | Description of this source | [optional] 
+**tags** | **dict(str, bool)** | A Map (String -&gt; boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true | [optional] 
 **creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
 **marked_new_epoch_millis** | **int** | Epoch Millis when this source was marked as ~status.new | [optional] 
 **source_name** | **str** | The name of the source, usually set by ingested telemetry | 
 
diff --git a/docs/SourceLabelPair.md b/docs/SourceLabelPair.md
index 8ba5c55..c1cc8b2 100644
--- a/docs/SourceLabelPair.md
+++ b/docs/SourceLabelPair.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**label** | **str** |  | [optional] 
 **host** | **str** | Source (or host).  \&quot;Source\&quot; and \&quot;host\&quot; are synonyms in current versions of wavefront, but the host terminology is deprecated | [optional] 
 **tags** | **dict(str, str)** |  | [optional] 
-**label** | **str** |  | [optional] 
 **firing** | **int** |  | [optional] 
 **observed** | **int** |  | [optional] 
 
diff --git a/docs/SourceSearchRequestContainer.md b/docs/SourceSearchRequestContainer.md
index 882e27a..c8044d4 100644
--- a/docs/SourceSearchRequestContainer.md
+++ b/docs/SourceSearchRequestContainer.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cursor** | **str** | The id (exclusive) from which search results resume returning.  Users should supply an entity &#39;id&#39; to this property.  Its main purpose is to resume where a previous search left off because of the &#39;limit&#39; parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results | [optional] 
-**limit** | **int** |  | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results | [optional] 
 **sort_sources_ascending** | **bool** | Whether to sort source results ascending lexigraphically by id/sourceName.  Default: true | [optional] 
 
diff --git a/setup.py b/setup.py
index 793468b..a93e40e 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-
+    
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.3.1"
+VERSION = "2.3.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 6fb1eb9..88d4e85 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -19,7 +19,7 @@
 from wavefront_api_client.api.alert_api import AlertApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
-from wavefront_api_client.api.derived_metric_definition_api import DerivedMetricDefinitionApi
+from wavefront_api_client.api.derived_metric_api import DerivedMetricApi
 from wavefront_api_client.api.event_api import EventApi
 from wavefront_api_client.api.external_link_api import ExternalLinkApi
 from wavefront_api_client.api.integration_api import IntegrationApi
@@ -66,6 +66,7 @@
 from wavefront_api_client.models.facet_search_request_container import FacetSearchRequestContainer
 from wavefront_api_client.models.facets_response_container import FacetsResponseContainer
 from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer
+from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
@@ -75,13 +76,18 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
+from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
+from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
+from wavefront_api_client.models.iterator_string import IteratorString
 from wavefront_api_client.models.json_node import JsonNode
+from wavefront_api_client.models.logical_type import LogicalType
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
 from wavefront_api_client.models.notificant import Notificant
+from wavefront_api_client.models.number import Number
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 829063b..20526ea 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -6,7 +6,7 @@
 from wavefront_api_client.api.alert_api import AlertApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
-from wavefront_api_client.api.derived_metric_definition_api import DerivedMetricDefinitionApi
+from wavefront_api_client.api.derived_metric_api import DerivedMetricApi
 from wavefront_api_client.api.event_api import EventApi
 from wavefront_api_client.api.external_link_api import ExternalLinkApi
 from wavefront_api_client.api.integration_api import IntegrationApi
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 21e1e5d..55677ef 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -38,11 +38,11 @@ def add_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_alert_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_alert_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -50,7 +50,7 @@ def add_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.add_alert_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.add_alert_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_alert_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_alert_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -74,7 +74,7 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -134,7 +134,7 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -145,18 +145,18 @@ def create_alert(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_alert(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_alert(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
-        :param Alert body: Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"user@example.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\" }</pre>
+        :param async_req bool
+        :param Alert body: Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_alert_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_alert_with_http_info(**kwargs)  # noqa: E501
@@ -167,19 +167,19 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_alert_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_alert_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
-        :param Alert body: Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"user@example.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\" }</pre>
+        :param async_req bool
+        :param Alert body: Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -229,7 +229,7 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -240,18 +240,18 @@ def delete_alert(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_alert(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_alert(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_alert_with_http_info(id, **kwargs)  # noqa: E501
@@ -262,11 +262,11 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_alert_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
@@ -274,7 +274,7 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -324,7 +324,7 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -335,18 +335,18 @@ def get_alert(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_alert_with_http_info(id, **kwargs)  # noqa: E501
@@ -357,11 +357,11 @@ def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
@@ -369,7 +369,7 @@ def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -419,7 +419,7 @@ def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -430,11 +430,11 @@ def get_alert_history(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_history(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_history(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int offset:
         :param int limit:
@@ -443,7 +443,7 @@ def get_alert_history(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_alert_history_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_alert_history_with_http_info(id, **kwargs)  # noqa: E501
@@ -454,11 +454,11 @@ def get_alert_history_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_history_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_history_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int offset:
         :param int limit:
@@ -468,7 +468,7 @@ def get_alert_history_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -522,7 +522,7 @@ def get_alert_history_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -533,18 +533,18 @@ def get_alert_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_alert_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_alert_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -555,11 +555,11 @@ def get_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
@@ -567,7 +567,7 @@ def get_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -617,7 +617,7 @@ def get_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerTagsResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -628,11 +628,11 @@ def get_alert_version(self, id, version, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_version(id, version, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_version(id, version, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int version: (required)
         :return: ResponseContainerAlert
@@ -640,7 +640,7 @@ def get_alert_version(self, id, version, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_alert_version_with_http_info(id, version, **kwargs)  # noqa: E501
         else:
             (data) = self.get_alert_version_with_http_info(id, version, **kwargs)  # noqa: E501
@@ -651,11 +651,11 @@ def get_alert_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alert_version_with_http_info(id, version, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_version_with_http_info(id, version, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int version: (required)
         :return: ResponseContainerAlert
@@ -664,7 +664,7 @@ def get_alert_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'version']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -720,7 +720,7 @@ def get_alert_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -731,17 +731,17 @@ def get_alerts_summary(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alerts_summary(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alerts_summary(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: ResponseContainerMapStringInteger
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_alerts_summary_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_alerts_summary_with_http_info(**kwargs)  # noqa: E501
@@ -752,18 +752,18 @@ def get_alerts_summary_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_alerts_summary_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alerts_summary_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: ResponseContainerMapStringInteger
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = []  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -807,7 +807,7 @@ def get_alerts_summary_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMapStringInteger',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -818,11 +818,11 @@ def get_all_alert(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_alert(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_alert(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedAlert
@@ -830,7 +830,7 @@ def get_all_alert(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_alert_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_alert_with_http_info(**kwargs)  # noqa: E501
@@ -841,11 +841,11 @@ def get_all_alert_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_alert_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_alert_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedAlert
@@ -854,7 +854,7 @@ def get_all_alert_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -902,7 +902,7 @@ def get_all_alert_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -913,11 +913,11 @@ def remove_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_alert_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_alert_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -925,7 +925,7 @@ def remove_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.remove_alert_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.remove_alert_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -936,11 +936,11 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_alert_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_alert_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -949,7 +949,7 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1005,7 +1005,7 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1016,11 +1016,11 @@ def set_alert_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_alert_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_alert_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -1028,7 +1028,7 @@ def set_alert_tags(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.set_alert_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.set_alert_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -1039,11 +1039,11 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_alert_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_alert_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -1052,7 +1052,7 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1108,7 +1108,7 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1119,11 +1119,11 @@ def snooze_alert(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.snooze_alert(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.snooze_alert(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int seconds:
         :return: ResponseContainerAlert
@@ -1131,7 +1131,7 @@ def snooze_alert(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.snooze_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.snooze_alert_with_http_info(id, **kwargs)  # noqa: E501
@@ -1142,11 +1142,11 @@ def snooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.snooze_alert_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.snooze_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int seconds:
         :return: ResponseContainerAlert
@@ -1155,7 +1155,7 @@ def snooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'seconds']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1207,7 +1207,7 @@ def snooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1218,18 +1218,18 @@ def undelete_alert(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_alert(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_alert(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.undelete_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.undelete_alert_with_http_info(id, **kwargs)  # noqa: E501
@@ -1240,11 +1240,11 @@ def undelete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_alert_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
@@ -1252,7 +1252,7 @@ def undelete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1302,7 +1302,7 @@ def undelete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1313,18 +1313,18 @@ def unsnooze_alert(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.unsnooze_alert(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.unsnooze_alert(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.unsnooze_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.unsnooze_alert_with_http_info(id, **kwargs)  # noqa: E501
@@ -1335,11 +1335,11 @@ def unsnooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.unsnooze_alert_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.unsnooze_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
@@ -1347,7 +1347,7 @@ def unsnooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1397,7 +1397,7 @@ def unsnooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1408,19 +1408,19 @@ def update_alert(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_alert(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_alert(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"user@example.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\" }</pre>
+        :param Alert body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_alert_with_http_info(id, **kwargs)  # noqa: E501
@@ -1431,20 +1431,20 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_alert_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"user@example.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\" }</pre>
+        :param Alert body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1500,7 +1500,7 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index b7c0212..51d1fe5 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -38,18 +38,18 @@ def create_cloud_integration(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_cloud_integration(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_cloud_integration(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_cloud_integration_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_cloud_integration_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def create_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_cloud_integration_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_cloud_integration_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def create_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def create_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,18 +133,18 @@ def delete_cloud_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_cloud_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_cloud_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -155,11 +155,11 @@ def delete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_cloud_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_cloud_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
@@ -167,7 +167,7 @@ def delete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -217,7 +217,7 @@ def delete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -228,18 +228,18 @@ def disable_cloud_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.disable_cloud_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.disable_cloud_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.disable_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.disable_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -250,11 +250,11 @@ def disable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.disable_cloud_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.disable_cloud_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
@@ -262,7 +262,7 @@ def disable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -312,7 +312,7 @@ def disable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -323,18 +323,18 @@ def enable_cloud_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.enable_cloud_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.enable_cloud_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.enable_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.enable_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -345,11 +345,11 @@ def enable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.enable_cloud_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.enable_cloud_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
@@ -357,7 +357,7 @@ def enable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -407,7 +407,7 @@ def enable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -418,11 +418,11 @@ def get_all_cloud_integration(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_cloud_integration(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_cloud_integration(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedCloudIntegration
@@ -430,7 +430,7 @@ def get_all_cloud_integration(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_cloud_integration_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_cloud_integration_with_http_info(**kwargs)  # noqa: E501
@@ -441,11 +441,11 @@ def get_all_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_cloud_integration_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_cloud_integration_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedCloudIntegration
@@ -454,7 +454,7 @@ def get_all_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -502,7 +502,7 @@ def get_all_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -513,18 +513,18 @@ def get_cloud_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_cloud_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cloud_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -535,11 +535,11 @@ def get_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_cloud_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cloud_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
@@ -547,7 +547,7 @@ def get_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -597,7 +597,7 @@ def get_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -608,18 +608,18 @@ def undelete_cloud_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_cloud_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_cloud_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.undelete_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.undelete_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -630,11 +630,11 @@ def undelete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_cloud_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_cloud_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
@@ -642,7 +642,7 @@ def undelete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -692,7 +692,7 @@ def undelete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -703,11 +703,11 @@ def update_cloud_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_cloud_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_cloud_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
@@ -715,7 +715,7 @@ def update_cloud_integration(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_cloud_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -726,11 +726,11 @@ def update_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_cloud_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_cloud_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
@@ -739,7 +739,7 @@ def update_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -795,7 +795,7 @@ def update_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index e2369bf..f1f2f14 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -38,11 +38,11 @@ def add_dashboard_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_dashboard_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_dashboard_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -50,7 +50,7 @@ def add_dashboard_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.add_dashboard_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.add_dashboard_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def add_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_dashboard_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_dashboard_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -74,7 +74,7 @@ def add_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -134,7 +134,7 @@ def add_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -145,18 +145,18 @@ def create_dashboard(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_dashboard(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_dashboard(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Dashboard body: Example Body:  <pre>{   \"name\": \"Dashboard API example\",   \"id\": \"api-example\",   \"url\": \"api-example\",   \"description\": \"Dashboard Description\",   \"sections\": [     {       \"name\": \"Section 1\",       \"rows\": [         {           \"charts\": [             {               \"name\": \"Chart 1\",               \"description\": \"description1\",               \"sources\": [                 {                   \"name\": \"Source1\",                   \"query\": \"ts()\"                 }               ]             }           ]         }       ]     }   ] }</pre>
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_dashboard_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_dashboard_with_http_info(**kwargs)  # noqa: E501
@@ -167,11 +167,11 @@ def create_dashboard_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_dashboard_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_dashboard_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Dashboard body: Example Body:  <pre>{   \"name\": \"Dashboard API example\",   \"id\": \"api-example\",   \"url\": \"api-example\",   \"description\": \"Dashboard Description\",   \"sections\": [     {       \"name\": \"Section 1\",       \"rows\": [         {           \"charts\": [             {               \"name\": \"Chart 1\",               \"description\": \"description1\",               \"sources\": [                 {                   \"name\": \"Source1\",                   \"query\": \"ts()\"                 }               ]             }           ]         }       ]     }   ] }</pre>
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
@@ -179,7 +179,7 @@ def create_dashboard_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -229,7 +229,7 @@ def create_dashboard_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -240,18 +240,18 @@ def delete_dashboard(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_dashboard(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_dashboard(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_dashboard_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_dashboard_with_http_info(id, **kwargs)  # noqa: E501
@@ -262,11 +262,11 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_dashboard_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_dashboard_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
@@ -274,7 +274,7 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -324,7 +324,7 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -335,11 +335,11 @@ def get_all_dashboard(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_dashboard(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_dashboard(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedDashboard
@@ -347,7 +347,7 @@ def get_all_dashboard(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_dashboard_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_dashboard_with_http_info(**kwargs)  # noqa: E501
@@ -358,11 +358,11 @@ def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_dashboard_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_dashboard_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedDashboard
@@ -371,7 +371,7 @@ def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -419,7 +419,7 @@ def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -430,18 +430,18 @@ def get_dashboard(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_dashboard_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_dashboard_with_http_info(id, **kwargs)  # noqa: E501
@@ -452,11 +452,11 @@ def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
@@ -464,7 +464,7 @@ def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -514,7 +514,7 @@ def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -525,11 +525,11 @@ def get_dashboard_history(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_history(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_history(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int offset:
         :param int limit:
@@ -538,7 +538,7 @@ def get_dashboard_history(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_dashboard_history_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_dashboard_history_with_http_info(id, **kwargs)  # noqa: E501
@@ -549,11 +549,11 @@ def get_dashboard_history_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_history_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_history_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int offset:
         :param int limit:
@@ -563,7 +563,7 @@ def get_dashboard_history_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -617,7 +617,7 @@ def get_dashboard_history_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -628,18 +628,18 @@ def get_dashboard_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_dashboard_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_dashboard_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -650,11 +650,11 @@ def get_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
@@ -662,7 +662,7 @@ def get_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -712,7 +712,7 @@ def get_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerTagsResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -723,11 +723,11 @@ def get_dashboard_version(self, id, version, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_version(id, version, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_version(id, version, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int version: (required)
         :return: ResponseContainerDashboard
@@ -735,7 +735,7 @@ def get_dashboard_version(self, id, version, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_dashboard_version_with_http_info(id, version, **kwargs)  # noqa: E501
         else:
             (data) = self.get_dashboard_version_with_http_info(id, version, **kwargs)  # noqa: E501
@@ -746,11 +746,11 @@ def get_dashboard_version_with_http_info(self, id, version, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_dashboard_version_with_http_info(id, version, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_version_with_http_info(id, version, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int version: (required)
         :return: ResponseContainerDashboard
@@ -759,7 +759,7 @@ def get_dashboard_version_with_http_info(self, id, version, **kwargs):  # noqa:
         """
 
         all_params = ['id', 'version']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -815,7 +815,7 @@ def get_dashboard_version_with_http_info(self, id, version, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -826,11 +826,11 @@ def remove_dashboard_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_dashboard_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_dashboard_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -838,7 +838,7 @@ def remove_dashboard_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.remove_dashboard_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.remove_dashboard_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -849,11 +849,11 @@ def remove_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_dashboard_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_dashboard_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -862,7 +862,7 @@ def remove_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa:
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -918,7 +918,7 @@ def remove_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -929,11 +929,11 @@ def set_dashboard_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_dashboard_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_dashboard_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -941,7 +941,7 @@ def set_dashboard_tags(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.set_dashboard_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.set_dashboard_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -952,11 +952,11 @@ def set_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_dashboard_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_dashboard_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -965,7 +965,7 @@ def set_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1021,7 +1021,7 @@ def set_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1032,18 +1032,18 @@ def undelete_dashboard(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_dashboard(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_dashboard(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.undelete_dashboard_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.undelete_dashboard_with_http_info(id, **kwargs)  # noqa: E501
@@ -1054,11 +1054,11 @@ def undelete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_dashboard_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_dashboard_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
@@ -1066,7 +1066,7 @@ def undelete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1116,7 +1116,7 @@ def undelete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1127,11 +1127,11 @@ def update_dashboard(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_dashboard(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_dashboard(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Dashboard body: Example Body:  <pre>{   \"name\": \"Dashboard API example\",   \"id\": \"api-example\",   \"url\": \"api-example\",   \"description\": \"Dashboard Description\",   \"sections\": [     {       \"name\": \"Section 1\",       \"rows\": [         {           \"charts\": [             {               \"name\": \"Chart 1\",               \"description\": \"description1\",               \"sources\": [                 {                   \"name\": \"Source1\",                   \"query\": \"ts()\"                 }               ]             }           ]         }       ]     }   ] }</pre>
         :return: ResponseContainerDashboard
@@ -1139,7 +1139,7 @@ def update_dashboard(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_dashboard_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_dashboard_with_http_info(id, **kwargs)  # noqa: E501
@@ -1150,11 +1150,11 @@ def update_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_dashboard_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_dashboard_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Dashboard body: Example Body:  <pre>{   \"name\": \"Dashboard API example\",   \"id\": \"api-example\",   \"url\": \"api-example\",   \"description\": \"Dashboard Description\",   \"sections\": [     {       \"name\": \"Section 1\",       \"rows\": [         {           \"charts\": [             {               \"name\": \"Chart 1\",               \"description\": \"description1\",               \"sources\": [                 {                   \"name\": \"Source1\",                   \"query\": \"ts()\"                 }               ]             }           ]         }       ]     }   ] }</pre>
         :return: ResponseContainerDashboard
@@ -1163,7 +1163,7 @@ def update_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1219,7 +1219,7 @@ def update_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
new file mode 100644
index 0000000..153a486
--- /dev/null
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -0,0 +1,1226 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class DerivedMetricApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def add_tag_to_derived_metric(self, id, tag_value, **kwargs):  # noqa: E501
+        """Add a tag to a specific Derived Metric  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_tag_to_derived_metric(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_tag_to_derived_metric_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_tag_to_derived_metric_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+            return data
+
+    def add_tag_to_derived_metric_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
+        """Add a tag to a specific Derived Metric  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_tag_to_derived_metric_with_http_info(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'tag_value']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_tag_to_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_tag_to_derived_metric`")  # noqa: E501
+        # verify the required parameter 'tag_value' is set
+        if ('tag_value' not in params or
+                params['tag_value'] is None):
+            raise ValueError("Missing the required parameter `tag_value` when calling `add_tag_to_derived_metric`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'tag_value' in params:
+            path_params['tagValue'] = params['tag_value']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/tag/{tagValue}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_derived_metric(self, **kwargs):  # noqa: E501
+        """Create a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_derived_metric(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derrivedMetricTag1\"     ]   } }</pre>
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_derived_metric_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_derived_metric_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_derived_metric_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_derived_metric_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derrivedMetricTag1\"     ]   } }</pre>
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_derived_metric(self, id, **kwargs):  # noqa: E501
+        """Delete a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_derived_metric(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_derived_metric_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_derived_metric`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_derived_metrics(self, **kwargs):  # noqa: E501
+        """Get all derived metric definitions for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_derived_metrics(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_derived_metrics_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_derived_metrics_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_derived_metrics_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all derived metric definitions for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_derived_metrics_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_derived_metrics" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_derived_metric(self, id, **kwargs):  # noqa: E501
+        """Get a specific registered query  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific registered query  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_derived_metric_by_version(self, id, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_by_version(id, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int version: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_derived_metric_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_derived_metric_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
+            return data
+
+    def get_derived_metric_by_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_by_version_with_http_info(id, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int version: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_derived_metric_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_by_version`")  # noqa: E501
+        # verify the required parameter 'version' is set
+        if ('version' not in params or
+                params['version'] is None):
+            raise ValueError("Missing the required parameter `version` when calling `get_derived_metric_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/history/{version}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_derived_metric_history(self, id, **kwargs):  # noqa: E501
+        """Get the version history of a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_history(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_derived_metric_history_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_derived_metric_history_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_derived_metric_history_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the version history of a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_history_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_derived_metric_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_history`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_derived_metric_tags(self, id, **kwargs):  # noqa: E501
+        """Get all tags associated with a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_tags(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerTagsResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_derived_metric_tags_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_derived_metric_tags_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_derived_metric_tags_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get all tags associated with a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_tags_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerTagsResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_derived_metric_tags" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_tags`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/tag', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerTagsResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_tag_from_derived_metric(self, id, tag_value, **kwargs):  # noqa: E501
+        """Remove a tag from a specific Derived Metric  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_tag_from_derived_metric(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_tag_from_derived_metric_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_tag_from_derived_metric_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+            return data
+
+    def remove_tag_from_derived_metric_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
+        """Remove a tag from a specific Derived Metric  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_tag_from_derived_metric_with_http_info(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'tag_value']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_tag_from_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_tag_from_derived_metric`")  # noqa: E501
+        # verify the required parameter 'tag_value' is set
+        if ('tag_value' not in params or
+                params['tag_value'] is None):
+            raise ValueError("Missing the required parameter `tag_value` when calling `remove_tag_from_derived_metric`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'tag_value' in params:
+            path_params['tagValue'] = params['tag_value']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/tag/{tagValue}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def set_derived_metric_tags(self, id, **kwargs):  # noqa: E501
+        """Set all tags associated with a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_derived_metric_tags(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body:
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.set_derived_metric_tags_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.set_derived_metric_tags_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def set_derived_metric_tags_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Set all tags associated with a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_derived_metric_tags_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body:
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method set_derived_metric_tags" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `set_derived_metric_tags`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/tag', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def undelete_derived_metric(self, id, **kwargs):  # noqa: E501
+        """Undelete a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_derived_metric(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.undelete_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.undelete_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def undelete_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Undelete a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_derived_metric_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method undelete_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `undelete_derived_metric`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}/undelete', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_derived_metric(self, id, **kwargs):  # noqa: E501
+        """Update a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_derived_metric(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_derived_metric_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific derived metric definition  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_derived_metric_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
+        :return: ResponseContainerDerivedMetricDefinition
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_derived_metric" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_derived_metric`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/derivedmetric/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/derived_metric_definition_api.py b/wavefront_api_client/api/derived_metric_definition_api.py
index b236571..206d769 100644
--- a/wavefront_api_client/api/derived_metric_definition_api.py
+++ b/wavefront_api_client/api/derived_metric_definition_api.py
@@ -38,11 +38,11 @@ def add_tag_to_derived_metric_definition(self, id, tag_value, **kwargs):  # noqa
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_tag_to_derived_metric_definition(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_tag_to_derived_metric_definition(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -50,7 +50,7 @@ def add_tag_to_derived_metric_definition(self, id, tag_value, **kwargs):  # noqa
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def add_tag_to_derived_metric_definition_with_http_info(self, id, tag_value, **k
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -74,7 +74,7 @@ def add_tag_to_derived_metric_definition_with_http_info(self, id, tag_value, **k
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -134,7 +134,7 @@ def add_tag_to_derived_metric_definition_with_http_info(self, id, tag_value, **k
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -145,18 +145,18 @@ def create_derived_metric_definition(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_derived_metric_definition(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_derived_metric_definition(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_derived_metric_definition_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_derived_metric_definition_with_http_info(**kwargs)  # noqa: E501
@@ -167,11 +167,11 @@ def create_derived_metric_definition_with_http_info(self, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_derived_metric_definition_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_derived_metric_definition_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
@@ -179,7 +179,7 @@ def create_derived_metric_definition_with_http_info(self, **kwargs):  # noqa: E5
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -229,7 +229,7 @@ def create_derived_metric_definition_with_http_info(self, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -240,18 +240,18 @@ def delete_derived_metric_definition(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_derived_metric_definition(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_derived_metric_definition(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
@@ -262,11 +262,11 @@ def delete_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_derived_metric_definition_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_derived_metric_definition_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
@@ -274,7 +274,7 @@ def delete_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -324,7 +324,7 @@ def delete_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa
             files=local_var_files,
             response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -335,11 +335,11 @@ def get_all_derived_metric_definitions(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_derived_metric_definitions(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_derived_metric_definitions(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedDerivedMetricDefinition
@@ -347,7 +347,7 @@ def get_all_derived_metric_definitions(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_derived_metric_definitions_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_derived_metric_definitions_with_http_info(**kwargs)  # noqa: E501
@@ -358,11 +358,11 @@ def get_all_derived_metric_definitions_with_http_info(self, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_derived_metric_definitions_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_derived_metric_definitions_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedDerivedMetricDefinition
@@ -371,7 +371,7 @@ def get_all_derived_metric_definitions_with_http_info(self, **kwargs):  # noqa:
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -419,7 +419,7 @@ def get_all_derived_metric_definitions_with_http_info(self, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -430,11 +430,11 @@ def get_derived_metric_definition_by_version(self, id, version, **kwargs):  # no
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_derived_metric_definition_by_version(id, version, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_definition_by_version(id, version, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int version: (required)
         :return: ResponseContainerDerivedMetricDefinition
@@ -442,7 +442,7 @@ def get_derived_metric_definition_by_version(self, id, version, **kwargs):  # no
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_derived_metric_definition_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
         else:
             (data) = self.get_derived_metric_definition_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
@@ -453,11 +453,11 @@ def get_derived_metric_definition_by_version_with_http_info(self, id, version, *
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_derived_metric_definition_by_version_with_http_info(id, version, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_definition_by_version_with_http_info(id, version, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int version: (required)
         :return: ResponseContainerDerivedMetricDefinition
@@ -466,7 +466,7 @@ def get_derived_metric_definition_by_version_with_http_info(self, id, version, *
         """
 
         all_params = ['id', 'version']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -522,7 +522,7 @@ def get_derived_metric_definition_by_version_with_http_info(self, id, version, *
             files=local_var_files,
             response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -533,11 +533,11 @@ def get_derived_metric_definition_history(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_derived_metric_definition_history(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_definition_history(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int offset:
         :param int limit:
@@ -546,7 +546,7 @@ def get_derived_metric_definition_history(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_derived_metric_definition_history_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_derived_metric_definition_history_with_http_info(id, **kwargs)  # noqa: E501
@@ -557,11 +557,11 @@ def get_derived_metric_definition_history_with_http_info(self, id, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_derived_metric_definition_history_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_definition_history_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param int offset:
         :param int limit:
@@ -571,7 +571,7 @@ def get_derived_metric_definition_history_with_http_info(self, id, **kwargs):  #
         """
 
         all_params = ['id', 'offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -625,7 +625,7 @@ def get_derived_metric_definition_history_with_http_info(self, id, **kwargs):  #
             files=local_var_files,
             response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -636,18 +636,18 @@ def get_derived_metric_definition_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_derived_metric_definition_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_definition_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -658,11 +658,11 @@ def get_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # no
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_derived_metric_definition_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_derived_metric_definition_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
@@ -670,7 +670,7 @@ def get_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # no
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -720,7 +720,7 @@ def get_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # no
             files=local_var_files,
             response_type='ResponseContainerTagsResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -731,18 +731,18 @@ def get_registered_query(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_registered_query(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_registered_query(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_registered_query_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_registered_query_with_http_info(id, **kwargs)  # noqa: E501
@@ -753,11 +753,11 @@ def get_registered_query_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_registered_query_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_registered_query_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
@@ -765,7 +765,7 @@ def get_registered_query_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -815,7 +815,7 @@ def get_registered_query_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -826,11 +826,11 @@ def remove_tag_from_derived_metric_definition(self, id, tag_value, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_tag_from_derived_metric_definition(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_tag_from_derived_metric_definition(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -838,7 +838,7 @@ def remove_tag_from_derived_metric_definition(self, id, tag_value, **kwargs):  #
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -849,11 +849,11 @@ def remove_tag_from_derived_metric_definition_with_http_info(self, id, tag_value
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -862,7 +862,7 @@ def remove_tag_from_derived_metric_definition_with_http_info(self, id, tag_value
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -918,7 +918,7 @@ def remove_tag_from_derived_metric_definition_with_http_info(self, id, tag_value
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -929,11 +929,11 @@ def set_derived_metric_definition_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_derived_metric_definition_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_derived_metric_definition_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -941,7 +941,7 @@ def set_derived_metric_definition_tags(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.set_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.set_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -952,11 +952,11 @@ def set_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # no
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_derived_metric_definition_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_derived_metric_definition_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -965,7 +965,7 @@ def set_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # no
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1021,7 +1021,7 @@ def set_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # no
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1032,18 +1032,18 @@ def undelete_derived_metric_definition(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_derived_metric_definition(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_derived_metric_definition(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.undelete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.undelete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
@@ -1054,11 +1054,11 @@ def undelete_derived_metric_definition_with_http_info(self, id, **kwargs):  # no
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_derived_metric_definition_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_derived_metric_definition_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
@@ -1066,7 +1066,7 @@ def undelete_derived_metric_definition_with_http_info(self, id, **kwargs):  # no
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1116,7 +1116,7 @@ def undelete_derived_metric_definition_with_http_info(self, id, **kwargs):  # no
             files=local_var_files,
             response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1127,11 +1127,11 @@ def update_derived_metric_definition(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_derived_metric_definition(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_derived_metric_definition(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param DerivedMetricDefinition body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
         :return: ResponseContainerDerivedMetricDefinition
@@ -1139,7 +1139,7 @@ def update_derived_metric_definition(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
@@ -1150,11 +1150,11 @@ def update_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_derived_metric_definition_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_derived_metric_definition_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param DerivedMetricDefinition body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
         :return: ResponseContainerDerivedMetricDefinition
@@ -1163,7 +1163,7 @@ def update_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1219,7 +1219,7 @@ def update_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa
             files=local_var_files,
             response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index ca9050d..71f9997 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -38,11 +38,11 @@ def add_event_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_event_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_event_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -50,7 +50,7 @@ def add_event_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.add_event_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.add_event_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def add_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_event_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_event_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -74,7 +74,7 @@ def add_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -134,7 +134,7 @@ def add_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -145,18 +145,18 @@ def close_event(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.close_event(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.close_event(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.close_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.close_event_with_http_info(id, **kwargs)  # noqa: E501
@@ -167,11 +167,11 @@ def close_event_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.close_event_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.close_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
@@ -179,7 +179,7 @@ def close_event_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -229,7 +229,7 @@ def close_event_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -240,18 +240,18 @@ def create_event(self, **kwargs):  # noqa: E501
 
         The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_event(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_event(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
-        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
+        :param async_req bool
+        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_event_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_event_with_http_info(**kwargs)  # noqa: E501
@@ -262,19 +262,19 @@ def create_event_with_http_info(self, **kwargs):  # noqa: E501
 
         The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_event_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_event_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
-        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
+        :param async_req bool
+        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -324,7 +324,7 @@ def create_event_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -335,18 +335,18 @@ def delete_event(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_event(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_event(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_event_with_http_info(id, **kwargs)  # noqa: E501
@@ -357,11 +357,11 @@ def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_event_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
@@ -369,7 +369,7 @@ def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -419,7 +419,7 @@ def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -430,11 +430,11 @@ def get_all_events_with_time_range(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_events_with_time_range(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_events_with_time_range(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int earliest_start_time_epoch_millis:
         :param int latest_start_time_epoch_millis:
         :param str cursor:
@@ -444,7 +444,7 @@ def get_all_events_with_time_range(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_events_with_time_range_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_events_with_time_range_with_http_info(**kwargs)  # noqa: E501
@@ -455,11 +455,11 @@ def get_all_events_with_time_range_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_events_with_time_range_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_events_with_time_range_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int earliest_start_time_epoch_millis:
         :param int latest_start_time_epoch_millis:
         :param str cursor:
@@ -470,7 +470,7 @@ def get_all_events_with_time_range_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['earliest_start_time_epoch_millis', 'latest_start_time_epoch_millis', 'cursor', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -522,7 +522,7 @@ def get_all_events_with_time_range_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -533,18 +533,18 @@ def get_event(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_event(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_event(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_event_with_http_info(id, **kwargs)  # noqa: E501
@@ -555,11 +555,11 @@ def get_event_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_event_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
@@ -567,7 +567,7 @@ def get_event_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -617,7 +617,7 @@ def get_event_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -628,18 +628,18 @@ def get_event_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_event_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_event_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_event_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_event_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -650,11 +650,11 @@ def get_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_event_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_event_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
@@ -662,7 +662,7 @@ def get_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -712,7 +712,7 @@ def get_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerTagsResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -723,11 +723,11 @@ def remove_event_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_event_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_event_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -735,7 +735,7 @@ def remove_event_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.remove_event_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.remove_event_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -746,11 +746,11 @@ def remove_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_event_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_event_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -759,7 +759,7 @@ def remove_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -819,7 +819,7 @@ def remove_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -830,11 +830,11 @@ def set_event_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_event_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_event_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -842,7 +842,7 @@ def set_event_tags(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.set_event_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.set_event_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -853,11 +853,11 @@ def set_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_event_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_event_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -866,7 +866,7 @@ def set_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -922,7 +922,7 @@ def set_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -933,19 +933,19 @@ def update_event(self, id, **kwargs):  # noqa: E501
 
         The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_event(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_event(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
-        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
+        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_event_with_http_info(id, **kwargs)  # noqa: E501
@@ -956,20 +956,20 @@ def update_event_with_http_info(self, id, **kwargs):  # noqa: E501
 
         The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_event_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
-        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
+        :param Event body: Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre>
         :return: ResponseContainerEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1025,7 +1025,7 @@ def update_event_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index 9ce3880..cddea20 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -38,18 +38,18 @@ def create_external_link(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_external_link(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_external_link(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param ExternalLink body: Example Body:  <pre>{   \"name\": \"External Link API Example\",   \"template\": \"https://example.com/{{source}}\",   \"description\": \"External Link Description\" }</pre>
         :return: ResponseContainerExternalLink
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_external_link_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_external_link_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def create_external_link_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_external_link_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_external_link_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param ExternalLink body: Example Body:  <pre>{   \"name\": \"External Link API Example\",   \"template\": \"https://example.com/{{source}}\",   \"description\": \"External Link Description\" }</pre>
         :return: ResponseContainerExternalLink
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def create_external_link_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def create_external_link_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerExternalLink',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,18 +133,18 @@ def delete_external_link(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_external_link(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_external_link(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerExternalLink
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_external_link_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_external_link_with_http_info(id, **kwargs)  # noqa: E501
@@ -155,11 +155,11 @@ def delete_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_external_link_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_external_link_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerExternalLink
                  If the method is called asynchronously,
@@ -167,7 +167,7 @@ def delete_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -221,7 +221,7 @@ def delete_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerExternalLink',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -232,11 +232,11 @@ def get_all_external_link(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_external_link(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_external_link(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedExternalLink
@@ -244,7 +244,7 @@ def get_all_external_link(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_external_link_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_external_link_with_http_info(**kwargs)  # noqa: E501
@@ -255,11 +255,11 @@ def get_all_external_link_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_external_link_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_external_link_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedExternalLink
@@ -268,7 +268,7 @@ def get_all_external_link_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -316,7 +316,7 @@ def get_all_external_link_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedExternalLink',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -327,18 +327,18 @@ def get_external_link(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_external_link(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_external_link(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerExternalLink
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_external_link_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_external_link_with_http_info(id, **kwargs)  # noqa: E501
@@ -349,11 +349,11 @@ def get_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_external_link_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_external_link_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerExternalLink
                  If the method is called asynchronously,
@@ -361,7 +361,7 @@ def get_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -411,7 +411,7 @@ def get_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerExternalLink',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -422,11 +422,11 @@ def update_external_link(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_external_link(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_external_link(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param ExternalLink body: Example Body:  <pre>{   \"name\": \"External Link API Example\",   \"template\": \"https://example.com/{{source}}\",   \"description\": \"External Link Description\" }</pre>
         :return: ResponseContainerExternalLink
@@ -434,7 +434,7 @@ def update_external_link(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_external_link_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_external_link_with_http_info(id, **kwargs)  # noqa: E501
@@ -445,11 +445,11 @@ def update_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_external_link_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_external_link_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param ExternalLink body: Example Body:  <pre>{   \"name\": \"External Link API Example\",   \"template\": \"https://example.com/{{source}}\",   \"description\": \"External Link Description\" }</pre>
         :return: ResponseContainerExternalLink
@@ -458,7 +458,7 @@ def update_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -514,7 +514,7 @@ def update_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerExternalLink',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index 37db18f..e80b366 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -38,11 +38,11 @@ def get_all_integration(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_integration(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedIntegration
@@ -50,7 +50,7 @@ def get_all_integration(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_integration_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_integration_with_http_info(**kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_integration_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedIntegration
@@ -74,7 +74,7 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,17 +133,17 @@ def get_all_integration_in_manifests(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_integration_in_manifests(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_in_manifests(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: ResponseContainerListIntegrationManifestGroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_integration_in_manifests_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_integration_in_manifests_with_http_info(**kwargs)  # noqa: E501
@@ -154,18 +154,18 @@ def get_all_integration_in_manifests_with_http_info(self, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_integration_in_manifests_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_in_manifests_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: ResponseContainerListIntegrationManifestGroup
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = []  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -209,7 +209,7 @@ def get_all_integration_in_manifests_with_http_info(self, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainerListIntegrationManifestGroup',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -220,17 +220,17 @@ def get_all_integration_statuses(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_integration_statuses(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_statuses(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: ResponseContainerMapStringIntegrationStatus
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_integration_statuses_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_integration_statuses_with_http_info(**kwargs)  # noqa: E501
@@ -241,18 +241,18 @@ def get_all_integration_statuses_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_integration_statuses_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_statuses_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: ResponseContainerMapStringIntegrationStatus
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = []  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -296,7 +296,7 @@ def get_all_integration_statuses_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMapStringIntegrationStatus',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -307,18 +307,18 @@ def get_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -329,11 +329,11 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegration
                  If the method is called asynchronously,
@@ -341,7 +341,7 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -391,7 +391,7 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -402,18 +402,18 @@ def get_integration_status(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_integration_status(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_integration_status(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegrationStatus
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_integration_status_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_integration_status_with_http_info(id, **kwargs)  # noqa: E501
@@ -424,11 +424,11 @@ def get_integration_status_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_integration_status_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_integration_status_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegrationStatus
                  If the method is called asynchronously,
@@ -436,7 +436,7 @@ def get_integration_status_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -486,7 +486,7 @@ def get_integration_status_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerIntegrationStatus',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -497,18 +497,18 @@ def install_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.install_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.install_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegrationStatus
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.install_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.install_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -519,11 +519,11 @@ def install_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.install_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.install_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegrationStatus
                  If the method is called asynchronously,
@@ -531,7 +531,7 @@ def install_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -581,7 +581,7 @@ def install_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerIntegrationStatus',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -592,18 +592,18 @@ def uninstall_integration(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.uninstall_integration(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.uninstall_integration(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegrationStatus
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.uninstall_integration_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.uninstall_integration_with_http_info(id, **kwargs)  # noqa: E501
@@ -614,11 +614,11 @@ def uninstall_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.uninstall_integration_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.uninstall_integration_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerIntegrationStatus
                  If the method is called asynchronously,
@@ -626,7 +626,7 @@ def uninstall_integration_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -676,7 +676,7 @@ def uninstall_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerIntegrationStatus',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index fe9aa44..a204511 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -38,18 +38,18 @@ def create_maintenance_window(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_maintenance_window(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_maintenance_window(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param MaintenanceWindow body: Example Body:  <pre>{   \"reason\": \"MW Reason\",   \"title\": \"MW Title\",   \"startTimeInSeconds\": 1483228800,   \"endTimeInSeconds\": 1483232400,   \"relevantCustomerTags\": [     \"alertId1\"   ],   \"relevantHostTags\": [     \"sourceTag1\"   ] }</pre>
         :return: ResponseContainerMaintenanceWindow
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_maintenance_window_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_maintenance_window_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def create_maintenance_window_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_maintenance_window_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_maintenance_window_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param MaintenanceWindow body: Example Body:  <pre>{   \"reason\": \"MW Reason\",   \"title\": \"MW Title\",   \"startTimeInSeconds\": 1483228800,   \"endTimeInSeconds\": 1483232400,   \"relevantCustomerTags\": [     \"alertId1\"   ],   \"relevantHostTags\": [     \"sourceTag1\"   ] }</pre>
         :return: ResponseContainerMaintenanceWindow
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def create_maintenance_window_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def create_maintenance_window_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMaintenanceWindow',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,18 +133,18 @@ def delete_maintenance_window(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_maintenance_window(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_maintenance_window(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerMaintenanceWindow
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_maintenance_window_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_maintenance_window_with_http_info(id, **kwargs)  # noqa: E501
@@ -155,11 +155,11 @@ def delete_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_maintenance_window_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_maintenance_window_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerMaintenanceWindow
                  If the method is called asynchronously,
@@ -167,7 +167,7 @@ def delete_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -217,7 +217,7 @@ def delete_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMaintenanceWindow',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -228,11 +228,11 @@ def get_all_maintenance_window(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_maintenance_window(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_maintenance_window(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedMaintenanceWindow
@@ -240,7 +240,7 @@ def get_all_maintenance_window(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_maintenance_window_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_maintenance_window_with_http_info(**kwargs)  # noqa: E501
@@ -251,11 +251,11 @@ def get_all_maintenance_window_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_maintenance_window_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_maintenance_window_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedMaintenanceWindow
@@ -264,7 +264,7 @@ def get_all_maintenance_window_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -312,7 +312,7 @@ def get_all_maintenance_window_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedMaintenanceWindow',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -323,18 +323,18 @@ def get_maintenance_window(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_maintenance_window(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_maintenance_window(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerMaintenanceWindow
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_maintenance_window_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_maintenance_window_with_http_info(id, **kwargs)  # noqa: E501
@@ -345,11 +345,11 @@ def get_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_maintenance_window_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_maintenance_window_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerMaintenanceWindow
                  If the method is called asynchronously,
@@ -357,7 +357,7 @@ def get_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -407,7 +407,7 @@ def get_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMaintenanceWindow',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -418,11 +418,11 @@ def update_maintenance_window(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_maintenance_window(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_maintenance_window(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param MaintenanceWindow body: Example Body:  <pre>{   \"reason\": \"MW Reason\",   \"title\": \"MW Title\",   \"startTimeInSeconds\": 1483228800,   \"endTimeInSeconds\": 1483232400,   \"relevantCustomerTags\": [     \"alertId1\"   ],   \"relevantHostTags\": [     \"sourceTag1\"   ] }</pre>
         :return: ResponseContainerMaintenanceWindow
@@ -430,7 +430,7 @@ def update_maintenance_window(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_maintenance_window_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_maintenance_window_with_http_info(id, **kwargs)  # noqa: E501
@@ -441,11 +441,11 @@ def update_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_maintenance_window_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_maintenance_window_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param MaintenanceWindow body: Example Body:  <pre>{   \"reason\": \"MW Reason\",   \"title\": \"MW Title\",   \"startTimeInSeconds\": 1483228800,   \"endTimeInSeconds\": 1483232400,   \"relevantCustomerTags\": [     \"alertId1\"   ],   \"relevantHostTags\": [     \"sourceTag1\"   ] }</pre>
         :return: ResponseContainerMaintenanceWindow
@@ -454,7 +454,7 @@ def update_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -510,7 +510,7 @@ def update_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMaintenanceWindow',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index 51bdf1f..7179dd8 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -38,11 +38,11 @@ def user_get_messages(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.user_get_messages(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.user_get_messages(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :param bool unread_only:
@@ -51,7 +51,7 @@ def user_get_messages(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.user_get_messages_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.user_get_messages_with_http_info(**kwargs)  # noqa: E501
@@ -62,11 +62,11 @@ def user_get_messages_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.user_get_messages_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.user_get_messages_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :param bool unread_only:
@@ -76,7 +76,7 @@ def user_get_messages_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit', 'unread_only']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -126,7 +126,7 @@ def user_get_messages_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedMessage',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -137,18 +137,18 @@ def user_read_message(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.user_read_message(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.user_read_message(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerMessage
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.user_read_message_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.user_read_message_with_http_info(id, **kwargs)  # noqa: E501
@@ -159,11 +159,11 @@ def user_read_message_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.user_read_message_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.user_read_message_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerMessage
                  If the method is called asynchronously,
@@ -171,7 +171,7 @@ def user_read_message_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -221,7 +221,7 @@ def user_read_message_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerMessage',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index a2e5b5b..d900ce5 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -38,11 +38,11 @@ def get_metric_details(self, m, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_metric_details(m, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metric_details(m, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str m: Metric name (required)
         :param int l: limit
         :param str c: cursor value to continue if the number of results exceeds 1000
@@ -52,7 +52,7 @@ def get_metric_details(self, m, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_metric_details_with_http_info(m, **kwargs)  # noqa: E501
         else:
             (data) = self.get_metric_details_with_http_info(m, **kwargs)  # noqa: E501
@@ -63,11 +63,11 @@ def get_metric_details_with_http_info(self, m, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_metric_details_with_http_info(m, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metric_details_with_http_info(m, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str m: Metric name (required)
         :param int l: limit
         :param str c: cursor value to continue if the number of results exceeds 1000
@@ -78,7 +78,7 @@ def get_metric_details_with_http_info(self, m, **kwargs):  # noqa: E501
         """
 
         all_params = ['m', 'l', 'c', 'h']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -135,7 +135,7 @@ def get_metric_details_with_http_info(self, m, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='MetricDetailsResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 4990087..48ea8b4 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -38,18 +38,18 @@ def create_notificant(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_notificant(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_notificant(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Notificant body: Example Body:  <pre>{   \"description\": \"Notificant Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"Email title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"method\": \"EMAIL\",   \"recipient\": \"value@example.com\",   \"emailSubject\": \"Email subject cannot contain new line\" }</pre>
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_notificant_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_notificant_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def create_notificant_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_notificant_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_notificant_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Notificant body: Example Body:  <pre>{   \"description\": \"Notificant Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"Email title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"method\": \"EMAIL\",   \"recipient\": \"value@example.com\",   \"emailSubject\": \"Email subject cannot contain new line\" }</pre>
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def create_notificant_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def create_notificant_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,18 +133,18 @@ def delete_notificant(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_notificant(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_notificant(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_notificant_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_notificant_with_http_info(id, **kwargs)  # noqa: E501
@@ -155,11 +155,11 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_notificant_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_notificant_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -167,7 +167,7 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -217,7 +217,7 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -228,11 +228,11 @@ def get_all_notificants(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_notificants(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_notificants(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedNotificant
@@ -240,7 +240,7 @@ def get_all_notificants(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_notificants_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_notificants_with_http_info(**kwargs)  # noqa: E501
@@ -251,11 +251,11 @@ def get_all_notificants_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_notificants_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_notificants_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedNotificant
@@ -264,7 +264,7 @@ def get_all_notificants_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -312,7 +312,7 @@ def get_all_notificants_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -323,18 +323,18 @@ def get_notificant(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_notificant(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_notificant(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_notificant_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_notificant_with_http_info(id, **kwargs)  # noqa: E501
@@ -345,11 +345,11 @@ def get_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_notificant_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_notificant_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -357,7 +357,7 @@ def get_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -407,7 +407,7 @@ def get_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -418,18 +418,18 @@ def test_notificant(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.test_notificant(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.test_notificant(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.test_notificant_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.test_notificant_with_http_info(id, **kwargs)  # noqa: E501
@@ -440,11 +440,11 @@ def test_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.test_notificant_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.test_notificant_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -452,7 +452,7 @@ def test_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -502,7 +502,7 @@ def test_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -513,11 +513,11 @@ def update_notificant(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_notificant(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_notificant(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Notificant body: Example Body:  <pre>{   \"description\": \"Notificant Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"Email title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"method\": \"EMAIL\",   \"recipient\": \"value@example.com\",   \"emailSubject\": \"Email subject cannot contain new line\" }</pre>
         :return: ResponseContainerNotificant
@@ -525,7 +525,7 @@ def update_notificant(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_notificant_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_notificant_with_http_info(id, **kwargs)  # noqa: E501
@@ -536,11 +536,11 @@ def update_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_notificant_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_notificant_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Notificant body: Example Body:  <pre>{   \"description\": \"Notificant Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"Email title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"method\": \"EMAIL\",   \"recipient\": \"value@example.com\",   \"emailSubject\": \"Email subject cannot contain new line\" }</pre>
         :return: ResponseContainerNotificant
@@ -549,7 +549,7 @@ def update_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -605,7 +605,7 @@ def update_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 7dead1e..5c51e07 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -38,18 +38,18 @@ def delete_proxy(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_proxy(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_proxy(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_proxy_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_proxy_with_http_info(id, **kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def delete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_proxy_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_proxy_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def delete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def delete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,11 +133,11 @@ def get_all_proxy(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_proxy(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_proxy(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedProxy
@@ -145,7 +145,7 @@ def get_all_proxy(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_proxy_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_proxy_with_http_info(**kwargs)  # noqa: E501
@@ -156,11 +156,11 @@ def get_all_proxy_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_proxy_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_proxy_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedProxy
@@ -169,7 +169,7 @@ def get_all_proxy_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -217,7 +217,7 @@ def get_all_proxy_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -228,18 +228,18 @@ def get_proxy(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_proxy(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_proxy(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_proxy_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_proxy_with_http_info(id, **kwargs)  # noqa: E501
@@ -250,11 +250,11 @@ def get_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_proxy_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_proxy_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
@@ -262,7 +262,7 @@ def get_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -312,7 +312,7 @@ def get_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -323,18 +323,18 @@ def undelete_proxy(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_proxy(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_proxy(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.undelete_proxy_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.undelete_proxy_with_http_info(id, **kwargs)  # noqa: E501
@@ -345,11 +345,11 @@ def undelete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.undelete_proxy_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_proxy_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
@@ -357,7 +357,7 @@ def undelete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -407,7 +407,7 @@ def undelete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -418,11 +418,11 @@ def update_proxy(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_proxy(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_proxy(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Proxy body: Example Body:  <pre>{   \"name\": \"New Name for proxy\" }</pre>
         :return: ResponseContainerProxy
@@ -430,7 +430,7 @@ def update_proxy(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_proxy_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_proxy_with_http_info(id, **kwargs)  # noqa: E501
@@ -441,11 +441,11 @@ def update_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_proxy_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_proxy_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Proxy body: Example Body:  <pre>{   \"name\": \"New Name for proxy\" }</pre>
         :return: ResponseContainerProxy
@@ -454,7 +454,7 @@ def update_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -510,7 +510,7 @@ def update_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index 19f415e..16915bf 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -38,11 +38,11 @@ def query_api(self, q, s, g, **kwargs):  # noqa: E501
 
         Long time spans and small granularities can take a long time to calculate  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.query_api(q, s, g, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.query_api(q, s, g, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str q: the query expression to execute (required)
         :param str s: the start time of the query window in epoch milliseconds (required)
         :param str g: the granularity of the points returned (required)
@@ -61,7 +61,7 @@ def query_api(self, q, s, g, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.query_api_with_http_info(q, s, g, **kwargs)  # noqa: E501
         else:
             (data) = self.query_api_with_http_info(q, s, g, **kwargs)  # noqa: E501
@@ -72,11 +72,11 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
 
         Long time spans and small granularities can take a long time to calculate  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.query_api_with_http_info(q, s, g, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.query_api_with_http_info(q, s, g, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str q: the query expression to execute (required)
         :param str s: the start time of the query window in epoch milliseconds (required)
         :param str g: the granularity of the points returned (required)
@@ -96,7 +96,7 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
         """
 
         all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'include_obsolete_metrics', 'sorted']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -178,7 +178,7 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='QueryResult',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -189,11 +189,11 @@ def query_raw(self, metric, **kwargs):  # noqa: E501
 
         An API to check if ingested points are as expected.  Points ingested within a single second are averaged when returned.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.query_raw(metric, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.query_raw(metric, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str metric: metric to query ingested points for (cannot contain wildcards) (required)
         :param str host: host to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.
         :param str source: source to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.
@@ -204,7 +204,7 @@ def query_raw(self, metric, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.query_raw_with_http_info(metric, **kwargs)  # noqa: E501
         else:
             (data) = self.query_raw_with_http_info(metric, **kwargs)  # noqa: E501
@@ -215,11 +215,11 @@ def query_raw_with_http_info(self, metric, **kwargs):  # noqa: E501
 
         An API to check if ingested points are as expected.  Points ingested within a single second are averaged when returned.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.query_raw_with_http_info(metric, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.query_raw_with_http_info(metric, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str metric: metric to query ingested points for (cannot contain wildcards) (required)
         :param str host: host to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.
         :param str source: source to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.
@@ -231,7 +231,7 @@ def query_raw_with_http_info(self, metric, **kwargs):  # noqa: E501
         """
 
         all_params = ['metric', 'host', 'source', 'start_time', 'end_time']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -289,7 +289,7 @@ def query_raw_with_http_info(self, metric, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='list[RawTimeseries]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index a22c9f9..450ec2d 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -38,18 +38,18 @@ def create_saved_search(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_saved_search(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_search(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SavedSearch body: Example Body:  <pre>{   \"query\": {     \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"   },   \"entityType\": \"DASHBOARD\" }</pre>
         :return: ResponseContainerSavedSearch
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_saved_search_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_saved_search_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def create_saved_search_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_saved_search_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_search_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SavedSearch body: Example Body:  <pre>{   \"query\": {     \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"   },   \"entityType\": \"DASHBOARD\" }</pre>
         :return: ResponseContainerSavedSearch
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def create_saved_search_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def create_saved_search_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSavedSearch',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,18 +133,18 @@ def delete_saved_search(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_saved_search(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_search(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSavedSearch
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_saved_search_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_saved_search_with_http_info(id, **kwargs)  # noqa: E501
@@ -155,11 +155,11 @@ def delete_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_saved_search_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_search_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSavedSearch
                  If the method is called asynchronously,
@@ -167,7 +167,7 @@ def delete_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -217,7 +217,7 @@ def delete_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSavedSearch',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -228,11 +228,11 @@ def get_all_entity_type_saved_searches(self, entitytype, **kwargs):  # noqa: E50
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_entity_type_saved_searches(entitytype, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_entity_type_saved_searches(entitytype, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str entitytype: (required)
         :param int offset:
         :param int limit:
@@ -241,7 +241,7 @@ def get_all_entity_type_saved_searches(self, entitytype, **kwargs):  # noqa: E50
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_entity_type_saved_searches_with_http_info(entitytype, **kwargs)  # noqa: E501
         else:
             (data) = self.get_all_entity_type_saved_searches_with_http_info(entitytype, **kwargs)  # noqa: E501
@@ -252,11 +252,11 @@ def get_all_entity_type_saved_searches_with_http_info(self, entitytype, **kwargs
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_entity_type_saved_searches_with_http_info(entitytype, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_entity_type_saved_searches_with_http_info(entitytype, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str entitytype: (required)
         :param int offset:
         :param int limit:
@@ -266,7 +266,7 @@ def get_all_entity_type_saved_searches_with_http_info(self, entitytype, **kwargs
         """
 
         all_params = ['entitytype', 'offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -320,7 +320,7 @@ def get_all_entity_type_saved_searches_with_http_info(self, entitytype, **kwargs
             files=local_var_files,
             response_type='ResponseContainerPagedSavedSearch',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -331,11 +331,11 @@ def get_all_saved_searches(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_saved_searches(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_searches(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedSavedSearch
@@ -343,7 +343,7 @@ def get_all_saved_searches(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_saved_searches_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_saved_searches_with_http_info(**kwargs)  # noqa: E501
@@ -354,11 +354,11 @@ def get_all_saved_searches_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_saved_searches_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_searches_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedSavedSearch
@@ -367,7 +367,7 @@ def get_all_saved_searches_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -415,7 +415,7 @@ def get_all_saved_searches_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedSavedSearch',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -426,18 +426,18 @@ def get_saved_search(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_saved_search(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_search(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSavedSearch
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_saved_search_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_saved_search_with_http_info(id, **kwargs)  # noqa: E501
@@ -448,11 +448,11 @@ def get_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_saved_search_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_search_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSavedSearch
                  If the method is called asynchronously,
@@ -460,7 +460,7 @@ def get_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -510,7 +510,7 @@ def get_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSavedSearch',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -521,11 +521,11 @@ def update_saved_search(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_saved_search(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_search(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param SavedSearch body: Example Body:  <pre>{   \"query\": {     \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"   },   \"entityType\": \"DASHBOARD\" }</pre>
         :return: ResponseContainerSavedSearch
@@ -533,7 +533,7 @@ def update_saved_search(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_saved_search_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_saved_search_with_http_info(id, **kwargs)  # noqa: E501
@@ -544,11 +544,11 @@ def update_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_saved_search_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_search_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param SavedSearch body: Example Body:  <pre>{   \"query\": {     \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"   },   \"entityType\": \"DASHBOARD\" }</pre>
         :return: ResponseContainerSavedSearch
@@ -557,7 +557,7 @@ def update_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -613,7 +613,7 @@ def update_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSavedSearch',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index c51fd83..abdf3ca 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -38,18 +38,18 @@ def search_alert_deleted_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_deleted_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_deleted_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_alert_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_alert_deleted_entities_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_deleted_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedAlert
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedAlert',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,11 +133,11 @@ def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_deleted_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -145,7 +145,7 @@ def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_alert_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_alert_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -156,11 +156,11 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_deleted_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -169,7 +169,7 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -225,7 +225,7 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -236,18 +236,18 @@ def search_alert_deleted_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_deleted_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_alert_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_alert_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -258,11 +258,11 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_deleted_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -270,7 +270,7 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -320,7 +320,7 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -331,18 +331,18 @@ def search_alert_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedAlertWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_alert_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_alert_entities_with_http_info(**kwargs)  # noqa: E501
@@ -353,11 +353,11 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedAlertWithStats
                  If the method is called asynchronously,
@@ -365,7 +365,7 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -415,7 +415,7 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedAlertWithStats',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -426,11 +426,11 @@ def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -438,7 +438,7 @@ def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_alert_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_alert_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -449,11 +449,11 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -462,7 +462,7 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -518,7 +518,7 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -529,18 +529,18 @@ def search_alert_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_alert_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_alert_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -551,11 +551,11 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_alert_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -563,7 +563,7 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -613,7 +613,7 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -624,18 +624,18 @@ def search_cloud_integration_deleted_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_deleted_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_deleted_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_cloud_integration_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_cloud_integration_deleted_entities_with_http_info(**kwargs)  # noqa: E501
@@ -646,11 +646,11 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_deleted_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedCloudIntegration
                  If the method is called asynchronously,
@@ -658,7 +658,7 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -708,7 +708,7 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
             files=local_var_files,
             response_type='ResponseContainerPagedCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -719,11 +719,11 @@ def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_deleted_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -731,7 +731,7 @@ def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa:
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_cloud_integration_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_cloud_integration_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -742,11 +742,11 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_deleted_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -755,7 +755,7 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -811,7 +811,7 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -822,18 +822,18 @@ def search_cloud_integration_deleted_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_deleted_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_cloud_integration_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_cloud_integration_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -844,11 +844,11 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_deleted_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -856,7 +856,7 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -906,7 +906,7 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -917,18 +917,18 @@ def search_cloud_integration_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_cloud_integration_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_cloud_integration_entities_with_http_info(**kwargs)  # noqa: E501
@@ -939,11 +939,11 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedCloudIntegration
                  If the method is called asynchronously,
@@ -951,7 +951,7 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1001,7 +1001,7 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
             files=local_var_files,
             response_type='ResponseContainerPagedCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1012,11 +1012,11 @@ def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1024,7 +1024,7 @@ def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_cloud_integration_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_cloud_integration_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -1035,11 +1035,11 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1048,7 +1048,7 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1104,7 +1104,7 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1115,18 +1115,18 @@ def search_cloud_integration_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_cloud_integration_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_cloud_integration_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -1137,11 +1137,11 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_cloud_integration_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_cloud_integration_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -1149,7 +1149,7 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1199,7 +1199,7 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1210,18 +1210,18 @@ def search_dashboard_deleted_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_deleted_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_deleted_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_dashboard_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_dashboard_deleted_entities_with_http_info(**kwargs)  # noqa: E501
@@ -1232,11 +1232,11 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_deleted_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
@@ -1244,7 +1244,7 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1294,7 +1294,7 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
             files=local_var_files,
             response_type='ResponseContainerPagedDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1305,11 +1305,11 @@ def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_deleted_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1317,7 +1317,7 @@ def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_dashboard_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_dashboard_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -1328,11 +1328,11 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_deleted_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1341,7 +1341,7 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1397,7 +1397,7 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1408,18 +1408,18 @@ def search_dashboard_deleted_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_deleted_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_dashboard_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_dashboard_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -1430,11 +1430,11 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_deleted_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -1442,7 +1442,7 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1492,7 +1492,7 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1503,18 +1503,18 @@ def search_dashboard_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_dashboard_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_dashboard_entities_with_http_info(**kwargs)  # noqa: E501
@@ -1525,11 +1525,11 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
@@ -1537,7 +1537,7 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1587,7 +1587,7 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedDashboard',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1598,11 +1598,11 @@ def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1610,7 +1610,7 @@ def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_dashboard_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_dashboard_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -1621,11 +1621,11 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1634,7 +1634,7 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1690,7 +1690,7 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1701,18 +1701,18 @@ def search_dashboard_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_dashboard_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_dashboard_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -1723,11 +1723,11 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_dashboard_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_dashboard_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -1735,7 +1735,7 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1785,7 +1785,7 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1796,18 +1796,18 @@ def search_external_link_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_external_link_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_external_link_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedExternalLink
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_external_link_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_external_link_entities_with_http_info(**kwargs)  # noqa: E501
@@ -1818,11 +1818,11 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_external_link_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_external_link_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedExternalLink
                  If the method is called asynchronously,
@@ -1830,7 +1830,7 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1880,7 +1880,7 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedExternalLink',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1891,11 +1891,11 @@ def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_external_links_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_external_links_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1903,7 +1903,7 @@ def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_external_links_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_external_links_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -1914,11 +1914,11 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_external_links_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_external_links_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -1927,7 +1927,7 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1983,7 +1983,7 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1994,18 +1994,18 @@ def search_external_links_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_external_links_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_external_links_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_external_links_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_external_links_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -2016,11 +2016,11 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_external_links_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_external_links_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -2028,7 +2028,7 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2078,7 +2078,7 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2089,18 +2089,18 @@ def search_maintenance_window_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_maintenance_window_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedMaintenanceWindow
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_maintenance_window_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_maintenance_window_entities_with_http_info(**kwargs)  # noqa: E501
@@ -2111,11 +2111,11 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_maintenance_window_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedMaintenanceWindow
                  If the method is called asynchronously,
@@ -2123,7 +2123,7 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2173,7 +2173,7 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerPagedMaintenanceWindow',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2184,11 +2184,11 @@ def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_maintenance_window_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -2196,7 +2196,7 @@ def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_maintenance_window_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_maintenance_window_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -2207,11 +2207,11 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_maintenance_window_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -2220,7 +2220,7 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2276,7 +2276,7 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2287,18 +2287,18 @@ def search_maintenance_window_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_maintenance_window_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_maintenance_window_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_maintenance_window_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -2309,11 +2309,11 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_maintenance_window_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -2321,7 +2321,7 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2371,7 +2371,7 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2382,18 +2382,18 @@ def search_notficant_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_notficant_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notficant_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -2404,11 +2404,11 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_notficant_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notficant_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -2416,7 +2416,7 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2466,7 +2466,7 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2477,18 +2477,18 @@ def search_notificant_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_notificant_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
@@ -2499,11 +2499,11 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_notificant_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedNotificant
                  If the method is called asynchronously,
@@ -2511,7 +2511,7 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2561,7 +2561,7 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2572,11 +2572,11 @@ def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_notificant_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -2584,7 +2584,7 @@ def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -2595,11 +2595,11 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_notificant_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -2608,7 +2608,7 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2664,7 +2664,7 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2675,18 +2675,18 @@ def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_deleted_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
@@ -2697,11 +2697,11 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_deleted_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
@@ -2709,7 +2709,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2759,7 +2759,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2770,11 +2770,11 @@ def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_deleted_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -2782,7 +2782,7 @@ def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -2793,11 +2793,11 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_deleted_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -2806,7 +2806,7 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2862,7 +2862,7 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2873,18 +2873,18 @@ def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_deleted_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -2895,11 +2895,11 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_deleted_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -2907,7 +2907,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -2957,7 +2957,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -2968,18 +2968,18 @@ def search_proxy_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
@@ -2990,11 +2990,11 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
@@ -3002,7 +3002,7 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3052,7 +3052,7 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedProxy',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3063,11 +3063,11 @@ def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3075,7 +3075,7 @@ def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -3086,11 +3086,11 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3099,7 +3099,7 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3155,7 +3155,7 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3166,18 +3166,18 @@ def search_proxy_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -3188,11 +3188,11 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_proxy_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -3200,7 +3200,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3250,7 +3250,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3261,18 +3261,18 @@ def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_deleted_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_deleted_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
@@ -3283,11 +3283,11 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_deleted_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDerivedMetricDefinition
                  If the method is called asynchronously,
@@ -3295,7 +3295,7 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3336,7 +3336,7 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetricdefinition/deleted', 'POST',
+            '/api/v2/search/derivedmetric/deleted', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3345,7 +3345,7 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
             files=local_var_files,
             response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3356,11 +3356,11 @@ def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_deleted_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3368,7 +3368,7 @@ def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -3379,11 +3379,11 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_deleted_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3392,7 +3392,7 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3439,7 +3439,7 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetricdefinition/deleted/{facet}', 'POST',
+            '/api/v2/search/derivedmetric/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3448,7 +3448,7 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3459,18 +3459,18 @@ def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_deleted_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -3481,11 +3481,11 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_deleted_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -3493,7 +3493,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3534,7 +3534,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetricdefinition/deleted/facets', 'POST',
+            '/api/v2/search/derivedmetric/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3543,7 +3543,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3554,18 +3554,18 @@ def search_registered_query_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
@@ -3576,11 +3576,11 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
                  If the method is called asynchronously,
@@ -3588,7 +3588,7 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3629,7 +3629,7 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetricdefinition', 'POST',
+            '/api/v2/search/derivedmetric', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3638,7 +3638,7 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainerPagedDerivedMetricDefinitionWithStats',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3649,11 +3649,11 @@ def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3661,7 +3661,7 @@ def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -3672,11 +3672,11 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3685,7 +3685,7 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3732,7 +3732,7 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetricdefinition/{facet}', 'POST',
+            '/api/v2/search/derivedmetric/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3741,7 +3741,7 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3752,18 +3752,18 @@ def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -3774,11 +3774,11 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_registered_query_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_registered_query_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -3786,7 +3786,7 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3827,7 +3827,7 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetricdefinition/facets', 'POST',
+            '/api/v2/search/derivedmetric/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3836,7 +3836,7 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3847,18 +3847,18 @@ def search_report_event_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_report_event_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_report_event_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param EventSearchRequest body:
         :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
@@ -3869,11 +3869,11 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_report_event_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_report_event_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param EventSearchRequest body:
         :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
@@ -3881,7 +3881,7 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -3931,7 +3931,7 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedEvent',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -3942,11 +3942,11 @@ def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_report_event_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_report_event_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3954,7 +3954,7 @@ def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -3965,11 +3965,11 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_report_event_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_report_event_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -3978,7 +3978,7 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4034,7 +4034,7 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4045,18 +4045,18 @@ def search_report_event_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_report_event_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_report_event_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -4067,11 +4067,11 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_report_event_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_report_event_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -4079,7 +4079,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4129,7 +4129,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4140,18 +4140,18 @@ def search_tagged_source_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_tagged_source_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_tagged_source_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SourceSearchRequestContainer body:
         :return: ResponseContainerPagedSource
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_tagged_source_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_tagged_source_entities_with_http_info(**kwargs)  # noqa: E501
@@ -4162,11 +4162,11 @@ def search_tagged_source_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_tagged_source_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_tagged_source_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SourceSearchRequestContainer body:
         :return: ResponseContainerPagedSource
                  If the method is called asynchronously,
@@ -4174,7 +4174,7 @@ def search_tagged_source_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4224,7 +4224,7 @@ def search_tagged_source_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedSource',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4235,11 +4235,11 @@ def search_tagged_source_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_tagged_source_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_tagged_source_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -4247,7 +4247,7 @@ def search_tagged_source_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_tagged_source_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_tagged_source_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -4258,11 +4258,11 @@ def search_tagged_source_for_facet_with_http_info(self, facet, **kwargs):  # noq
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_tagged_source_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_tagged_source_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -4271,7 +4271,7 @@ def search_tagged_source_for_facet_with_http_info(self, facet, **kwargs):  # noq
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4327,7 +4327,7 @@ def search_tagged_source_for_facet_with_http_info(self, facet, **kwargs):  # noq
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4338,18 +4338,18 @@ def search_tagged_source_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_tagged_source_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_tagged_source_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_tagged_source_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_tagged_source_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -4360,11 +4360,11 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_tagged_source_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_tagged_source_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -4372,7 +4372,7 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4422,7 +4422,7 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4433,18 +4433,18 @@ def search_user_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_user_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedCustomerFacingUserObject
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_user_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_user_entities_with_http_info(**kwargs)  # noqa: E501
@@ -4455,11 +4455,11 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_user_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedCustomerFacingUserObject
                  If the method is called asynchronously,
@@ -4467,7 +4467,7 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4517,7 +4517,7 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedCustomerFacingUserObject',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4528,11 +4528,11 @@ def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_user_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -4540,7 +4540,7 @@ def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_user_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_user_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -4551,11 +4551,11 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_user_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -4564,7 +4564,7 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4620,7 +4620,7 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4631,18 +4631,18 @@ def search_user_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_user_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_user_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_user_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -4653,11 +4653,11 @@ def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_user_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -4665,7 +4665,7 @@ def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4715,7 +4715,7 @@ def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4726,18 +4726,18 @@ def search_web_hook_entities(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_web_hook_entities(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_web_hook_entities(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_web_hook_entities_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_web_hook_entities_with_http_info(**kwargs)  # noqa: E501
@@ -4748,11 +4748,11 @@ def search_web_hook_entities_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_web_hook_entities_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_web_hook_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param SortableSearchRequest body:
         :return: ResponseContainerPagedNotificant
                  If the method is called asynchronously,
@@ -4760,7 +4760,7 @@ def search_web_hook_entities_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4810,7 +4810,7 @@ def search_web_hook_entities_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4821,11 +4821,11 @@ def search_web_hook_for_facet(self, facet, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_web_hook_for_facet(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_web_hook_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -4833,7 +4833,7 @@ def search_web_hook_for_facet(self, facet, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_web_hook_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
             (data) = self.search_web_hook_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
@@ -4844,11 +4844,11 @@ def search_web_hook_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_web_hook_for_facet_with_http_info(facet, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_web_hook_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str facet: (required)
         :param FacetSearchRequestContainer body:
         :return: ResponseContainerFacetResponse
@@ -4857,7 +4857,7 @@ def search_web_hook_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E5
         """
 
         all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -4913,7 +4913,7 @@ def search_web_hook_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -4924,18 +4924,18 @@ def search_webhook_for_facets(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_webhook_for_facets(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_webhook_for_facets(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.search_webhook_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.search_webhook_for_facets_with_http_info(**kwargs)  # noqa: E501
@@ -4946,11 +4946,11 @@ def search_webhook_for_facets_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.search_webhook_for_facets_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_webhook_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param FacetsSearchRequestContainer body:
         :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
@@ -4958,7 +4958,7 @@ def search_webhook_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -5008,7 +5008,7 @@ def search_webhook_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 14882e4..015ef15 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -38,11 +38,11 @@ def add_source_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_source_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_source_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -50,7 +50,7 @@ def add_source_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.add_source_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.add_source_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def add_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.add_source_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_source_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -74,7 +74,7 @@ def add_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -134,7 +134,7 @@ def add_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -145,18 +145,18 @@ def create_source(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_source(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_source(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Source body: Example Body:  <pre>{     \"sourceName\": \"source.name\",     \"tags\": {\"sourceTag1\": true},     \"description\": \"Source Description\" }</pre>
         :return: ResponseContainerSource
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_source_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_source_with_http_info(**kwargs)  # noqa: E501
@@ -167,11 +167,11 @@ def create_source_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_source_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_source_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Source body: Example Body:  <pre>{     \"sourceName\": \"source.name\",     \"tags\": {\"sourceTag1\": true},     \"description\": \"Source Description\" }</pre>
         :return: ResponseContainerSource
                  If the method is called asynchronously,
@@ -179,7 +179,7 @@ def create_source_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -225,7 +225,7 @@ def create_source_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSource',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -236,18 +236,18 @@ def delete_source(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_source(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_source(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSource
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_source_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_source_with_http_info(id, **kwargs)  # noqa: E501
@@ -258,11 +258,11 @@ def delete_source_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_source_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_source_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSource
                  If the method is called asynchronously,
@@ -270,7 +270,7 @@ def delete_source_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -320,7 +320,7 @@ def delete_source_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSource',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -331,11 +331,11 @@ def get_all_source(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_source(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_source(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str cursor:
         :param int limit:
         :return: ResponseContainerPagedSource
@@ -343,7 +343,7 @@ def get_all_source(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_source_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_source_with_http_info(**kwargs)  # noqa: E501
@@ -354,11 +354,11 @@ def get_all_source_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_source_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_source_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str cursor:
         :param int limit:
         :return: ResponseContainerPagedSource
@@ -367,7 +367,7 @@ def get_all_source_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['cursor', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -415,7 +415,7 @@ def get_all_source_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedSource',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -426,18 +426,18 @@ def get_source(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_source(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_source(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSource
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_source_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_source_with_http_info(id, **kwargs)  # noqa: E501
@@ -448,11 +448,11 @@ def get_source_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_source_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_source_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerSource
                  If the method is called asynchronously,
@@ -460,7 +460,7 @@ def get_source_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -510,7 +510,7 @@ def get_source_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSource',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -521,18 +521,18 @@ def get_source_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_source_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_source_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_source_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_source_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -543,11 +543,11 @@ def get_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_source_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_source_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerTagsResponse
                  If the method is called asynchronously,
@@ -555,7 +555,7 @@ def get_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -605,7 +605,7 @@ def get_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerTagsResponse',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -616,18 +616,18 @@ def remove_description(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_description(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_description(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.remove_description_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.remove_description_with_http_info(id, **kwargs)  # noqa: E501
@@ -638,11 +638,11 @@ def remove_description_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_description_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_description_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainer
                  If the method is called asynchronously,
@@ -650,7 +650,7 @@ def remove_description_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -700,7 +700,7 @@ def remove_description_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -711,11 +711,11 @@ def remove_source_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_source_tag(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_source_tag(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -723,7 +723,7 @@ def remove_source_tag(self, id, tag_value, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.remove_source_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
         else:
             (data) = self.remove_source_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
@@ -734,11 +734,11 @@ def remove_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.remove_source_tag_with_http_info(id, tag_value, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_source_tag_with_http_info(id, tag_value, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str tag_value: (required)
         :return: ResponseContainer
@@ -747,7 +747,7 @@ def remove_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
         """
 
         all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -807,7 +807,7 @@ def remove_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -818,11 +818,11 @@ def set_description(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_description(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_description(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str body:
         :return: ResponseContainer
@@ -830,7 +830,7 @@ def set_description(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.set_description_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.set_description_with_http_info(id, **kwargs)  # noqa: E501
@@ -841,11 +841,11 @@ def set_description_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_description_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_description_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str body:
         :return: ResponseContainer
@@ -854,7 +854,7 @@ def set_description_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -910,7 +910,7 @@ def set_description_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -921,11 +921,11 @@ def set_source_tags(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_source_tags(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_source_tags(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -933,7 +933,7 @@ def set_source_tags(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.set_source_tags_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.set_source_tags_with_http_info(id, **kwargs)  # noqa: E501
@@ -944,11 +944,11 @@ def set_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.set_source_tags_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_source_tags_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param list[str] body:
         :return: ResponseContainer
@@ -957,7 +957,7 @@ def set_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1013,7 +1013,7 @@ def set_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -1024,11 +1024,11 @@ def update_source(self, id, **kwargs):  # noqa: E501
 
         The \"hidden\" property is stored as a tag. To set the value, add \"hidden\": &lt;value&gt; to the list of tags.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_source(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_source(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Source body: Example Body:  <pre>{     \"sourceName\": \"source.name\",     \"tags\": {\"sourceTag1\": true},     \"description\": \"Source Description\" }</pre>
         :return: ResponseContainerSource
@@ -1036,7 +1036,7 @@ def update_source(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_source_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_source_with_http_info(id, **kwargs)  # noqa: E501
@@ -1047,11 +1047,11 @@ def update_source_with_http_info(self, id, **kwargs):  # noqa: E501
 
         The \"hidden\" property is stored as a tag. To set the value, add \"hidden\": &lt;value&gt; to the list of tags.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_source_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_source_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Source body: Example Body:  <pre>{     \"sourceName\": \"source.name\",     \"tags\": {\"sourceTag1\": true},     \"description\": \"Source Description\" }</pre>
         :return: ResponseContainerSource
@@ -1060,7 +1060,7 @@ def update_source_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -1112,7 +1112,7 @@ def update_source_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerSource',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index ab233e8..41a49fe 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -38,11 +38,11 @@ def create_or_update_user(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_or_update_user(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_or_update_user(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
         :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"browse\"   ] }</pre>
         :return: UserModel
@@ -50,7 +50,7 @@ def create_or_update_user(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_or_update_user_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_or_update_user_with_http_info(**kwargs)  # noqa: E501
@@ -61,11 +61,11 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_or_update_user_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_or_update_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
         :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"browse\"   ] }</pre>
         :return: UserModel
@@ -74,7 +74,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['send_email', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -126,7 +126,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='UserModel',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -137,18 +137,18 @@ def delete_user(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_user(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_user(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_user_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_user_with_http_info(id, **kwargs)  # noqa: E501
@@ -159,11 +159,11 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_user_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_user_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: None
                  If the method is called asynchronously,
@@ -171,7 +171,7 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -221,7 +221,7 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type=None,  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -232,17 +232,17 @@ def get_all_user(self, **kwargs):  # noqa: E501
 
         Returns all users  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_user(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_user(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: list[UserModel]
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_user_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_user_with_http_info(**kwargs)  # noqa: E501
@@ -253,18 +253,18 @@ def get_all_user_with_http_info(self, **kwargs):  # noqa: E501
 
         Returns all users  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_user_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :return: list[UserModel]
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
         all_params = []  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -308,7 +308,7 @@ def get_all_user_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='list[UserModel]',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -319,18 +319,18 @@ def get_user(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_user(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_user_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_user_with_http_info(id, **kwargs)  # noqa: E501
@@ -341,11 +341,11 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_user_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: UserModel
                  If the method is called asynchronously,
@@ -353,7 +353,7 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -403,7 +403,7 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='UserModel',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -414,11 +414,11 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.grant_user_permission(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_user_permission(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
         :return: UserModel
@@ -426,7 +426,7 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.grant_user_permission_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.grant_user_permission_with_http_info(id, **kwargs)  # noqa: E501
@@ -437,11 +437,11 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.grant_user_permission_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_user_permission_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
         :return: UserModel
@@ -450,7 +450,7 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'group']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -506,7 +506,7 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='UserModel',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -517,11 +517,11 @@ def revoke_user_permission(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.revoke_user_permission(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_user_permission(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str group:
         :return: UserModel
@@ -529,7 +529,7 @@ def revoke_user_permission(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.revoke_user_permission_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.revoke_user_permission_with_http_info(id, **kwargs)  # noqa: E501
@@ -540,11 +540,11 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.revoke_user_permission_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_user_permission_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param str group:
         :return: UserModel
@@ -553,7 +553,7 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'group']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -609,7 +609,7 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='UserModel',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 89dcaf0..673f856 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -38,18 +38,18 @@ def create_webhook(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_webhook(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_webhook(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Notificant body: Example Body:  <pre>{   \"description\": \"WebHook Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"WebHook Title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"recipient\": \"http://example.com\",   \"customHttpHeaders\": {},   \"contentType\": \"text/plain\" }</pre>
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.create_webhook_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.create_webhook_with_http_info(**kwargs)  # noqa: E501
@@ -60,11 +60,11 @@ def create_webhook_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.create_webhook_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_webhook_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param Notificant body: Example Body:  <pre>{   \"description\": \"WebHook Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"WebHook Title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"recipient\": \"http://example.com\",   \"customHttpHeaders\": {},   \"contentType\": \"text/plain\" }</pre>
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -72,7 +72,7 @@ def create_webhook_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -122,7 +122,7 @@ def create_webhook_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -133,18 +133,18 @@ def delete_webhook(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_webhook(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_webhook(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.delete_webhook_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.delete_webhook_with_http_info(id, **kwargs)  # noqa: E501
@@ -155,11 +155,11 @@ def delete_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.delete_webhook_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_webhook_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -167,7 +167,7 @@ def delete_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -217,7 +217,7 @@ def delete_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -228,11 +228,11 @@ def get_all_webhooks(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_webhooks(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_webhooks(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedNotificant
@@ -240,7 +240,7 @@ def get_all_webhooks(self, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_all_webhooks_with_http_info(**kwargs)  # noqa: E501
         else:
             (data) = self.get_all_webhooks_with_http_info(**kwargs)  # noqa: E501
@@ -251,11 +251,11 @@ def get_all_webhooks_with_http_info(self, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_all_webhooks_with_http_info(async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_webhooks_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedNotificant
@@ -264,7 +264,7 @@ def get_all_webhooks_with_http_info(self, **kwargs):  # noqa: E501
         """
 
         all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -312,7 +312,7 @@ def get_all_webhooks_with_http_info(self, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerPagedNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -323,18 +323,18 @@ def get_webhook(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webhook(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webhook(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.get_webhook_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.get_webhook_with_http_info(id, **kwargs)  # noqa: E501
@@ -345,11 +345,11 @@ def get_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.get_webhook_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_webhook_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
@@ -357,7 +357,7 @@ def get_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -407,7 +407,7 @@ def get_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
@@ -418,11 +418,11 @@ def update_webhook(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_webhook(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_webhook(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Notificant body: Example Body:  <pre>{   \"description\": \"WebHook Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"WebHook Title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"recipient\": \"http://example.com\",   \"customHttpHeaders\": {},   \"contentType\": \"text/plain\" }</pre>
         :return: ResponseContainerNotificant
@@ -430,7 +430,7 @@ def update_webhook(self, id, **kwargs):  # noqa: E501
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        if kwargs.get('async'):
+        if kwargs.get('async_req'):
             return self.update_webhook_with_http_info(id, **kwargs)  # noqa: E501
         else:
             (data) = self.update_webhook_with_http_info(id, **kwargs)  # noqa: E501
@@ -441,11 +441,11 @@ def update_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async=True
-        >>> thread = api.update_webhook_with_http_info(id, async=True)
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_webhook_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
-        :param async bool
+        :param async_req bool
         :param str id: (required)
         :param Notificant body: Example Body:  <pre>{   \"description\": \"WebHook Description\",   \"template\": \"POST Body -- Mustache syntax\",   \"title\": \"WebHook Title\",   \"triggers\": [     \"ALERT_OPENED\"   ],   \"recipient\": \"http://example.com\",   \"customHttpHeaders\": {},   \"contentType\": \"text/plain\" }</pre>
         :return: ResponseContainerNotificant
@@ -454,7 +454,7 @@ def update_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
         """
 
         all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async')
+        all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
         all_params.append('_request_timeout')
@@ -510,7 +510,7 @@ def update_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             files=local_var_files,
             response_type='ResponseContainerNotificant',  # noqa: E501
             auth_settings=auth_settings,
-            async=params.get('async'),
+            async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b8c819d..4b64eef 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -73,7 +73,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.3.1/python'
+        self.user_agent = 'Swagger-Codegen/2.3.2/python'
 
     def __del__(self):
         self.pool.close()
@@ -274,12 +274,12 @@ def __deserialize(self, data, klass):
     def call_api(self, resource_path, method,
                  path_params=None, query_params=None, header_params=None,
                  body=None, post_params=None, files=None,
-                 response_type=None, auth_settings=None, async=None,
+                 response_type=None, auth_settings=None, async_req=None,
                  _return_http_data_only=None, collection_formats=None,
                  _preload_content=True, _request_timeout=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
-        To make an async request, set the async parameter.
+        To make an asynchronous request, set the async_req parameter.
 
         :param resource_path: Path to method endpoint.
         :param method: Method to call.
@@ -294,7 +294,7 @@ def call_api(self, resource_path, method,
         :param response: Response data type.
         :param files dict: key -> filename, value -> filepath,
             for `multipart/form-data`.
-        :param async bool: execute request asynchronously
+        :param async_req bool: execute request asynchronously
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param collection_formats: dict of collection formats for path, query,
@@ -307,13 +307,13 @@ def call_api(self, resource_path, method,
                                  timeout. It can also be a pair (tuple) of
                                  (connection, read) timeouts.
         :return:
-            If async parameter is True,
+            If async_req parameter is True,
             the request will be called asynchronously.
             The method will return the request thread.
-            If parameter async is False or missing,
+            If parameter async_req is False or missing,
             then the method will return the response directly.
         """
-        if not async:
+        if not async_req:
             return self.__call_api(resource_path, method,
                                    path_params, query_params, header_params,
                                    body, post_params, files,
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 72f6135..00d6177 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -243,5 +243,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.3.1".\
+               "SDK Package Version: 2.3.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index afd19bf..33d150c 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -42,6 +42,7 @@
 from wavefront_api_client.models.facet_search_request_container import FacetSearchRequestContainer
 from wavefront_api_client.models.facets_response_container import FacetsResponseContainer
 from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer
+from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
@@ -51,13 +52,18 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
+from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
+from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
+from wavefront_api_client.models.iterator_string import IteratorString
 from wavefront_api_client.models.json_node import JsonNode
+from wavefront_api_client.models.logical_type import LogicalType
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
 from wavefront_api_client.models.notificant import Notificant
+from wavefront_api_client.models.number import Number
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 45ec013..98af7f3 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -37,11 +37,18 @@ class Alert(object):
     """
     swagger_types = {
         'last_event_time': 'int',
+        'created': 'int',
+        'minutes': 'int',
         'name': 'str',
         'id': 'str',
         'target': 'str',
         'tags': 'WFTags',
         'status': 'list[str]',
+        'event': 'Event',
+        'updated': 'int',
+        'process_rate_minutes': 'int',
+        'last_processed_millis': 'int',
+        'update_user_id': 'str',
         'display_expression': 'str',
         'condition_qb_enabled': 'bool',
         'display_expression_qb_enabled': 'bool',
@@ -50,40 +57,33 @@ class Alert(object):
         'display_expression_qb_serialization': 'str',
         'include_obsolete_metrics': 'bool',
         'severity': 'str',
-        'creator_id': 'str',
-        'additional_information': 'str',
-        'resolve_after_minutes': 'int',
-        'minutes': 'int',
+        'last_query_time': 'int',
+        'notificants': 'list[str]',
+        'alerts_last_day': 'int',
+        'alerts_last_week': 'int',
+        'alerts_last_month': 'int',
+        'snoozed': 'int',
+        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
         'failing_host_label_pairs': 'list[SourceLabelPair]',
+        'active_maintenance_windows': 'list[str]',
+        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
+        'no_data_event': 'Event',
+        'in_trash': 'bool',
         'query_failing': 'bool',
+        'create_user_id': 'str',
+        'additional_information': 'str',
+        'creator_id': 'str',
+        'resolve_after_minutes': 'int',
+        'updater_id': 'str',
         'last_failed_time': 'int',
         'last_error_message': 'str',
         'metrics_used': 'list[str]',
         'hosts_used': 'list[str]',
-        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
-        'active_maintenance_windows': 'list[str]',
-        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
-        'notificants': 'list[str]',
-        'last_processed_millis': 'int',
-        'process_rate_minutes': 'int',
         'points_scanned_at_last_query': 'int',
         'last_notification_millis': 'int',
         'notification_resend_frequency_minutes': 'int',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'event': 'Event',
-        'updater_id': 'str',
-        'created': 'int',
-        'updated': 'int',
-        'update_user_id': 'str',
-        'last_query_time': 'int',
-        'alerts_last_day': 'int',
-        'alerts_last_week': 'int',
-        'alerts_last_month': 'int',
-        'snoozed': 'int',
-        'no_data_event': 'Event',
-        'in_trash': 'bool',
-        'create_user_id': 'str',
         'deleted': 'bool',
         'target_info': 'list[TargetInfo]',
         'sort_attr': 'int'
@@ -91,11 +91,18 @@ class Alert(object):
 
     attribute_map = {
         'last_event_time': 'lastEventTime',
+        'created': 'created',
+        'minutes': 'minutes',
         'name': 'name',
         'id': 'id',
         'target': 'target',
         'tags': 'tags',
         'status': 'status',
+        'event': 'event',
+        'updated': 'updated',
+        'process_rate_minutes': 'processRateMinutes',
+        'last_processed_millis': 'lastProcessedMillis',
+        'update_user_id': 'updateUserId',
         'display_expression': 'displayExpression',
         'condition_qb_enabled': 'conditionQBEnabled',
         'display_expression_qb_enabled': 'displayExpressionQBEnabled',
@@ -104,54 +111,54 @@ class Alert(object):
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
         'severity': 'severity',
-        'creator_id': 'creatorId',
-        'additional_information': 'additionalInformation',
-        'resolve_after_minutes': 'resolveAfterMinutes',
-        'minutes': 'minutes',
+        'last_query_time': 'lastQueryTime',
+        'notificants': 'notificants',
+        'alerts_last_day': 'alertsLastDay',
+        'alerts_last_week': 'alertsLastWeek',
+        'alerts_last_month': 'alertsLastMonth',
+        'snoozed': 'snoozed',
+        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
         'failing_host_label_pairs': 'failingHostLabelPairs',
+        'active_maintenance_windows': 'activeMaintenanceWindows',
+        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
+        'no_data_event': 'noDataEvent',
+        'in_trash': 'inTrash',
         'query_failing': 'queryFailing',
+        'create_user_id': 'createUserId',
+        'additional_information': 'additionalInformation',
+        'creator_id': 'creatorId',
+        'resolve_after_minutes': 'resolveAfterMinutes',
+        'updater_id': 'updaterId',
         'last_failed_time': 'lastFailedTime',
         'last_error_message': 'lastErrorMessage',
         'metrics_used': 'metricsUsed',
         'hosts_used': 'hostsUsed',
-        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
-        'active_maintenance_windows': 'activeMaintenanceWindows',
-        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
-        'notificants': 'notificants',
-        'last_processed_millis': 'lastProcessedMillis',
-        'process_rate_minutes': 'processRateMinutes',
         'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
         'last_notification_millis': 'lastNotificationMillis',
         'notification_resend_frequency_minutes': 'notificationResendFrequencyMinutes',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'event': 'event',
-        'updater_id': 'updaterId',
-        'created': 'created',
-        'updated': 'updated',
-        'update_user_id': 'updateUserId',
-        'last_query_time': 'lastQueryTime',
-        'alerts_last_day': 'alertsLastDay',
-        'alerts_last_week': 'alertsLastWeek',
-        'alerts_last_month': 'alertsLastMonth',
-        'snoozed': 'snoozed',
-        'no_data_event': 'noDataEvent',
-        'in_trash': 'inTrash',
-        'create_user_id': 'createUserId',
         'deleted': 'deleted',
         'target_info': 'targetInfo',
         'sort_attr': 'sortAttr'
     }
 
-    def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=None, status=None, display_expression=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, severity=None, creator_id=None, additional_information=None, resolve_after_minutes=None, minutes=None, failing_host_label_pairs=None, query_failing=None, last_failed_time=None, last_error_message=None, metrics_used=None, hosts_used=None, in_maintenance_host_label_pairs=None, active_maintenance_windows=None, prefiring_host_label_pairs=None, notificants=None, last_processed_millis=None, process_rate_minutes=None, points_scanned_at_last_query=None, last_notification_millis=None, notification_resend_frequency_minutes=None, created_epoch_millis=None, updated_epoch_millis=None, event=None, updater_id=None, created=None, updated=None, update_user_id=None, last_query_time=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, snoozed=None, no_data_event=None, in_trash=None, create_user_id=None, deleted=None, target_info=None, sort_attr=None):  # noqa: E501
+    def __init__(self, last_event_time=None, created=None, minutes=None, name=None, id=None, target=None, tags=None, status=None, event=None, updated=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, display_expression=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, severity=None, last_query_time=None, notificants=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, snoozed=None, in_maintenance_host_label_pairs=None, failing_host_label_pairs=None, active_maintenance_windows=None, prefiring_host_label_pairs=None, no_data_event=None, in_trash=None, query_failing=None, create_user_id=None, additional_information=None, creator_id=None, resolve_after_minutes=None, updater_id=None, last_failed_time=None, last_error_message=None, metrics_used=None, hosts_used=None, points_scanned_at_last_query=None, last_notification_millis=None, notification_resend_frequency_minutes=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, target_info=None, sort_attr=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._last_event_time = None
+        self._created = None
+        self._minutes = None
         self._name = None
         self._id = None
         self._target = None
         self._tags = None
         self._status = None
+        self._event = None
+        self._updated = None
+        self._process_rate_minutes = None
+        self._last_processed_millis = None
+        self._update_user_id = None
         self._display_expression = None
         self._condition_qb_enabled = None
         self._display_expression_qb_enabled = None
@@ -160,40 +167,33 @@ def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=N
         self._display_expression_qb_serialization = None
         self._include_obsolete_metrics = None
         self._severity = None
-        self._creator_id = None
-        self._additional_information = None
-        self._resolve_after_minutes = None
-        self._minutes = None
+        self._last_query_time = None
+        self._notificants = None
+        self._alerts_last_day = None
+        self._alerts_last_week = None
+        self._alerts_last_month = None
+        self._snoozed = None
+        self._in_maintenance_host_label_pairs = None
         self._failing_host_label_pairs = None
+        self._active_maintenance_windows = None
+        self._prefiring_host_label_pairs = None
+        self._no_data_event = None
+        self._in_trash = None
         self._query_failing = None
+        self._create_user_id = None
+        self._additional_information = None
+        self._creator_id = None
+        self._resolve_after_minutes = None
+        self._updater_id = None
         self._last_failed_time = None
         self._last_error_message = None
         self._metrics_used = None
         self._hosts_used = None
-        self._in_maintenance_host_label_pairs = None
-        self._active_maintenance_windows = None
-        self._prefiring_host_label_pairs = None
-        self._notificants = None
-        self._last_processed_millis = None
-        self._process_rate_minutes = None
         self._points_scanned_at_last_query = None
         self._last_notification_millis = None
         self._notification_resend_frequency_minutes = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._event = None
-        self._updater_id = None
-        self._created = None
-        self._updated = None
-        self._update_user_id = None
-        self._last_query_time = None
-        self._alerts_last_day = None
-        self._alerts_last_week = None
-        self._alerts_last_month = None
-        self._snoozed = None
-        self._no_data_event = None
-        self._in_trash = None
-        self._create_user_id = None
         self._deleted = None
         self._target_info = None
         self._sort_attr = None
@@ -201,6 +201,9 @@ def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=N
 
         if last_event_time is not None:
             self.last_event_time = last_event_time
+        if created is not None:
+            self.created = created
+        self.minutes = minutes
         self.name = name
         if id is not None:
             self.id = id
@@ -209,6 +212,16 @@ def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=N
             self.tags = tags
         if status is not None:
             self.status = status
+        if event is not None:
+            self.event = event
+        if updated is not None:
+            self.updated = updated
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
         if display_expression is not None:
             self.display_expression = display_expression
         if condition_qb_enabled is not None:
@@ -223,17 +236,42 @@ def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=N
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
         self.severity = severity
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if additional_information is not None:
-            self.additional_information = additional_information
-        if resolve_after_minutes is not None:
-            self.resolve_after_minutes = resolve_after_minutes
-        self.minutes = minutes
+        if last_query_time is not None:
+            self.last_query_time = last_query_time
+        if notificants is not None:
+            self.notificants = notificants
+        if alerts_last_day is not None:
+            self.alerts_last_day = alerts_last_day
+        if alerts_last_week is not None:
+            self.alerts_last_week = alerts_last_week
+        if alerts_last_month is not None:
+            self.alerts_last_month = alerts_last_month
+        if snoozed is not None:
+            self.snoozed = snoozed
+        if in_maintenance_host_label_pairs is not None:
+            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
         if failing_host_label_pairs is not None:
             self.failing_host_label_pairs = failing_host_label_pairs
+        if active_maintenance_windows is not None:
+            self.active_maintenance_windows = active_maintenance_windows
+        if prefiring_host_label_pairs is not None:
+            self.prefiring_host_label_pairs = prefiring_host_label_pairs
+        if no_data_event is not None:
+            self.no_data_event = no_data_event
+        if in_trash is not None:
+            self.in_trash = in_trash
         if query_failing is not None:
             self.query_failing = query_failing
+        if create_user_id is not None:
+            self.create_user_id = create_user_id
+        if additional_information is not None:
+            self.additional_information = additional_information
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if resolve_after_minutes is not None:
+            self.resolve_after_minutes = resolve_after_minutes
+        if updater_id is not None:
+            self.updater_id = updater_id
         if last_failed_time is not None:
             self.last_failed_time = last_failed_time
         if last_error_message is not None:
@@ -242,18 +280,6 @@ def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=N
             self.metrics_used = metrics_used
         if hosts_used is not None:
             self.hosts_used = hosts_used
-        if in_maintenance_host_label_pairs is not None:
-            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
-        if active_maintenance_windows is not None:
-            self.active_maintenance_windows = active_maintenance_windows
-        if prefiring_host_label_pairs is not None:
-            self.prefiring_host_label_pairs = prefiring_host_label_pairs
-        if notificants is not None:
-            self.notificants = notificants
-        if last_processed_millis is not None:
-            self.last_processed_millis = last_processed_millis
-        if process_rate_minutes is not None:
-            self.process_rate_minutes = process_rate_minutes
         if points_scanned_at_last_query is not None:
             self.points_scanned_at_last_query = points_scanned_at_last_query
         if last_notification_millis is not None:
@@ -264,32 +290,6 @@ def __init__(self, last_event_time=None, name=None, id=None, target=None, tags=N
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if event is not None:
-            self.event = event
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if created is not None:
-            self.created = created
-        if updated is not None:
-            self.updated = updated
-        if update_user_id is not None:
-            self.update_user_id = update_user_id
-        if last_query_time is not None:
-            self.last_query_time = last_query_time
-        if alerts_last_day is not None:
-            self.alerts_last_day = alerts_last_day
-        if alerts_last_week is not None:
-            self.alerts_last_week = alerts_last_week
-        if alerts_last_month is not None:
-            self.alerts_last_month = alerts_last_month
-        if snoozed is not None:
-            self.snoozed = snoozed
-        if no_data_event is not None:
-            self.no_data_event = no_data_event
-        if in_trash is not None:
-            self.in_trash = in_trash
-        if create_user_id is not None:
-            self.create_user_id = create_user_id
         if deleted is not None:
             self.deleted = deleted
         if target_info is not None:
@@ -321,31 +321,79 @@ def last_event_time(self, last_event_time):
         self._last_event_time = last_event_time
 
     @property
-    def name(self):
-        """Gets the name of this Alert.  # noqa: E501
+    def created(self):
+        """Gets the created of this Alert.  # noqa: E501
 
+        When this alert was created, in epoch millis  # noqa: E501
 
-        :return: The name of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The created of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._name
+        return self._created
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Alert.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this Alert.
 
+        When this alert was created, in epoch millis  # noqa: E501
 
-        :param name: The name of this Alert.  # noqa: E501
-        :type: str
+        :param created: The created of this Alert.  # noqa: E501
+        :type: int
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._created = created
 
     @property
-    def id(self):
-        """Gets the id of this Alert.  # noqa: E501
+    def minutes(self):
+        """Gets the minutes of this Alert.  # noqa: E501
+
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+
+        :return: The minutes of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._minutes
+
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this Alert.
+
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+
+        :param minutes: The minutes of this Alert.  # noqa: E501
+        :type: int
+        """
+        if minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
+
+        self._minutes = minutes
+
+    @property
+    def name(self):
+        """Gets the name of this Alert.  # noqa: E501
+
+
+        :return: The name of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Alert.
+
+
+        :param name: The name of this Alert.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def id(self):
+        """Gets the id of this Alert.  # noqa: E501
 
 
         :return: The id of this Alert.  # noqa: E501
@@ -433,6 +481,119 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def event(self):
+        """Gets the event of this Alert.  # noqa: E501
+
+
+        :return: The event of this Alert.  # noqa: E501
+        :rtype: Event
+        """
+        return self._event
+
+    @event.setter
+    def event(self, event):
+        """Sets the event of this Alert.
+
+
+        :param event: The event of this Alert.  # noqa: E501
+        :type: Event
+        """
+
+        self._event = event
+
+    @property
+    def updated(self):
+        """Gets the updated of this Alert.  # noqa: E501
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :return: The updated of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated
+
+    @updated.setter
+    def updated(self, updated):
+        """Sets the updated of this Alert.
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :param updated: The updated of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._updated = updated
+
+    @property
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this Alert.  # noqa: E501
+
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :return: The process_rate_minutes of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._process_rate_minutes
+
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this Alert.
+
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._process_rate_minutes = process_rate_minutes
+
+    @property
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this Alert.  # noqa: E501
+
+        The time when this alert was last checked, in epoch millis  # noqa: E501
+
+        :return: The last_processed_millis of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_processed_millis
+
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this Alert.
+
+        The time when this alert was last checked, in epoch millis  # noqa: E501
+
+        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_processed_millis = last_processed_millis
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this Alert.  # noqa: E501
+
+        The user that last updated this alert  # noqa: E501
+
+        :return: The update_user_id of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._update_user_id
+
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this Alert.
+
+        The user that last updated this alert  # noqa: E501
+
+        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._update_user_id = update_user_id
+
     @property
     def display_expression(self):
         """Gets the display_expression of this Alert.  # noqa: E501
@@ -628,234 +789,136 @@ def severity(self, severity):
         self._severity = severity
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this Alert.  # noqa: E501
+    def last_query_time(self):
+        """Gets the last_query_time of this Alert.  # noqa: E501
 
+        Last query time of the alert, averaged on hourly basis  # noqa: E501
 
-        :return: The creator_id of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The last_query_time of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._creator_id
+        return self._last_query_time
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Alert.
+    @last_query_time.setter
+    def last_query_time(self, last_query_time):
+        """Sets the last_query_time of this Alert.
 
+        Last query time of the alert, averaged on hourly basis  # noqa: E501
 
-        :param creator_id: The creator_id of this Alert.  # noqa: E501
-        :type: str
+        :param last_query_time: The last_query_time of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._creator_id = creator_id
+        self._last_query_time = last_query_time
 
     @property
-    def additional_information(self):
-        """Gets the additional_information of this Alert.  # noqa: E501
+    def notificants(self):
+        """Gets the notificants of this Alert.  # noqa: E501
 
-        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+        A derived field listing the webhook ids used by this alert  # noqa: E501
 
-        :return: The additional_information of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The notificants of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._additional_information
+        return self._notificants
 
-    @additional_information.setter
-    def additional_information(self, additional_information):
-        """Sets the additional_information of this Alert.
+    @notificants.setter
+    def notificants(self, notificants):
+        """Sets the notificants of this Alert.
 
-        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+        A derived field listing the webhook ids used by this alert  # noqa: E501
 
-        :param additional_information: The additional_information of this Alert.  # noqa: E501
-        :type: str
+        :param notificants: The notificants of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._additional_information = additional_information
+        self._notificants = notificants
 
     @property
-    def resolve_after_minutes(self):
-        """Gets the resolve_after_minutes of this Alert.  # noqa: E501
+    def alerts_last_day(self):
+        """Gets the alerts_last_day of this Alert.  # noqa: E501
 
-        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
 
-        :return: The resolve_after_minutes of this Alert.  # noqa: E501
+        :return: The alerts_last_day of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._resolve_after_minutes
+        return self._alerts_last_day
 
-    @resolve_after_minutes.setter
-    def resolve_after_minutes(self, resolve_after_minutes):
-        """Sets the resolve_after_minutes of this Alert.
+    @alerts_last_day.setter
+    def alerts_last_day(self, alerts_last_day):
+        """Sets the alerts_last_day of this Alert.
 
-        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
 
-        :param resolve_after_minutes: The resolve_after_minutes of this Alert.  # noqa: E501
+        :param alerts_last_day: The alerts_last_day of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._resolve_after_minutes = resolve_after_minutes
+        self._alerts_last_day = alerts_last_day
 
     @property
-    def minutes(self):
-        """Gets the minutes of this Alert.  # noqa: E501
+    def alerts_last_week(self):
+        """Gets the alerts_last_week of this Alert.  # noqa: E501
 
-        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
 
-        :return: The minutes of this Alert.  # noqa: E501
+        :return: The alerts_last_week of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._minutes
+        return self._alerts_last_week
 
-    @minutes.setter
-    def minutes(self, minutes):
-        """Sets the minutes of this Alert.
+    @alerts_last_week.setter
+    def alerts_last_week(self, alerts_last_week):
+        """Sets the alerts_last_week of this Alert.
 
-        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
 
-        :param minutes: The minutes of this Alert.  # noqa: E501
+        :param alerts_last_week: The alerts_last_week of this Alert.  # noqa: E501
         :type: int
         """
-        if minutes is None:
-            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
-        self._minutes = minutes
+        self._alerts_last_week = alerts_last_week
 
     @property
-    def failing_host_label_pairs(self):
-        """Gets the failing_host_label_pairs of this Alert.  # noqa: E501
-
-        Failing host/metric pairs  # noqa: E501
-
-        :return: The failing_host_label_pairs of this Alert.  # noqa: E501
-        :rtype: list[SourceLabelPair]
-        """
-        return self._failing_host_label_pairs
-
-    @failing_host_label_pairs.setter
-    def failing_host_label_pairs(self, failing_host_label_pairs):
-        """Sets the failing_host_label_pairs of this Alert.
-
-        Failing host/metric pairs  # noqa: E501
-
-        :param failing_host_label_pairs: The failing_host_label_pairs of this Alert.  # noqa: E501
-        :type: list[SourceLabelPair]
-        """
-
-        self._failing_host_label_pairs = failing_host_label_pairs
-
-    @property
-    def query_failing(self):
-        """Gets the query_failing of this Alert.  # noqa: E501
-
-        Whether there was an exception when the alert condition last ran  # noqa: E501
-
-        :return: The query_failing of this Alert.  # noqa: E501
-        :rtype: bool
-        """
-        return self._query_failing
-
-    @query_failing.setter
-    def query_failing(self, query_failing):
-        """Sets the query_failing of this Alert.
-
-        Whether there was an exception when the alert condition last ran  # noqa: E501
-
-        :param query_failing: The query_failing of this Alert.  # noqa: E501
-        :type: bool
-        """
-
-        self._query_failing = query_failing
-
-    @property
-    def last_failed_time(self):
-        """Gets the last_failed_time of this Alert.  # noqa: E501
+    def alerts_last_month(self):
+        """Gets the alerts_last_month of this Alert.  # noqa: E501
 
-        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :return: The last_failed_time of this Alert.  # noqa: E501
+        :return: The alerts_last_month of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_failed_time
+        return self._alerts_last_month
 
-    @last_failed_time.setter
-    def last_failed_time(self, last_failed_time):
-        """Sets the last_failed_time of this Alert.
+    @alerts_last_month.setter
+    def alerts_last_month(self, alerts_last_month):
+        """Sets the alerts_last_month of this Alert.
 
-        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :param last_failed_time: The last_failed_time of this Alert.  # noqa: E501
+        :param alerts_last_month: The alerts_last_month of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_failed_time = last_failed_time
-
-    @property
-    def last_error_message(self):
-        """Gets the last_error_message of this Alert.  # noqa: E501
-
-        The last error encountered when running this alert's condition query  # noqa: E501
-
-        :return: The last_error_message of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._last_error_message
-
-    @last_error_message.setter
-    def last_error_message(self, last_error_message):
-        """Sets the last_error_message of this Alert.
-
-        The last error encountered when running this alert's condition query  # noqa: E501
-
-        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._last_error_message = last_error_message
-
-    @property
-    def metrics_used(self):
-        """Gets the metrics_used of this Alert.  # noqa: E501
-
-        Number of metrics checked by the alert condition  # noqa: E501
-
-        :return: The metrics_used of this Alert.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._metrics_used
-
-    @metrics_used.setter
-    def metrics_used(self, metrics_used):
-        """Sets the metrics_used of this Alert.
-
-        Number of metrics checked by the alert condition  # noqa: E501
-
-        :param metrics_used: The metrics_used of this Alert.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._metrics_used = metrics_used
+        self._alerts_last_month = alerts_last_month
 
     @property
-    def hosts_used(self):
-        """Gets the hosts_used of this Alert.  # noqa: E501
+    def snoozed(self):
+        """Gets the snoozed of this Alert.  # noqa: E501
 
-        Number of hosts checked by the alert condition  # noqa: E501
+        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
 
-        :return: The hosts_used of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The snoozed of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._hosts_used
+        return self._snoozed
 
-    @hosts_used.setter
-    def hosts_used(self, hosts_used):
-        """Sets the hosts_used of this Alert.
+    @snoozed.setter
+    def snoozed(self, snoozed):
+        """Sets the snoozed of this Alert.
 
-        Number of hosts checked by the alert condition  # noqa: E501
+        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
 
-        :param hosts_used: The hosts_used of this Alert.  # noqa: E501
-        :type: list[str]
+        :param snoozed: The snoozed of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._hosts_used = hosts_used
+        self._snoozed = snoozed
 
     @property
     def in_maintenance_host_label_pairs(self):
@@ -880,6 +943,29 @@ def in_maintenance_host_label_pairs(self, in_maintenance_host_label_pairs):
 
         self._in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
 
+    @property
+    def failing_host_label_pairs(self):
+        """Gets the failing_host_label_pairs of this Alert.  # noqa: E501
+
+        Failing host/metric pairs  # noqa: E501
+
+        :return: The failing_host_label_pairs of this Alert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._failing_host_label_pairs
+
+    @failing_host_label_pairs.setter
+    def failing_host_label_pairs(self, failing_host_label_pairs):
+        """Sets the failing_host_label_pairs of this Alert.
+
+        Failing host/metric pairs  # noqa: E501
+
+        :param failing_host_label_pairs: The failing_host_label_pairs of this Alert.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._failing_host_label_pairs = failing_host_label_pairs
+
     @property
     def active_maintenance_windows(self):
         """Gets the active_maintenance_windows of this Alert.  # noqa: E501
@@ -927,205 +1013,159 @@ def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
         self._prefiring_host_label_pairs = prefiring_host_label_pairs
 
     @property
-    def notificants(self):
-        """Gets the notificants of this Alert.  # noqa: E501
+    def no_data_event(self):
+        """Gets the no_data_event of this Alert.  # noqa: E501
 
-        A derived field listing the webhook ids used by this alert  # noqa: E501
+        No data event related to the alert  # noqa: E501
 
-        :return: The notificants of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The no_data_event of this Alert.  # noqa: E501
+        :rtype: Event
         """
-        return self._notificants
+        return self._no_data_event
 
-    @notificants.setter
-    def notificants(self, notificants):
-        """Sets the notificants of this Alert.
+    @no_data_event.setter
+    def no_data_event(self, no_data_event):
+        """Sets the no_data_event of this Alert.
 
-        A derived field listing the webhook ids used by this alert  # noqa: E501
+        No data event related to the alert  # noqa: E501
 
-        :param notificants: The notificants of this Alert.  # noqa: E501
-        :type: list[str]
+        :param no_data_event: The no_data_event of this Alert.  # noqa: E501
+        :type: Event
         """
 
-        self._notificants = notificants
+        self._no_data_event = no_data_event
 
     @property
-    def last_processed_millis(self):
-        """Gets the last_processed_millis of this Alert.  # noqa: E501
+    def in_trash(self):
+        """Gets the in_trash of this Alert.  # noqa: E501
 
-        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :return: The last_processed_millis of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The in_trash of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._last_processed_millis
+        return self._in_trash
 
-    @last_processed_millis.setter
-    def last_processed_millis(self, last_processed_millis):
-        """Sets the last_processed_millis of this Alert.
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this Alert.
 
-        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
-        :type: int
+        :param in_trash: The in_trash of this Alert.  # noqa: E501
+        :type: bool
         """
 
-        self._last_processed_millis = last_processed_millis
+        self._in_trash = in_trash
 
     @property
-    def process_rate_minutes(self):
-        """Gets the process_rate_minutes of this Alert.  # noqa: E501
+    def query_failing(self):
+        """Gets the query_failing of this Alert.  # noqa: E501
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+        Whether there was an exception when the alert condition last ran  # noqa: E501
 
-        :return: The process_rate_minutes of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The query_failing of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._process_rate_minutes
+        return self._query_failing
 
-    @process_rate_minutes.setter
-    def process_rate_minutes(self, process_rate_minutes):
-        """Sets the process_rate_minutes of this Alert.
+    @query_failing.setter
+    def query_failing(self, query_failing):
+        """Sets the query_failing of this Alert.
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+        Whether there was an exception when the alert condition last ran  # noqa: E501
 
-        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
-        :type: int
+        :param query_failing: The query_failing of this Alert.  # noqa: E501
+        :type: bool
         """
 
-        self._process_rate_minutes = process_rate_minutes
+        self._query_failing = query_failing
 
     @property
-    def points_scanned_at_last_query(self):
-        """Gets the points_scanned_at_last_query of this Alert.  # noqa: E501
+    def create_user_id(self):
+        """Gets the create_user_id of this Alert.  # noqa: E501
 
-        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
 
-        :return: The points_scanned_at_last_query of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The create_user_id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._points_scanned_at_last_query
+        return self._create_user_id
 
-    @points_scanned_at_last_query.setter
-    def points_scanned_at_last_query(self, points_scanned_at_last_query):
-        """Sets the points_scanned_at_last_query of this Alert.
+    @create_user_id.setter
+    def create_user_id(self, create_user_id):
+        """Sets the create_user_id of this Alert.
 
-        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
 
-        :param points_scanned_at_last_query: The points_scanned_at_last_query of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._points_scanned_at_last_query = points_scanned_at_last_query
-
-    @property
-    def last_notification_millis(self):
-        """Gets the last_notification_millis of this Alert.  # noqa: E501
-
-        When this alert last caused a notification, in epoch millis  # noqa: E501
-
-        :return: The last_notification_millis of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_notification_millis
-
-    @last_notification_millis.setter
-    def last_notification_millis(self, last_notification_millis):
-        """Sets the last_notification_millis of this Alert.
-
-        When this alert last caused a notification, in epoch millis  # noqa: E501
-
-        :param last_notification_millis: The last_notification_millis of this Alert.  # noqa: E501
-        :type: int
+        :param create_user_id: The create_user_id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._last_notification_millis = last_notification_millis
+        self._create_user_id = create_user_id
 
     @property
-    def notification_resend_frequency_minutes(self):
-        """Gets the notification_resend_frequency_minutes of this Alert.  # noqa: E501
+    def additional_information(self):
+        """Gets the additional_information of this Alert.  # noqa: E501
 
-        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
 
-        :return: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The additional_information of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._notification_resend_frequency_minutes
+        return self._additional_information
 
-    @notification_resend_frequency_minutes.setter
-    def notification_resend_frequency_minutes(self, notification_resend_frequency_minutes):
-        """Sets the notification_resend_frequency_minutes of this Alert.
+    @additional_information.setter
+    def additional_information(self, additional_information):
+        """Sets the additional_information of this Alert.
 
-        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
 
-        :param notification_resend_frequency_minutes: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
-        :type: int
+        :param additional_information: The additional_information of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._notification_resend_frequency_minutes = notification_resend_frequency_minutes
+        self._additional_information = additional_information
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Alert.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this Alert.  # noqa: E501
 
 
-        :return: The created_epoch_millis of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._created_epoch_millis
+        return self._creator_id
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Alert.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Alert.
 
 
-        :param created_epoch_millis: The created_epoch_millis of this Alert.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._creator_id = creator_id
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this Alert.  # noqa: E501
+    def resolve_after_minutes(self):
+        """Gets the resolve_after_minutes of this Alert.  # noqa: E501
 
+        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
 
-        :return: The updated_epoch_millis of this Alert.  # noqa: E501
+        :return: The resolve_after_minutes of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._updated_epoch_millis
+        return self._resolve_after_minutes
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this Alert.
+    @resolve_after_minutes.setter
+    def resolve_after_minutes(self, resolve_after_minutes):
+        """Sets the resolve_after_minutes of this Alert.
 
+        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this Alert.  # noqa: E501
+        :param resolve_after_minutes: The resolve_after_minutes of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._updated_epoch_millis = updated_epoch_millis
-
-    @property
-    def event(self):
-        """Gets the event of this Alert.  # noqa: E501
-
-
-        :return: The event of this Alert.  # noqa: E501
-        :rtype: Event
-        """
-        return self._event
-
-    @event.setter
-    def event(self, event):
-        """Sets the event of this Alert.
-
-
-        :param event: The event of this Alert.  # noqa: E501
-        :type: Event
-        """
-
-        self._event = event
+        self._resolve_after_minutes = resolve_after_minutes
 
     @property
     def updater_id(self):
@@ -1149,247 +1189,207 @@ def updater_id(self, updater_id):
         self._updater_id = updater_id
 
     @property
-    def created(self):
-        """Gets the created of this Alert.  # noqa: E501
-
-        When this alert was created, in epoch millis  # noqa: E501
-
-        :return: The created of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this Alert.
-
-        When this alert was created, in epoch millis  # noqa: E501
-
-        :param created: The created of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._created = created
-
-    @property
-    def updated(self):
-        """Gets the updated of this Alert.  # noqa: E501
+    def last_failed_time(self):
+        """Gets the last_failed_time of this Alert.  # noqa: E501
 
-        When the alert was last updated, in epoch millis  # noqa: E501
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :return: The updated of this Alert.  # noqa: E501
+        :return: The last_failed_time of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._updated
+        return self._last_failed_time
 
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this Alert.
+    @last_failed_time.setter
+    def last_failed_time(self, last_failed_time):
+        """Sets the last_failed_time of this Alert.
 
-        When the alert was last updated, in epoch millis  # noqa: E501
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :param updated: The updated of this Alert.  # noqa: E501
+        :param last_failed_time: The last_failed_time of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._updated = updated
+        self._last_failed_time = last_failed_time
 
     @property
-    def update_user_id(self):
-        """Gets the update_user_id of this Alert.  # noqa: E501
+    def last_error_message(self):
+        """Gets the last_error_message of this Alert.  # noqa: E501
 
-        The user that last updated this alert  # noqa: E501
+        The last error encountered when running this alert's condition query  # noqa: E501
 
-        :return: The update_user_id of this Alert.  # noqa: E501
+        :return: The last_error_message of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._update_user_id
+        return self._last_error_message
 
-    @update_user_id.setter
-    def update_user_id(self, update_user_id):
-        """Sets the update_user_id of this Alert.
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this Alert.
 
-        The user that last updated this alert  # noqa: E501
+        The last error encountered when running this alert's condition query  # noqa: E501
 
-        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
+        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
         :type: str
         """
 
-        self._update_user_id = update_user_id
+        self._last_error_message = last_error_message
 
     @property
-    def last_query_time(self):
-        """Gets the last_query_time of this Alert.  # noqa: E501
+    def metrics_used(self):
+        """Gets the metrics_used of this Alert.  # noqa: E501
 
-        Last query time of the alert, averaged on hourly basis  # noqa: E501
+        Number of metrics checked by the alert condition  # noqa: E501
 
-        :return: The last_query_time of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The metrics_used of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._last_query_time
+        return self._metrics_used
 
-    @last_query_time.setter
-    def last_query_time(self, last_query_time):
-        """Sets the last_query_time of this Alert.
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this Alert.
 
-        Last query time of the alert, averaged on hourly basis  # noqa: E501
+        Number of metrics checked by the alert condition  # noqa: E501
 
-        :param last_query_time: The last_query_time of this Alert.  # noqa: E501
-        :type: int
+        :param metrics_used: The metrics_used of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._last_query_time = last_query_time
+        self._metrics_used = metrics_used
 
     @property
-    def alerts_last_day(self):
-        """Gets the alerts_last_day of this Alert.  # noqa: E501
+    def hosts_used(self):
+        """Gets the hosts_used of this Alert.  # noqa: E501
 
+        Number of hosts checked by the alert condition  # noqa: E501
 
-        :return: The alerts_last_day of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The hosts_used of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._alerts_last_day
+        return self._hosts_used
 
-    @alerts_last_day.setter
-    def alerts_last_day(self, alerts_last_day):
-        """Sets the alerts_last_day of this Alert.
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this Alert.
 
+        Number of hosts checked by the alert condition  # noqa: E501
 
-        :param alerts_last_day: The alerts_last_day of this Alert.  # noqa: E501
-        :type: int
+        :param hosts_used: The hosts_used of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._alerts_last_day = alerts_last_day
+        self._hosts_used = hosts_used
 
     @property
-    def alerts_last_week(self):
-        """Gets the alerts_last_week of this Alert.  # noqa: E501
+    def points_scanned_at_last_query(self):
+        """Gets the points_scanned_at_last_query of this Alert.  # noqa: E501
 
+        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
 
-        :return: The alerts_last_week of this Alert.  # noqa: E501
+        :return: The points_scanned_at_last_query of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._alerts_last_week
+        return self._points_scanned_at_last_query
 
-    @alerts_last_week.setter
-    def alerts_last_week(self, alerts_last_week):
-        """Sets the alerts_last_week of this Alert.
+    @points_scanned_at_last_query.setter
+    def points_scanned_at_last_query(self, points_scanned_at_last_query):
+        """Sets the points_scanned_at_last_query of this Alert.
 
+        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
 
-        :param alerts_last_week: The alerts_last_week of this Alert.  # noqa: E501
+        :param points_scanned_at_last_query: The points_scanned_at_last_query of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._alerts_last_week = alerts_last_week
+        self._points_scanned_at_last_query = points_scanned_at_last_query
 
     @property
-    def alerts_last_month(self):
-        """Gets the alerts_last_month of this Alert.  # noqa: E501
+    def last_notification_millis(self):
+        """Gets the last_notification_millis of this Alert.  # noqa: E501
 
+        When this alert last caused a notification, in epoch millis  # noqa: E501
 
-        :return: The alerts_last_month of this Alert.  # noqa: E501
+        :return: The last_notification_millis of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._alerts_last_month
+        return self._last_notification_millis
 
-    @alerts_last_month.setter
-    def alerts_last_month(self, alerts_last_month):
-        """Sets the alerts_last_month of this Alert.
+    @last_notification_millis.setter
+    def last_notification_millis(self, last_notification_millis):
+        """Sets the last_notification_millis of this Alert.
 
+        When this alert last caused a notification, in epoch millis  # noqa: E501
 
-        :param alerts_last_month: The alerts_last_month of this Alert.  # noqa: E501
+        :param last_notification_millis: The last_notification_millis of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._alerts_last_month = alerts_last_month
+        self._last_notification_millis = last_notification_millis
 
     @property
-    def snoozed(self):
-        """Gets the snoozed of this Alert.  # noqa: E501
+    def notification_resend_frequency_minutes(self):
+        """Gets the notification_resend_frequency_minutes of this Alert.  # noqa: E501
 
-        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
+        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
 
-        :return: The snoozed of this Alert.  # noqa: E501
+        :return: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._snoozed
+        return self._notification_resend_frequency_minutes
 
-    @snoozed.setter
-    def snoozed(self, snoozed):
-        """Sets the snoozed of this Alert.
+    @notification_resend_frequency_minutes.setter
+    def notification_resend_frequency_minutes(self, notification_resend_frequency_minutes):
+        """Sets the notification_resend_frequency_minutes of this Alert.
 
-        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
+        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
 
-        :param snoozed: The snoozed of this Alert.  # noqa: E501
+        :param notification_resend_frequency_minutes: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._snoozed = snoozed
-
-    @property
-    def no_data_event(self):
-        """Gets the no_data_event of this Alert.  # noqa: E501
-
-        No data event related to the alert  # noqa: E501
-
-        :return: The no_data_event of this Alert.  # noqa: E501
-        :rtype: Event
-        """
-        return self._no_data_event
-
-    @no_data_event.setter
-    def no_data_event(self, no_data_event):
-        """Sets the no_data_event of this Alert.
-
-        No data event related to the alert  # noqa: E501
-
-        :param no_data_event: The no_data_event of this Alert.  # noqa: E501
-        :type: Event
-        """
-
-        self._no_data_event = no_data_event
+        self._notification_resend_frequency_minutes = notification_resend_frequency_minutes
 
     @property
-    def in_trash(self):
-        """Gets the in_trash of this Alert.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Alert.  # noqa: E501
 
 
-        :return: The in_trash of this Alert.  # noqa: E501
-        :rtype: bool
+        :return: The created_epoch_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._in_trash
+        return self._created_epoch_millis
 
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this Alert.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Alert.
 
 
-        :param in_trash: The in_trash of this Alert.  # noqa: E501
-        :type: bool
+        :param created_epoch_millis: The created_epoch_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._in_trash = in_trash
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def create_user_id(self):
-        """Gets the create_user_id of this Alert.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Alert.  # noqa: E501
 
 
-        :return: The create_user_id of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The updated_epoch_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._create_user_id
+        return self._updated_epoch_millis
 
-    @create_user_id.setter
-    def create_user_id(self, create_user_id):
-        """Sets the create_user_id of this Alert.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Alert.
 
 
-        :param create_user_id: The create_user_id of this Alert.  # noqa: E501
-        :type: str
+        :param updated_epoch_millis: The updated_epoch_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._create_user_id = create_user_id
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
     def deleted(self):
diff --git a/wavefront_api_client/models/avro_backed_standardized_dto.py b/wavefront_api_client/models/avro_backed_standardized_dto.py
index 1049b1c..62d0a39 100644
--- a/wavefront_api_client/models/avro_backed_standardized_dto.py
+++ b/wavefront_api_client/models/avro_backed_standardized_dto.py
@@ -33,29 +33,29 @@ class AvroBackedStandardizedDTO(object):
     swagger_types = {
         'id': 'str',
         'creator_id': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'updater_id': 'str',
         'deleted': 'bool'
     }
 
     attribute_map = {
         'id': 'id',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId',
         'deleted': 'deleted'
     }
 
-    def __init__(self, id=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, updater_id=None, deleted=None):  # noqa: E501
+    def __init__(self, id=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
         """AvroBackedStandardizedDTO - a model defined in Swagger"""  # noqa: E501
 
         self._id = None
         self._creator_id = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._updater_id = None
         self._deleted = None
         self.discriminator = None
 
@@ -63,12 +63,12 @@ def __init__(self, id=None, creator_id=None, created_epoch_millis=None, updated_
             self.id = id
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if updater_id is not None:
-            self.updater_id = updater_id
         if deleted is not None:
             self.deleted = deleted
 
@@ -114,6 +114,27 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
+
+
+        :return: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this AvroBackedStandardizedDTO.
+
+
+        :param updater_id: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
@@ -156,27 +177,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this AvroBackedStandardizedDTO.
-
-
-        :param updater_id: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
     @property
     def deleted(self):
         """Gets the deleted of this AvroBackedStandardizedDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index c0e72e2..033b45d 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -32,27 +32,27 @@ class AzureBaseCredentials(object):
     """
     swagger_types = {
         'client_id': 'str',
-        'tenant': 'str',
-        'client_secret': 'str'
+        'client_secret': 'str',
+        'tenant': 'str'
     }
 
     attribute_map = {
         'client_id': 'clientId',
-        'tenant': 'tenant',
-        'client_secret': 'clientSecret'
+        'client_secret': 'clientSecret',
+        'tenant': 'tenant'
     }
 
-    def __init__(self, client_id=None, tenant=None, client_secret=None):  # noqa: E501
+    def __init__(self, client_id=None, client_secret=None, tenant=None):  # noqa: E501
         """AzureBaseCredentials - a model defined in Swagger"""  # noqa: E501
 
         self._client_id = None
-        self._tenant = None
         self._client_secret = None
+        self._tenant = None
         self.discriminator = None
 
         self.client_id = client_id
-        self.tenant = tenant
         self.client_secret = client_secret
+        self.tenant = tenant
 
     @property
     def client_id(self):
@@ -79,31 +79,6 @@ def client_id(self, client_id):
 
         self._client_id = client_id
 
-    @property
-    def tenant(self):
-        """Gets the tenant of this AzureBaseCredentials.  # noqa: E501
-
-        Tenant Id for an Azure service account within your project.  # noqa: E501
-
-        :return: The tenant of this AzureBaseCredentials.  # noqa: E501
-        :rtype: str
-        """
-        return self._tenant
-
-    @tenant.setter
-    def tenant(self, tenant):
-        """Sets the tenant of this AzureBaseCredentials.
-
-        Tenant Id for an Azure service account within your project.  # noqa: E501
-
-        :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
-        :type: str
-        """
-        if tenant is None:
-            raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
-
-        self._tenant = tenant
-
     @property
     def client_secret(self):
         """Gets the client_secret of this AzureBaseCredentials.  # noqa: E501
@@ -129,6 +104,31 @@ def client_secret(self, client_secret):
 
         self._client_secret = client_secret
 
+    @property
+    def tenant(self):
+        """Gets the tenant of this AzureBaseCredentials.  # noqa: E501
+
+        Tenant Id for an Azure service account within your project.  # noqa: E501
+
+        :return: The tenant of this AzureBaseCredentials.  # noqa: E501
+        :rtype: str
+        """
+        return self._tenant
+
+    @tenant.setter
+    def tenant(self, tenant):
+        """Sets the tenant of this AzureBaseCredentials.
+
+        Tenant Id for an Azure service account within your project.  # noqa: E501
+
+        :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
+        :type: str
+        """
+        if tenant is None:
+            raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
+
+        self._tenant = tenant
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index b98715c..c1905e3 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -33,58 +33,37 @@ class AzureConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'base_credentials': 'AzureBaseCredentials',
         'metric_filter_regex': 'str',
+        'base_credentials': 'AzureBaseCredentials',
         'category_filter': 'list[str]',
         'resource_group_filter': 'list[str]'
     }
 
     attribute_map = {
-        'base_credentials': 'baseCredentials',
         'metric_filter_regex': 'metricFilterRegex',
+        'base_credentials': 'baseCredentials',
         'category_filter': 'categoryFilter',
         'resource_group_filter': 'resourceGroupFilter'
     }
 
-    def __init__(self, base_credentials=None, metric_filter_regex=None, category_filter=None, resource_group_filter=None):  # noqa: E501
+    def __init__(self, metric_filter_regex=None, base_credentials=None, category_filter=None, resource_group_filter=None):  # noqa: E501
         """AzureConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._base_credentials = None
         self._metric_filter_regex = None
+        self._base_credentials = None
         self._category_filter = None
         self._resource_group_filter = None
         self.discriminator = None
 
-        if base_credentials is not None:
-            self.base_credentials = base_credentials
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
+        if base_credentials is not None:
+            self.base_credentials = base_credentials
         if category_filter is not None:
             self.category_filter = category_filter
         if resource_group_filter is not None:
             self.resource_group_filter = resource_group_filter
 
-    @property
-    def base_credentials(self):
-        """Gets the base_credentials of this AzureConfiguration.  # noqa: E501
-
-
-        :return: The base_credentials of this AzureConfiguration.  # noqa: E501
-        :rtype: AzureBaseCredentials
-        """
-        return self._base_credentials
-
-    @base_credentials.setter
-    def base_credentials(self, base_credentials):
-        """Sets the base_credentials of this AzureConfiguration.
-
-
-        :param base_credentials: The base_credentials of this AzureConfiguration.  # noqa: E501
-        :type: AzureBaseCredentials
-        """
-
-        self._base_credentials = base_credentials
-
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this AzureConfiguration.  # noqa: E501
@@ -108,6 +87,27 @@ def metric_filter_regex(self, metric_filter_regex):
 
         self._metric_filter_regex = metric_filter_regex
 
+    @property
+    def base_credentials(self):
+        """Gets the base_credentials of this AzureConfiguration.  # noqa: E501
+
+
+        :return: The base_credentials of this AzureConfiguration.  # noqa: E501
+        :rtype: AzureBaseCredentials
+        """
+        return self._base_credentials
+
+    @base_credentials.setter
+    def base_credentials(self, base_credentials):
+        """Sets the base_credentials of this AzureConfiguration.
+
+
+        :param base_credentials: The base_credentials of this AzureConfiguration.  # noqa: E501
+        :type: AzureBaseCredentials
+        """
+
+        self._base_credentials = base_credentials
+
     @property
     def category_filter(self):
         """Gets the category_filter of this AzureConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index ff740f4..c1373c6 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -35,49 +35,51 @@ class Chart(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'units': 'str',
         'name': 'str',
         'description': 'str',
         'sources': 'list[ChartSourceQuery]',
         'include_obsolete_metrics': 'bool',
         'no_default_events': 'bool',
-        'base': 'int',
-        'units': 'str',
         'chart_attributes': 'JsonNode',
-        'interpolate_points': 'bool',
+        'summarization': 'str',
+        'base': 'int',
         'chart_settings': 'ChartSettings',
-        'summarization': 'str'
+        'interpolate_points': 'bool'
     }
 
     attribute_map = {
+        'units': 'units',
         'name': 'name',
         'description': 'description',
         'sources': 'sources',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
         'no_default_events': 'noDefaultEvents',
-        'base': 'base',
-        'units': 'units',
         'chart_attributes': 'chartAttributes',
-        'interpolate_points': 'interpolatePoints',
+        'summarization': 'summarization',
+        'base': 'base',
         'chart_settings': 'chartSettings',
-        'summarization': 'summarization'
+        'interpolate_points': 'interpolatePoints'
     }
 
-    def __init__(self, name=None, description=None, sources=None, include_obsolete_metrics=None, no_default_events=None, base=None, units=None, chart_attributes=None, interpolate_points=None, chart_settings=None, summarization=None):  # noqa: E501
+    def __init__(self, units=None, name=None, description=None, sources=None, include_obsolete_metrics=None, no_default_events=None, chart_attributes=None, summarization=None, base=None, chart_settings=None, interpolate_points=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
 
+        self._units = None
         self._name = None
         self._description = None
         self._sources = None
         self._include_obsolete_metrics = None
         self._no_default_events = None
-        self._base = None
-        self._units = None
         self._chart_attributes = None
-        self._interpolate_points = None
-        self._chart_settings = None
         self._summarization = None
+        self._base = None
+        self._chart_settings = None
+        self._interpolate_points = None
         self.discriminator = None
 
+        if units is not None:
+            self.units = units
         self.name = name
         if description is not None:
             self.description = description
@@ -86,18 +88,39 @@ def __init__(self, name=None, description=None, sources=None, include_obsolete_m
             self.include_obsolete_metrics = include_obsolete_metrics
         if no_default_events is not None:
             self.no_default_events = no_default_events
-        if base is not None:
-            self.base = base
-        if units is not None:
-            self.units = units
         if chart_attributes is not None:
             self.chart_attributes = chart_attributes
-        if interpolate_points is not None:
-            self.interpolate_points = interpolate_points
-        if chart_settings is not None:
-            self.chart_settings = chart_settings
         if summarization is not None:
             self.summarization = summarization
+        if base is not None:
+            self.base = base
+        if chart_settings is not None:
+            self.chart_settings = chart_settings
+        if interpolate_points is not None:
+            self.interpolate_points = interpolate_points
+
+    @property
+    def units(self):
+        """Gets the units of this Chart.  # noqa: E501
+
+        String to label the units of the chart on the Y-axis  # noqa: E501
+
+        :return: The units of this Chart.  # noqa: E501
+        :rtype: str
+        """
+        return self._units
+
+    @units.setter
+    def units(self, units):
+        """Sets the units of this Chart.
+
+        String to label the units of the chart on the Y-axis  # noqa: E501
+
+        :param units: The units of this Chart.  # noqa: E501
+        :type: str
+        """
+
+        self._units = units
 
     @property
     def name(self):
@@ -218,52 +241,6 @@ def no_default_events(self, no_default_events):
 
         self._no_default_events = no_default_events
 
-    @property
-    def base(self):
-        """Gets the base of this Chart.  # noqa: E501
-
-        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
-
-        :return: The base of this Chart.  # noqa: E501
-        :rtype: int
-        """
-        return self._base
-
-    @base.setter
-    def base(self, base):
-        """Sets the base of this Chart.
-
-        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
-
-        :param base: The base of this Chart.  # noqa: E501
-        :type: int
-        """
-
-        self._base = base
-
-    @property
-    def units(self):
-        """Gets the units of this Chart.  # noqa: E501
-
-        String to label the units of the chart on the Y-axis  # noqa: E501
-
-        :return: The units of this Chart.  # noqa: E501
-        :rtype: str
-        """
-        return self._units
-
-    @units.setter
-    def units(self, units):
-        """Sets the units of this Chart.
-
-        String to label the units of the chart on the Y-axis  # noqa: E501
-
-        :param units: The units of this Chart.  # noqa: E501
-        :type: str
-        """
-
-        self._units = units
-
     @property
     def chart_attributes(self):
         """Gets the chart_attributes of this Chart.  # noqa: E501
@@ -288,27 +265,56 @@ def chart_attributes(self, chart_attributes):
         self._chart_attributes = chart_attributes
 
     @property
-    def interpolate_points(self):
-        """Gets the interpolate_points of this Chart.  # noqa: E501
+    def summarization(self):
+        """Gets the summarization of this Chart.  # noqa: E501
 
-        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+        Summarization strategy for the chart.  MEAN is default  # noqa: E501
 
-        :return: The interpolate_points of this Chart.  # noqa: E501
-        :rtype: bool
+        :return: The summarization of this Chart.  # noqa: E501
+        :rtype: str
         """
-        return self._interpolate_points
+        return self._summarization
 
-    @interpolate_points.setter
-    def interpolate_points(self, interpolate_points):
-        """Sets the interpolate_points of this Chart.
+    @summarization.setter
+    def summarization(self, summarization):
+        """Sets the summarization of this Chart.
 
-        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+        Summarization strategy for the chart.  MEAN is default  # noqa: E501
 
-        :param interpolate_points: The interpolate_points of this Chart.  # noqa: E501
-        :type: bool
+        :param summarization: The summarization of this Chart.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
+        if summarization not in allowed_values:
+            raise ValueError(
+                "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
+                .format(summarization, allowed_values)
+            )
 
-        self._interpolate_points = interpolate_points
+        self._summarization = summarization
+
+    @property
+    def base(self):
+        """Gets the base of this Chart.  # noqa: E501
+
+        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
+
+        :return: The base of this Chart.  # noqa: E501
+        :rtype: int
+        """
+        return self._base
+
+    @base.setter
+    def base(self, base):
+        """Sets the base of this Chart.
+
+        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
+
+        :param base: The base of this Chart.  # noqa: E501
+        :type: int
+        """
+
+        self._base = base
 
     @property
     def chart_settings(self):
@@ -332,33 +338,27 @@ def chart_settings(self, chart_settings):
         self._chart_settings = chart_settings
 
     @property
-    def summarization(self):
-        """Gets the summarization of this Chart.  # noqa: E501
+    def interpolate_points(self):
+        """Gets the interpolate_points of this Chart.  # noqa: E501
 
-        Summarization strategy for the chart.  MEAN is default  # noqa: E501
+        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
 
-        :return: The summarization of this Chart.  # noqa: E501
-        :rtype: str
+        :return: The interpolate_points of this Chart.  # noqa: E501
+        :rtype: bool
         """
-        return self._summarization
+        return self._interpolate_points
 
-    @summarization.setter
-    def summarization(self, summarization):
-        """Sets the summarization of this Chart.
+    @interpolate_points.setter
+    def interpolate_points(self, interpolate_points):
+        """Sets the interpolate_points of this Chart.
 
-        Summarization strategy for the chart.  MEAN is default  # noqa: E501
+        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
 
-        :param summarization: The summarization of this Chart.  # noqa: E501
-        :type: str
+        :param interpolate_points: The interpolate_points of this Chart.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
-        if summarization not in allowed_values:
-            raise ValueError(
-                "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
-                .format(summarization, allowed_values)
-            )
 
-        self._summarization = summarization
+        self._interpolate_points = interpolate_points
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 0ae4911..85aeb25 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -31,13 +31,13 @@ class ChartSettings(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'type': 'str',
         'min': 'float',
+        'type': 'str',
         'max': 'float',
         'expected_data_spacing': 'int',
-        'plain_markdown_content': 'str',
         'fixed_legend_enabled': 'bool',
         'fixed_legend_use_raw_stats': 'bool',
+        'plain_markdown_content': 'str',
         'line_type': 'str',
         'stack_type': 'str',
         'windowing': 'str',
@@ -91,13 +91,13 @@ class ChartSettings(object):
     }
 
     attribute_map = {
-        'type': 'type',
         'min': 'min',
+        'type': 'type',
         'max': 'max',
         'expected_data_spacing': 'expectedDataSpacing',
-        'plain_markdown_content': 'plainMarkdownContent',
         'fixed_legend_enabled': 'fixedLegendEnabled',
         'fixed_legend_use_raw_stats': 'fixedLegendUseRawStats',
+        'plain_markdown_content': 'plainMarkdownContent',
         'line_type': 'lineType',
         'stack_type': 'stackType',
         'windowing': 'windowing',
@@ -150,16 +150,16 @@ class ChartSettings(object):
         'sparkline_value_text_map_thresholds': 'sparklineValueTextMapThresholds'
     }
 
-    def __init__(self, type=None, min=None, max=None, expected_data_spacing=None, plain_markdown_content=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None):  # noqa: E501
+    def __init__(self, min=None, type=None, max=None, expected_data_spacing=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, plain_markdown_content=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
-        self._type = None
         self._min = None
+        self._type = None
         self._max = None
         self._expected_data_spacing = None
-        self._plain_markdown_content = None
         self._fixed_legend_enabled = None
         self._fixed_legend_use_raw_stats = None
+        self._plain_markdown_content = None
         self._line_type = None
         self._stack_type = None
         self._windowing = None
@@ -212,19 +212,19 @@ def __init__(self, type=None, min=None, max=None, expected_data_spacing=None, pl
         self._sparkline_value_text_map_thresholds = None
         self.discriminator = None
 
-        self.type = type
         if min is not None:
             self.min = min
+        self.type = type
         if max is not None:
             self.max = max
         if expected_data_spacing is not None:
             self.expected_data_spacing = expected_data_spacing
-        if plain_markdown_content is not None:
-            self.plain_markdown_content = plain_markdown_content
         if fixed_legend_enabled is not None:
             self.fixed_legend_enabled = fixed_legend_enabled
         if fixed_legend_use_raw_stats is not None:
             self.fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
+        if plain_markdown_content is not None:
+            self.plain_markdown_content = plain_markdown_content
         if line_type is not None:
             self.line_type = line_type
         if stack_type is not None:
@@ -326,6 +326,29 @@ def __init__(self, type=None, min=None, max=None, expected_data_spacing=None, pl
         if sparkline_value_text_map_thresholds is not None:
             self.sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
 
+    @property
+    def min(self):
+        """Gets the min of this ChartSettings.  # noqa: E501
+
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+
+        :return: The min of this ChartSettings.  # noqa: E501
+        :rtype: float
+        """
+        return self._min
+
+    @min.setter
+    def min(self, min):
+        """Sets the min of this ChartSettings.
+
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+
+        :param min: The min of this ChartSettings.  # noqa: E501
+        :type: float
+        """
+
+        self._min = min
+
     @property
     def type(self):
         """Gets the type of this ChartSettings.  # noqa: E501
@@ -357,29 +380,6 @@ def type(self, type):
 
         self._type = type
 
-    @property
-    def min(self):
-        """Gets the min of this ChartSettings.  # noqa: E501
-
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
-
-        :return: The min of this ChartSettings.  # noqa: E501
-        :rtype: float
-        """
-        return self._min
-
-    @min.setter
-    def min(self, min):
-        """Sets the min of this ChartSettings.
-
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
-
-        :param min: The min of this ChartSettings.  # noqa: E501
-        :type: float
-        """
-
-        self._min = min
-
     @property
     def max(self):
         """Gets the max of this ChartSettings.  # noqa: E501
@@ -426,29 +426,6 @@ def expected_data_spacing(self, expected_data_spacing):
 
         self._expected_data_spacing = expected_data_spacing
 
-    @property
-    def plain_markdown_content(self):
-        """Gets the plain_markdown_content of this ChartSettings.  # noqa: E501
-
-        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
-
-        :return: The plain_markdown_content of this ChartSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._plain_markdown_content
-
-    @plain_markdown_content.setter
-    def plain_markdown_content(self, plain_markdown_content):
-        """Sets the plain_markdown_content of this ChartSettings.
-
-        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
-
-        :param plain_markdown_content: The plain_markdown_content of this ChartSettings.  # noqa: E501
-        :type: str
-        """
-
-        self._plain_markdown_content = plain_markdown_content
-
     @property
     def fixed_legend_enabled(self):
         """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
@@ -495,6 +472,29 @@ def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
 
         self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
 
+    @property
+    def plain_markdown_content(self):
+        """Gets the plain_markdown_content of this ChartSettings.  # noqa: E501
+
+        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
+
+        :return: The plain_markdown_content of this ChartSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._plain_markdown_content
+
+    @plain_markdown_content.setter
+    def plain_markdown_content(self, plain_markdown_content):
+        """Sets the plain_markdown_content of this ChartSettings.
+
+        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
+
+        :param plain_markdown_content: The plain_markdown_content of this ChartSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._plain_markdown_content = plain_markdown_content
+
     @property
     def line_type(self):
         """Gets the line_type of this ChartSettings.  # noqa: E501
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index d7ce1da..56d9c45 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -22,6 +22,7 @@
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.ec2_configuration import EC2Configuration  # noqa: F401,E501
 from wavefront_api_client.models.event import Event  # noqa: F401,E501
+from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration  # noqa: F401,E501
 
@@ -44,7 +45,10 @@ class CloudIntegration(object):
         'name': 'str',
         'id': 'str',
         'service': 'str',
+        'in_trash': 'bool',
         'creator_id': 'str',
+        'updater_id': 'str',
+        'last_error_event': 'Event',
         'additional_tags': 'dict(str, str)',
         'last_received_data_point_ms': 'int',
         'last_metric_count': 'int',
@@ -52,6 +56,7 @@ class CloudIntegration(object):
         'cloud_trail': 'CloudTrailConfiguration',
         'ec2': 'EC2Configuration',
         'gcp': 'GCPConfiguration',
+        'gcp_billing': 'GCPBillingConfiguration',
         'tesla': 'TeslaConfiguration',
         'azure': 'AzureConfiguration',
         'azure_activity_log': 'AzureActivityLogConfiguration',
@@ -63,9 +68,6 @@ class CloudIntegration(object):
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'service_refresh_rate_in_mins': 'int',
-        'updater_id': 'str',
-        'in_trash': 'bool',
-        'last_error_event': 'Event',
         'deleted': 'bool'
     }
 
@@ -74,7 +76,10 @@ class CloudIntegration(object):
         'name': 'name',
         'id': 'id',
         'service': 'service',
+        'in_trash': 'inTrash',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
+        'last_error_event': 'lastErrorEvent',
         'additional_tags': 'additionalTags',
         'last_received_data_point_ms': 'lastReceivedDataPointMs',
         'last_metric_count': 'lastMetricCount',
@@ -82,6 +87,7 @@ class CloudIntegration(object):
         'cloud_trail': 'cloudTrail',
         'ec2': 'ec2',
         'gcp': 'gcp',
+        'gcp_billing': 'gcpBilling',
         'tesla': 'tesla',
         'azure': 'azure',
         'azure_activity_log': 'azureActivityLog',
@@ -93,20 +99,20 @@ class CloudIntegration(object):
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
-        'updater_id': 'updaterId',
-        'in_trash': 'inTrash',
-        'last_error_event': 'lastErrorEvent',
         'deleted': 'deleted'
     }
 
-    def __init__(self, force_save=None, name=None, id=None, service=None, creator_id=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, service_refresh_rate_in_mins=None, updater_id=None, in_trash=None, last_error_event=None, deleted=None):  # noqa: E501
+    def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=None, creator_id=None, updater_id=None, last_error_event=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, gcp_billing=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, service_refresh_rate_in_mins=None, deleted=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
 
         self._force_save = None
         self._name = None
         self._id = None
         self._service = None
+        self._in_trash = None
         self._creator_id = None
+        self._updater_id = None
+        self._last_error_event = None
         self._additional_tags = None
         self._last_received_data_point_ms = None
         self._last_metric_count = None
@@ -114,6 +120,7 @@ def __init__(self, force_save=None, name=None, id=None, service=None, creator_id
         self._cloud_trail = None
         self._ec2 = None
         self._gcp = None
+        self._gcp_billing = None
         self._tesla = None
         self._azure = None
         self._azure_activity_log = None
@@ -125,9 +132,6 @@ def __init__(self, force_save=None, name=None, id=None, service=None, creator_id
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._service_refresh_rate_in_mins = None
-        self._updater_id = None
-        self._in_trash = None
-        self._last_error_event = None
         self._deleted = None
         self.discriminator = None
 
@@ -137,8 +141,14 @@ def __init__(self, force_save=None, name=None, id=None, service=None, creator_id
         if id is not None:
             self.id = id
         self.service = service
+        if in_trash is not None:
+            self.in_trash = in_trash
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
+        if last_error_event is not None:
+            self.last_error_event = last_error_event
         if additional_tags is not None:
             self.additional_tags = additional_tags
         if last_received_data_point_ms is not None:
@@ -153,6 +163,8 @@ def __init__(self, force_save=None, name=None, id=None, service=None, creator_id
             self.ec2 = ec2
         if gcp is not None:
             self.gcp = gcp
+        if gcp_billing is not None:
+            self.gcp_billing = gcp_billing
         if tesla is not None:
             self.tesla = tesla
         if azure is not None:
@@ -175,12 +187,6 @@ def __init__(self, force_save=None, name=None, id=None, service=None, creator_id
             self.updated_epoch_millis = updated_epoch_millis
         if service_refresh_rate_in_mins is not None:
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if in_trash is not None:
-            self.in_trash = in_trash
-        if last_error_event is not None:
-            self.last_error_event = last_error_event
         if deleted is not None:
             self.deleted = deleted
 
@@ -273,7 +279,7 @@ def service(self, service):
         """
         if service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "TESLA", "AZURE", "AZUREACTIVITYLOG"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG"]  # noqa: E501
         if service not in allowed_values:
             raise ValueError(
                 "Invalid value for `service` ({0}), must be one of {1}"  # noqa: E501
@@ -282,6 +288,27 @@ def service(self, service):
 
         self._service = service
 
+    @property
+    def in_trash(self):
+        """Gets the in_trash of this CloudIntegration.  # noqa: E501
+
+
+        :return: The in_trash of this CloudIntegration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._in_trash
+
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this CloudIntegration.
+
+
+        :param in_trash: The in_trash of this CloudIntegration.  # noqa: E501
+        :type: bool
+        """
+
+        self._in_trash = in_trash
+
     @property
     def creator_id(self):
         """Gets the creator_id of this CloudIntegration.  # noqa: E501
@@ -303,6 +330,48 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this CloudIntegration.  # noqa: E501
+
+
+        :return: The updater_id of this CloudIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this CloudIntegration.
+
+
+        :param updater_id: The updater_id of this CloudIntegration.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    @property
+    def last_error_event(self):
+        """Gets the last_error_event of this CloudIntegration.  # noqa: E501
+
+
+        :return: The last_error_event of this CloudIntegration.  # noqa: E501
+        :rtype: Event
+        """
+        return self._last_error_event
+
+    @last_error_event.setter
+    def last_error_event(self, last_error_event):
+        """Sets the last_error_event of this CloudIntegration.
+
+
+        :param last_error_event: The last_error_event of this CloudIntegration.  # noqa: E501
+        :type: Event
+        """
+
+        self._last_error_event = last_error_event
+
     @property
     def additional_tags(self):
         """Gets the additional_tags of this CloudIntegration.  # noqa: E501
@@ -456,6 +525,27 @@ def gcp(self, gcp):
 
         self._gcp = gcp
 
+    @property
+    def gcp_billing(self):
+        """Gets the gcp_billing of this CloudIntegration.  # noqa: E501
+
+
+        :return: The gcp_billing of this CloudIntegration.  # noqa: E501
+        :rtype: GCPBillingConfiguration
+        """
+        return self._gcp_billing
+
+    @gcp_billing.setter
+    def gcp_billing(self, gcp_billing):
+        """Sets the gcp_billing of this CloudIntegration.
+
+
+        :param gcp_billing: The gcp_billing of this CloudIntegration.  # noqa: E501
+        :type: GCPBillingConfiguration
+        """
+
+        self._gcp_billing = gcp_billing
+
     @property
     def tesla(self):
         """Gets the tesla of this CloudIntegration.  # noqa: E501
@@ -699,69 +789,6 @@ def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
 
         self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this CloudIntegration.  # noqa: E501
-
-
-        :return: The updater_id of this CloudIntegration.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this CloudIntegration.
-
-
-        :param updater_id: The updater_id of this CloudIntegration.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    @property
-    def in_trash(self):
-        """Gets the in_trash of this CloudIntegration.  # noqa: E501
-
-
-        :return: The in_trash of this CloudIntegration.  # noqa: E501
-        :rtype: bool
-        """
-        return self._in_trash
-
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this CloudIntegration.
-
-
-        :param in_trash: The in_trash of this CloudIntegration.  # noqa: E501
-        :type: bool
-        """
-
-        self._in_trash = in_trash
-
-    @property
-    def last_error_event(self):
-        """Gets the last_error_event of this CloudIntegration.  # noqa: E501
-
-
-        :return: The last_error_event of this CloudIntegration.  # noqa: E501
-        :rtype: Event
-        """
-        return self._last_error_event
-
-    @last_error_event.setter
-    def last_error_event(self, last_error_event):
-        """Sets the last_error_event of this CloudIntegration.
-
-
-        :param last_error_event: The last_error_event of this CloudIntegration.  # noqa: E501
-        :type: Event
-        """
-
-        self._last_error_event = last_error_event
-
     @property
     def deleted(self):
         """Gets the deleted of this CloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index 4f9a981..d05e1d9 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -33,65 +33,40 @@ class CloudTrailConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'region': 'str',
         'prefix': 'str',
-        'base_credentials': 'AWSBaseCredentials',
+        'region': 'str',
         'bucket_name': 'str',
+        'base_credentials': 'AWSBaseCredentials',
         'filter_rule': 'str'
     }
 
     attribute_map = {
-        'region': 'region',
         'prefix': 'prefix',
-        'base_credentials': 'baseCredentials',
+        'region': 'region',
         'bucket_name': 'bucketName',
+        'base_credentials': 'baseCredentials',
         'filter_rule': 'filterRule'
     }
 
-    def __init__(self, region=None, prefix=None, base_credentials=None, bucket_name=None, filter_rule=None):  # noqa: E501
+    def __init__(self, prefix=None, region=None, bucket_name=None, base_credentials=None, filter_rule=None):  # noqa: E501
         """CloudTrailConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._region = None
         self._prefix = None
-        self._base_credentials = None
+        self._region = None
         self._bucket_name = None
+        self._base_credentials = None
         self._filter_rule = None
         self.discriminator = None
 
-        self.region = region
         if prefix is not None:
             self.prefix = prefix
+        self.region = region
+        self.bucket_name = bucket_name
         if base_credentials is not None:
             self.base_credentials = base_credentials
-        self.bucket_name = bucket_name
         if filter_rule is not None:
             self.filter_rule = filter_rule
 
-    @property
-    def region(self):
-        """Gets the region of this CloudTrailConfiguration.  # noqa: E501
-
-        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
-
-        :return: The region of this CloudTrailConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._region
-
-    @region.setter
-    def region(self, region):
-        """Sets the region of this CloudTrailConfiguration.
-
-        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
-
-        :param region: The region of this CloudTrailConfiguration.  # noqa: E501
-        :type: str
-        """
-        if region is None:
-            raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
-
-        self._region = region
-
     @property
     def prefix(self):
         """Gets the prefix of this CloudTrailConfiguration.  # noqa: E501
@@ -116,25 +91,29 @@ def prefix(self, prefix):
         self._prefix = prefix
 
     @property
-    def base_credentials(self):
-        """Gets the base_credentials of this CloudTrailConfiguration.  # noqa: E501
+    def region(self):
+        """Gets the region of this CloudTrailConfiguration.  # noqa: E501
 
+        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
 
-        :return: The base_credentials of this CloudTrailConfiguration.  # noqa: E501
-        :rtype: AWSBaseCredentials
+        :return: The region of this CloudTrailConfiguration.  # noqa: E501
+        :rtype: str
         """
-        return self._base_credentials
+        return self._region
 
-    @base_credentials.setter
-    def base_credentials(self, base_credentials):
-        """Sets the base_credentials of this CloudTrailConfiguration.
+    @region.setter
+    def region(self, region):
+        """Sets the region of this CloudTrailConfiguration.
 
+        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
 
-        :param base_credentials: The base_credentials of this CloudTrailConfiguration.  # noqa: E501
-        :type: AWSBaseCredentials
+        :param region: The region of this CloudTrailConfiguration.  # noqa: E501
+        :type: str
         """
+        if region is None:
+            raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
 
-        self._base_credentials = base_credentials
+        self._region = region
 
     @property
     def bucket_name(self):
@@ -161,6 +140,27 @@ def bucket_name(self, bucket_name):
 
         self._bucket_name = bucket_name
 
+    @property
+    def base_credentials(self):
+        """Gets the base_credentials of this CloudTrailConfiguration.  # noqa: E501
+
+
+        :return: The base_credentials of this CloudTrailConfiguration.  # noqa: E501
+        :rtype: AWSBaseCredentials
+        """
+        return self._base_credentials
+
+    @base_credentials.setter
+    def base_credentials(self, base_credentials):
+        """Sets the base_credentials of this CloudTrailConfiguration.
+
+
+        :param base_credentials: The base_credentials of this CloudTrailConfiguration.  # noqa: E501
+        :type: AWSBaseCredentials
+        """
+
+        self._base_credentials = base_credentials
+
     @property
     def filter_rule(self):
         """Gets the filter_rule of this CloudTrailConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 0287dd7..243df7d 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -33,67 +33,46 @@ class CloudWatchConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'base_credentials': 'AWSBaseCredentials',
         'metric_filter_regex': 'str',
+        'namespaces': 'list[str]',
+        'base_credentials': 'AWSBaseCredentials',
         'instance_selection_tags': 'dict(str, str)',
         'volume_selection_tags': 'dict(str, str)',
-        'point_tag_filter_regex': 'str',
-        'namespaces': 'list[str]'
+        'point_tag_filter_regex': 'str'
     }
 
     attribute_map = {
-        'base_credentials': 'baseCredentials',
         'metric_filter_regex': 'metricFilterRegex',
+        'namespaces': 'namespaces',
+        'base_credentials': 'baseCredentials',
         'instance_selection_tags': 'instanceSelectionTags',
         'volume_selection_tags': 'volumeSelectionTags',
-        'point_tag_filter_regex': 'pointTagFilterRegex',
-        'namespaces': 'namespaces'
+        'point_tag_filter_regex': 'pointTagFilterRegex'
     }
 
-    def __init__(self, base_credentials=None, metric_filter_regex=None, instance_selection_tags=None, volume_selection_tags=None, point_tag_filter_regex=None, namespaces=None):  # noqa: E501
+    def __init__(self, metric_filter_regex=None, namespaces=None, base_credentials=None, instance_selection_tags=None, volume_selection_tags=None, point_tag_filter_regex=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._base_credentials = None
         self._metric_filter_regex = None
+        self._namespaces = None
+        self._base_credentials = None
         self._instance_selection_tags = None
         self._volume_selection_tags = None
         self._point_tag_filter_regex = None
-        self._namespaces = None
         self.discriminator = None
 
-        if base_credentials is not None:
-            self.base_credentials = base_credentials
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
+        if namespaces is not None:
+            self.namespaces = namespaces
+        if base_credentials is not None:
+            self.base_credentials = base_credentials
         if instance_selection_tags is not None:
             self.instance_selection_tags = instance_selection_tags
         if volume_selection_tags is not None:
             self.volume_selection_tags = volume_selection_tags
         if point_tag_filter_regex is not None:
             self.point_tag_filter_regex = point_tag_filter_regex
-        if namespaces is not None:
-            self.namespaces = namespaces
-
-    @property
-    def base_credentials(self):
-        """Gets the base_credentials of this CloudWatchConfiguration.  # noqa: E501
-
-
-        :return: The base_credentials of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: AWSBaseCredentials
-        """
-        return self._base_credentials
-
-    @base_credentials.setter
-    def base_credentials(self, base_credentials):
-        """Sets the base_credentials of this CloudWatchConfiguration.
-
-
-        :param base_credentials: The base_credentials of this CloudWatchConfiguration.  # noqa: E501
-        :type: AWSBaseCredentials
-        """
-
-        self._base_credentials = base_credentials
 
     @property
     def metric_filter_regex(self):
@@ -118,6 +97,50 @@ def metric_filter_regex(self, metric_filter_regex):
 
         self._metric_filter_regex = metric_filter_regex
 
+    @property
+    def namespaces(self):
+        """Gets the namespaces of this CloudWatchConfiguration.  # noqa: E501
+
+        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
+
+        :return: The namespaces of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._namespaces
+
+    @namespaces.setter
+    def namespaces(self, namespaces):
+        """Sets the namespaces of this CloudWatchConfiguration.
+
+        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
+
+        :param namespaces: The namespaces of this CloudWatchConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._namespaces = namespaces
+
+    @property
+    def base_credentials(self):
+        """Gets the base_credentials of this CloudWatchConfiguration.  # noqa: E501
+
+
+        :return: The base_credentials of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: AWSBaseCredentials
+        """
+        return self._base_credentials
+
+    @base_credentials.setter
+    def base_credentials(self, base_credentials):
+        """Sets the base_credentials of this CloudWatchConfiguration.
+
+
+        :param base_credentials: The base_credentials of this CloudWatchConfiguration.  # noqa: E501
+        :type: AWSBaseCredentials
+        """
+
+        self._base_credentials = base_credentials
+
     @property
     def instance_selection_tags(self):
         """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
@@ -187,29 +210,6 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
 
         self._point_tag_filter_regex = point_tag_filter_regex
 
-    @property
-    def namespaces(self):
-        """Gets the namespaces of this CloudWatchConfiguration.  # noqa: E501
-
-        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
-
-        :return: The namespaces of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._namespaces
-
-    @namespaces.setter
-    def namespaces(self, namespaces):
-        """Sets the namespaces of this CloudWatchConfiguration.
-
-        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
-
-        :param namespaces: The namespaces of this CloudWatchConfiguration.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._namespaces = namespaces
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index 02a4df5..c81ffae 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -31,10 +31,10 @@ class CustomerFacingUserObject(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'str',
-        'customer': 'str',
         'identifier': 'str',
+        'id': 'str',
         'groups': 'list[str]',
+        'customer': 'str',
         'last_successful_login': 'int',
         '_self': 'bool',
         'escaped_identifier': 'str',
@@ -42,34 +42,34 @@ class CustomerFacingUserObject(object):
     }
 
     attribute_map = {
-        'id': 'id',
-        'customer': 'customer',
         'identifier': 'identifier',
+        'id': 'id',
         'groups': 'groups',
+        'customer': 'customer',
         'last_successful_login': 'lastSuccessfulLogin',
         '_self': 'self',
         'escaped_identifier': 'escapedIdentifier',
         'gravatar_url': 'gravatarUrl'
     }
 
-    def __init__(self, id=None, customer=None, identifier=None, groups=None, last_successful_login=None, _self=None, escaped_identifier=None, gravatar_url=None):  # noqa: E501
+    def __init__(self, identifier=None, id=None, groups=None, customer=None, last_successful_login=None, _self=None, escaped_identifier=None, gravatar_url=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
-        self._id = None
-        self._customer = None
         self._identifier = None
+        self._id = None
         self._groups = None
+        self._customer = None
         self._last_successful_login = None
         self.__self = None
         self._escaped_identifier = None
         self._gravatar_url = None
         self.discriminator = None
 
-        self.id = id
-        self.customer = customer
         self.identifier = identifier
+        self.id = id
         if groups is not None:
             self.groups = groups
+        self.customer = customer
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         self._self = _self
@@ -79,79 +79,54 @@ def __init__(self, id=None, customer=None, identifier=None, groups=None, last_su
             self.gravatar_url = gravatar_url
 
     @property
-    def id(self):
-        """Gets the id of this CustomerFacingUserObject.  # noqa: E501
+    def identifier(self):
+        """Gets the identifier of this CustomerFacingUserObject.  # noqa: E501
 
         The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :return: The id of this CustomerFacingUserObject.  # noqa: E501
+        :return: The identifier of this CustomerFacingUserObject.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._identifier
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CustomerFacingUserObject.
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this CustomerFacingUserObject.
 
         The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :param id: The id of this CustomerFacingUserObject.  # noqa: E501
-        :type: str
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def customer(self):
-        """Gets the customer of this CustomerFacingUserObject.  # noqa: E501
-
-        The id of the customer to which the user belongs  # noqa: E501
-
-        :return: The customer of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer
-
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this CustomerFacingUserObject.
-
-        The id of the customer to which the user belongs  # noqa: E501
-
-        :param customer: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :param identifier: The identifier of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if customer is None:
-            raise ValueError("Invalid value for `customer`, must not be `None`")  # noqa: E501
+        if identifier is None:
+            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
-        self._customer = customer
+        self._identifier = identifier
 
     @property
-    def identifier(self):
-        """Gets the identifier of this CustomerFacingUserObject.  # noqa: E501
+    def id(self):
+        """Gets the id of this CustomerFacingUserObject.  # noqa: E501
 
         The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :return: The identifier of this CustomerFacingUserObject.  # noqa: E501
+        :return: The id of this CustomerFacingUserObject.  # noqa: E501
         :rtype: str
         """
-        return self._identifier
+        return self._id
 
-    @identifier.setter
-    def identifier(self, identifier):
-        """Sets the identifier of this CustomerFacingUserObject.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CustomerFacingUserObject.
 
         The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :param identifier: The identifier of this CustomerFacingUserObject.  # noqa: E501
+        :param id: The id of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if identifier is None:
-            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._identifier = identifier
+        self._id = id
 
     @property
     def groups(self):
@@ -176,6 +151,31 @@ def groups(self, groups):
 
         self._groups = groups
 
+    @property
+    def customer(self):
+        """Gets the customer of this CustomerFacingUserObject.  # noqa: E501
+
+        The id of the customer to which the user belongs  # noqa: E501
+
+        :return: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this CustomerFacingUserObject.
+
+        The id of the customer to which the user belongs  # noqa: E501
+
+        :param customer: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :type: str
+        """
+        if customer is None:
+            raise ValueError("Invalid value for `customer`, must not be `None`")  # noqa: E501
+
+        self._customer = customer
+
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this CustomerFacingUserObject.  # noqa: E501
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index adf3b88..58a3d35 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -35,16 +35,15 @@ class Dashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'hidden': 'bool',
         'name': 'str',
         'id': 'str',
         'parameters': 'dict(str, str)',
+        'description': 'str',
         'tags': 'WFTags',
         'customer': 'str',
-        'description': 'str',
         'url': 'str',
         'creator_id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
         'updater_id': 'str',
         'event_filter_type': 'str',
         'sections': 'list[DashboardSection]',
@@ -62,25 +61,25 @@ class Dashboard(object):
         'views_last_day': 'int',
         'views_last_week': 'int',
         'views_last_month': 'int',
-        'hidden': 'bool',
+        'created_epoch_millis': 'int',
+        'updated_epoch_millis': 'int',
         'deleted': 'bool',
         'system_owned': 'bool',
         'num_charts': 'int',
-        'num_favorites': 'int',
-        'favorite': 'bool'
+        'favorite': 'bool',
+        'num_favorites': 'int'
     }
 
     attribute_map = {
+        'hidden': 'hidden',
         'name': 'name',
         'id': 'id',
         'parameters': 'parameters',
+        'description': 'description',
         'tags': 'tags',
         'customer': 'customer',
-        'description': 'description',
         'url': 'url',
         'creator_id': 'creatorId',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId',
         'event_filter_type': 'eventFilterType',
         'sections': 'sections',
@@ -98,27 +97,27 @@ class Dashboard(object):
         'views_last_day': 'viewsLastDay',
         'views_last_week': 'viewsLastWeek',
         'views_last_month': 'viewsLastMonth',
-        'hidden': 'hidden',
+        'created_epoch_millis': 'createdEpochMillis',
+        'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted',
         'system_owned': 'systemOwned',
         'num_charts': 'numCharts',
-        'num_favorites': 'numFavorites',
-        'favorite': 'favorite'
+        'favorite': 'favorite',
+        'num_favorites': 'numFavorites'
     }
 
-    def __init__(self, name=None, id=None, parameters=None, tags=None, customer=None, description=None, url=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, updater_id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, hidden=None, deleted=None, system_owned=None, num_charts=None, num_favorites=None, favorite=None):  # noqa: E501
+    def __init__(self, hidden=None, name=None, id=None, parameters=None, description=None, tags=None, customer=None, url=None, creator_id=None, updater_id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, system_owned=None, num_charts=None, favorite=None, num_favorites=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
 
+        self._hidden = None
         self._name = None
         self._id = None
         self._parameters = None
+        self._description = None
         self._tags = None
         self._customer = None
-        self._description = None
         self._url = None
         self._creator_id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
         self._updater_id = None
         self._event_filter_type = None
         self._sections = None
@@ -136,31 +135,30 @@ def __init__(self, name=None, id=None, parameters=None, tags=None, customer=None
         self._views_last_day = None
         self._views_last_week = None
         self._views_last_month = None
-        self._hidden = None
+        self._created_epoch_millis = None
+        self._updated_epoch_millis = None
         self._deleted = None
         self._system_owned = None
         self._num_charts = None
-        self._num_favorites = None
         self._favorite = None
+        self._num_favorites = None
         self.discriminator = None
 
+        if hidden is not None:
+            self.hidden = hidden
         self.name = name
         self.id = id
         if parameters is not None:
             self.parameters = parameters
+        if description is not None:
+            self.description = description
         if tags is not None:
             self.tags = tags
         if customer is not None:
             self.customer = customer
-        if description is not None:
-            self.description = description
         self.url = url
         if creator_id is not None:
             self.creator_id = creator_id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
             self.updater_id = updater_id
         if event_filter_type is not None:
@@ -194,18 +192,41 @@ def __init__(self, name=None, id=None, parameters=None, tags=None, customer=None
             self.views_last_week = views_last_week
         if views_last_month is not None:
             self.views_last_month = views_last_month
-        if hidden is not None:
-            self.hidden = hidden
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
         if deleted is not None:
             self.deleted = deleted
         if system_owned is not None:
             self.system_owned = system_owned
         if num_charts is not None:
             self.num_charts = num_charts
-        if num_favorites is not None:
-            self.num_favorites = num_favorites
         if favorite is not None:
             self.favorite = favorite
+        if num_favorites is not None:
+            self.num_favorites = num_favorites
+
+    @property
+    def hidden(self):
+        """Gets the hidden of this Dashboard.  # noqa: E501
+
+
+        :return: The hidden of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Dashboard.
+
+
+        :param hidden: The hidden of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
 
     @property
     def name(self):
@@ -280,6 +301,29 @@ def parameters(self, parameters):
 
         self._parameters = parameters
 
+    @property
+    def description(self):
+        """Gets the description of this Dashboard.  # noqa: E501
+
+        Human-readable description of the dashboard  # noqa: E501
+
+        :return: The description of this Dashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Dashboard.
+
+        Human-readable description of the dashboard  # noqa: E501
+
+        :param description: The description of this Dashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def tags(self):
         """Gets the tags of this Dashboard.  # noqa: E501
@@ -324,29 +368,6 @@ def customer(self, customer):
 
         self._customer = customer
 
-    @property
-    def description(self):
-        """Gets the description of this Dashboard.  # noqa: E501
-
-        Human-readable description of the dashboard  # noqa: E501
-
-        :return: The description of this Dashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Dashboard.
-
-        Human-readable description of the dashboard  # noqa: E501
-
-        :param description: The description of this Dashboard.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
     @property
     def url(self):
         """Gets the url of this Dashboard.  # noqa: E501
@@ -393,48 +414,6 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Dashboard.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this Dashboard.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Dashboard.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this Dashboard.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this Dashboard.  # noqa: E501
-
-
-        :return: The updated_epoch_millis of this Dashboard.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated_epoch_millis
-
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this Dashboard.
-
-
-        :param updated_epoch_millis: The updated_epoch_millis of this Dashboard.  # noqa: E501
-        :type: int
-        """
-
-        self._updated_epoch_millis = updated_epoch_millis
-
     @property
     def updater_id(self):
         """Gets the updater_id of this Dashboard.  # noqa: E501
@@ -827,25 +806,46 @@ def views_last_month(self, views_last_month):
         self._views_last_month = views_last_month
 
     @property
-    def hidden(self):
-        """Gets the hidden of this Dashboard.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Dashboard.  # noqa: E501
 
 
-        :return: The hidden of this Dashboard.  # noqa: E501
-        :rtype: bool
+        :return: The created_epoch_millis of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._hidden
+        return self._created_epoch_millis
 
-    @hidden.setter
-    def hidden(self, hidden):
-        """Sets the hidden of this Dashboard.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Dashboard.
 
 
-        :param hidden: The hidden of this Dashboard.  # noqa: E501
-        :type: bool
+        :param created_epoch_millis: The created_epoch_millis of this Dashboard.  # noqa: E501
+        :type: int
         """
 
-        self._hidden = hidden
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Dashboard.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this Dashboard.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Dashboard.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this Dashboard.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
     def deleted(self):
@@ -912,27 +912,6 @@ def num_charts(self, num_charts):
 
         self._num_charts = num_charts
 
-    @property
-    def num_favorites(self):
-        """Gets the num_favorites of this Dashboard.  # noqa: E501
-
-
-        :return: The num_favorites of this Dashboard.  # noqa: E501
-        :rtype: int
-        """
-        return self._num_favorites
-
-    @num_favorites.setter
-    def num_favorites(self, num_favorites):
-        """Sets the num_favorites of this Dashboard.
-
-
-        :param num_favorites: The num_favorites of this Dashboard.  # noqa: E501
-        :type: int
-        """
-
-        self._num_favorites = num_favorites
-
     @property
     def favorite(self):
         """Gets the favorite of this Dashboard.  # noqa: E501
@@ -954,6 +933,27 @@ def favorite(self, favorite):
 
         self._favorite = favorite
 
+    @property
+    def num_favorites(self):
+        """Gets the num_favorites of this Dashboard.  # noqa: E501
+
+
+        :return: The num_favorites of this Dashboard.  # noqa: E501
+        :rtype: int
+        """
+        return self._num_favorites
+
+    @num_favorites.setter
+    def num_favorites(self, num_favorites):
+        """Sets the num_favorites of this Dashboard.
+
+
+        :param num_favorites: The num_favorites of this Dashboard.  # noqa: E501
+        :type: int
+        """
+
+        self._num_favorites = num_favorites
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index e624070..6777002 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -31,76 +31,97 @@ class DashboardParameterValue(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'label': 'str',
         'default_value': 'str',
         'description': 'str',
-        'label': 'str',
+        'parameter_type': 'str',
+        'values_to_readable_strings': 'dict(str, str)',
+        'dynamic_field_type': 'str',
         'query_value': 'str',
-        'reverse_dyn_sort': 'bool',
         'hide_from_view': 'bool',
-        'dynamic_field_type': 'str',
         'tag_key': 'str',
+        'multivalue': 'bool',
         'allow_all': 'bool',
-        'parameter_type': 'str',
-        'values_to_readable_strings': 'dict(str, str)',
-        'multivalue': 'bool'
+        'reverse_dyn_sort': 'bool'
     }
 
     attribute_map = {
+        'label': 'label',
         'default_value': 'defaultValue',
         'description': 'description',
-        'label': 'label',
+        'parameter_type': 'parameterType',
+        'values_to_readable_strings': 'valuesToReadableStrings',
+        'dynamic_field_type': 'dynamicFieldType',
         'query_value': 'queryValue',
-        'reverse_dyn_sort': 'reverseDynSort',
         'hide_from_view': 'hideFromView',
-        'dynamic_field_type': 'dynamicFieldType',
         'tag_key': 'tagKey',
+        'multivalue': 'multivalue',
         'allow_all': 'allowAll',
-        'parameter_type': 'parameterType',
-        'values_to_readable_strings': 'valuesToReadableStrings',
-        'multivalue': 'multivalue'
+        'reverse_dyn_sort': 'reverseDynSort'
     }
 
-    def __init__(self, default_value=None, description=None, label=None, query_value=None, reverse_dyn_sort=None, hide_from_view=None, dynamic_field_type=None, tag_key=None, allow_all=None, parameter_type=None, values_to_readable_strings=None, multivalue=None):  # noqa: E501
+    def __init__(self, label=None, default_value=None, description=None, parameter_type=None, values_to_readable_strings=None, dynamic_field_type=None, query_value=None, hide_from_view=None, tag_key=None, multivalue=None, allow_all=None, reverse_dyn_sort=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
 
+        self._label = None
         self._default_value = None
         self._description = None
-        self._label = None
+        self._parameter_type = None
+        self._values_to_readable_strings = None
+        self._dynamic_field_type = None
         self._query_value = None
-        self._reverse_dyn_sort = None
         self._hide_from_view = None
-        self._dynamic_field_type = None
         self._tag_key = None
-        self._allow_all = None
-        self._parameter_type = None
-        self._values_to_readable_strings = None
         self._multivalue = None
+        self._allow_all = None
+        self._reverse_dyn_sort = None
         self.discriminator = None
 
+        if label is not None:
+            self.label = label
         if default_value is not None:
             self.default_value = default_value
         if description is not None:
             self.description = description
-        if label is not None:
-            self.label = label
+        if parameter_type is not None:
+            self.parameter_type = parameter_type
+        if values_to_readable_strings is not None:
+            self.values_to_readable_strings = values_to_readable_strings
+        if dynamic_field_type is not None:
+            self.dynamic_field_type = dynamic_field_type
         if query_value is not None:
             self.query_value = query_value
-        if reverse_dyn_sort is not None:
-            self.reverse_dyn_sort = reverse_dyn_sort
         if hide_from_view is not None:
             self.hide_from_view = hide_from_view
-        if dynamic_field_type is not None:
-            self.dynamic_field_type = dynamic_field_type
         if tag_key is not None:
             self.tag_key = tag_key
-        if allow_all is not None:
-            self.allow_all = allow_all
-        if parameter_type is not None:
-            self.parameter_type = parameter_type
-        if values_to_readable_strings is not None:
-            self.values_to_readable_strings = values_to_readable_strings
         if multivalue is not None:
             self.multivalue = multivalue
+        if allow_all is not None:
+            self.allow_all = allow_all
+        if reverse_dyn_sort is not None:
+            self.reverse_dyn_sort = reverse_dyn_sort
+
+    @property
+    def label(self):
+        """Gets the label of this DashboardParameterValue.  # noqa: E501
+
+
+        :return: The label of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
+        """
+        return self._label
+
+    @label.setter
+    def label(self, label):
+        """Sets the label of this DashboardParameterValue.
+
+
+        :param label: The label of this DashboardParameterValue.  # noqa: E501
+        :type: str
+        """
+
+        self._label = label
 
     @property
     def default_value(self):
@@ -145,69 +166,100 @@ def description(self, description):
         self._description = description
 
     @property
-    def label(self):
-        """Gets the label of this DashboardParameterValue.  # noqa: E501
+    def parameter_type(self):
+        """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The label of this DashboardParameterValue.  # noqa: E501
+        :return: The parameter_type of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._label
+        return self._parameter_type
 
-    @label.setter
-    def label(self, label):
-        """Sets the label of this DashboardParameterValue.
+    @parameter_type.setter
+    def parameter_type(self, parameter_type):
+        """Sets the parameter_type of this DashboardParameterValue.
 
 
-        :param label: The label of this DashboardParameterValue.  # noqa: E501
+        :param parameter_type: The parameter_type of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
+        allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
+        if parameter_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(parameter_type, allowed_values)
+            )
 
-        self._label = label
+        self._parameter_type = parameter_type
 
     @property
-    def query_value(self):
-        """Gets the query_value of this DashboardParameterValue.  # noqa: E501
+    def values_to_readable_strings(self):
+        """Gets the values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The query_value of this DashboardParameterValue.  # noqa: E501
+        :return: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._values_to_readable_strings
+
+    @values_to_readable_strings.setter
+    def values_to_readable_strings(self, values_to_readable_strings):
+        """Sets the values_to_readable_strings of this DashboardParameterValue.
+
+
+        :param values_to_readable_strings: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._values_to_readable_strings = values_to_readable_strings
+
+    @property
+    def dynamic_field_type(self):
+        """Gets the dynamic_field_type of this DashboardParameterValue.  # noqa: E501
+
+
+        :return: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._query_value
+        return self._dynamic_field_type
 
-    @query_value.setter
-    def query_value(self, query_value):
-        """Sets the query_value of this DashboardParameterValue.
+    @dynamic_field_type.setter
+    def dynamic_field_type(self, dynamic_field_type):
+        """Sets the dynamic_field_type of this DashboardParameterValue.
 
 
-        :param query_value: The query_value of this DashboardParameterValue.  # noqa: E501
+        :param dynamic_field_type: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
+        allowed_values = ["SOURCE", "SOURCE_TAG", "METRIC_NAME", "TAG_KEY", "MATCHING_SOURCE_TAG"]  # noqa: E501
+        if dynamic_field_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `dynamic_field_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(dynamic_field_type, allowed_values)
+            )
 
-        self._query_value = query_value
+        self._dynamic_field_type = dynamic_field_type
 
     @property
-    def reverse_dyn_sort(self):
-        """Gets the reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
+    def query_value(self):
+        """Gets the query_value of this DashboardParameterValue.  # noqa: E501
 
-        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :return: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
-        :rtype: bool
+        :return: The query_value of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
         """
-        return self._reverse_dyn_sort
+        return self._query_value
 
-    @reverse_dyn_sort.setter
-    def reverse_dyn_sort(self, reverse_dyn_sort):
-        """Sets the reverse_dyn_sort of this DashboardParameterValue.
+    @query_value.setter
+    def query_value(self, query_value):
+        """Sets the query_value of this DashboardParameterValue.
 
-        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :param reverse_dyn_sort: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
-        :type: bool
+        :param query_value: The query_value of this DashboardParameterValue.  # noqa: E501
+        :type: str
         """
 
-        self._reverse_dyn_sort = reverse_dyn_sort
+        self._query_value = query_value
 
     @property
     def hide_from_view(self):
@@ -230,33 +282,6 @@ def hide_from_view(self, hide_from_view):
 
         self._hide_from_view = hide_from_view
 
-    @property
-    def dynamic_field_type(self):
-        """Gets the dynamic_field_type of this DashboardParameterValue.  # noqa: E501
-
-
-        :return: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
-        :rtype: str
-        """
-        return self._dynamic_field_type
-
-    @dynamic_field_type.setter
-    def dynamic_field_type(self, dynamic_field_type):
-        """Sets the dynamic_field_type of this DashboardParameterValue.
-
-
-        :param dynamic_field_type: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["SOURCE", "SOURCE_TAG", "METRIC_NAME", "TAG_KEY", "MATCHING_SOURCE_TAG"]  # noqa: E501
-        if dynamic_field_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `dynamic_field_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(dynamic_field_type, allowed_values)
-            )
-
-        self._dynamic_field_type = dynamic_field_type
-
     @property
     def tag_key(self):
         """Gets the tag_key of this DashboardParameterValue.  # noqa: E501
@@ -279,94 +304,69 @@ def tag_key(self, tag_key):
         self._tag_key = tag_key
 
     @property
-    def allow_all(self):
-        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
+    def multivalue(self):
+        """Gets the multivalue of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :return: The multivalue of this DashboardParameterValue.  # noqa: E501
         :rtype: bool
         """
-        return self._allow_all
+        return self._multivalue
 
-    @allow_all.setter
-    def allow_all(self, allow_all):
-        """Sets the allow_all of this DashboardParameterValue.
+    @multivalue.setter
+    def multivalue(self, multivalue):
+        """Sets the multivalue of this DashboardParameterValue.
 
 
-        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :param multivalue: The multivalue of this DashboardParameterValue.  # noqa: E501
         :type: bool
         """
 
-        self._allow_all = allow_all
-
-    @property
-    def parameter_type(self):
-        """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
-
-
-        :return: The parameter_type of this DashboardParameterValue.  # noqa: E501
-        :rtype: str
-        """
-        return self._parameter_type
-
-    @parameter_type.setter
-    def parameter_type(self, parameter_type):
-        """Sets the parameter_type of this DashboardParameterValue.
-
-
-        :param parameter_type: The parameter_type of this DashboardParameterValue.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
-        if parameter_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(parameter_type, allowed_values)
-            )
-
-        self._parameter_type = parameter_type
+        self._multivalue = multivalue
 
     @property
-    def values_to_readable_strings(self):
-        """Gets the values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
+    def allow_all(self):
+        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :rtype: bool
         """
-        return self._values_to_readable_strings
+        return self._allow_all
 
-    @values_to_readable_strings.setter
-    def values_to_readable_strings(self, values_to_readable_strings):
-        """Sets the values_to_readable_strings of this DashboardParameterValue.
+    @allow_all.setter
+    def allow_all(self, allow_all):
+        """Sets the allow_all of this DashboardParameterValue.
 
 
-        :param values_to_readable_strings: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
-        :type: dict(str, str)
+        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :type: bool
         """
 
-        self._values_to_readable_strings = values_to_readable_strings
+        self._allow_all = allow_all
 
     @property
-    def multivalue(self):
-        """Gets the multivalue of this DashboardParameterValue.  # noqa: E501
+    def reverse_dyn_sort(self):
+        """Gets the reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
 
+        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :return: The multivalue of this DashboardParameterValue.  # noqa: E501
+        :return: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
         :rtype: bool
         """
-        return self._multivalue
+        return self._reverse_dyn_sort
 
-    @multivalue.setter
-    def multivalue(self, multivalue):
-        """Sets the multivalue of this DashboardParameterValue.
+    @reverse_dyn_sort.setter
+    def reverse_dyn_sort(self, reverse_dyn_sort):
+        """Sets the reverse_dyn_sort of this DashboardParameterValue.
 
+        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :param multivalue: The multivalue of this DashboardParameterValue.  # noqa: E501
+        :param reverse_dyn_sort: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
         :type: bool
         """
 
-        self._multivalue = multivalue
+        self._reverse_dyn_sort = reverse_dyn_sort
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index f058cd7..2501ec0 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -33,103 +33,106 @@ class DerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'created': 'int',
+        'minutes': 'int',
         'name': 'str',
         'id': 'str',
         'query': 'str',
         'tags': 'WFTags',
         'status': 'list[str]',
+        'updated': 'int',
+        'process_rate_minutes': 'int',
+        'last_processed_millis': 'int',
+        'update_user_id': 'str',
         'include_obsolete_metrics': 'bool',
-        'creator_id': 'str',
-        'additional_information': 'str',
-        'minutes': 'int',
+        'last_query_time': 'int',
+        'in_trash': 'bool',
         'query_failing': 'bool',
+        'create_user_id': 'str',
+        'additional_information': 'str',
+        'creator_id': 'str',
+        'updater_id': 'str',
         'last_failed_time': 'int',
         'last_error_message': 'str',
         'metrics_used': 'list[str]',
         'hosts_used': 'list[str]',
-        'last_processed_millis': 'int',
-        'process_rate_minutes': 'int',
         'points_scanned_at_last_query': 'int',
         'query_qb_enabled': 'bool',
         'query_qb_serialization': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'updater_id': 'str',
-        'created': 'int',
-        'updated': 'int',
-        'update_user_id': 'str',
-        'last_query_time': 'int',
-        'in_trash': 'bool',
-        'create_user_id': 'str',
         'deleted': 'bool'
     }
 
     attribute_map = {
+        'created': 'created',
+        'minutes': 'minutes',
         'name': 'name',
         'id': 'id',
         'query': 'query',
         'tags': 'tags',
         'status': 'status',
+        'updated': 'updated',
+        'process_rate_minutes': 'processRateMinutes',
+        'last_processed_millis': 'lastProcessedMillis',
+        'update_user_id': 'updateUserId',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
-        'creator_id': 'creatorId',
-        'additional_information': 'additionalInformation',
-        'minutes': 'minutes',
+        'last_query_time': 'lastQueryTime',
+        'in_trash': 'inTrash',
         'query_failing': 'queryFailing',
+        'create_user_id': 'createUserId',
+        'additional_information': 'additionalInformation',
+        'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'last_failed_time': 'lastFailedTime',
         'last_error_message': 'lastErrorMessage',
         'metrics_used': 'metricsUsed',
         'hosts_used': 'hostsUsed',
-        'last_processed_millis': 'lastProcessedMillis',
-        'process_rate_minutes': 'processRateMinutes',
         'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
         'query_qb_enabled': 'queryQBEnabled',
         'query_qb_serialization': 'queryQBSerialization',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId',
-        'created': 'created',
-        'updated': 'updated',
-        'update_user_id': 'updateUserId',
-        'last_query_time': 'lastQueryTime',
-        'in_trash': 'inTrash',
-        'create_user_id': 'createUserId',
         'deleted': 'deleted'
     }
 
-    def __init__(self, name=None, id=None, query=None, tags=None, status=None, include_obsolete_metrics=None, creator_id=None, additional_information=None, minutes=None, query_failing=None, last_failed_time=None, last_error_message=None, metrics_used=None, hosts_used=None, last_processed_millis=None, process_rate_minutes=None, points_scanned_at_last_query=None, query_qb_enabled=None, query_qb_serialization=None, created_epoch_millis=None, updated_epoch_millis=None, updater_id=None, created=None, updated=None, update_user_id=None, last_query_time=None, in_trash=None, create_user_id=None, deleted=None):  # noqa: E501
+    def __init__(self, created=None, minutes=None, name=None, id=None, query=None, tags=None, status=None, updated=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, include_obsolete_metrics=None, last_query_time=None, in_trash=None, query_failing=None, create_user_id=None, additional_information=None, creator_id=None, updater_id=None, last_failed_time=None, last_error_message=None, metrics_used=None, hosts_used=None, points_scanned_at_last_query=None, query_qb_enabled=None, query_qb_serialization=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
         """DerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
+        self._created = None
+        self._minutes = None
         self._name = None
         self._id = None
         self._query = None
         self._tags = None
         self._status = None
+        self._updated = None
+        self._process_rate_minutes = None
+        self._last_processed_millis = None
+        self._update_user_id = None
         self._include_obsolete_metrics = None
-        self._creator_id = None
-        self._additional_information = None
-        self._minutes = None
+        self._last_query_time = None
+        self._in_trash = None
         self._query_failing = None
+        self._create_user_id = None
+        self._additional_information = None
+        self._creator_id = None
+        self._updater_id = None
         self._last_failed_time = None
         self._last_error_message = None
         self._metrics_used = None
         self._hosts_used = None
-        self._last_processed_millis = None
-        self._process_rate_minutes = None
         self._points_scanned_at_last_query = None
         self._query_qb_enabled = None
         self._query_qb_serialization = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._updater_id = None
-        self._created = None
-        self._updated = None
-        self._update_user_id = None
-        self._last_query_time = None
-        self._in_trash = None
-        self._create_user_id = None
         self._deleted = None
         self.discriminator = None
 
+        if created is not None:
+            self.created = created
+        self.minutes = minutes
         self.name = name
         if id is not None:
             self.id = id
@@ -138,15 +141,30 @@ def __init__(self, name=None, id=None, query=None, tags=None, status=None, inclu
             self.tags = tags
         if status is not None:
             self.status = status
+        if updated is not None:
+            self.updated = updated
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if additional_information is not None:
-            self.additional_information = additional_information
-        self.minutes = minutes
+        if last_query_time is not None:
+            self.last_query_time = last_query_time
+        if in_trash is not None:
+            self.in_trash = in_trash
         if query_failing is not None:
             self.query_failing = query_failing
+        if create_user_id is not None:
+            self.create_user_id = create_user_id
+        if additional_information is not None:
+            self.additional_information = additional_information
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if last_failed_time is not None:
             self.last_failed_time = last_failed_time
         if last_error_message is not None:
@@ -155,10 +173,6 @@ def __init__(self, name=None, id=None, query=None, tags=None, status=None, inclu
             self.metrics_used = metrics_used
         if hosts_used is not None:
             self.hosts_used = hosts_used
-        if last_processed_millis is not None:
-            self.last_processed_millis = last_processed_millis
-        if process_rate_minutes is not None:
-            self.process_rate_minutes = process_rate_minutes
         if points_scanned_at_last_query is not None:
             self.points_scanned_at_last_query = points_scanned_at_last_query
         if query_qb_enabled is not None:
@@ -169,23 +183,57 @@ def __init__(self, name=None, id=None, query=None, tags=None, status=None, inclu
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if created is not None:
-            self.created = created
-        if updated is not None:
-            self.updated = updated
-        if update_user_id is not None:
-            self.update_user_id = update_user_id
-        if last_query_time is not None:
-            self.last_query_time = last_query_time
-        if in_trash is not None:
-            self.in_trash = in_trash
-        if create_user_id is not None:
-            self.create_user_id = create_user_id
         if deleted is not None:
             self.deleted = deleted
 
+    @property
+    def created(self):
+        """Gets the created of this DerivedMetricDefinition.  # noqa: E501
+
+        When this derived metric was created, in epoch millis  # noqa: E501
+
+        :return: The created of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._created
+
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DerivedMetricDefinition.
+
+        When this derived metric was created, in epoch millis  # noqa: E501
+
+        :param created: The created of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._created = created
+
+    @property
+    def minutes(self):
+        """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
+
+        How frequently the query generating the derived metric is run  # noqa: E501
+
+        :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._minutes
+
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this DerivedMetricDefinition.
+
+        How frequently the query generating the derived metric is run  # noqa: E501
+
+        :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+        if minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
+
+        self._minutes = minutes
+
     @property
     def name(self):
         """Gets the name of this DerivedMetricDefinition.  # noqa: E501
@@ -299,6 +347,98 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def updated(self):
+        """Gets the updated of this DerivedMetricDefinition.  # noqa: E501
+
+        When the derived metric definition was last updated, in epoch millis  # noqa: E501
+
+        :return: The updated of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated
+
+    @updated.setter
+    def updated(self, updated):
+        """Sets the updated of this DerivedMetricDefinition.
+
+        When the derived metric definition was last updated, in epoch millis  # noqa: E501
+
+        :param updated: The updated of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._updated = updated
+
+    @property
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
+
+        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :return: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._process_rate_minutes
+
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this DerivedMetricDefinition.
+
+        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :param process_rate_minutes: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._process_rate_minutes = process_rate_minutes
+
+    @property
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
+
+        The last time when the derived metric query was run, in epoch millis  # noqa: E501
+
+        :return: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_processed_millis
+
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this DerivedMetricDefinition.
+
+        The last time when the derived metric query was run, in epoch millis  # noqa: E501
+
+        :param last_processed_millis: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._last_processed_millis = last_processed_millis
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this DerivedMetricDefinition.  # noqa: E501
+
+        The user that last updated this derived metric definition  # noqa: E501
+
+        :return: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._update_user_id
+
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this DerivedMetricDefinition.
+
+        The user that last updated this derived metric definition  # noqa: E501
+
+        :param update_user_id: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+
+        self._update_user_id = update_user_id
+
     @property
     def include_obsolete_metrics(self):
         """Gets the include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
@@ -323,25 +463,92 @@ def include_obsolete_metrics(self, include_obsolete_metrics):
         self._include_obsolete_metrics = include_obsolete_metrics
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this DerivedMetricDefinition.  # noqa: E501
+    def last_query_time(self):
+        """Gets the last_query_time of this DerivedMetricDefinition.  # noqa: E501
 
+        Time for the query execute, averaged on hourly basis  # noqa: E501
 
-        :return: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :return: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_query_time
+
+    @last_query_time.setter
+    def last_query_time(self, last_query_time):
+        """Sets the last_query_time of this DerivedMetricDefinition.
+
+        Time for the query execute, averaged on hourly basis  # noqa: E501
+
+        :param last_query_time: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._last_query_time = last_query_time
+
+    @property
+    def in_trash(self):
+        """Gets the in_trash of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The in_trash of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
+        """
+        return self._in_trash
+
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this DerivedMetricDefinition.
+
+
+        :param in_trash: The in_trash of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
+        """
+
+        self._in_trash = in_trash
+
+    @property
+    def query_failing(self):
+        """Gets the query_failing of this DerivedMetricDefinition.  # noqa: E501
+
+        Whether there was an exception when the query last ran  # noqa: E501
+
+        :return: The query_failing of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
+        """
+        return self._query_failing
+
+    @query_failing.setter
+    def query_failing(self, query_failing):
+        """Sets the query_failing of this DerivedMetricDefinition.
+
+        Whether there was an exception when the query last ran  # noqa: E501
+
+        :param query_failing: The query_failing of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
+        """
+
+        self._query_failing = query_failing
+
+    @property
+    def create_user_id(self):
+        """Gets the create_user_id of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
         :rtype: str
         """
-        return self._creator_id
+        return self._create_user_id
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this DerivedMetricDefinition.
+    @create_user_id.setter
+    def create_user_id(self, create_user_id):
+        """Sets the create_user_id of this DerivedMetricDefinition.
 
 
-        :param creator_id: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :param create_user_id: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
 
-        self._creator_id = creator_id
+        self._create_user_id = create_user_id
 
     @property
     def additional_information(self):
@@ -367,52 +574,46 @@ def additional_information(self, additional_information):
         self._additional_information = additional_information
 
     @property
-    def minutes(self):
-        """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this DerivedMetricDefinition.  # noqa: E501
 
-        How frequently the query generating the derived metric is run  # noqa: E501
 
-        :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._minutes
+        return self._creator_id
 
-    @minutes.setter
-    def minutes(self, minutes):
-        """Sets the minutes of this DerivedMetricDefinition.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this DerivedMetricDefinition.
 
-        How frequently the query generating the derived metric is run  # noqa: E501
 
-        :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
-        if minutes is None:
-            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
-        self._minutes = minutes
+        self._creator_id = creator_id
 
     @property
-    def query_failing(self):
-        """Gets the query_failing of this DerivedMetricDefinition.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this DerivedMetricDefinition.  # noqa: E501
 
-        Whether there was an exception when the query last ran  # noqa: E501
 
-        :return: The query_failing of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
+        :return: The updater_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._query_failing
+        return self._updater_id
 
-    @query_failing.setter
-    def query_failing(self, query_failing):
-        """Sets the query_failing of this DerivedMetricDefinition.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this DerivedMetricDefinition.
 
-        Whether there was an exception when the query last ran  # noqa: E501
 
-        :param query_failing: The query_failing of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
+        :param updater_id: The updater_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
 
-        self._query_failing = query_failing
+        self._updater_id = updater_id
 
     @property
     def last_failed_time(self):
@@ -506,52 +707,6 @@ def hosts_used(self, hosts_used):
 
         self._hosts_used = hosts_used
 
-    @property
-    def last_processed_millis(self):
-        """Gets the last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
-
-        The last time when the derived metric query was run, in epoch millis  # noqa: E501
-
-        :return: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_processed_millis
-
-    @last_processed_millis.setter
-    def last_processed_millis(self, last_processed_millis):
-        """Sets the last_processed_millis of this DerivedMetricDefinition.
-
-        The last time when the derived metric query was run, in epoch millis  # noqa: E501
-
-        :param last_processed_millis: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._last_processed_millis = last_processed_millis
-
-    @property
-    def process_rate_minutes(self):
-        """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
-
-        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
-
-        :return: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._process_rate_minutes
-
-    @process_rate_minutes.setter
-    def process_rate_minutes(self, process_rate_minutes):
-        """Sets the process_rate_minutes of this DerivedMetricDefinition.
-
-        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
-
-        :param process_rate_minutes: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._process_rate_minutes = process_rate_minutes
-
     @property
     def points_scanned_at_last_query(self):
         """Gets the points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
@@ -663,161 +818,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The updater_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this DerivedMetricDefinition.
-
-
-        :param updater_id: The updater_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    @property
-    def created(self):
-        """Gets the created of this DerivedMetricDefinition.  # noqa: E501
-
-        When this derived metric was created, in epoch millis  # noqa: E501
-
-        :return: The created of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this DerivedMetricDefinition.
-
-        When this derived metric was created, in epoch millis  # noqa: E501
-
-        :param created: The created of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._created = created
-
-    @property
-    def updated(self):
-        """Gets the updated of this DerivedMetricDefinition.  # noqa: E501
-
-        When the derived metric definition was last updated, in epoch millis  # noqa: E501
-
-        :return: The updated of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated
-
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this DerivedMetricDefinition.
-
-        When the derived metric definition was last updated, in epoch millis  # noqa: E501
-
-        :param updated: The updated of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._updated = updated
-
-    @property
-    def update_user_id(self):
-        """Gets the update_user_id of this DerivedMetricDefinition.  # noqa: E501
-
-        The user that last updated this derived metric definition  # noqa: E501
-
-        :return: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._update_user_id
-
-    @update_user_id.setter
-    def update_user_id(self, update_user_id):
-        """Sets the update_user_id of this DerivedMetricDefinition.
-
-        The user that last updated this derived metric definition  # noqa: E501
-
-        :param update_user_id: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._update_user_id = update_user_id
-
-    @property
-    def last_query_time(self):
-        """Gets the last_query_time of this DerivedMetricDefinition.  # noqa: E501
-
-        Time for the query execute, averaged on hourly basis  # noqa: E501
-
-        :return: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_query_time
-
-    @last_query_time.setter
-    def last_query_time(self, last_query_time):
-        """Sets the last_query_time of this DerivedMetricDefinition.
-
-        Time for the query execute, averaged on hourly basis  # noqa: E501
-
-        :param last_query_time: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._last_query_time = last_query_time
-
-    @property
-    def in_trash(self):
-        """Gets the in_trash of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The in_trash of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
-        """
-        return self._in_trash
-
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this DerivedMetricDefinition.
-
-
-        :param in_trash: The in_trash of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
-        """
-
-        self._in_trash = in_trash
-
-    @property
-    def create_user_id(self):
-        """Gets the create_user_id of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._create_user_id
-
-    @create_user_id.setter
-    def create_user_id(self, create_user_id):
-        """Sets the create_user_id of this DerivedMetricDefinition.
-
-
-        :param create_user_id: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._create_user_id = create_user_id
-
     @property
     def deleted(self):
         """Gets the deleted of this DerivedMetricDefinition.  # noqa: E501
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 74ce3de..041425d 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -31,23 +31,23 @@ class Event(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'start_time': 'int',
+        'end_time': 'int',
         'name': 'str',
         'annotations': 'dict(str, str)',
         'id': 'str',
         'table': 'str',
         'tags': 'list[str]',
-        'hosts': 'list[str]',
+        'created_at': 'int',
+        'is_user_event': 'bool',
         'is_ephemeral': 'bool',
         'creator_id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
-        'is_user_event': 'bool',
+        'hosts': 'list[str]',
         'summarized_events': 'int',
         'updater_id': 'str',
         'updated_at': 'int',
-        'created_at': 'int',
-        'start_time': 'int',
-        'end_time': 'int',
+        'created_epoch_millis': 'int',
+        'updated_epoch_millis': 'int',
         'running_state': 'str',
         'can_delete': 'bool',
         'can_close': 'bool',
@@ -55,55 +55,58 @@ class Event(object):
     }
 
     attribute_map = {
+        'start_time': 'startTime',
+        'end_time': 'endTime',
         'name': 'name',
         'annotations': 'annotations',
         'id': 'id',
         'table': 'table',
         'tags': 'tags',
-        'hosts': 'hosts',
+        'created_at': 'createdAt',
+        'is_user_event': 'isUserEvent',
         'is_ephemeral': 'isEphemeral',
         'creator_id': 'creatorId',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'is_user_event': 'isUserEvent',
+        'hosts': 'hosts',
         'summarized_events': 'summarizedEvents',
         'updater_id': 'updaterId',
         'updated_at': 'updatedAt',
-        'created_at': 'createdAt',
-        'start_time': 'startTime',
-        'end_time': 'endTime',
+        'created_epoch_millis': 'createdEpochMillis',
+        'updated_epoch_millis': 'updatedEpochMillis',
         'running_state': 'runningState',
         'can_delete': 'canDelete',
         'can_close': 'canClose',
         'creator_type': 'creatorType'
     }
 
-    def __init__(self, name=None, annotations=None, id=None, table=None, tags=None, hosts=None, is_ephemeral=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, is_user_event=None, summarized_events=None, updater_id=None, updated_at=None, created_at=None, start_time=None, end_time=None, running_state=None, can_delete=None, can_close=None, creator_type=None):  # noqa: E501
+    def __init__(self, start_time=None, end_time=None, name=None, annotations=None, id=None, table=None, tags=None, created_at=None, is_user_event=None, is_ephemeral=None, creator_id=None, hosts=None, summarized_events=None, updater_id=None, updated_at=None, created_epoch_millis=None, updated_epoch_millis=None, running_state=None, can_delete=None, can_close=None, creator_type=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
+        self._start_time = None
+        self._end_time = None
         self._name = None
         self._annotations = None
         self._id = None
         self._table = None
         self._tags = None
-        self._hosts = None
+        self._created_at = None
+        self._is_user_event = None
         self._is_ephemeral = None
         self._creator_id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._is_user_event = None
+        self._hosts = None
         self._summarized_events = None
         self._updater_id = None
         self._updated_at = None
-        self._created_at = None
-        self._start_time = None
-        self._end_time = None
+        self._created_epoch_millis = None
+        self._updated_epoch_millis = None
         self._running_state = None
         self._can_delete = None
         self._can_close = None
         self._creator_type = None
         self.discriminator = None
 
+        self.start_time = start_time
+        if end_time is not None:
+            self.end_time = end_time
         self.name = name
         self.annotations = annotations
         if id is not None:
@@ -112,28 +115,26 @@ def __init__(self, name=None, annotations=None, id=None, table=None, tags=None,
             self.table = table
         if tags is not None:
             self.tags = tags
-        if hosts is not None:
-            self.hosts = hosts
+        if created_at is not None:
+            self.created_at = created_at
+        if is_user_event is not None:
+            self.is_user_event = is_user_event
         if is_ephemeral is not None:
             self.is_ephemeral = is_ephemeral
         if creator_id is not None:
             self.creator_id = creator_id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        if is_user_event is not None:
-            self.is_user_event = is_user_event
+        if hosts is not None:
+            self.hosts = hosts
         if summarized_events is not None:
             self.summarized_events = summarized_events
         if updater_id is not None:
             self.updater_id = updater_id
         if updated_at is not None:
             self.updated_at = updated_at
-        if created_at is not None:
-            self.created_at = created_at
-        self.start_time = start_time
-        self.end_time = end_time
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
         if running_state is not None:
             self.running_state = running_state
         if can_delete is not None:
@@ -143,6 +144,54 @@ def __init__(self, name=None, annotations=None, id=None, table=None, tags=None,
         if creator_type is not None:
             self.creator_type = creator_type
 
+    @property
+    def start_time(self):
+        """Gets the start_time of this Event.  # noqa: E501
+
+        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
+
+        :return: The start_time of this Event.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_time
+
+    @start_time.setter
+    def start_time(self, start_time):
+        """Sets the start_time of this Event.
+
+        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
+
+        :param start_time: The start_time of this Event.  # noqa: E501
+        :type: int
+        """
+        if start_time is None:
+            raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
+
+        self._start_time = start_time
+
+    @property
+    def end_time(self):
+        """Gets the end_time of this Event.  # noqa: E501
+
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :return: The end_time of this Event.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_time
+
+    @end_time.setter
+    def end_time(self, end_time):
+        """Sets the end_time of this Event.
+
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :param end_time: The end_time of this Event.  # noqa: E501
+        :type: int
+        """
+
+        self._end_time = end_time
+
     @property
     def name(self):
         """Gets the name of this Event.  # noqa: E501
@@ -261,27 +310,48 @@ def tags(self, tags):
         self._tags = tags
 
     @property
-    def hosts(self):
-        """Gets the hosts of this Event.  # noqa: E501
+    def created_at(self):
+        """Gets the created_at of this Event.  # noqa: E501
 
-        A list of sources/hosts affected by the event  # noqa: E501
 
-        :return: The hosts of this Event.  # noqa: E501
-        :rtype: list[str]
+        :return: The created_at of this Event.  # noqa: E501
+        :rtype: int
         """
-        return self._hosts
+        return self._created_at
 
-    @hosts.setter
-    def hosts(self, hosts):
-        """Sets the hosts of this Event.
+    @created_at.setter
+    def created_at(self, created_at):
+        """Sets the created_at of this Event.
 
-        A list of sources/hosts affected by the event  # noqa: E501
 
-        :param hosts: The hosts of this Event.  # noqa: E501
-        :type: list[str]
+        :param created_at: The created_at of this Event.  # noqa: E501
+        :type: int
         """
 
-        self._hosts = hosts
+        self._created_at = created_at
+
+    @property
+    def is_user_event(self):
+        """Gets the is_user_event of this Event.  # noqa: E501
+
+        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+
+        :return: The is_user_event of this Event.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_user_event
+
+    @is_user_event.setter
+    def is_user_event(self, is_user_event):
+        """Sets the is_user_event of this Event.
+
+        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+
+        :param is_user_event: The is_user_event of this Event.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_user_event = is_user_event
 
     @property
     def is_ephemeral(self):
@@ -328,69 +398,27 @@ def creator_id(self, creator_id):
         self._creator_id = creator_id
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Event.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Event.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this Event.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this Event.  # noqa: E501
-
-
-        :return: The updated_epoch_millis of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated_epoch_millis
-
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this Event.
-
-
-        :param updated_epoch_millis: The updated_epoch_millis of this Event.  # noqa: E501
-        :type: int
-        """
-
-        self._updated_epoch_millis = updated_epoch_millis
-
-    @property
-    def is_user_event(self):
-        """Gets the is_user_event of this Event.  # noqa: E501
+    def hosts(self):
+        """Gets the hosts of this Event.  # noqa: E501
 
-        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+        A list of sources/hosts affected by the event  # noqa: E501
 
-        :return: The is_user_event of this Event.  # noqa: E501
-        :rtype: bool
+        :return: The hosts of this Event.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._is_user_event
+        return self._hosts
 
-    @is_user_event.setter
-    def is_user_event(self, is_user_event):
-        """Sets the is_user_event of this Event.
+    @hosts.setter
+    def hosts(self, hosts):
+        """Sets the hosts of this Event.
 
-        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+        A list of sources/hosts affected by the event  # noqa: E501
 
-        :param is_user_event: The is_user_event of this Event.  # noqa: E501
-        :type: bool
+        :param hosts: The hosts of this Event.  # noqa: E501
+        :type: list[str]
         """
 
-        self._is_user_event = is_user_event
+        self._hosts = hosts
 
     @property
     def summarized_events(self):
@@ -458,73 +486,46 @@ def updated_at(self, updated_at):
         self._updated_at = updated_at
 
     @property
-    def created_at(self):
-        """Gets the created_at of this Event.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Event.  # noqa: E501
 
 
-        :return: The created_at of this Event.  # noqa: E501
+        :return: The created_epoch_millis of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._created_at
+        return self._created_epoch_millis
 
-    @created_at.setter
-    def created_at(self, created_at):
-        """Sets the created_at of this Event.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Event.
 
 
-        :param created_at: The created_at of this Event.  # noqa: E501
+        :param created_epoch_millis: The created_epoch_millis of this Event.  # noqa: E501
         :type: int
         """
 
-        self._created_at = created_at
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def start_time(self):
-        """Gets the start_time of this Event.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Event.  # noqa: E501
 
-        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
 
-        :return: The start_time of this Event.  # noqa: E501
+        :return: The updated_epoch_millis of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._start_time
+        return self._updated_epoch_millis
 
-    @start_time.setter
-    def start_time(self, start_time):
-        """Sets the start_time of this Event.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Event.
 
-        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
 
-        :param start_time: The start_time of this Event.  # noqa: E501
+        :param updated_epoch_millis: The updated_epoch_millis of this Event.  # noqa: E501
         :type: int
         """
-        if start_time is None:
-            raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
-
-        self._start_time = start_time
-
-    @property
-    def end_time(self):
-        """Gets the end_time of this Event.  # noqa: E501
-
-        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
-
-        :return: The end_time of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._end_time
-
-    @end_time.setter
-    def end_time(self, end_time):
-        """Sets the end_time of this Event.
 
-        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
-
-        :param end_time: The end_time of this Event.  # noqa: E501
-        :type: int
-        """
-        if end_time is not None:
-            self._end_time = end_time
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
     def running_state(self):
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index a8e28c5..da7827f 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -97,6 +97,7 @@ def cursor(self, cursor):
     def limit(self):
         """Gets the limit of this EventSearchRequest.  # noqa: E501
 
+        The number of results to return.  Default: 100  # noqa: E501
 
         :return: The limit of this EventSearchRequest.  # noqa: E501
         :rtype: int
@@ -107,6 +108,7 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this EventSearchRequest.
 
+        The number of results to return.  Default: 100  # noqa: E501
 
         :param limit: The limit of this EventSearchRequest.  # noqa: E501
         :type: int
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index c0089ec..f5f8cef 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -35,13 +35,13 @@ class ExternalLink(object):
         'id': 'str',
         'description': 'str',
         'creator_id': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'template': 'str',
         'metric_filter_regex': 'str',
         'source_filter_regex': 'str',
-        'point_tag_filter_regexes': 'dict(str, str)',
-        'updater_id': 'str'
+        'point_tag_filter_regexes': 'dict(str, str)'
     }
 
     attribute_map = {
@@ -49,29 +49,29 @@ class ExternalLink(object):
         'id': 'id',
         'description': 'description',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'template': 'template',
         'metric_filter_regex': 'metricFilterRegex',
         'source_filter_regex': 'sourceFilterRegex',
-        'point_tag_filter_regexes': 'pointTagFilterRegexes',
-        'updater_id': 'updaterId'
+        'point_tag_filter_regexes': 'pointTagFilterRegexes'
     }
 
-    def __init__(self, name=None, id=None, description=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None, updater_id=None):  # noqa: E501
+    def __init__(self, name=None, id=None, description=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None):  # noqa: E501
         """ExternalLink - a model defined in Swagger"""  # noqa: E501
 
         self._name = None
         self._id = None
         self._description = None
         self._creator_id = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._template = None
         self._metric_filter_regex = None
         self._source_filter_regex = None
         self._point_tag_filter_regexes = None
-        self._updater_id = None
         self.discriminator = None
 
         self.name = name
@@ -80,6 +80,8 @@ def __init__(self, name=None, id=None, description=None, creator_id=None, create
         self.description = description
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
@@ -91,8 +93,6 @@ def __init__(self, name=None, id=None, description=None, creator_id=None, create
             self.source_filter_regex = source_filter_regex
         if point_tag_filter_regexes is not None:
             self.point_tag_filter_regexes = point_tag_filter_regexes
-        if updater_id is not None:
-            self.updater_id = updater_id
 
     @property
     def name(self):
@@ -186,6 +186,27 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this ExternalLink.  # noqa: E501
+
+
+        :return: The updater_id of this ExternalLink.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this ExternalLink.
+
+
+        :param updater_id: The updater_id of this ExternalLink.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
@@ -322,27 +343,6 @@ def point_tag_filter_regexes(self, point_tag_filter_regexes):
 
         self._point_tag_filter_regexes = point_tag_filter_regexes
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this ExternalLink.  # noqa: E501
-
-
-        :return: The updater_id of this ExternalLink.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this ExternalLink.
-
-
-        :param updater_id: The updater_id of this ExternalLink.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
new file mode 100644
index 0000000..d343e5e
--- /dev/null
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -0,0 +1,173 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class GCPBillingConfiguration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'project_id': 'str',
+        'gcp_json_key': 'str',
+        'gcp_api_key': 'str'
+    }
+
+    attribute_map = {
+        'project_id': 'projectId',
+        'gcp_json_key': 'gcpJsonKey',
+        'gcp_api_key': 'gcpApiKey'
+    }
+
+    def __init__(self, project_id=None, gcp_json_key=None, gcp_api_key=None):  # noqa: E501
+        """GCPBillingConfiguration - a model defined in Swagger"""  # noqa: E501
+
+        self._project_id = None
+        self._gcp_json_key = None
+        self._gcp_api_key = None
+        self.discriminator = None
+
+        self.project_id = project_id
+        self.gcp_json_key = gcp_json_key
+        self.gcp_api_key = gcp_api_key
+
+    @property
+    def project_id(self):
+        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
+
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
+
+        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_id
+
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPBillingConfiguration.
+
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
+
+        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :type: str
+        """
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
+
+        self._project_id = project_id
+
+    @property
+    def gcp_json_key(self):
+        """Gets the gcp_json_key of this GCPBillingConfiguration.  # noqa: E501
+
+        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
+
+        :return: The gcp_json_key of this GCPBillingConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._gcp_json_key
+
+    @gcp_json_key.setter
+    def gcp_json_key(self, gcp_json_key):
+        """Sets the gcp_json_key of this GCPBillingConfiguration.
+
+        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
+
+        :param gcp_json_key: The gcp_json_key of this GCPBillingConfiguration.  # noqa: E501
+        :type: str
+        """
+        if gcp_json_key is None:
+            raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
+
+        self._gcp_json_key = gcp_json_key
+
+    @property
+    def gcp_api_key(self):
+        """Gets the gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
+
+        API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating  # noqa: E501
+
+        :return: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._gcp_api_key
+
+    @gcp_api_key.setter
+    def gcp_api_key(self, gcp_api_key):
+        """Sets the gcp_api_key of this GCPBillingConfiguration.
+
+        API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating  # noqa: E501
+
+        :param gcp_api_key: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
+        :type: str
+        """
+        if gcp_api_key is None:
+            raise ValueError("Invalid value for `gcp_api_key`, must not be `None`")  # noqa: E501
+
+        self._gcp_api_key = gcp_api_key
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, GCPBillingConfiguration):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 6ba17ed..39c2209 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -31,59 +31,57 @@ class GCPConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'gcp_json_key': 'str',
-        'project_id': 'str',
         'metric_filter_regex': 'str',
+        'project_id': 'str',
+        'gcp_json_key': 'str',
         'categories_to_fetch': 'list[str]'
     }
 
     attribute_map = {
-        'gcp_json_key': 'gcpJsonKey',
-        'project_id': 'projectId',
         'metric_filter_regex': 'metricFilterRegex',
+        'project_id': 'projectId',
+        'gcp_json_key': 'gcpJsonKey',
         'categories_to_fetch': 'categoriesToFetch'
     }
 
-    def __init__(self, gcp_json_key=None, project_id=None, metric_filter_regex=None, categories_to_fetch=None):  # noqa: E501
+    def __init__(self, metric_filter_regex=None, project_id=None, gcp_json_key=None, categories_to_fetch=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._gcp_json_key = None
-        self._project_id = None
         self._metric_filter_regex = None
+        self._project_id = None
+        self._gcp_json_key = None
         self._categories_to_fetch = None
         self.discriminator = None
 
-        self.gcp_json_key = gcp_json_key
-        self.project_id = project_id
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
+        self.project_id = project_id
+        self.gcp_json_key = gcp_json_key
         if categories_to_fetch is not None:
             self.categories_to_fetch = categories_to_fetch
 
     @property
-    def gcp_json_key(self):
-        """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this GCPConfiguration.  # noqa: E501
 
-        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP.  # noqa: E501
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
 
-        :return: The gcp_json_key of this GCPConfiguration.  # noqa: E501
+        :return: The metric_filter_regex of this GCPConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._gcp_json_key
+        return self._metric_filter_regex
 
-    @gcp_json_key.setter
-    def gcp_json_key(self, gcp_json_key):
-        """Sets the gcp_json_key of this GCPConfiguration.
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this GCPConfiguration.
 
-        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP.  # noqa: E501
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
 
-        :param gcp_json_key: The gcp_json_key of this GCPConfiguration.  # noqa: E501
+        :param metric_filter_regex: The metric_filter_regex of this GCPConfiguration.  # noqa: E501
         :type: str
         """
-        if gcp_json_key is None:
-            raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
 
-        self._gcp_json_key = gcp_json_key
+        self._metric_filter_regex = metric_filter_regex
 
     @property
     def project_id(self):
@@ -111,27 +109,29 @@ def project_id(self, project_id):
         self._project_id = project_id
 
     @property
-    def metric_filter_regex(self):
-        """Gets the metric_filter_regex of this GCPConfiguration.  # noqa: E501
+    def gcp_json_key(self):
+        """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
 
-        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
 
-        :return: The metric_filter_regex of this GCPConfiguration.  # noqa: E501
+        :return: The gcp_json_key of this GCPConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._metric_filter_regex
+        return self._gcp_json_key
 
-    @metric_filter_regex.setter
-    def metric_filter_regex(self, metric_filter_regex):
-        """Sets the metric_filter_regex of this GCPConfiguration.
+    @gcp_json_key.setter
+    def gcp_json_key(self, gcp_json_key):
+        """Sets the gcp_json_key of this GCPConfiguration.
 
-        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
 
-        :param metric_filter_regex: The metric_filter_regex of this GCPConfiguration.  # noqa: E501
+        :param gcp_json_key: The gcp_json_key of this GCPConfiguration.  # noqa: E501
         :type: str
         """
+        if gcp_json_key is None:
+            raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
 
-        self._metric_filter_regex = metric_filter_regex
+        self._gcp_json_key = gcp_json_key
 
     @property
     def categories_to_fetch(self):
@@ -153,7 +153,7 @@ def categories_to_fetch(self, categories_to_fetch):
         :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "LOGGING", "ML", "PUBSUB", "ROUTER", "SPANNER", "STORAGE", "VPN"]  # noqa: E501
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
         if not set(categories_to_fetch).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 0777675..005dc16 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -36,20 +36,20 @@ class Integration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'icon': 'str',
+        'version': 'str',
         'name': 'str',
         'id': 'str',
+        'metrics': 'IntegrationMetrics',
         'description': 'str',
+        'base_url': 'str',
         'status': 'IntegrationStatus',
         'creator_id': 'str',
-        'version': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'metrics': 'IntegrationMetrics',
-        'base_url': 'str',
-        'updater_id': 'str',
         'dashboards': 'list[IntegrationDashboard]',
         'alias_of': 'str',
-        'icon': 'str',
         'alias_integrations': 'list[IntegrationAlias]',
         'deleted': 'bool',
         'overview': 'str',
@@ -57,73 +57,73 @@ class Integration(object):
     }
 
     attribute_map = {
+        'icon': 'icon',
+        'version': 'version',
         'name': 'name',
         'id': 'id',
+        'metrics': 'metrics',
         'description': 'description',
+        'base_url': 'baseUrl',
         'status': 'status',
         'creator_id': 'creatorId',
-        'version': 'version',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'metrics': 'metrics',
-        'base_url': 'baseUrl',
-        'updater_id': 'updaterId',
         'dashboards': 'dashboards',
         'alias_of': 'aliasOf',
-        'icon': 'icon',
         'alias_integrations': 'aliasIntegrations',
         'deleted': 'deleted',
         'overview': 'overview',
         'setup': 'setup'
     }
 
-    def __init__(self, name=None, id=None, description=None, status=None, creator_id=None, version=None, created_epoch_millis=None, updated_epoch_millis=None, metrics=None, base_url=None, updater_id=None, dashboards=None, alias_of=None, icon=None, alias_integrations=None, deleted=None, overview=None, setup=None):  # noqa: E501
+    def __init__(self, icon=None, version=None, name=None, id=None, metrics=None, description=None, base_url=None, status=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, dashboards=None, alias_of=None, alias_integrations=None, deleted=None, overview=None, setup=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
 
+        self._icon = None
+        self._version = None
         self._name = None
         self._id = None
+        self._metrics = None
         self._description = None
+        self._base_url = None
         self._status = None
         self._creator_id = None
-        self._version = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._metrics = None
-        self._base_url = None
-        self._updater_id = None
         self._dashboards = None
         self._alias_of = None
-        self._icon = None
         self._alias_integrations = None
         self._deleted = None
         self._overview = None
         self._setup = None
         self.discriminator = None
 
+        self.icon = icon
+        self.version = version
         self.name = name
         if id is not None:
             self.id = id
+        if metrics is not None:
+            self.metrics = metrics
         self.description = description
+        if base_url is not None:
+            self.base_url = base_url
         if status is not None:
             self.status = status
         if creator_id is not None:
             self.creator_id = creator_id
-        self.version = version
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if metrics is not None:
-            self.metrics = metrics
-        if base_url is not None:
-            self.base_url = base_url
-        if updater_id is not None:
-            self.updater_id = updater_id
         if dashboards is not None:
             self.dashboards = dashboards
         if alias_of is not None:
             self.alias_of = alias_of
-        self.icon = icon
         if alias_integrations is not None:
             self.alias_integrations = alias_integrations
         if deleted is not None:
@@ -133,6 +133,56 @@ def __init__(self, name=None, id=None, description=None, status=None, creator_id
         if setup is not None:
             self.setup = setup
 
+    @property
+    def icon(self):
+        """Gets the icon of this Integration.  # noqa: E501
+
+        URI path to the integration icon  # noqa: E501
+
+        :return: The icon of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._icon
+
+    @icon.setter
+    def icon(self, icon):
+        """Sets the icon of this Integration.
+
+        URI path to the integration icon  # noqa: E501
+
+        :param icon: The icon of this Integration.  # noqa: E501
+        :type: str
+        """
+        if icon is None:
+            raise ValueError("Invalid value for `icon`, must not be `None`")  # noqa: E501
+
+        self._icon = icon
+
+    @property
+    def version(self):
+        """Gets the version of this Integration.  # noqa: E501
+
+        Integration version string  # noqa: E501
+
+        :return: The version of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._version
+
+    @version.setter
+    def version(self, version):
+        """Sets the version of this Integration.
+
+        Integration version string  # noqa: E501
+
+        :param version: The version of this Integration.  # noqa: E501
+        :type: str
+        """
+        if version is None:
+            raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
+
+        self._version = version
+
     @property
     def name(self):
         """Gets the name of this Integration.  # noqa: E501
@@ -179,6 +229,27 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def metrics(self):
+        """Gets the metrics of this Integration.  # noqa: E501
+
+
+        :return: The metrics of this Integration.  # noqa: E501
+        :rtype: IntegrationMetrics
+        """
+        return self._metrics
+
+    @metrics.setter
+    def metrics(self, metrics):
+        """Sets the metrics of this Integration.
+
+
+        :param metrics: The metrics of this Integration.  # noqa: E501
+        :type: IntegrationMetrics
+        """
+
+        self._metrics = metrics
+
     @property
     def description(self):
         """Gets the description of this Integration.  # noqa: E501
@@ -204,6 +275,29 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def base_url(self):
+        """Gets the base_url of this Integration.  # noqa: E501
+
+        Base URL for this integration's assets  # noqa: E501
+
+        :return: The base_url of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._base_url
+
+    @base_url.setter
+    def base_url(self, base_url):
+        """Sets the base_url of this Integration.
+
+        Base URL for this integration's assets  # noqa: E501
+
+        :param base_url: The base_url of this Integration.  # noqa: E501
+        :type: str
+        """
+
+        self._base_url = base_url
+
     @property
     def status(self):
         """Gets the status of this Integration.  # noqa: E501
@@ -247,29 +341,25 @@ def creator_id(self, creator_id):
         self._creator_id = creator_id
 
     @property
-    def version(self):
-        """Gets the version of this Integration.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Integration.  # noqa: E501
 
-        Integration version string  # noqa: E501
 
-        :return: The version of this Integration.  # noqa: E501
+        :return: The updater_id of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._version
+        return self._updater_id
 
-    @version.setter
-    def version(self, version):
-        """Sets the version of this Integration.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Integration.
 
-        Integration version string  # noqa: E501
 
-        :param version: The version of this Integration.  # noqa: E501
+        :param updater_id: The updater_id of this Integration.  # noqa: E501
         :type: str
         """
-        if version is None:
-            raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
 
-        self._version = version
+        self._updater_id = updater_id
 
     @property
     def created_epoch_millis(self):
@@ -313,71 +403,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def metrics(self):
-        """Gets the metrics of this Integration.  # noqa: E501
-
-
-        :return: The metrics of this Integration.  # noqa: E501
-        :rtype: IntegrationMetrics
-        """
-        return self._metrics
-
-    @metrics.setter
-    def metrics(self, metrics):
-        """Sets the metrics of this Integration.
-
-
-        :param metrics: The metrics of this Integration.  # noqa: E501
-        :type: IntegrationMetrics
-        """
-
-        self._metrics = metrics
-
-    @property
-    def base_url(self):
-        """Gets the base_url of this Integration.  # noqa: E501
-
-        Base URL for this integration's assets  # noqa: E501
-
-        :return: The base_url of this Integration.  # noqa: E501
-        :rtype: str
-        """
-        return self._base_url
-
-    @base_url.setter
-    def base_url(self, base_url):
-        """Sets the base_url of this Integration.
-
-        Base URL for this integration's assets  # noqa: E501
-
-        :param base_url: The base_url of this Integration.  # noqa: E501
-        :type: str
-        """
-
-        self._base_url = base_url
-
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this Integration.  # noqa: E501
-
-
-        :return: The updater_id of this Integration.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Integration.
-
-
-        :param updater_id: The updater_id of this Integration.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
     @property
     def dashboards(self):
         """Gets the dashboards of this Integration.  # noqa: E501
@@ -424,31 +449,6 @@ def alias_of(self, alias_of):
 
         self._alias_of = alias_of
 
-    @property
-    def icon(self):
-        """Gets the icon of this Integration.  # noqa: E501
-
-        URI path to the integration icon  # noqa: E501
-
-        :return: The icon of this Integration.  # noqa: E501
-        :rtype: str
-        """
-        return self._icon
-
-    @icon.setter
-    def icon(self, icon):
-        """Sets the icon of this Integration.
-
-        URI path to the integration icon  # noqa: E501
-
-        :param icon: The icon of this Integration.  # noqa: E501
-        :type: str
-        """
-        if icon is None:
-            raise ValueError("Invalid value for `icon`, must not be `None`")  # noqa: E501
-
-        self._icon = icon
-
     @property
     def alias_integrations(self):
         """Gets the alias_integrations of this Integration.  # noqa: E501
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index 0e14ce1..97da426 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -31,31 +31,33 @@ class IntegrationAlias(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'icon': 'str',
         'name': 'str',
         'id': 'str',
         'description': 'str',
-        'base_url': 'str',
-        'icon': 'str'
+        'base_url': 'str'
     }
 
     attribute_map = {
+        'icon': 'icon',
         'name': 'name',
         'id': 'id',
         'description': 'description',
-        'base_url': 'baseUrl',
-        'icon': 'icon'
+        'base_url': 'baseUrl'
     }
 
-    def __init__(self, name=None, id=None, description=None, base_url=None, icon=None):  # noqa: E501
+    def __init__(self, icon=None, name=None, id=None, description=None, base_url=None):  # noqa: E501
         """IntegrationAlias - a model defined in Swagger"""  # noqa: E501
 
+        self._icon = None
         self._name = None
         self._id = None
         self._description = None
         self._base_url = None
-        self._icon = None
         self.discriminator = None
 
+        if icon is not None:
+            self.icon = icon
         if name is not None:
             self.name = name
         if id is not None:
@@ -64,8 +66,29 @@ def __init__(self, name=None, id=None, description=None, base_url=None, icon=Non
             self.description = description
         if base_url is not None:
             self.base_url = base_url
-        if icon is not None:
-            self.icon = icon
+
+    @property
+    def icon(self):
+        """Gets the icon of this IntegrationAlias.  # noqa: E501
+
+        Icon path of the alias Integration  # noqa: E501
+
+        :return: The icon of this IntegrationAlias.  # noqa: E501
+        :rtype: str
+        """
+        return self._icon
+
+    @icon.setter
+    def icon(self, icon):
+        """Sets the icon of this IntegrationAlias.
+
+        Icon path of the alias Integration  # noqa: E501
+
+        :param icon: The icon of this IntegrationAlias.  # noqa: E501
+        :type: str
+        """
+
+        self._icon = icon
 
     @property
     def name(self):
@@ -159,29 +182,6 @@ def base_url(self, base_url):
 
         self._base_url = base_url
 
-    @property
-    def icon(self):
-        """Gets the icon of this IntegrationAlias.  # noqa: E501
-
-        Icon path of the alias Integration  # noqa: E501
-
-        :return: The icon of this IntegrationAlias.  # noqa: E501
-        :rtype: str
-        """
-        return self._icon
-
-    @icon.setter
-    def icon(self, icon):
-        """Sets the icon of this IntegrationAlias.
-
-        Icon path of the alias Integration  # noqa: E501
-
-        :param icon: The icon of this IntegrationAlias.  # noqa: E501
-        :type: str
-        """
-
-        self._icon = icon
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index a6d20e7..1d7639a 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -33,58 +33,58 @@ class IntegrationManifestGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'subtitle': 'str',
+        'title': 'str',
         'integrations': 'list[str]',
         'integration_objs': 'list[Integration]',
-        'title': 'str'
+        'subtitle': 'str'
     }
 
     attribute_map = {
-        'subtitle': 'subtitle',
+        'title': 'title',
         'integrations': 'integrations',
         'integration_objs': 'integrationObjs',
-        'title': 'title'
+        'subtitle': 'subtitle'
     }
 
-    def __init__(self, subtitle=None, integrations=None, integration_objs=None, title=None):  # noqa: E501
+    def __init__(self, title=None, integrations=None, integration_objs=None, subtitle=None):  # noqa: E501
         """IntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._subtitle = None
+        self._title = None
         self._integrations = None
         self._integration_objs = None
-        self._title = None
+        self._subtitle = None
         self.discriminator = None
 
-        self.subtitle = subtitle
+        self.title = title
         self.integrations = integrations
         if integration_objs is not None:
             self.integration_objs = integration_objs
-        self.title = title
+        self.subtitle = subtitle
 
     @property
-    def subtitle(self):
-        """Gets the subtitle of this IntegrationManifestGroup.  # noqa: E501
+    def title(self):
+        """Gets the title of this IntegrationManifestGroup.  # noqa: E501
 
-        Subtitle of this integration group  # noqa: E501
+        Title of this integration group  # noqa: E501
 
-        :return: The subtitle of this IntegrationManifestGroup.  # noqa: E501
+        :return: The title of this IntegrationManifestGroup.  # noqa: E501
         :rtype: str
         """
-        return self._subtitle
+        return self._title
 
-    @subtitle.setter
-    def subtitle(self, subtitle):
-        """Sets the subtitle of this IntegrationManifestGroup.
+    @title.setter
+    def title(self, title):
+        """Sets the title of this IntegrationManifestGroup.
 
-        Subtitle of this integration group  # noqa: E501
+        Title of this integration group  # noqa: E501
 
-        :param subtitle: The subtitle of this IntegrationManifestGroup.  # noqa: E501
+        :param title: The title of this IntegrationManifestGroup.  # noqa: E501
         :type: str
         """
-        if subtitle is None:
-            raise ValueError("Invalid value for `subtitle`, must not be `None`")  # noqa: E501
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._subtitle = subtitle
+        self._title = title
 
     @property
     def integrations(self):
@@ -135,29 +135,29 @@ def integration_objs(self, integration_objs):
         self._integration_objs = integration_objs
 
     @property
-    def title(self):
-        """Gets the title of this IntegrationManifestGroup.  # noqa: E501
+    def subtitle(self):
+        """Gets the subtitle of this IntegrationManifestGroup.  # noqa: E501
 
-        Title of this integration group  # noqa: E501
+        Subtitle of this integration group  # noqa: E501
 
-        :return: The title of this IntegrationManifestGroup.  # noqa: E501
+        :return: The subtitle of this IntegrationManifestGroup.  # noqa: E501
         :rtype: str
         """
-        return self._title
+        return self._subtitle
 
-    @title.setter
-    def title(self, title):
-        """Sets the title of this IntegrationManifestGroup.
+    @subtitle.setter
+    def subtitle(self, subtitle):
+        """Sets the subtitle of this IntegrationManifestGroup.
 
-        Title of this integration group  # noqa: E501
+        Subtitle of this integration group  # noqa: E501
 
-        :param title: The title of this IntegrationManifestGroup.  # noqa: E501
+        :param subtitle: The subtitle of this IntegrationManifestGroup.  # noqa: E501
         :type: str
         """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+        if subtitle is None:
+            raise ValueError("Invalid value for `subtitle`, must not be `None`")  # noqa: E501
 
-        self._title = title
+        self._subtitle = subtitle
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index bfe895f..2ba449a 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -33,43 +33,68 @@ class IntegrationMetrics(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'prefixes': 'list[str]',
         'display': 'list[str]',
-        'chart_objs': 'list[Chart]',
         'charts': 'list[str]',
+        'chart_objs': 'list[Chart]',
         'required': 'list[str]',
-        'prefixes': 'list[str]',
         'pps_dimensions': 'list[str]'
     }
 
     attribute_map = {
+        'prefixes': 'prefixes',
         'display': 'display',
-        'chart_objs': 'chartObjs',
         'charts': 'charts',
+        'chart_objs': 'chartObjs',
         'required': 'required',
-        'prefixes': 'prefixes',
         'pps_dimensions': 'ppsDimensions'
     }
 
-    def __init__(self, display=None, chart_objs=None, charts=None, required=None, prefixes=None, pps_dimensions=None):  # noqa: E501
+    def __init__(self, prefixes=None, display=None, charts=None, chart_objs=None, required=None, pps_dimensions=None):  # noqa: E501
         """IntegrationMetrics - a model defined in Swagger"""  # noqa: E501
 
+        self._prefixes = None
         self._display = None
-        self._chart_objs = None
         self._charts = None
+        self._chart_objs = None
         self._required = None
-        self._prefixes = None
         self._pps_dimensions = None
         self.discriminator = None
 
+        self.prefixes = prefixes
         self.display = display
+        self.charts = charts
         if chart_objs is not None:
             self.chart_objs = chart_objs
-        self.charts = charts
         self.required = required
-        self.prefixes = prefixes
         if pps_dimensions is not None:
             self.pps_dimensions = pps_dimensions
 
+    @property
+    def prefixes(self):
+        """Gets the prefixes of this IntegrationMetrics.  # noqa: E501
+
+        Set of metric prefix namespaces belonging to this integration  # noqa: E501
+
+        :return: The prefixes of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._prefixes
+
+    @prefixes.setter
+    def prefixes(self, prefixes):
+        """Sets the prefixes of this IntegrationMetrics.
+
+        Set of metric prefix namespaces belonging to this integration  # noqa: E501
+
+        :param prefixes: The prefixes of this IntegrationMetrics.  # noqa: E501
+        :type: list[str]
+        """
+        if prefixes is None:
+            raise ValueError("Invalid value for `prefixes`, must not be `None`")  # noqa: E501
+
+        self._prefixes = prefixes
+
     @property
     def display(self):
         """Gets the display of this IntegrationMetrics.  # noqa: E501
@@ -95,29 +120,6 @@ def display(self, display):
 
         self._display = display
 
-    @property
-    def chart_objs(self):
-        """Gets the chart_objs of this IntegrationMetrics.  # noqa: E501
-
-        Chart JSONs materialized from the links in `charts`  # noqa: E501
-
-        :return: The chart_objs of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[Chart]
-        """
-        return self._chart_objs
-
-    @chart_objs.setter
-    def chart_objs(self, chart_objs):
-        """Sets the chart_objs of this IntegrationMetrics.
-
-        Chart JSONs materialized from the links in `charts`  # noqa: E501
-
-        :param chart_objs: The chart_objs of this IntegrationMetrics.  # noqa: E501
-        :type: list[Chart]
-        """
-
-        self._chart_objs = chart_objs
-
     @property
     def charts(self):
         """Gets the charts of this IntegrationMetrics.  # noqa: E501
@@ -143,6 +145,29 @@ def charts(self, charts):
 
         self._charts = charts
 
+    @property
+    def chart_objs(self):
+        """Gets the chart_objs of this IntegrationMetrics.  # noqa: E501
+
+        Chart JSONs materialized from the links in `charts`  # noqa: E501
+
+        :return: The chart_objs of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[Chart]
+        """
+        return self._chart_objs
+
+    @chart_objs.setter
+    def chart_objs(self, chart_objs):
+        """Sets the chart_objs of this IntegrationMetrics.
+
+        Chart JSONs materialized from the links in `charts`  # noqa: E501
+
+        :param chart_objs: The chart_objs of this IntegrationMetrics.  # noqa: E501
+        :type: list[Chart]
+        """
+
+        self._chart_objs = chart_objs
+
     @property
     def required(self):
         """Gets the required of this IntegrationMetrics.  # noqa: E501
@@ -168,31 +193,6 @@ def required(self, required):
 
         self._required = required
 
-    @property
-    def prefixes(self):
-        """Gets the prefixes of this IntegrationMetrics.  # noqa: E501
-
-        Set of metric prefix namespaces belonging to this integration  # noqa: E501
-
-        :return: The prefixes of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._prefixes
-
-    @prefixes.setter
-    def prefixes(self, prefixes):
-        """Sets the prefixes of this IntegrationMetrics.
-
-        Set of metric prefix namespaces belonging to this integration  # noqa: E501
-
-        :param prefixes: The prefixes of this IntegrationMetrics.  # noqa: E501
-        :type: list[str]
-        """
-        if prefixes is None:
-            raise ValueError("Invalid value for `prefixes`, must not be `None`")  # noqa: E501
-
-        self._prefixes = prefixes
-
     @property
     def pps_dimensions(self):
         """Gets the pps_dimensions of this IntegrationMetrics.  # noqa: E501
diff --git a/wavefront_api_client/models/iterator_entry_string_json_node.py b/wavefront_api_client/models/iterator_entry_string_json_node.py
new file mode 100644
index 0000000..1c22cde
--- /dev/null
+++ b/wavefront_api_client/models/iterator_entry_string_json_node.py
@@ -0,0 +1,84 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class IteratorEntryStringJsonNode(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """IteratorEntryStringJsonNode - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IteratorEntryStringJsonNode):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/iterator_json_node.py b/wavefront_api_client/models/iterator_json_node.py
new file mode 100644
index 0000000..5d9f434
--- /dev/null
+++ b/wavefront_api_client/models/iterator_json_node.py
@@ -0,0 +1,84 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class IteratorJsonNode(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """IteratorJsonNode - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IteratorJsonNode):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/iterator_string.py b/wavefront_api_client/models/iterator_string.py
new file mode 100644
index 0000000..6810500
--- /dev/null
+++ b/wavefront_api_client/models/iterator_string.py
@@ -0,0 +1,84 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class IteratorString(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """IteratorString - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IteratorString):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
new file mode 100644
index 0000000..16c0f94
--- /dev/null
+++ b/wavefront_api_client/models/logical_type.py
@@ -0,0 +1,112 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class LogicalType(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'name': 'str'
+    }
+
+    attribute_map = {
+        'name': 'name'
+    }
+
+    def __init__(self, name=None):  # noqa: E501
+        """LogicalType - a model defined in Swagger"""  # noqa: E501
+
+        self._name = None
+        self.discriminator = None
+
+        if name is not None:
+            self.name = name
+
+    @property
+    def name(self):
+        """Gets the name of this LogicalType.  # noqa: E501
+
+
+        :return: The name of this LogicalType.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this LogicalType.
+
+
+        :param name: The name of this LogicalType.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, LogicalType):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index 1dab67c..7e841ae 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -31,122 +31,101 @@ class MaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'str',
         'reason': 'str',
+        'id': 'str',
         'customer_id': 'str',
-        'event_name': 'str',
+        'relevant_customer_tags': 'list[str]',
+        'title': 'str',
+        'start_time_in_seconds': 'int',
+        'end_time_in_seconds': 'int',
+        'relevant_host_tags': 'list[str]',
+        'relevant_host_names': 'list[str]',
         'creator_id': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'relevant_host_names': 'list[str]',
-        'relevant_host_tags': 'list[str]',
         'relevant_host_tags_anded': 'bool',
         'host_tag_group_host_names_group_anded': 'bool',
-        'updater_id': 'str',
-        'relevant_customer_tags': 'list[str]',
-        'title': 'str',
-        'start_time_in_seconds': 'int',
-        'end_time_in_seconds': 'int',
-        'running_state': 'str',
-        'sort_attr': 'int'
+        'event_name': 'str',
+        'sort_attr': 'int',
+        'running_state': 'str'
     }
 
     attribute_map = {
-        'id': 'id',
         'reason': 'reason',
+        'id': 'id',
         'customer_id': 'customerId',
-        'event_name': 'eventName',
+        'relevant_customer_tags': 'relevantCustomerTags',
+        'title': 'title',
+        'start_time_in_seconds': 'startTimeInSeconds',
+        'end_time_in_seconds': 'endTimeInSeconds',
+        'relevant_host_tags': 'relevantHostTags',
+        'relevant_host_names': 'relevantHostNames',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'relevant_host_names': 'relevantHostNames',
-        'relevant_host_tags': 'relevantHostTags',
         'relevant_host_tags_anded': 'relevantHostTagsAnded',
         'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
-        'updater_id': 'updaterId',
-        'relevant_customer_tags': 'relevantCustomerTags',
-        'title': 'title',
-        'start_time_in_seconds': 'startTimeInSeconds',
-        'end_time_in_seconds': 'endTimeInSeconds',
-        'running_state': 'runningState',
-        'sort_attr': 'sortAttr'
+        'event_name': 'eventName',
+        'sort_attr': 'sortAttr',
+        'running_state': 'runningState'
     }
 
-    def __init__(self, id=None, reason=None, customer_id=None, event_name=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, updater_id=None, relevant_customer_tags=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, running_state=None, sort_attr=None):  # noqa: E501
+    def __init__(self, reason=None, id=None, customer_id=None, relevant_customer_tags=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, relevant_host_tags=None, relevant_host_names=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, event_name=None, sort_attr=None, running_state=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
-        self._id = None
         self._reason = None
+        self._id = None
         self._customer_id = None
-        self._event_name = None
+        self._relevant_customer_tags = None
+        self._title = None
+        self._start_time_in_seconds = None
+        self._end_time_in_seconds = None
+        self._relevant_host_tags = None
+        self._relevant_host_names = None
         self._creator_id = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._relevant_host_names = None
-        self._relevant_host_tags = None
         self._relevant_host_tags_anded = None
         self._host_tag_group_host_names_group_anded = None
-        self._updater_id = None
-        self._relevant_customer_tags = None
-        self._title = None
-        self._start_time_in_seconds = None
-        self._end_time_in_seconds = None
-        self._running_state = None
+        self._event_name = None
         self._sort_attr = None
+        self._running_state = None
         self.discriminator = None
 
+        self.reason = reason
         if id is not None:
             self.id = id
-        self.reason = reason
         if customer_id is not None:
             self.customer_id = customer_id
-        if event_name is not None:
-            self.event_name = event_name
+        self.relevant_customer_tags = relevant_customer_tags
+        self.title = title
+        self.start_time_in_seconds = start_time_in_seconds
+        self.end_time_in_seconds = end_time_in_seconds
+        if relevant_host_tags is not None:
+            self.relevant_host_tags = relevant_host_tags
+        if relevant_host_names is not None:
+            self.relevant_host_names = relevant_host_names
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if relevant_host_names is not None:
-            self.relevant_host_names = relevant_host_names
-        if relevant_host_tags is not None:
-            self.relevant_host_tags = relevant_host_tags
         if relevant_host_tags_anded is not None:
             self.relevant_host_tags_anded = relevant_host_tags_anded
         if host_tag_group_host_names_group_anded is not None:
             self.host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
-        if updater_id is not None:
-            self.updater_id = updater_id
-        self.relevant_customer_tags = relevant_customer_tags
-        self.title = title
-        self.start_time_in_seconds = start_time_in_seconds
-        self.end_time_in_seconds = end_time_in_seconds
-        if running_state is not None:
-            self.running_state = running_state
+        if event_name is not None:
+            self.event_name = event_name
         if sort_attr is not None:
             self.sort_attr = sort_attr
-
-    @property
-    def id(self):
-        """Gets the id of this MaintenanceWindow.  # noqa: E501
-
-
-        :return: The id of this MaintenanceWindow.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this MaintenanceWindow.
-
-
-        :param id: The id of this MaintenanceWindow.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
+        if running_state is not None:
+            self.running_state = running_state
 
     @property
     def reason(self):
@@ -173,6 +152,27 @@ def reason(self, reason):
 
         self._reason = reason
 
+    @property
+    def id(self):
+        """Gets the id of this MaintenanceWindow.  # noqa: E501
+
+
+        :return: The id of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this MaintenanceWindow.
+
+
+        :param id: The id of this MaintenanceWindow.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def customer_id(self):
         """Gets the customer_id of this MaintenanceWindow.  # noqa: E501
@@ -195,113 +195,104 @@ def customer_id(self, customer_id):
         self._customer_id = customer_id
 
     @property
-    def event_name(self):
-        """Gets the event_name of this MaintenanceWindow.  # noqa: E501
+    def relevant_customer_tags(self):
+        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
 
-        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :return: The event_name of this MaintenanceWindow.  # noqa: E501
-        :rtype: str
+        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._event_name
+        return self._relevant_customer_tags
 
-    @event_name.setter
-    def event_name(self, event_name):
-        """Sets the event_name of this MaintenanceWindow.
+    @relevant_customer_tags.setter
+    def relevant_customer_tags(self, relevant_customer_tags):
+        """Sets the relevant_customer_tags of this MaintenanceWindow.
 
-        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :param event_name: The event_name of this MaintenanceWindow.  # noqa: E501
-        :type: str
+        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+        :type: list[str]
         """
+        if relevant_customer_tags is None:
+            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
 
-        self._event_name = event_name
+        self._relevant_customer_tags = relevant_customer_tags
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this MaintenanceWindow.  # noqa: E501
+    def title(self):
+        """Gets the title of this MaintenanceWindow.  # noqa: E501
 
+        Title of this maintenance window  # noqa: E501
 
-        :return: The creator_id of this MaintenanceWindow.  # noqa: E501
+        :return: The title of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._creator_id
+        return self._title
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this MaintenanceWindow.
+    @title.setter
+    def title(self, title):
+        """Sets the title of this MaintenanceWindow.
 
+        Title of this maintenance window  # noqa: E501
 
-        :param creator_id: The creator_id of this MaintenanceWindow.  # noqa: E501
+        :param title: The title of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._creator_id = creator_id
+        self._title = title
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+    def start_time_in_seconds(self):
+        """Gets the start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
 
+        The time in epoch seconds when this maintenance window will start  # noqa: E501
 
-        :return: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :return: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :rtype: int
         """
-        return self._created_epoch_millis
+        return self._start_time_in_seconds
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this MaintenanceWindow.
+    @start_time_in_seconds.setter
+    def start_time_in_seconds(self, start_time_in_seconds):
+        """Sets the start_time_in_seconds of this MaintenanceWindow.
 
+        The time in epoch seconds when this maintenance window will start  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :param start_time_in_seconds: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
+        if start_time_in_seconds is None:
+            raise ValueError("Invalid value for `start_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._created_epoch_millis = created_epoch_millis
+        self._start_time_in_seconds = start_time_in_seconds
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+    def end_time_in_seconds(self):
+        """Gets the end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
 
+        The time in epoch seconds when this maintenance window will end  # noqa: E501
 
-        :return: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :return: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :rtype: int
         """
-        return self._updated_epoch_millis
+        return self._end_time_in_seconds
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this MaintenanceWindow.
+    @end_time_in_seconds.setter
+    def end_time_in_seconds(self, end_time_in_seconds):
+        """Sets the end_time_in_seconds of this MaintenanceWindow.
 
+        The time in epoch seconds when this maintenance window will end  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :param end_time_in_seconds: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
+        if end_time_in_seconds is None:
+            raise ValueError("Invalid value for `end_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._updated_epoch_millis = updated_epoch_millis
-
-    @property
-    def relevant_host_names(self):
-        """Gets the relevant_host_names of this MaintenanceWindow.  # noqa: E501
-
-        List of source/host names that will be put into maintenance because of this maintenance window  # noqa: E501
-
-        :return: The relevant_host_names of this MaintenanceWindow.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._relevant_host_names
-
-    @relevant_host_names.setter
-    def relevant_host_names(self, relevant_host_names):
-        """Sets the relevant_host_names of this MaintenanceWindow.
-
-        List of source/host names that will be put into maintenance because of this maintenance window  # noqa: E501
-
-        :param relevant_host_names: The relevant_host_names of this MaintenanceWindow.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._relevant_host_names = relevant_host_names
+        self._end_time_in_seconds = end_time_in_seconds
 
     @property
     def relevant_host_tags(self):
@@ -327,50 +318,48 @@ def relevant_host_tags(self, relevant_host_tags):
         self._relevant_host_tags = relevant_host_tags
 
     @property
-    def relevant_host_tags_anded(self):
-        """Gets the relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
+    def relevant_host_names(self):
+        """Gets the relevant_host_names of this MaintenanceWindow.  # noqa: E501
 
-        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
+        List of source/host names that will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :return: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
-        :rtype: bool
+        :return: The relevant_host_names of this MaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._relevant_host_tags_anded
+        return self._relevant_host_names
 
-    @relevant_host_tags_anded.setter
-    def relevant_host_tags_anded(self, relevant_host_tags_anded):
-        """Sets the relevant_host_tags_anded of this MaintenanceWindow.
+    @relevant_host_names.setter
+    def relevant_host_names(self, relevant_host_names):
+        """Sets the relevant_host_names of this MaintenanceWindow.
 
-        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
+        List of source/host names that will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :param relevant_host_tags_anded: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
-        :type: bool
+        :param relevant_host_names: The relevant_host_names of this MaintenanceWindow.  # noqa: E501
+        :type: list[str]
         """
 
-        self._relevant_host_tags_anded = relevant_host_tags_anded
+        self._relevant_host_names = relevant_host_names
 
     @property
-    def host_tag_group_host_names_group_anded(self):
-        """Gets the host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this MaintenanceWindow.  # noqa: E501
 
-        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
 
-        :return: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
-        :rtype: bool
+        :return: The creator_id of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
         """
-        return self._host_tag_group_host_names_group_anded
+        return self._creator_id
 
-    @host_tag_group_host_names_group_anded.setter
-    def host_tag_group_host_names_group_anded(self, host_tag_group_host_names_group_anded):
-        """Sets the host_tag_group_host_names_group_anded of this MaintenanceWindow.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this MaintenanceWindow.
 
-        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
 
-        :param host_tag_group_host_names_group_anded: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
-        :type: bool
+        :param creator_id: The creator_id of this MaintenanceWindow.  # noqa: E501
+        :type: str
         """
 
-        self._host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
+        self._creator_id = creator_id
 
     @property
     def updater_id(self):
@@ -394,131 +383,115 @@ def updater_id(self, updater_id):
         self._updater_id = updater_id
 
     @property
-    def relevant_customer_tags(self):
-        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this MaintenanceWindow.  # noqa: E501
 
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :rtype: list[str]
+        :return: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :rtype: int
         """
-        return self._relevant_customer_tags
+        return self._created_epoch_millis
 
-    @relevant_customer_tags.setter
-    def relevant_customer_tags(self, relevant_customer_tags):
-        """Sets the relevant_customer_tags of this MaintenanceWindow.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this MaintenanceWindow.
 
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :type: list[str]
+        :param created_epoch_millis: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :type: int
         """
-        if relevant_customer_tags is None:
-            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
 
-        self._relevant_customer_tags = relevant_customer_tags
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def title(self):
-        """Gets the title of this MaintenanceWindow.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
 
-        Title of this maintenance window  # noqa: E501
 
-        :return: The title of this MaintenanceWindow.  # noqa: E501
-        :rtype: str
+        :return: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :rtype: int
         """
-        return self._title
+        return self._updated_epoch_millis
 
-    @title.setter
-    def title(self, title):
-        """Sets the title of this MaintenanceWindow.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this MaintenanceWindow.
 
-        Title of this maintenance window  # noqa: E501
 
-        :param title: The title of this MaintenanceWindow.  # noqa: E501
-        :type: str
+        :param updated_epoch_millis: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :type: int
         """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._title = title
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def start_time_in_seconds(self):
-        """Gets the start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
+    def relevant_host_tags_anded(self):
+        """Gets the relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
 
-        The time in epoch seconds when this maintenance window will start  # noqa: E501
+        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
 
-        :return: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :rtype: int
+        :return: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
+        :rtype: bool
         """
-        return self._start_time_in_seconds
+        return self._relevant_host_tags_anded
 
-    @start_time_in_seconds.setter
-    def start_time_in_seconds(self, start_time_in_seconds):
-        """Sets the start_time_in_seconds of this MaintenanceWindow.
+    @relevant_host_tags_anded.setter
+    def relevant_host_tags_anded(self, relevant_host_tags_anded):
+        """Sets the relevant_host_tags_anded of this MaintenanceWindow.
 
-        The time in epoch seconds when this maintenance window will start  # noqa: E501
+        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
 
-        :param start_time_in_seconds: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :type: int
+        :param relevant_host_tags_anded: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
+        :type: bool
         """
-        if start_time_in_seconds is None:
-            raise ValueError("Invalid value for `start_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._start_time_in_seconds = start_time_in_seconds
+        self._relevant_host_tags_anded = relevant_host_tags_anded
 
     @property
-    def end_time_in_seconds(self):
-        """Gets the end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
+    def host_tag_group_host_names_group_anded(self):
+        """Gets the host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
 
-        The time in epoch seconds when this maintenance window will end  # noqa: E501
+        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
 
-        :return: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :rtype: int
+        :return: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
+        :rtype: bool
         """
-        return self._end_time_in_seconds
+        return self._host_tag_group_host_names_group_anded
 
-    @end_time_in_seconds.setter
-    def end_time_in_seconds(self, end_time_in_seconds):
-        """Sets the end_time_in_seconds of this MaintenanceWindow.
+    @host_tag_group_host_names_group_anded.setter
+    def host_tag_group_host_names_group_anded(self, host_tag_group_host_names_group_anded):
+        """Sets the host_tag_group_host_names_group_anded of this MaintenanceWindow.
 
-        The time in epoch seconds when this maintenance window will end  # noqa: E501
+        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
 
-        :param end_time_in_seconds: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :type: int
+        :param host_tag_group_host_names_group_anded: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
+        :type: bool
         """
-        if end_time_in_seconds is None:
-            raise ValueError("Invalid value for `end_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._end_time_in_seconds = end_time_in_seconds
+        self._host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
 
     @property
-    def running_state(self):
-        """Gets the running_state of this MaintenanceWindow.  # noqa: E501
+    def event_name(self):
+        """Gets the event_name of this MaintenanceWindow.  # noqa: E501
 
+        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
 
-        :return: The running_state of this MaintenanceWindow.  # noqa: E501
+        :return: The event_name of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._running_state
+        return self._event_name
 
-    @running_state.setter
-    def running_state(self, running_state):
-        """Sets the running_state of this MaintenanceWindow.
+    @event_name.setter
+    def event_name(self, event_name):
+        """Sets the event_name of this MaintenanceWindow.
 
+        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
 
-        :param running_state: The running_state of this MaintenanceWindow.  # noqa: E501
+        :param event_name: The event_name of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
-        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
-            raise ValueError(
-                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
-                .format(running_state, allowed_values)
-            )
 
-        self._running_state = running_state
+        self._event_name = event_name
 
     @property
     def sort_attr(self):
@@ -543,6 +516,33 @@ def sort_attr(self, sort_attr):
 
         self._sort_attr = sort_attr
 
+    @property
+    def running_state(self):
+        """Gets the running_state of this MaintenanceWindow.  # noqa: E501
+
+
+        :return: The running_state of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
+        """
+        return self._running_state
+
+    @running_state.setter
+    def running_state(self, running_state):
+        """Sets the running_state of this MaintenanceWindow.
+
+
+        :param running_state: The running_state of this MaintenanceWindow.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
+        if running_state not in allowed_values:
+            raise ValueError(
+                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
+                .format(running_state, allowed_values)
+            )
+
+        self._running_state = running_state
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 3a126ab..53e3903 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -31,69 +31,117 @@ class Message(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'source': 'str',
+        'attributes': 'dict(str, str)',
         'id': 'str',
         'target': 'str',
-        'attributes': 'dict(str, str)',
         'content': 'str',
         'scope': 'str',
+        'title': 'str',
         'severity': 'str',
-        'source': 'str',
         'start_epoch_millis': 'int',
         'end_epoch_millis': 'int',
         'display': 'str',
-        'title': 'str',
         'read': 'bool'
     }
 
     attribute_map = {
+        'source': 'source',
+        'attributes': 'attributes',
         'id': 'id',
         'target': 'target',
-        'attributes': 'attributes',
         'content': 'content',
         'scope': 'scope',
+        'title': 'title',
         'severity': 'severity',
-        'source': 'source',
         'start_epoch_millis': 'startEpochMillis',
         'end_epoch_millis': 'endEpochMillis',
         'display': 'display',
-        'title': 'title',
         'read': 'read'
     }
 
-    def __init__(self, id=None, target=None, attributes=None, content=None, scope=None, severity=None, source=None, start_epoch_millis=None, end_epoch_millis=None, display=None, title=None, read=None):  # noqa: E501
+    def __init__(self, source=None, attributes=None, id=None, target=None, content=None, scope=None, title=None, severity=None, start_epoch_millis=None, end_epoch_millis=None, display=None, read=None):  # noqa: E501
         """Message - a model defined in Swagger"""  # noqa: E501
 
+        self._source = None
+        self._attributes = None
         self._id = None
         self._target = None
-        self._attributes = None
         self._content = None
         self._scope = None
+        self._title = None
         self._severity = None
-        self._source = None
         self._start_epoch_millis = None
         self._end_epoch_millis = None
         self._display = None
-        self._title = None
         self._read = None
         self.discriminator = None
 
+        self.source = source
+        if attributes is not None:
+            self.attributes = attributes
         if id is not None:
             self.id = id
         if target is not None:
             self.target = target
-        if attributes is not None:
-            self.attributes = attributes
         self.content = content
         self.scope = scope
+        self.title = title
         self.severity = severity
-        self.source = source
         self.start_epoch_millis = start_epoch_millis
         self.end_epoch_millis = end_epoch_millis
         self.display = display
-        self.title = title
         if read is not None:
             self.read = read
 
+    @property
+    def source(self):
+        """Gets the source of this Message.  # noqa: E501
+
+        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+
+        :return: The source of this Message.  # noqa: E501
+        :rtype: str
+        """
+        return self._source
+
+    @source.setter
+    def source(self, source):
+        """Sets the source of this Message.
+
+        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+
+        :param source: The source of this Message.  # noqa: E501
+        :type: str
+        """
+        if source is None:
+            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
+
+        self._source = source
+
+    @property
+    def attributes(self):
+        """Gets the attributes of this Message.  # noqa: E501
+
+        A string->string map of additional properties associated with this message  # noqa: E501
+
+        :return: The attributes of this Message.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._attributes
+
+    @attributes.setter
+    def attributes(self, attributes):
+        """Sets the attributes of this Message.
+
+        A string->string map of additional properties associated with this message  # noqa: E501
+
+        :param attributes: The attributes of this Message.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._attributes = attributes
+
     @property
     def id(self):
         """Gets the id of this Message.  # noqa: E501
@@ -138,29 +186,6 @@ def target(self, target):
 
         self._target = target
 
-    @property
-    def attributes(self):
-        """Gets the attributes of this Message.  # noqa: E501
-
-        A string->string map of additional properties associated with this message  # noqa: E501
-
-        :return: The attributes of this Message.  # noqa: E501
-        :rtype: dict(str, str)
-        """
-        return self._attributes
-
-    @attributes.setter
-    def attributes(self, attributes):
-        """Sets the attributes of this Message.
-
-        A string->string map of additional properties associated with this message  # noqa: E501
-
-        :param attributes: The attributes of this Message.  # noqa: E501
-        :type: dict(str, str)
-        """
-
-        self._attributes = attributes
-
     @property
     def content(self):
         """Gets the content of this Message.  # noqa: E501
@@ -217,6 +242,31 @@ def scope(self, scope):
 
         self._scope = scope
 
+    @property
+    def title(self):
+        """Gets the title of this Message.  # noqa: E501
+
+        Title of this message  # noqa: E501
+
+        :return: The title of this Message.  # noqa: E501
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this Message.
+
+        Title of this message  # noqa: E501
+
+        :param title: The title of this Message.  # noqa: E501
+        :type: str
+        """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+
+        self._title = title
+
     @property
     def severity(self):
         """Gets the severity of this Message.  # noqa: E501
@@ -248,31 +298,6 @@ def severity(self, severity):
 
         self._severity = severity
 
-    @property
-    def source(self):
-        """Gets the source of this Message.  # noqa: E501
-
-        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
-
-        :return: The source of this Message.  # noqa: E501
-        :rtype: str
-        """
-        return self._source
-
-    @source.setter
-    def source(self, source):
-        """Sets the source of this Message.
-
-        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
-
-        :param source: The source of this Message.  # noqa: E501
-        :type: str
-        """
-        if source is None:
-            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
-
-        self._source = source
-
     @property
     def start_epoch_millis(self):
         """Gets the start_epoch_millis of this Message.  # noqa: E501
@@ -354,31 +379,6 @@ def display(self, display):
 
         self._display = display
 
-    @property
-    def title(self):
-        """Gets the title of this Message.  # noqa: E501
-
-        Title of this message  # noqa: E501
-
-        :return: The title of this Message.  # noqa: E501
-        :rtype: str
-        """
-        return self._title
-
-    @title.setter
-    def title(self, title):
-        """Sets the title of this Message.
-
-        Title of this message  # noqa: E501
-
-        :param title: The title of this Message.  # noqa: E501
-        :type: str
-        """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
-
-        self._title = title
-
     @property
     def read(self):
         """Gets the read of this Message.  # noqa: E501
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index 7feaf0b..cba9b4a 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -33,83 +33,88 @@ class Notificant(object):
     swagger_types = {
         'method': 'str',
         'id': 'str',
-        'customer_id': 'str',
+        'content_type': 'str',
         'description': 'str',
+        'customer_id': 'str',
+        'title': 'str',
         'creator_id': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'template': 'str',
-        'updater_id': 'str',
-        'title': 'str',
         'triggers': 'list[str]',
         'recipient': 'str',
         'custom_http_headers': 'dict(str, str)',
         'email_subject': 'str',
-        'content_type': 'str'
+        'is_html_content': 'bool'
     }
 
     attribute_map = {
         'method': 'method',
         'id': 'id',
-        'customer_id': 'customerId',
+        'content_type': 'contentType',
         'description': 'description',
+        'customer_id': 'customerId',
+        'title': 'title',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'template': 'template',
-        'updater_id': 'updaterId',
-        'title': 'title',
         'triggers': 'triggers',
         'recipient': 'recipient',
         'custom_http_headers': 'customHttpHeaders',
         'email_subject': 'emailSubject',
-        'content_type': 'contentType'
+        'is_html_content': 'isHtmlContent'
     }
 
-    def __init__(self, method=None, id=None, customer_id=None, description=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, updater_id=None, title=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, content_type=None):  # noqa: E501
+    def __init__(self, method=None, id=None, content_type=None, description=None, customer_id=None, title=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, is_html_content=None):  # noqa: E501
         """Notificant - a model defined in Swagger"""  # noqa: E501
 
         self._method = None
         self._id = None
-        self._customer_id = None
+        self._content_type = None
         self._description = None
+        self._customer_id = None
+        self._title = None
         self._creator_id = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._template = None
-        self._updater_id = None
-        self._title = None
         self._triggers = None
         self._recipient = None
         self._custom_http_headers = None
         self._email_subject = None
-        self._content_type = None
+        self._is_html_content = None
         self.discriminator = None
 
         self.method = method
         if id is not None:
             self.id = id
+        if content_type is not None:
+            self.content_type = content_type
+        self.description = description
         if customer_id is not None:
             self.customer_id = customer_id
-        self.description = description
+        self.title = title
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         self.template = template
-        if updater_id is not None:
-            self.updater_id = updater_id
-        self.title = title
         self.triggers = triggers
         self.recipient = recipient
         if custom_http_headers is not None:
             self.custom_http_headers = custom_http_headers
         if email_subject is not None:
             self.email_subject = email_subject
-        if content_type is not None:
-            self.content_type = content_type
+        if is_html_content is not None:
+            self.is_html_content = is_html_content
 
     @property
     def method(self):
@@ -164,25 +169,33 @@ def id(self, id):
         self._id = id
 
     @property
-    def customer_id(self):
-        """Gets the customer_id of this Notificant.  # noqa: E501
+    def content_type(self):
+        """Gets the content_type of this Notificant.  # noqa: E501
 
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :return: The customer_id of this Notificant.  # noqa: E501
+        :return: The content_type of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._customer_id
+        return self._content_type
 
-    @customer_id.setter
-    def customer_id(self, customer_id):
-        """Sets the customer_id of this Notificant.
+    @content_type.setter
+    def content_type(self, content_type):
+        """Sets the content_type of this Notificant.
 
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :param customer_id: The customer_id of this Notificant.  # noqa: E501
+        :param content_type: The content_type of this Notificant.  # noqa: E501
         :type: str
         """
+        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
+        if content_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(content_type, allowed_values)
+            )
 
-        self._customer_id = customer_id
+        self._content_type = content_type
 
     @property
     def description(self):
@@ -209,6 +222,52 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def customer_id(self):
+        """Gets the customer_id of this Notificant.  # noqa: E501
+
+
+        :return: The customer_id of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer_id
+
+    @customer_id.setter
+    def customer_id(self, customer_id):
+        """Sets the customer_id of this Notificant.
+
+
+        :param customer_id: The customer_id of this Notificant.  # noqa: E501
+        :type: str
+        """
+
+        self._customer_id = customer_id
+
+    @property
+    def title(self):
+        """Gets the title of this Notificant.  # noqa: E501
+
+        Title  # noqa: E501
+
+        :return: The title of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this Notificant.
+
+        Title  # noqa: E501
+
+        :param title: The title of this Notificant.  # noqa: E501
+        :type: str
+        """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+
+        self._title = title
+
     @property
     def creator_id(self):
         """Gets the creator_id of this Notificant.  # noqa: E501
@@ -230,6 +289,27 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this Notificant.  # noqa: E501
+
+
+        :return: The updater_id of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Notificant.
+
+
+        :param updater_id: The updater_id of this Notificant.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this Notificant.  # noqa: E501
@@ -297,52 +377,6 @@ def template(self, template):
 
         self._template = template
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this Notificant.  # noqa: E501
-
-
-        :return: The updater_id of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Notificant.
-
-
-        :param updater_id: The updater_id of this Notificant.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    @property
-    def title(self):
-        """Gets the title of this Notificant.  # noqa: E501
-
-        Title  # noqa: E501
-
-        :return: The title of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._title
-
-    @title.setter
-    def title(self, title):
-        """Sets the title of this Notificant.
-
-        Title  # noqa: E501
-
-        :param title: The title of this Notificant.  # noqa: E501
-        :type: str
-        """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
-
-        self._title = title
-
     @property
     def triggers(self):
         """Gets the triggers of this Notificant.  # noqa: E501
@@ -447,33 +481,27 @@ def email_subject(self, email_subject):
         self._email_subject = email_subject
 
     @property
-    def content_type(self):
-        """Gets the content_type of this Notificant.  # noqa: E501
+    def is_html_content(self):
+        """Gets the is_html_content of this Notificant.  # noqa: E501
 
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
+        Determine whether the email alert target content is sent as html or text.  # noqa: E501
 
-        :return: The content_type of this Notificant.  # noqa: E501
-        :rtype: str
+        :return: The is_html_content of this Notificant.  # noqa: E501
+        :rtype: bool
         """
-        return self._content_type
+        return self._is_html_content
 
-    @content_type.setter
-    def content_type(self, content_type):
-        """Sets the content_type of this Notificant.
+    @is_html_content.setter
+    def is_html_content(self, is_html_content):
+        """Sets the is_html_content of this Notificant.
 
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
+        Determine whether the email alert target content is sent as html or text.  # noqa: E501
 
-        :param content_type: The content_type of this Notificant.  # noqa: E501
-        :type: str
+        :param is_html_content: The is_html_content of this Notificant.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
-        if content_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(content_type, allowed_values)
-            )
 
-        self._content_type = content_type
+        self._is_html_content = is_html_content
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/number.py b/wavefront_api_client/models/number.py
new file mode 100644
index 0000000..c8f1027
--- /dev/null
+++ b/wavefront_api_client/models/number.py
@@ -0,0 +1,84 @@
+# coding: utf-8
+
+"""
+    Wavefront Public API
+
+    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Number(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """Number - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Number):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 8fa0eba..3b08eb8 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -33,96 +33,92 @@ class Proxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'version': 'str',
         'name': 'str',
         'id': 'str',
-        'customer_id': 'str',
-        'hostname': 'str',
-        'version': 'str',
         'status': 'str',
-        'ephemeral': 'bool',
+        'customer_id': 'str',
         'in_trash': 'bool',
-        'last_check_in_time': 'int',
-        'last_error_event': 'Event',
-        'ssh_agent': 'bool',
+        'hostname': 'str',
+        'last_known_error': 'str',
         'last_error_time': 'int',
+        'last_error_event': 'Event',
         'time_drift': 'int',
         'bytes_left_for_buffer': 'int',
         'bytes_per_minute_for_buffer': 'int',
         'local_queue_size': 'int',
-        'last_known_error': 'str',
+        'ssh_agent': 'bool',
+        'ephemeral': 'bool',
+        'last_check_in_time': 'int',
         'deleted': 'bool',
         'status_cause': 'str'
     }
 
     attribute_map = {
+        'version': 'version',
         'name': 'name',
         'id': 'id',
-        'customer_id': 'customerId',
-        'hostname': 'hostname',
-        'version': 'version',
         'status': 'status',
-        'ephemeral': 'ephemeral',
+        'customer_id': 'customerId',
         'in_trash': 'inTrash',
-        'last_check_in_time': 'lastCheckInTime',
-        'last_error_event': 'lastErrorEvent',
-        'ssh_agent': 'sshAgent',
+        'hostname': 'hostname',
+        'last_known_error': 'lastKnownError',
         'last_error_time': 'lastErrorTime',
+        'last_error_event': 'lastErrorEvent',
         'time_drift': 'timeDrift',
         'bytes_left_for_buffer': 'bytesLeftForBuffer',
         'bytes_per_minute_for_buffer': 'bytesPerMinuteForBuffer',
         'local_queue_size': 'localQueueSize',
-        'last_known_error': 'lastKnownError',
+        'ssh_agent': 'sshAgent',
+        'ephemeral': 'ephemeral',
+        'last_check_in_time': 'lastCheckInTime',
         'deleted': 'deleted',
         'status_cause': 'statusCause'
     }
 
-    def __init__(self, name=None, id=None, customer_id=None, hostname=None, version=None, status=None, ephemeral=None, in_trash=None, last_check_in_time=None, last_error_event=None, ssh_agent=None, last_error_time=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, last_known_error=None, deleted=None, status_cause=None):  # noqa: E501
+    def __init__(self, version=None, name=None, id=None, status=None, customer_id=None, in_trash=None, hostname=None, last_known_error=None, last_error_time=None, last_error_event=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, ssh_agent=None, ephemeral=None, last_check_in_time=None, deleted=None, status_cause=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
+        self._version = None
         self._name = None
         self._id = None
-        self._customer_id = None
-        self._hostname = None
-        self._version = None
         self._status = None
-        self._ephemeral = None
+        self._customer_id = None
         self._in_trash = None
-        self._last_check_in_time = None
-        self._last_error_event = None
-        self._ssh_agent = None
+        self._hostname = None
+        self._last_known_error = None
         self._last_error_time = None
+        self._last_error_event = None
         self._time_drift = None
         self._bytes_left_for_buffer = None
         self._bytes_per_minute_for_buffer = None
         self._local_queue_size = None
-        self._last_known_error = None
+        self._ssh_agent = None
+        self._ephemeral = None
+        self._last_check_in_time = None
         self._deleted = None
         self._status_cause = None
         self.discriminator = None
 
+        if version is not None:
+            self.version = version
         self.name = name
         if id is not None:
             self.id = id
-        if customer_id is not None:
-            self.customer_id = customer_id
-        if hostname is not None:
-            self.hostname = hostname
-        if version is not None:
-            self.version = version
         if status is not None:
             self.status = status
-        if ephemeral is not None:
-            self.ephemeral = ephemeral
+        if customer_id is not None:
+            self.customer_id = customer_id
         if in_trash is not None:
             self.in_trash = in_trash
-        if last_check_in_time is not None:
-            self.last_check_in_time = last_check_in_time
-        if last_error_event is not None:
-            self.last_error_event = last_error_event
-        if ssh_agent is not None:
-            self.ssh_agent = ssh_agent
+        if hostname is not None:
+            self.hostname = hostname
+        if last_known_error is not None:
+            self.last_known_error = last_known_error
         if last_error_time is not None:
             self.last_error_time = last_error_time
+        if last_error_event is not None:
+            self.last_error_event = last_error_event
         if time_drift is not None:
             self.time_drift = time_drift
         if bytes_left_for_buffer is not None:
@@ -131,13 +127,38 @@ def __init__(self, name=None, id=None, customer_id=None, hostname=None, version=
             self.bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
         if local_queue_size is not None:
             self.local_queue_size = local_queue_size
-        if last_known_error is not None:
-            self.last_known_error = last_known_error
+        if ssh_agent is not None:
+            self.ssh_agent = ssh_agent
+        if ephemeral is not None:
+            self.ephemeral = ephemeral
+        if last_check_in_time is not None:
+            self.last_check_in_time = last_check_in_time
         if deleted is not None:
             self.deleted = deleted
         if status_cause is not None:
             self.status_cause = status_cause
 
+    @property
+    def version(self):
+        """Gets the version of this Proxy.  # noqa: E501
+
+
+        :return: The version of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._version
+
+    @version.setter
+    def version(self, version):
+        """Sets the version of this Proxy.
+
+
+        :param version: The version of this Proxy.  # noqa: E501
+        :type: str
+        """
+
+        self._version = version
+
     @property
     def name(self):
         """Gets the name of this Proxy.  # noqa: E501
@@ -184,71 +205,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def customer_id(self):
-        """Gets the customer_id of this Proxy.  # noqa: E501
-
-
-        :return: The customer_id of this Proxy.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer_id
-
-    @customer_id.setter
-    def customer_id(self, customer_id):
-        """Sets the customer_id of this Proxy.
-
-
-        :param customer_id: The customer_id of this Proxy.  # noqa: E501
-        :type: str
-        """
-
-        self._customer_id = customer_id
-
-    @property
-    def hostname(self):
-        """Gets the hostname of this Proxy.  # noqa: E501
-
-        Host name of the machine running the proxy  # noqa: E501
-
-        :return: The hostname of this Proxy.  # noqa: E501
-        :rtype: str
-        """
-        return self._hostname
-
-    @hostname.setter
-    def hostname(self, hostname):
-        """Sets the hostname of this Proxy.
-
-        Host name of the machine running the proxy  # noqa: E501
-
-        :param hostname: The hostname of this Proxy.  # noqa: E501
-        :type: str
-        """
-
-        self._hostname = hostname
-
-    @property
-    def version(self):
-        """Gets the version of this Proxy.  # noqa: E501
-
-
-        :return: The version of this Proxy.  # noqa: E501
-        :rtype: str
-        """
-        return self._version
-
-    @version.setter
-    def version(self, version):
-        """Sets the version of this Proxy.
-
-
-        :param version: The version of this Proxy.  # noqa: E501
-        :type: str
-        """
-
-        self._version = version
-
     @property
     def status(self):
         """Gets the status of this Proxy.  # noqa: E501
@@ -279,27 +235,25 @@ def status(self, status):
         self._status = status
 
     @property
-    def ephemeral(self):
-        """Gets the ephemeral of this Proxy.  # noqa: E501
+    def customer_id(self):
+        """Gets the customer_id of this Proxy.  # noqa: E501
 
-        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
 
-        :return: The ephemeral of this Proxy.  # noqa: E501
-        :rtype: bool
+        :return: The customer_id of this Proxy.  # noqa: E501
+        :rtype: str
         """
-        return self._ephemeral
+        return self._customer_id
 
-    @ephemeral.setter
-    def ephemeral(self, ephemeral):
-        """Sets the ephemeral of this Proxy.
+    @customer_id.setter
+    def customer_id(self, customer_id):
+        """Sets the customer_id of this Proxy.
 
-        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
 
-        :param ephemeral: The ephemeral of this Proxy.  # noqa: E501
-        :type: bool
+        :param customer_id: The customer_id of this Proxy.  # noqa: E501
+        :type: str
         """
 
-        self._ephemeral = ephemeral
+        self._customer_id = customer_id
 
     @property
     def in_trash(self):
@@ -323,71 +277,50 @@ def in_trash(self, in_trash):
         self._in_trash = in_trash
 
     @property
-    def last_check_in_time(self):
-        """Gets the last_check_in_time of this Proxy.  # noqa: E501
-
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
-
-        :return: The last_check_in_time of this Proxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_check_in_time
-
-    @last_check_in_time.setter
-    def last_check_in_time(self, last_check_in_time):
-        """Sets the last_check_in_time of this Proxy.
-
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
-
-        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
-        :type: int
-        """
-
-        self._last_check_in_time = last_check_in_time
-
-    @property
-    def last_error_event(self):
-        """Gets the last_error_event of this Proxy.  # noqa: E501
+    def hostname(self):
+        """Gets the hostname of this Proxy.  # noqa: E501
 
+        Host name of the machine running the proxy  # noqa: E501
 
-        :return: The last_error_event of this Proxy.  # noqa: E501
-        :rtype: Event
+        :return: The hostname of this Proxy.  # noqa: E501
+        :rtype: str
         """
-        return self._last_error_event
+        return self._hostname
 
-    @last_error_event.setter
-    def last_error_event(self, last_error_event):
-        """Sets the last_error_event of this Proxy.
+    @hostname.setter
+    def hostname(self, hostname):
+        """Sets the hostname of this Proxy.
 
+        Host name of the machine running the proxy  # noqa: E501
 
-        :param last_error_event: The last_error_event of this Proxy.  # noqa: E501
-        :type: Event
+        :param hostname: The hostname of this Proxy.  # noqa: E501
+        :type: str
         """
 
-        self._last_error_event = last_error_event
+        self._hostname = hostname
 
     @property
-    def ssh_agent(self):
-        """Gets the ssh_agent of this Proxy.  # noqa: E501
+    def last_known_error(self):
+        """Gets the last_known_error of this Proxy.  # noqa: E501
 
         deprecated  # noqa: E501
 
-        :return: The ssh_agent of this Proxy.  # noqa: E501
-        :rtype: bool
+        :return: The last_known_error of this Proxy.  # noqa: E501
+        :rtype: str
         """
-        return self._ssh_agent
+        return self._last_known_error
 
-    @ssh_agent.setter
-    def ssh_agent(self, ssh_agent):
-        """Sets the ssh_agent of this Proxy.
+    @last_known_error.setter
+    def last_known_error(self, last_known_error):
+        """Sets the last_known_error of this Proxy.
 
         deprecated  # noqa: E501
 
-        :param ssh_agent: The ssh_agent of this Proxy.  # noqa: E501
-        :type: bool
+        :param last_known_error: The last_known_error of this Proxy.  # noqa: E501
+        :type: str
         """
 
-        self._ssh_agent = ssh_agent
+        self._last_known_error = last_known_error
 
     @property
     def last_error_time(self):
@@ -412,6 +345,27 @@ def last_error_time(self, last_error_time):
 
         self._last_error_time = last_error_time
 
+    @property
+    def last_error_event(self):
+        """Gets the last_error_event of this Proxy.  # noqa: E501
+
+
+        :return: The last_error_event of this Proxy.  # noqa: E501
+        :rtype: Event
+        """
+        return self._last_error_event
+
+    @last_error_event.setter
+    def last_error_event(self, last_error_event):
+        """Sets the last_error_event of this Proxy.
+
+
+        :param last_error_event: The last_error_event of this Proxy.  # noqa: E501
+        :type: Event
+        """
+
+        self._last_error_event = last_error_event
+
     @property
     def time_drift(self):
         """Gets the time_drift of this Proxy.  # noqa: E501
@@ -505,27 +459,73 @@ def local_queue_size(self, local_queue_size):
         self._local_queue_size = local_queue_size
 
     @property
-    def last_known_error(self):
-        """Gets the last_known_error of this Proxy.  # noqa: E501
+    def ssh_agent(self):
+        """Gets the ssh_agent of this Proxy.  # noqa: E501
 
         deprecated  # noqa: E501
 
-        :return: The last_known_error of this Proxy.  # noqa: E501
-        :rtype: str
+        :return: The ssh_agent of this Proxy.  # noqa: E501
+        :rtype: bool
         """
-        return self._last_known_error
+        return self._ssh_agent
 
-    @last_known_error.setter
-    def last_known_error(self, last_known_error):
-        """Sets the last_known_error of this Proxy.
+    @ssh_agent.setter
+    def ssh_agent(self, ssh_agent):
+        """Sets the ssh_agent of this Proxy.
 
         deprecated  # noqa: E501
 
-        :param last_known_error: The last_known_error of this Proxy.  # noqa: E501
-        :type: str
+        :param ssh_agent: The ssh_agent of this Proxy.  # noqa: E501
+        :type: bool
         """
 
-        self._last_known_error = last_known_error
+        self._ssh_agent = ssh_agent
+
+    @property
+    def ephemeral(self):
+        """Gets the ephemeral of this Proxy.  # noqa: E501
+
+        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
+
+        :return: The ephemeral of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._ephemeral
+
+    @ephemeral.setter
+    def ephemeral(self, ephemeral):
+        """Sets the ephemeral of this Proxy.
+
+        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
+
+        :param ephemeral: The ephemeral of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._ephemeral = ephemeral
+
+    @property
+    def last_check_in_time(self):
+        """Gets the last_check_in_time of this Proxy.  # noqa: E501
+
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+
+        :return: The last_check_in_time of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_check_in_time
+
+    @last_check_in_time.setter
+    def last_check_in_time(self, last_check_in_time):
+        """Sets the last_check_in_time of this Proxy.
+
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+
+        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._last_check_in_time = last_check_in_time
 
     @property
     def deleted(self):
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index a064206..f7b7eb6 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -35,51 +35,74 @@ class QueryResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'warnings': 'str',
         'name': 'str',
         'query': 'str',
         'stats': 'StatsModel',
-        'warnings': 'str',
-        'granularity': 'int',
         'events': 'list[QueryEvent]',
-        'timeseries': 'list[Timeseries]'
+        'timeseries': 'list[Timeseries]',
+        'granularity': 'int'
     }
 
     attribute_map = {
+        'warnings': 'warnings',
         'name': 'name',
         'query': 'query',
         'stats': 'stats',
-        'warnings': 'warnings',
-        'granularity': 'granularity',
         'events': 'events',
-        'timeseries': 'timeseries'
+        'timeseries': 'timeseries',
+        'granularity': 'granularity'
     }
 
-    def __init__(self, name=None, query=None, stats=None, warnings=None, granularity=None, events=None, timeseries=None):  # noqa: E501
+    def __init__(self, warnings=None, name=None, query=None, stats=None, events=None, timeseries=None, granularity=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
 
+        self._warnings = None
         self._name = None
         self._query = None
         self._stats = None
-        self._warnings = None
-        self._granularity = None
         self._events = None
         self._timeseries = None
+        self._granularity = None
         self.discriminator = None
 
+        if warnings is not None:
+            self.warnings = warnings
         if name is not None:
             self.name = name
         if query is not None:
             self.query = query
         if stats is not None:
             self.stats = stats
-        if warnings is not None:
-            self.warnings = warnings
-        if granularity is not None:
-            self.granularity = granularity
         if events is not None:
             self.events = events
         if timeseries is not None:
             self.timeseries = timeseries
+        if granularity is not None:
+            self.granularity = granularity
+
+    @property
+    def warnings(self):
+        """Gets the warnings of this QueryResult.  # noqa: E501
+
+        The warnings incurred by this query  # noqa: E501
+
+        :return: The warnings of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._warnings
+
+    @warnings.setter
+    def warnings(self, warnings):
+        """Sets the warnings of this QueryResult.
+
+        The warnings incurred by this query  # noqa: E501
+
+        :param warnings: The warnings of this QueryResult.  # noqa: E501
+        :type: str
+        """
+
+        self._warnings = warnings
 
     @property
     def name(self):
@@ -148,52 +171,6 @@ def stats(self, stats):
 
         self._stats = stats
 
-    @property
-    def warnings(self):
-        """Gets the warnings of this QueryResult.  # noqa: E501
-
-        The warnings incurred by this query  # noqa: E501
-
-        :return: The warnings of this QueryResult.  # noqa: E501
-        :rtype: str
-        """
-        return self._warnings
-
-    @warnings.setter
-    def warnings(self, warnings):
-        """Sets the warnings of this QueryResult.
-
-        The warnings incurred by this query  # noqa: E501
-
-        :param warnings: The warnings of this QueryResult.  # noqa: E501
-        :type: str
-        """
-
-        self._warnings = warnings
-
-    @property
-    def granularity(self):
-        """Gets the granularity of this QueryResult.  # noqa: E501
-
-        The granularity of the returned results, in seconds  # noqa: E501
-
-        :return: The granularity of this QueryResult.  # noqa: E501
-        :rtype: int
-        """
-        return self._granularity
-
-    @granularity.setter
-    def granularity(self, granularity):
-        """Sets the granularity of this QueryResult.
-
-        The granularity of the returned results, in seconds  # noqa: E501
-
-        :param granularity: The granularity of this QueryResult.  # noqa: E501
-        :type: int
-        """
-
-        self._granularity = granularity
-
     @property
     def events(self):
         """Gets the events of this QueryResult.  # noqa: E501
@@ -236,6 +213,29 @@ def timeseries(self, timeseries):
 
         self._timeseries = timeseries
 
+    @property
+    def granularity(self):
+        """Gets the granularity of this QueryResult.  # noqa: E501
+
+        The granularity of the returned results, in seconds  # noqa: E501
+
+        :return: The granularity of this QueryResult.  # noqa: E501
+        :rtype: int
+        """
+        return self._granularity
+
+    @granularity.setter
+    def granularity(self, granularity):
+        """Sets the granularity of this QueryResult.
+
+        The granularity of the returned results, in seconds  # noqa: E501
+
+        :param granularity: The granularity of this QueryResult.  # noqa: E501
+        :type: int
+        """
+
+        self._granularity = granularity
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index b8ca350..542cf66 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -33,52 +33,52 @@ class SavedSearch(object):
     swagger_types = {
         'id': 'str',
         'query': 'dict(str, str)',
+        'entity_type': 'str',
         'creator_id': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'updater_id': 'str',
-        'user_id': 'str',
-        'entity_type': 'str'
+        'user_id': 'str'
     }
 
     attribute_map = {
         'id': 'id',
         'query': 'query',
+        'entity_type': 'entityType',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId',
-        'user_id': 'userId',
-        'entity_type': 'entityType'
+        'user_id': 'userId'
     }
 
-    def __init__(self, id=None, query=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, updater_id=None, user_id=None, entity_type=None):  # noqa: E501
+    def __init__(self, id=None, query=None, entity_type=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, user_id=None):  # noqa: E501
         """SavedSearch - a model defined in Swagger"""  # noqa: E501
 
         self._id = None
         self._query = None
+        self._entity_type = None
         self._creator_id = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._updater_id = None
         self._user_id = None
-        self._entity_type = None
         self.discriminator = None
 
         if id is not None:
             self.id = id
         self.query = query
+        self.entity_type = entity_type
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if updater_id is not None:
-            self.updater_id = updater_id
         if user_id is not None:
             self.user_id = user_id
-        self.entity_type = entity_type
 
     @property
     def id(self):
@@ -126,6 +126,37 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def entity_type(self):
+        """Gets the entity_type of this SavedSearch.  # noqa: E501
+
+        The Wavefront entity type over which to search  # noqa: E501
+
+        :return: The entity_type of this SavedSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._entity_type
+
+    @entity_type.setter
+    def entity_type(self, entity_type):
+        """Sets the entity_type of this SavedSearch.
+
+        The Wavefront entity type over which to search  # noqa: E501
+
+        :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
+        :type: str
+        """
+        if entity_type is None:
+            raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY"]  # noqa: E501
+        if entity_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(entity_type, allowed_values)
+            )
+
+        self._entity_type = entity_type
+
     @property
     def creator_id(self):
         """Gets the creator_id of this SavedSearch.  # noqa: E501
@@ -147,6 +178,27 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SavedSearch.  # noqa: E501
+
+
+        :return: The updater_id of this SavedSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SavedSearch.
+
+
+        :param updater_id: The updater_id of this SavedSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this SavedSearch.  # noqa: E501
@@ -189,27 +241,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this SavedSearch.  # noqa: E501
-
-
-        :return: The updater_id of this SavedSearch.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this SavedSearch.
-
-
-        :param updater_id: The updater_id of this SavedSearch.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
     @property
     def user_id(self):
         """Gets the user_id of this SavedSearch.  # noqa: E501
@@ -233,37 +264,6 @@ def user_id(self, user_id):
 
         self._user_id = user_id
 
-    @property
-    def entity_type(self):
-        """Gets the entity_type of this SavedSearch.  # noqa: E501
-
-        The Wavefront entity type over which to search  # noqa: E501
-
-        :return: The entity_type of this SavedSearch.  # noqa: E501
-        :rtype: str
-        """
-        return self._entity_type
-
-    @entity_type.setter
-    def entity_type(self, entity_type):
-        """Sets the entity_type of this SavedSearch.
-
-        The Wavefront entity type over which to search  # noqa: E501
-
-        :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
-        :type: str
-        """
-        if entity_type is None:
-            raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY"]  # noqa: E501
-        if entity_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(entity_type, allowed_values)
-            )
-
-        self._entity_type = entity_type
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 6284e92..fe96e24 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -31,65 +31,88 @@ class Source(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'str',
         'hidden': 'bool',
-        'tags': 'dict(str, bool)',
+        'id': 'str',
         'description': 'str',
+        'tags': 'dict(str, bool)',
         'creator_id': 'str',
+        'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'updater_id': 'str',
         'marked_new_epoch_millis': 'int',
         'source_name': 'str'
     }
 
     attribute_map = {
-        'id': 'id',
         'hidden': 'hidden',
-        'tags': 'tags',
+        'id': 'id',
         'description': 'description',
+        'tags': 'tags',
         'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId',
         'marked_new_epoch_millis': 'markedNewEpochMillis',
         'source_name': 'sourceName'
     }
 
-    def __init__(self, id=None, hidden=None, tags=None, description=None, creator_id=None, created_epoch_millis=None, updated_epoch_millis=None, updater_id=None, marked_new_epoch_millis=None, source_name=None):  # noqa: E501
+    def __init__(self, hidden=None, id=None, description=None, tags=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, marked_new_epoch_millis=None, source_name=None):  # noqa: E501
         """Source - a model defined in Swagger"""  # noqa: E501
 
-        self._id = None
         self._hidden = None
-        self._tags = None
+        self._id = None
         self._description = None
+        self._tags = None
         self._creator_id = None
+        self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._updater_id = None
         self._marked_new_epoch_millis = None
         self._source_name = None
         self.discriminator = None
 
-        self.id = id
         if hidden is not None:
             self.hidden = hidden
-        if tags is not None:
-            self.tags = tags
+        self.id = id
         if description is not None:
             self.description = description
+        if tags is not None:
+            self.tags = tags
         if creator_id is not None:
             self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if updater_id is not None:
-            self.updater_id = updater_id
         if marked_new_epoch_millis is not None:
             self.marked_new_epoch_millis = marked_new_epoch_millis
         self.source_name = source_name
 
+    @property
+    def hidden(self):
+        """Gets the hidden of this Source.  # noqa: E501
+
+        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
+
+        :return: The hidden of this Source.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Source.
+
+        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
+
+        :param hidden: The hidden of this Source.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
     @property
     def id(self):
         """Gets the id of this Source.  # noqa: E501
@@ -116,27 +139,27 @@ def id(self, id):
         self._id = id
 
     @property
-    def hidden(self):
-        """Gets the hidden of this Source.  # noqa: E501
+    def description(self):
+        """Gets the description of this Source.  # noqa: E501
 
-        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
+        Description of this source  # noqa: E501
 
-        :return: The hidden of this Source.  # noqa: E501
-        :rtype: bool
+        :return: The description of this Source.  # noqa: E501
+        :rtype: str
         """
-        return self._hidden
+        return self._description
 
-    @hidden.setter
-    def hidden(self, hidden):
-        """Sets the hidden of this Source.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Source.
 
-        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
+        Description of this source  # noqa: E501
 
-        :param hidden: The hidden of this Source.  # noqa: E501
-        :type: bool
+        :param description: The description of this Source.  # noqa: E501
+        :type: str
         """
 
-        self._hidden = hidden
+        self._description = description
 
     @property
     def tags(self):
@@ -162,48 +185,46 @@ def tags(self, tags):
         self._tags = tags
 
     @property
-    def description(self):
-        """Gets the description of this Source.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this Source.  # noqa: E501
 
-        Description of this source  # noqa: E501
 
-        :return: The description of this Source.  # noqa: E501
+        :return: The creator_id of this Source.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._creator_id
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Source.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Source.
 
-        Description of this source  # noqa: E501
 
-        :param description: The description of this Source.  # noqa: E501
+        :param creator_id: The creator_id of this Source.  # noqa: E501
         :type: str
         """
 
-        self._description = description
+        self._creator_id = creator_id
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this Source.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Source.  # noqa: E501
 
 
-        :return: The creator_id of this Source.  # noqa: E501
+        :return: The updater_id of this Source.  # noqa: E501
         :rtype: str
         """
-        return self._creator_id
+        return self._updater_id
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Source.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Source.
 
 
-        :param creator_id: The creator_id of this Source.  # noqa: E501
+        :param updater_id: The updater_id of this Source.  # noqa: E501
         :type: str
         """
 
-        self._creator_id = creator_id
+        self._updater_id = updater_id
 
     @property
     def created_epoch_millis(self):
@@ -247,27 +268,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this Source.  # noqa: E501
-
-
-        :return: The updater_id of this Source.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Source.
-
-
-        :param updater_id: The updater_id of this Source.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
     @property
     def marked_new_epoch_millis(self):
         """Gets the marked_new_epoch_millis of this Source.  # noqa: E501
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 4309640..7de5de0 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -31,42 +31,63 @@ class SourceLabelPair(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'label': 'str',
         'host': 'str',
         'tags': 'dict(str, str)',
-        'label': 'str',
         'firing': 'int',
         'observed': 'int'
     }
 
     attribute_map = {
+        'label': 'label',
         'host': 'host',
         'tags': 'tags',
-        'label': 'label',
         'firing': 'firing',
         'observed': 'observed'
     }
 
-    def __init__(self, host=None, tags=None, label=None, firing=None, observed=None):  # noqa: E501
+    def __init__(self, label=None, host=None, tags=None, firing=None, observed=None):  # noqa: E501
         """SourceLabelPair - a model defined in Swagger"""  # noqa: E501
 
+        self._label = None
         self._host = None
         self._tags = None
-        self._label = None
         self._firing = None
         self._observed = None
         self.discriminator = None
 
+        if label is not None:
+            self.label = label
         if host is not None:
             self.host = host
         if tags is not None:
             self.tags = tags
-        if label is not None:
-            self.label = label
         if firing is not None:
             self.firing = firing
         if observed is not None:
             self.observed = observed
 
+    @property
+    def label(self):
+        """Gets the label of this SourceLabelPair.  # noqa: E501
+
+
+        :return: The label of this SourceLabelPair.  # noqa: E501
+        :rtype: str
+        """
+        return self._label
+
+    @label.setter
+    def label(self, label):
+        """Sets the label of this SourceLabelPair.
+
+
+        :param label: The label of this SourceLabelPair.  # noqa: E501
+        :type: str
+        """
+
+        self._label = label
+
     @property
     def host(self):
         """Gets the host of this SourceLabelPair.  # noqa: E501
@@ -111,27 +132,6 @@ def tags(self, tags):
 
         self._tags = tags
 
-    @property
-    def label(self):
-        """Gets the label of this SourceLabelPair.  # noqa: E501
-
-
-        :return: The label of this SourceLabelPair.  # noqa: E501
-        :rtype: str
-        """
-        return self._label
-
-    @label.setter
-    def label(self, label):
-        """Sets the label of this SourceLabelPair.
-
-
-        :param label: The label of this SourceLabelPair.  # noqa: E501
-        :type: str
-        """
-
-        self._label = label
-
     @property
     def firing(self):
         """Gets the firing of this SourceLabelPair.  # noqa: E501
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index 8fde912..121ea08 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -91,6 +91,7 @@ def cursor(self, cursor):
     def limit(self):
         """Gets the limit of this SourceSearchRequestContainer.  # noqa: E501
 
+        The number of results to return.  Default: 100  # noqa: E501
 
         :return: The limit of this SourceSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -101,6 +102,7 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this SourceSearchRequestContainer.
 
+        The number of results to return.  Default: 100  # noqa: E501
 
         :param limit: The limit of this SourceSearchRequestContainer.  # noqa: E501
         :type: int

From a04ca0fc4d2e3b4ac7e646f663386ad0fe690349 Mon Sep 17 00:00:00 2001
From: Vikram Raman <vikram.raman@gmail.com>
Date: Tue, 14 Aug 2018 19:17:46 -0700
Subject: [PATCH 015/161] Remove pyformance and lambda (#44)

---
 setup.py                                      |   2 +-
 wavefront_lambda/README.md                    |  64 --------
 wavefront_lambda/example.py                   |  20 ---
 wavefront_lambda/setup.py                     |  36 -----
 wavefront_lambda/wavefront_lambda/__init__.py | 125 --------------
 .../wavefront_lambda/tests/__init__.py        |   0
 .../tests/test_wavefront_lambda_wrapper.py    |  19 ---
 wavefront_pyformance/README.md                |  57 -------
 wavefront_pyformance/example.py               |  52 ------
 wavefront_pyformance/setup.py                 |  40 -----
 .../wavefront_pyformance/__init__.py          |   1 -
 .../wavefront_pyformance/delta.py             |  54 -------
 .../wavefront_pyformance/tests/__init__.py    |   0
 .../tests/test_wavefront_pyformance.py        |  86 ----------
 .../wavefront_reporter.py                     | 153 ------------------
 15 files changed, 1 insertion(+), 708 deletions(-)
 delete mode 100644 wavefront_lambda/README.md
 delete mode 100644 wavefront_lambda/example.py
 delete mode 100644 wavefront_lambda/setup.py
 delete mode 100644 wavefront_lambda/wavefront_lambda/__init__.py
 delete mode 100644 wavefront_lambda/wavefront_lambda/tests/__init__.py
 delete mode 100644 wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py
 delete mode 100644 wavefront_pyformance/README.md
 delete mode 100644 wavefront_pyformance/example.py
 delete mode 100644 wavefront_pyformance/setup.py
 delete mode 100644 wavefront_pyformance/wavefront_pyformance/__init__.py
 delete mode 100644 wavefront_pyformance/wavefront_pyformance/delta.py
 delete mode 100644 wavefront_pyformance/wavefront_pyformance/tests/__init__.py
 delete mode 100644 wavefront_pyformance/wavefront_pyformance/tests/test_wavefront_pyformance.py
 delete mode 100644 wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py

diff --git a/setup.py b/setup.py
index a93e40e..6603b4a 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@
     url="https://github.com/wavefrontHQ/python-client",
     keywords=["Swagger", "Wavefront Public API"],
     install_requires=REQUIRES,
-    packages=find_packages(exclude=["wavefront_lambda","wavefront_pyformance","*.tests"]),
+    packages=find_packages(),
     include_package_data=True,
     long_description="""\
     &lt;p&gt;The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.&lt;/p&gt;&lt;p&gt;When you make API calls outside the Wavefront API documentation you must add the header \&quot;Authorization: Bearer &amp;lt;&amp;lt;API-TOKEN&amp;gt;&amp;gt;\&quot; to your HTTP requests.&lt;/p&gt;&lt;p&gt;For legacy versions of the Wavefront API, see the &lt;a href&#x3D;\&quot;/api-docs/ui/deprecated\&quot;&gt;legacy API documentation&lt;/a&gt;.&lt;/p&gt;  # noqa: E501
diff --git a/wavefront_lambda/README.md b/wavefront_lambda/README.md
deleted file mode 100644
index 3e81bd9..0000000
--- a/wavefront_lambda/README.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# wavefront_lambda
-
-This is a Wavefront python wrapper for AWS Lambda python function handler to send metrics directly to wavefront.
-
-## Requirements
-Python 2.7 or 3.6.
-
-## Installation
-To install from PyPi
-```
-pip install wavefront_lambda
-```
-
-## Environment variables
-WAVEFRONT_URL = https://\<INSTANCE>.wavefront.com  
-WAVEFRONT_API_TOKEN = Wavefront API token with Direct Data Ingestion permission.  
-REPORT_STANDARD_METRICS = Set to False or false to not report standard lambda metrics directly to wavefront.  
-
-## Usage
-
-Decorate your AWS Lambda handler function with @wavefront_lambda.wrapper.
-
-```Python
-import wavefront_lambda
-
-@wavefront_lambda.wrapper
-def handler(event, context):
-    # your code
-
-```
-
-## Standard Lambda Metrics reported by Wavefront Lambda wrapper
-
-The Lambda wrapper sends the following standard lambda metrics to wavefront:
-
-| Metric Name                       |  Type              | Description                                                             |
-| ----------------------------------|:------------------:| ----------------------------------------------------------------------- |
-| aws.lambda.wf.invocations.count   | Delta Counter      | Count of number of lambda function invocations aggregated at the server.|
-| aws.lambda.wf.invocation_event.count   |  Counter      | Count of number of lambda function invocations.|
-| aws.lambda.wf.errors.count        | Delta Counter      | Count of number of errors aggregated at the server.                     |
-| aws.lambda.wf.error_event.count        |  Counter      | Count of number of errors.                     |
-| aws.lambda.wf.coldstarts.count    | Delta Counter      | Count of number of cold starts aggregated at the server.                |
-| aws.lambda.wf.coldstart_event.count| Counter           | Count of number of cold starts.                                         |
-| aws.lambda.wf.duration.value      | Gauge              | Execution time of the Lambda handler function in milliseconds.          |
-
-The Lambda wrapper adds the following point tags to all metrics sent to wavefront:
-
-| Point Tag             | Description                                                                   |
-| --------------------- | ----------------------------------------------------------------------------- |
-| LambdaArn             | ARN(Amazon Resource Name) of the Lambda function.                             |
-| Region                | AWS Region of the Lambda function.                                            |
-| accountId             | AWS Account ID from which the Lambda function was invoked.                    |
-| ExecutedVersion       | The version of Lambda function.                                               |
-| FunctionName          | The name of Lambda function.                                                  |
-| Resource              | The name and version/alias of Lambda function. (Ex: DemoLambdaFunc:aliasProd) |
-| EventSourceMappings   | AWS Event source mapping Id. (Set in case of Lambda invocation by AWS Poll-Based Services)|
-
-## Custom Lambda Metrics
-
-The wavefront lambda wrapper reports custom business metrics via a metrics registry provided by the [pyformance plugin](https://github.com/wavefrontHQ/python-client/tree/master/wavefront_pyformance).  
-Please refer to the [code sample](https://github.com/wavefrontHQ/python-client/blob/master/wavefront_lambda/example.py) which shows how you can send custom business metrics to wavefront from your lambda function.
-
-Note: Having the same metric name for any two types of metrics will result in only one time series at the server and thus cause collisions.
-In general, all metric names should be different. In case you have metrics that you want to track as both a Counter and Delta Counter, consider adding a relevant suffix to one of the metrics to differentiate one metric name from another.
diff --git a/wavefront_lambda/example.py b/wavefront_lambda/example.py
deleted file mode 100644
index 825ac65..0000000
--- a/wavefront_lambda/example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import wavefront_lambda
-from wavefront_pyformance import delta
-
-
-@wavefront_lambda.wrapper
-def lambda_handler(event, context):
-    # Get registry to report metrics.
-    registry = wavefront_lambda.get_registry()
-
-    # Report Delta Counters
-    delta_counter = delta.delta_counter(registry, "deltaCounter")
-    delta_counter.inc()
-
-    # Report Counters
-    counter = registry.counter("counter")
-    counter.inc()
-
-    # Report Gauge
-    gauge_value = registry.gauge("gaugeValue")
-    gauge_value.set_value(5.5)
diff --git a/wavefront_lambda/setup.py b/wavefront_lambda/setup.py
deleted file mode 100644
index f05ce72..0000000
--- a/wavefront_lambda/setup.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront AWS Lambda Wrapper
-
-    <p>This is a Wavefront python wrapper for AWS Lambda python function handler to send metrics directly to wavefront.</p>  # noqa: E501
-"""
-
-
-from setuptools import setup, find_packages  # noqa: H301
-
-NAME = "wavefront_lambda"
-VERSION = "0.9.3"
-# To install the library, run the following
-#
-# python setup.py install
-#
-# prerequisite: setuptools
-# http://pypi.python.org/pypi/setuptools
-
-REQUIRES = ["wavefront-pyformance >= 0.9.2"]
-
-setup(
-    name=NAME,
-    version=VERSION,
-    description="Wavefront Python Wrapper for AWS Lambda",
-    author_email="",
-    url="https://github.com/wavefrontHQ/python-client/tree/master/wavefront_lambda",
-    keywords=["Wavefront Lambda", "Wavefront"],
-    install_requires=REQUIRES,
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
-    include_package_data=True,
-    long_description="""\
-    This is a Wavefront python wrapper for AWS Lambda python function handler to send metrics directly to wavefront.
-    """
-)
diff --git a/wavefront_lambda/wavefront_lambda/__init__.py b/wavefront_lambda/wavefront_lambda/__init__.py
deleted file mode 100644
index b4774fc..0000000
--- a/wavefront_lambda/wavefront_lambda/__init__.py
+++ /dev/null
@@ -1,125 +0,0 @@
-from wavefront_pyformance.wavefront_reporter import WavefrontDirectReporter
-from pyformance import MetricsRegistry
-import os
-from datetime import datetime
-from wavefront_pyformance import delta
-
-is_cold_start = True
-reg = None
-
-
-def wrapper(func):
-    """
-    Returns the Wavefront Lambda wrapper. The wrapper collects aws lambda's
-    standard metrics and reports it directly to the specified wavefront url. It
-    requires the following Environment variables to be set:
-    1.WAVEFRONT_URL : https://<INSTANCE>.wavefront.com
-    2.WAVEFRONT_API_TOKEN : Wavefront API token with Direct Data Ingestion permission
-    3.REPORT_STANDARD_METRICS : Set to False to not report standard lambda
-                                   metrics directly to wavefront.
-
-    """
-    def call_lambda_with_standard_metrics(wf_reporter, *args, **kwargs):
-        METRIC_PREFIX = "aws.lambda.wf."
-        METRIC_EVENT_SUFFIX = "_event"
-        # Register cold start counter
-        aws_cold_starts_counter = delta.delta_counter(reg, METRIC_PREFIX + "coldstarts")
-        aws_cold_start_event_counter = reg.counter(METRIC_PREFIX + "coldstart" + METRIC_EVENT_SUFFIX)
-        global is_cold_start
-        if is_cold_start:
-            # Set cold start counter.
-            aws_cold_starts_counter.inc()
-            aws_cold_start_event_counter.inc()
-            is_cold_start = False
-        # Set invocations counter
-        aws_lambda_invocations_counter = delta.delta_counter(reg, METRIC_PREFIX + "invocations")
-        aws_lambda_invocations_counter.inc()
-        aws_lambda_invocation_event_counter = reg.counter(METRIC_PREFIX + "invocation" + METRIC_EVENT_SUFFIX)
-        aws_lambda_invocation_event_counter.inc()
-        # Register duration gauge.
-        aws_lambda_duration_gauge = reg.gauge(METRIC_PREFIX + "duration")
-        # Register error counter.
-        aws_lambda_errors_counter = delta.delta_counter(reg, METRIC_PREFIX + "errors")
-        aws_lambda_error_event_counter = reg.counter(METRIC_PREFIX + "error" + METRIC_EVENT_SUFFIX)
-        time_start = datetime.now()
-        try:
-            result = func(*args, **kwargs)
-            return result
-        except:
-            # Set error counter
-            aws_lambda_errors_counter.inc()
-            aws_lambda_error_event_counter.inc()
-            raise
-        finally:
-            time_taken = datetime.now() - time_start
-            # Set duration gauge
-            aws_lambda_duration_gauge.set_value(time_taken.total_seconds() * 1000)
-            wf_reporter.report_now(registry=reg)
-
-    def call_lambda_without_standard_metrics(wf_reporter, *args, **kwargs):
-        try:
-            result = func(*args, **kwargs)
-            return result
-        except:
-            raise
-        finally:
-            wf_reporter.report_now(registry=reg)
-
-    def wavefront_wrapper(*args, **kwargs):
-        server = os.environ.get('WAVEFRONT_URL')
-        if not server:
-            raise ValueError("Environment variable WAVEFRONT_URL is not set.")
-        auth_token = os.environ.get('WAVEFRONT_API_TOKEN')
-        if not auth_token:
-            raise ValueError("Environment variable WAVEFRONT_API_TOKEN is not set.")
-        is_report_standard_metrics = True
-        if os.environ.get('REPORT_STANDARD_METRICS') in ['False', 'false']:
-            is_report_standard_metrics = False
-        # AWS lambda execution enviroment requires handler to consume two arguments
-        # 1. Event - input of json format
-        # 2. Context - The execution context object
-        context = args[1]
-        # Expected formats for Lambda ARN are:
-        # https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-lambda
-        invoked_function_arn = context.invoked_function_arn
-        split_arn = invoked_function_arn.split(':')
-        point_tags = {
-            'LambdaArn': invoked_function_arn,
-            'FunctionName' : context.function_name,
-            'ExecutedVersion': context.function_version,
-            'Region': split_arn[3],
-            'accountId': split_arn[4]
-        }
-        if split_arn[5] == 'function':
-            point_tags['Resource'] = split_arn[6]
-            if len(split_arn) == 8 :
-                point_tags['Resource'] = point_tags['Resource'] + ":" + split_arn[7]
-        elif split_arn[5] == 'event-source-mappings':
-            point_tags['EventSourceMappings'] = split_arn[6]
-
-        # Initialize registry for each lambda invocation
-        global reg
-        reg = MetricsRegistry()
-
-        # Initialize the wavefront direct reporter
-        wf_direct_reporter = WavefrontDirectReporter(server=server,
-                                                     token=auth_token,
-                                                     registry=reg,
-                                                     source=point_tags['FunctionName'],
-                                                     tags=point_tags,
-                                                     prefix="")
-
-        if is_report_standard_metrics:
-            call_lambda_with_standard_metrics(wf_direct_reporter,
-                                              *args,
-                                              **kwargs)
-        else:
-            call_lambda_without_standard_metrics(wf_direct_reporter,
-                                                 *args,
-                                                 **kwargs)
-
-    return wavefront_wrapper
-
-
-def get_registry():
-    return reg
diff --git a/wavefront_lambda/wavefront_lambda/tests/__init__.py b/wavefront_lambda/wavefront_lambda/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py b/wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py
deleted file mode 100644
index 566fbc2..0000000
--- a/wavefront_lambda/wavefront_lambda/tests/test_wavefront_lambda_wrapper.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from unittest import TestCase
-from wavefront_pyformance.wavefront_reporter import WavefrontDirectReporter
-import unittest
-from pyformance import MetricsRegistry
-from __init__ import wrapper
-
-@wrapper
-def lambda_handler(event, context):
-    return True
-
-class TestWrapper(TestCase):
-    def test_wavefront_wrapper(self):
-        #reg = MetricsRegistry()
-        function_wrapper = wrapper(lambda_handler)
-        assert(function_wrapper.__name__ == "wavefront_wrapper")
-
-if __name__ == '__main__':
-    # run 'python -m unittest discover' from toplevel to run tests
-    unittest.main()
diff --git a/wavefront_pyformance/README.md b/wavefront_pyformance/README.md
deleted file mode 100644
index 0d79ef2..0000000
--- a/wavefront_pyformance/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# wavefront_pyformance
-
-This is a plugin for [pyformance](https://github.com/omergertel/pyformance) which adds Wavefront reporters (via proxy or direct ingestion) and a simple abstraction that supports tagging at the host level. It also includes support for Wavefront delta counters.
-
-## Requirements
-Python 2.7+ and Python 3.x are supported.
-
-```
-pip install wavefront_pyformance
-```
-
-## Usage
-
-### Wavefront Reporter
-
-The Wavefront Reporters support tagging at the host level. Tags passed to a reporter will be applied to every metric before being sent to Wavefront.
-
-You can create a `WavefrontProxyReporter` or `WavefrontDirectReporter`:
-
-```Python
-from pyformance import MetricsRegistry
-from wavefront_pyformance.wavefront_reporter import WavefrontProxyReporter, WavefrontDirectReporter
-
-reg = MetricsRegistry()
-
-# report metrics to a Wavefront proxy every 10s
-wf_proxy_reporter = WavefrontProxyReporter(host=host, port=2878, registry=reg,
-                                           source="wavefront-pyformance-example",
-                                           tags={"key1":"val1", "key2":"val2"},
-                                           prefix="python.proxy.",
-                                           reporting_interval=10)
-wf_proxy_reporter.start()
-
-# report metrics directly to a Wavefront server every 10s
-wf_direct_reporter = WavefrontDirectReporter(server=server, token=token, registry=reg,
-                                             source="wavefront-pyformance-exmaple",
-                                             tags={"key1":"val1", "key2": "val2"},
-                                             prefix="python.direct.",
-                                             reporting_interval=10)
-wf_direct_reporter.start()
-```
-
-### Delta Counter
-
-To create a Wavefront delta counter:
-
-```Python
-from pyformance import MetricsRegistry
-from wavefront_pyformance import delta
-
-reg = MetricsRegistry()
-d1 = delta.delta_counter(reg, "requests_delta")
-d1.inc(10)
-```
-
-Note: Having the same metric name for any two types of metrics will result in only one time series at the server and thus cause collisions.
-In general, all metric names should be different. In case you have metrics that you want to track as both a Counter and Delta Counter, consider adding a relevant suffix to one of the metrics to differentiate one metric name from another.
diff --git a/wavefront_pyformance/example.py b/wavefront_pyformance/example.py
deleted file mode 100644
index cf8737b..0000000
--- a/wavefront_pyformance/example.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from pyformance import MetricsRegistry
-from wavefront_pyformance.wavefront_reporter import WavefrontReporter, WavefrontProxyReporter, WavefrontDirectReporter
-from wavefront_pyformance import delta
-import time
-import sys
-
-
-def report_metrics(host, server, token):
-    reg = MetricsRegistry()
-
-    wf_proxy_reporter = WavefrontProxyReporter(host=host, port=2878, registry=reg, source="wavefront-pyformance-example", tags={"key1":"val1", "key2":"val2"}, prefix="python.proxy.")
-    wf_direct_reporter = WavefrontDirectReporter(server=server, token=token, registry=reg, source="wavefront-pyformance-exmaple", tags={"key1":"val1", "key2": "val2"}, prefix="python.direct.")
-
-    # counter
-    c1 = reg.counter("foo_count")
-    c1.inc()
-
-    # delta counter
-    d1 = delta.delta_counter(reg, "foo_delta_count")
-    d1.inc()
-    d1.inc()
-
-    # gauge
-    g1 = reg.gauge("foo_gauge")
-    g1.set_value(2)
-
-    # meter
-    m1 = reg.meter("foo_meter")
-    m1.mark()
-
-    # timer
-    t1 = reg.timer("foo_timer")
-    timer_ctx = t1.time()
-    time.sleep(3)
-    timer_ctx.stop()
-
-    # histogram
-    h1 = reg.histogram("foo_histogram")
-    h1.add(1.0)
-    h1.add(1.5)
-
-    wf_proxy_reporter.report_now()
-    wf_proxy_reporter.stop()
-    wf_direct_reporter.report_now()
-
-
-if __name__ == "__main__":
-    # python example.py proxy_host server_url server_token
-    host = sys.argv[1]
-    server = sys.argv[2]
-    token = sys.argv[3]
-    report_metrics(host, server, token)
diff --git a/wavefront_pyformance/setup.py b/wavefront_pyformance/setup.py
deleted file mode 100644
index 0af8103..0000000
--- a/wavefront_pyformance/setup.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront Pyformance Library
-
-    <p>The Wavefront Pyformance library provides Wavefront reporters (via proxy and direct ingestion) and a simple abstraction for tagging at the host level. It also includes support for Wavefront delta counters.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from setuptools import setup, find_packages  # noqa: H301
-
-NAME = "wavefront_pyformance"
-VERSION = "0.9.2"
-# To install the library, run the following
-#
-# python setup.py install
-#
-# prerequisite: setuptools
-# http://pypi.python.org/pypi/setuptools
-
-REQUIRES = ["pyformance >= 0.4", "requests >= 2.18.4"]
-
-setup(
-    name=NAME,
-    version=VERSION,
-    description="Wavefront Pyformance Library",
-    author_email="",
-    url="https://github.com/wavefrontHQ/python-client/tree/master/wavefront_pyformance",
-    keywords=["Wavefront Pyformance", "Wavefront"],
-    install_requires=REQUIRES,
-    packages=find_packages(),
-    include_package_data=True,
-    long_description="""\
-    The Wavefront Pyformance library provides Wavefront reporters (via proxy and direct ingestion) and a simple abstraction for tagging at the host level. It also includes support for Wavefront delta counters.
-    """
-)
diff --git a/wavefront_pyformance/wavefront_pyformance/__init__.py b/wavefront_pyformance/wavefront_pyformance/__init__.py
deleted file mode 100644
index 1f04780..0000000
--- a/wavefront_pyformance/wavefront_pyformance/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = '0.9.2'
diff --git a/wavefront_pyformance/wavefront_pyformance/delta.py b/wavefront_pyformance/wavefront_pyformance/delta.py
deleted file mode 100644
index 4187227..0000000
--- a/wavefront_pyformance/wavefront_pyformance/delta.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-from pyformance.meters import Counter
-
-
-def delta_counter(registry, name):
-    """
-    Registers a DeltaCounter with the given registry and returns the instance.
-
-    The given name is prefixed with DeltaCounter.DELTA_PREFIX for registering.
-
-    :param registry: the metrics registry to register with
-    :param name: the delta counter name
-    :return: the registered DeltaCounter instance
-    """
-    if not name:
-        raise ValueError("invalid counter name")
-
-    name = name if _has_delta_prefix(name) else DeltaCounter.DELTA_PREFIX + name
-    try:
-        ret_counter = DeltaCounter()
-        registry.add(name, ret_counter)
-        return ret_counter
-    except LookupError:
-        return registry.counter(name)
-
-
-def is_delta_counter(name, registry):
-    counter = registry.counter(name)
-    return counter and isinstance(counter, DeltaCounter)
-
-
-def get_delta_name(prefix, name, value_key):
-    """
-    returns the name of the delta metric name of the form: ∆prefix.name.value_key
-    """
-    return "%s%s.%s" % (DeltaCounter.DELTA_PREFIX + prefix, name[1:], value_key)
-
-
-def _has_delta_prefix(name):
-    return name and name.startswith(DeltaCounter.DELTA_PREFIX) or name.startswith(DeltaCounter.ALT_DELTA_PREFIX)
-
-
-class DeltaCounter(Counter):
-    """
-    A counter for Wavefront delta metrics.
-
-    Differs from a counter in that it is reset in the WavefrontReporter every time the value is reported.
-    """
-
-    DELTA_PREFIX = u"\u2206"
-    ALT_DELTA_PREFIX = u"\u0394"
-
-    def __init__(self):
-        super(DeltaCounter, self).__init__()
diff --git a/wavefront_pyformance/wavefront_pyformance/tests/__init__.py b/wavefront_pyformance/wavefront_pyformance/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/wavefront_pyformance/wavefront_pyformance/tests/test_wavefront_pyformance.py b/wavefront_pyformance/wavefront_pyformance/tests/test_wavefront_pyformance.py
deleted file mode 100644
index b250a6e..0000000
--- a/wavefront_pyformance/wavefront_pyformance/tests/test_wavefront_pyformance.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from unittest import TestCase
-import unittest
-from pyformance import MetricsRegistry
-import delta
-from wavefront_reporter import WavefrontReporter, WavefrontProxyReporter, WavefrontDirectReporter
-import time
-
-
-def get_base_reporter(registry=None):
-    return WavefrontReporter(registry=registry, source="python-test", tags={"key1":"val1"}, prefix="python.test.")
-
-def get_direct_reporter(registry=None):
-    return WavefrontDirectReporter(server="https://foo.wavefront.com", token="token",
-                                   registry=registry, source="python-test", prefix="python.direct.", tags={"key1":"val1"})
-
-
-class TestReporter(TestCase):
-    def test_collect_metrics(self):
-        # should return a list of point lines
-        reg = MetricsRegistry()
-        reg.counter("foo_counter_1")
-        reg.counter("foo_counter_2")
-
-        wf_reporter = get_base_reporter(reg)
-        lines = wf_reporter._collect_metrics(reg)
-        assert(len(lines) == 2) # equals no. of registered counters
-
-        delta.delta_counter(reg, "foo_delta_1")
-        delta.delta_counter(reg, "foo_delta_2")
-        lines = wf_reporter._collect_metrics(reg)
-        assert(len(lines) == 4) # added two more counters
-
-    def test_delta_reset(self):
-        reg = MetricsRegistry()
-        counter = delta.delta_counter(reg, "foo_delta_1")
-        counter.inc(10)
-        wf_reporter = get_base_reporter(reg)
-        wf_reporter._collect_metrics(reg)
-        assert(counter.get_count() == 0) # delta decremented by count
-
-    def test_get_metric_line(self):
-        wf_reporter = get_base_reporter()
-        out = wf_reporter._get_metric_line("foo", 10, timestamp=None)
-        assert(out == 'foo 10 source=\"python-test\" \"key1\"=\"val1\"') # w/o timestamp
-
-        out = wf_reporter._get_metric_line("foo", 10, timestamp=123456)
-        assert(out == 'foo 10 123456 source=\"python-test\" \"key1\"=\"val1\"') # with timestamp
-
-    def test_chunking(self):
-        l = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        wf_reporter = get_direct_reporter()
-        chunks = wf_reporter._get_chunks(l, 2)
-        for chunk in chunks:
-            assert(len(chunk) == 2)
-        chunks = wf_reporter._get_chunks(l, 100)
-        for chunk in chunks:
-            assert(len(chunk) == 10)
-
-
-class TestDelta(TestCase):
-    def test_delta_counter(self):
-        reg = MetricsRegistry()
-        counter = delta.delta_counter(reg, "foo")
-        assert(isinstance(counter, delta.DeltaCounter))
-
-        # test duplicate (should return previously registered counter)
-        duplicate_counter = delta.delta_counter(reg, "foo")
-        assert(counter == duplicate_counter)
-        assert(delta.is_delta_counter(delta.DeltaCounter.DELTA_PREFIX + "foo", reg))
-
-        different_counter = delta.delta_counter(reg, "foobar")
-        assert(counter != different_counter)
-
-    def test_has_delta_prefix(self):
-        assert(delta._has_delta_prefix(delta.DeltaCounter.DELTA_PREFIX + "foo")) # valid prefix
-        assert(delta._has_delta_prefix(delta.DeltaCounter.ALT_DELTA_PREFIX + "foo")) # valid prefix
-        assert(delta._has_delta_prefix("foo") is False) # invalid prefix
-
-    def test_get_delta_name(self):
-        d = delta.get_delta_name('delta.prefix', delta.DeltaCounter.DELTA_PREFIX + 'foo', 'count')
-        assert(d.startswith(delta.DeltaCounter.DELTA_PREFIX))
-
-
-if __name__ == '__main__':
-    # run 'python -m unittest discover' from toplevel to run tests
-    unittest.main()
\ No newline at end of file
diff --git a/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py b/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
deleted file mode 100644
index 844a6ee..0000000
--- a/wavefront_pyformance/wavefront_pyformance/wavefront_reporter.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
-import sys
-import socket
-import requests
-from pyformance.reporters.reporter import Reporter
-from . import delta
-
-if sys.version_info[0] > 2:
-    from urllib.parse import urlparse
-else:
-    from urlparse import urlparse
-
-
-class WavefrontReporter(Reporter):
-    """
-    Base reporter for reporting data in Wavefront format.
-    """
-
-    def __init__(self, source="wavefront-pyformance", registry=None, reporting_interval=10, clock=None, prefix="", tags={}):
-        super(WavefrontReporter, self).__init__(registry=registry,
-                                                reporting_interval=reporting_interval,
-                                                clock=clock)
-        self.source = source
-        self.prefix = prefix
-        tags = tags or {}
-        self.tagStr = ' '.join(['\"%s\"=\"%s\"' % (k,v) for (k,v) in tags.items()])
-
-    def report_now(self, registry=None, timestamp=None):
-        raise NotImplementedError('use WavefrontProxyReporter or WavefrontDirectReporter')
-
-    def _collect_metrics(self, registry, timestamp=None):
-        metrics = registry.dump_metrics()
-        metrics_data = []
-        for key in metrics.keys():
-            is_delta = delta.is_delta_counter(key, registry)
-            for value_key in metrics[key].keys():
-                if is_delta:
-                    registry.counter(key).dec(metrics[key][value_key]) # decrement delta counter
-                metric_name = self._get_metric_name(self.prefix, key, value_key, is_delta=is_delta)
-                metric_line = self._get_metric_line(metric_name, metrics[key][value_key], timestamp)
-                metrics_data.append(metric_line)
-        return metrics_data
-
-    def _get_metric_line(self, name, value, timestamp):
-        if timestamp:
-            return "%s %s %s source=\"%s\" %s" % (name, value, timestamp, self.source, self.tagStr)
-        else:
-            return "%s %s source=\"%s\" %s" % (name, value, self.source, self.tagStr)
-
-    def _get_metric_name(self, prefix, name, value_key, is_delta=False):
-        return delta.get_delta_name(prefix, name, value_key) if is_delta else "%s%s.%s" % (prefix, name, value_key)
-
-
-class WavefrontProxyReporter(WavefrontReporter):
-    """
-    This reporter requires a host and port to report data to a Wavefront proxy.
-    """
-
-    def __init__(self, host, port=2878, source="wavefront-pyformance", registry=None, reporting_interval=10, clock=None,
-                 prefix="proxy.", tags={}):
-        super(WavefrontProxyReporter, self).__init__(source=source,
-                                                     registry=registry,
-                                                     reporting_interval=reporting_interval,
-                                                     clock=clock,
-                                                     prefix=prefix,
-                                                     tags=tags)
-        self.host = host
-        self.port = port
-        self.socket_factory = socket.socket
-        self.proxy_socket = None
-
-    def report_now(self, registry=None, timestamp=None):
-        timestamp = timestamp or int(round(self.clock.time()))
-        metrics = self._collect_metrics(registry or self.registry, timestamp)
-        if metrics:
-            self._report_points(metrics)
-
-    def stop(self):
-        super(WavefrontProxyReporter, self).stop()
-        if self.proxy_socket:
-            self.proxy_socket.close()
-
-    def _report_points(self, metrics, reconnect=True):
-        try:
-            if not self.proxy_socket:
-                self._connect()
-            for line in metrics:
-                self.proxy_socket.send(line.encode('utf-8') + "\n")
-        except socket.error as e:
-            if reconnect:
-                self.proxy_socket = None
-                self._report_points(metrics, reconnect=False)
-            else:
-                print("error reporting to wavefront proxy:", e, file=sys.stderr)
-        except Exception as e:
-            print("error reporting to wavefront proxy:", e, file=sys.stderr)
-
-    def _connect(self):
-        self.proxy_socket = self.socket_factory(socket.AF_INET, socket.SOCK_STREAM)
-        self.proxy_socket.connect((self.host, self.port))
-
-
-class WavefrontDirectReporter(WavefrontReporter):
-    """
-    This reporter requires a server and a token to report data directly to a Wavefront server.
-    """
-
-    def __init__(self, server, token, source="wavefront-pyformance", registry=None, reporting_interval=10, clock=None,
-                 prefix="direct.", tags={}):
-        super(WavefrontDirectReporter, self).__init__(source=source,
-                                                      registry=registry,
-                                                      reporting_interval=reporting_interval,
-                                                      clock=clock,
-                                                      prefix=prefix,
-                                                      tags=tags)
-        self.server = self._validate_url(server)
-        self.token = token
-        self.batch_size = 10000
-        self.headers = {'Content-Type': 'text/plain',
-                             'Authorization': 'Bearer ' + token}
-        self.params = {'f': 'graphite_v2'}
-
-    def _validate_url(self, server):
-        parsed_url = urlparse(server)
-        if not all([parsed_url.scheme, parsed_url.netloc]):
-            raise ValueError("invalid server url")
-        return server
-
-    def report_now(self, registry=None, timestamp=None):
-        metrics = self._collect_metrics(registry or self.registry)
-        if metrics:
-            # limit to batch_size per api call
-            chunks = self._get_chunks(metrics, self.batch_size)
-            for chunk in chunks:
-                metrics_str = u'\n'.join(chunk).encode('utf-8')
-                self._report_points(metrics_str)
-
-    def _get_chunks(self, metrics, chunk_size):
-        """
-        returns a lazy list generator
-        """
-        for i in range(0, len(metrics), chunk_size):
-            yield metrics[i:i+chunk_size]
-
-    def _report_points(self, points):
-        try:
-            r = requests.post(self.server+'/report', params=self.params, headers=self.headers, data=points)
-            r.raise_for_status()
-        except Exception as e:
-            print(e, file=sys.stderr)
-
-

From ca1618e2eecb5ecaa5735437361b4306b2c8a78a Mon Sep 17 00:00:00 2001
From: Vasily V <vasily@wavefront.com>
Date: Tue, 28 Aug 2018 13:06:17 -0500
Subject: [PATCH 016/161] Update author/email (pypi requirement) (#45)

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6603b4a..372346e 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,8 @@
     name=NAME,
     version=VERSION,
     description="Wavefront Public API",
-    author_email="",
+    author="Wavefront",
+    author_email="support@wavefront.com",
     url="https://github.com/wavefrontHQ/python-client",
     keywords=["Swagger", "Wavefront Public API"],
     install_requires=REQUIRES,

From c8c9d29f6a35bb2f39cc45224daa75e0cc13aee6 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Wed, 14 Nov 2018 17:02:38 -0800
Subject: [PATCH 017/161] Update Minimum Versions for Required Packages.

Set "certifi>=2017.4.17" to keep it aligned with popular 'requests' package.
Set "python-dateutil>=2.1" to make it not conflict with 'botocore' package.
---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 372346e..6799878 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,10 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
+REQUIRES = ["certifi>=2017.4.17",
+            "python-dateutil>=2.1",
+            "six>=1.10",
+            "urllib3>=1.15"]
 
 setup(
     name=NAME,

From eff3c34e0b78ce622229ffe74836a6dc9824f49d Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Wed, 14 Nov 2018 17:06:54 -0800
Subject: [PATCH 018/161] Bump 'urllib3' Minimum Version As Well.

Align it with 'requests' lib requirement.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6799878..6a3a7a1 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 REQUIRES = ["certifi>=2017.4.17",
             "python-dateutil>=2.1",
             "six>=1.10",
-            "urllib3>=1.15"]
+            "urllib3>=1.21.1"]
 
 setup(
     name=NAME,

From 6f5ea2e15864cb7c3dc1ce65daf1e48eb9061aa0 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Thu, 14 Mar 2019 17:18:10 -0700
Subject: [PATCH 019/161] Generated Python Client Update v.2.9.37

Command:
```
java -jar ~/Applications/swagger-codegen-cli.jar generate -l python -i https://mon.wavefront.com/api/v2/swagger.json -c .swagger-codegen/config.json --additional-properties basePath=https://YOUR_INSTANCE.wavefront.com,infoEmail=support@wavefront.com
```

Config:
```
{
    "gitRepoId": "python-client",
    "gitUserId": "wavefrontHQ",
    "packageName": "wavefront_api_client",
    "packageUrl": "https://github.com/wavefrontHQ/python-client",
    "packageVersion": "2.9.37"
}
```
---
 .gitignore                                    |    5 -
 .swagger-codegen-ignore                       |    2 +
 .swagger-codegen/VERSION                      |    2 +-
 .swagger-codegen/config.json                  |    7 +
 .travis.yml                                   |   25 +
 README.md                                     |   91 +-
 docs/ACL.md                                   |   12 +
 docs/AccessControlElement.md                  |   11 +
 docs/AccessControlListSimple.md               |   11 +
 docs/Alert.md                                 |   49 +-
 docs/AlertApi.md                              |  116 +-
 docs/AzureBaseCredentials.md                  |    2 +-
 docs/AzureConfiguration.md                    |    2 +-
 docs/BusinessActionGroupBasicDTO.md           |   13 +
 docs/Chart.md                                 |    8 +-
 docs/ChartSettings.md                         |   10 +-
 docs/ChartSourceQuery.md                      |    4 +-
 docs/CloudIntegration.md                      |    3 +-
 docs/CloudIntegrationApi.md                   |    2 +-
 docs/CloudTrailConfiguration.md               |    4 +-
 docs/CloudWatchConfiguration.md               |    4 +-
 docs/CustomerFacingUserObject.md              |    5 +-
 docs/CustomerPreferences.md                   |   25 +
 docs/CustomerPreferencesUpdating.md           |   16 +
 docs/Dashboard.md                             |    7 +-
 docs/DashboardApi.md                          |  329 ++++-
 docs/DashboardParameterValue.md               |    4 +-
 docs/DerivedMetricApi.md                      |    6 +-
 docs/DerivedMetricDefinition.md               |   14 +-
 docs/DirectIngestionApi.md                    |   64 +
 docs/EC2Configuration.md                      |    2 +-
 docs/Event.md                                 |   10 +-
 docs/EventApi.md                              |    2 +-
 docs/ExternalLink.md                          |    6 +-
 docs/ExternalLinkApi.md                       |    2 +-
 docs/GCPBillingConfiguration.md               |    4 +-
 docs/GCPConfiguration.md                      |    4 +-
 docs/InstallAlerts.md                         |   10 +
 docs/Integration.md                           |    9 +-
 docs/IntegrationAlert.md                      |   13 +
 docs/IntegrationAlias.md                      |    2 +-
 docs/IntegrationApi.md                        |  228 +++-
 docs/IntegrationDashboard.md                  |    2 +-
 docs/IntegrationMetrics.md                    |    6 +-
 docs/IntegrationStatus.md                     |    3 +-
 docs/MaintenanceWindow.md                     |    4 +-
 docs/MaintenanceWindowApi.md                  |    2 +-
 docs/Message.md                               |    6 +-
 docs/MessageApi.md                            |    2 +-
 docs/MetricApi.md                             |    2 +-
 docs/NewRelicConfiguration.md                 |   13 +
 docs/NewRelicMetricFilters.md                 |   11 +
 docs/Notificant.md                            |    6 +-
 docs/NotificantApi.md                         |    2 +-
 docs/PagedUserGroup.md                        |   16 +
 docs/Proxy.md                                 |    2 +-
 docs/ProxyApi.md                              |    2 +-
 docs/QueryApi.md                              |    8 +-
 docs/QueryResult.md                           |    4 +-
 docs/ResponseContainerListACL.md              |   11 +
 docs/ResponseContainerListIntegration.md      |   11 +
 docs/ResponseContainerListString.md           |   11 +
 docs/ResponseContainerListUserGroup.md        |   11 +
 docs/ResponseContainerPagedUserGroup.md       |   11 +
 docs/ResponseContainerUserGroup.md            |   11 +
 docs/SavedSearchApi.md                        |    2 +-
 docs/SearchApi.md                             |  169 ++-
 docs/SettingsApi.md                           |  220 ++++
 docs/Source.md                                |    2 +-
 docs/SourceApi.md                             |    2 +-
 docs/SourceLabelPair.md                       |    1 +
 docs/User.md                                  |   26 +
 docs/UserApi.md                               |  401 +++++-
 docs/UserGroup.md                             |   16 +
 docs/UserGroupApi.md                          |  515 ++++++++
 docs/UserGroupPropertiesDTO.md                |   12 +
 docs/UserGroupWrite.md                        |   14 +
 docs/UserModel.md                             |    3 +
 docs/UserRequestDTO.md                        |   14 +
 docs/UserSettings.md                          |   18 +
 docs/UserToCreate.md                          |    5 +-
 docs/WebhookApi.md                            |    2 +-
 setup.py                                      |   25 +-
 test-requirements.txt                         |    5 +
 test/__init__.py                              |    0
 test/test_access_control_element.py           |   40 +
 test/test_access_control_list_simple.py       |   40 +
 test/test_acl.py                              |   40 +
 test/test_alert.py                            |   40 +
 test/test_alert_api.py                        |  153 +++
 test/test_avro_backed_standardized_dto.py     |   40 +
 test/test_aws_base_credentials.py             |   40 +
 test/test_azure_activity_log_configuration.py |   40 +
 test/test_azure_base_credentials.py           |   40 +
 test/test_azure_configuration.py              |   40 +
 test/test_business_action_group_basic_dto.py  |   40 +
 test/test_chart.py                            |   40 +
 test/test_chart_settings.py                   |   40 +
 test/test_chart_source_query.py               |   40 +
 test/test_cloud_integration.py                |   40 +
 test/test_cloud_integration_api.py            |   90 ++
 test/test_cloud_trail_configuration.py        |   40 +
 test/test_cloud_watch_configuration.py        |   40 +
 test/test_customer_facing_user_object.py      |   40 +
 test/test_customer_preferences.py             |   40 +
 test/test_customer_preferences_updating.py    |   40 +
 test/test_dashboard.py                        |   40 +
 test/test_dashboard_api.py                    |  160 +++
 test/test_dashboard_parameter_value.py        |   40 +
 test/test_dashboard_section.py                |   40 +
 test/test_dashboard_section_row.py            |   40 +
 test/test_derived_metric_api.py               |  118 ++
 test/test_derived_metric_definition.py        |   40 +
 test/test_direct_ingestion_api.py             |   41 +
 test/test_ec2_configuration.py                |   40 +
 test/test_event.py                            |   40 +
 test/test_event_api.py                        |  104 ++
 test/test_event_search_request.py             |   40 +
 test/test_event_time_range.py                 |   40 +
 test/test_external_link.py                    |   40 +
 test/test_external_link_api.py                |   69 +
 test/test_facet_response.py                   |   40 +
 test/test_facet_search_request_container.py   |   40 +
 test/test_facets_response_container.py        |   40 +
 test/test_facets_search_request_container.py  |   40 +
 test/test_gcp_billing_configuration.py        |   40 +
 test/test_gcp_configuration.py                |   40 +
 test/test_history_entry.py                    |   40 +
 test/test_history_response.py                 |   40 +
 test/test_install_alerts.py                   |   40 +
 test/test_integration.py                      |   40 +
 test/test_integration_alert.py                |   40 +
 test/test_integration_alias.py                |   40 +
 test/test_integration_api.py                  |  111 ++
 test/test_integration_dashboard.py            |   40 +
 test/test_integration_manifest_group.py       |   40 +
 test/test_integration_metrics.py              |   40 +
 test/test_integration_status.py               |   40 +
 test/test_iterator_entry_string_json_node.py  |   40 +
 test/test_iterator_json_node.py               |   40 +
 test/test_iterator_string.py                  |   40 +
 test/test_json_node.py                        |   40 +
 test/test_logical_type.py                     |   40 +
 test/test_maintenance_window.py               |   40 +
 test/test_maintenance_window_api.py           |   69 +
 test/test_message.py                          |   40 +
 test/test_message_api.py                      |   48 +
 test/test_metric_api.py                       |   41 +
 test/test_metric_details.py                   |   40 +
 test/test_metric_details_response.py          |   40 +
 test/test_metric_status.py                    |   40 +
 test/test_new_relic_configuration.py          |   40 +
 test/test_new_relic_metric_filters.py         |   40 +
 test/test_notificant.py                       |   40 +
 test/test_notificant_api.py                   |   76 ++
 test/test_number.py                           |   40 +
 test/test_paged_alert.py                      |   40 +
 test/test_paged_alert_with_stats.py           |   40 +
 test/test_paged_cloud_integration.py          |   40 +
 .../test_paged_customer_facing_user_object.py |   40 +
 test/test_paged_dashboard.py                  |   40 +
 test/test_paged_derived_metric_definition.py  |   40 +
 ...ed_derived_metric_definition_with_stats.py |   40 +
 test/test_paged_event.py                      |   40 +
 test/test_paged_external_link.py              |   40 +
 test/test_paged_integration.py                |   40 +
 test/test_paged_maintenance_window.py         |   40 +
 test/test_paged_message.py                    |   40 +
 test/test_paged_notificant.py                 |   40 +
 test/test_paged_proxy.py                      |   40 +
 test/test_paged_saved_search.py               |   40 +
 test/test_paged_source.py                     |   40 +
 test/test_paged_user_group.py                 |   40 +
 test/test_point.py                            |   40 +
 test/test_proxy.py                            |   40 +
 test/test_proxy_api.py                        |   69 +
 test/test_query_api.py                        |   48 +
 test/test_query_event.py                      |   40 +
 test/test_query_result.py                     |   40 +
 test/test_raw_timeseries.py                   |   40 +
 test/test_response_container.py               |   40 +
 test/test_response_container_alert.py         |   40 +
 ...st_response_container_cloud_integration.py |   40 +
 test/test_response_container_dashboard.py     |   40 +
 ...nse_container_derived_metric_definition.py |   40 +
 test/test_response_container_event.py         |   40 +
 test/test_response_container_external_link.py |   40 +
 .../test_response_container_facet_response.py |   40 +
 ...nse_container_facets_response_container.py |   40 +
 ...est_response_container_history_response.py |   40 +
 test/test_response_container_integration.py   |   40 +
 ...t_response_container_integration_status.py |   40 +
 test/test_response_container_list_acl.py      |   40 +
 ...est_response_container_list_integration.py |   40 +
 ...ntainer_list_integration_manifest_group.py |   40 +
 test/test_response_container_list_string.py   |   40 +
 ...test_response_container_list_user_group.py |   40 +
 ...t_response_container_maintenance_window.py |   40 +
 ...t_response_container_map_string_integer.py |   40 +
 ...container_map_string_integration_status.py |   40 +
 test/test_response_container_message.py       |   40 +
 test/test_response_container_notificant.py    |   40 +
 test/test_response_container_paged_alert.py   |   40 +
 ...sponse_container_paged_alert_with_stats.py |   40 +
 ...ponse_container_paged_cloud_integration.py |   40 +
 ...ainer_paged_customer_facing_user_object.py |   40 +
 ...test_response_container_paged_dashboard.py |   40 +
 ...ntainer_paged_derived_metric_definition.py |   40 +
 ...ed_derived_metric_definition_with_stats.py |   40 +
 test/test_response_container_paged_event.py   |   40 +
 ..._response_container_paged_external_link.py |   40 +
 ...st_response_container_paged_integration.py |   40 +
 ...onse_container_paged_maintenance_window.py |   40 +
 test/test_response_container_paged_message.py |   40 +
 ...est_response_container_paged_notificant.py |   40 +
 test/test_response_container_paged_proxy.py   |   40 +
 ...t_response_container_paged_saved_search.py |   40 +
 test/test_response_container_paged_source.py  |   40 +
 ...est_response_container_paged_user_group.py |   40 +
 test/test_response_container_proxy.py         |   40 +
 test/test_response_container_saved_search.py  |   40 +
 test/test_response_container_source.py        |   40 +
 test/test_response_container_tags_response.py |   40 +
 test/test_response_container_user_group.py    |   40 +
 test/test_response_status.py                  |   40 +
 test/test_saved_search.py                     |   40 +
 test/test_saved_search_api.py                 |   76 ++
 test/test_search_api.py                       |  412 ++++++
 test/test_search_query.py                     |   40 +
 test/test_settings_api.py                     |   62 +
 test/test_sortable_search_request.py          |   40 +
 test/test_sorting.py                          |   40 +
 test/test_source.py                           |   40 +
 test/test_source_api.py                       |  111 ++
 test/test_source_label_pair.py                |   40 +
 test/test_source_search_request_container.py  |   40 +
 test/test_stats_model.py                      |   40 +
 test/test_tags_response.py                    |   40 +
 test/test_target_info.py                      |   40 +
 test/test_tesla_configuration.py              |   40 +
 test/test_timeseries.py                       |   40 +
 test/test_user.py                             |   40 +
 test/test_user_api.py                         |  125 ++
 test/test_user_group.py                       |   40 +
 test/test_user_group_api.py                   |   97 ++
 test/test_user_group_properties_dto.py        |   40 +
 test/test_user_group_write.py                 |   40 +
 test/test_user_model.py                       |   40 +
 test/test_user_request_dto.py                 |   40 +
 test/test_user_settings.py                    |   40 +
 test/test_user_to_create.py                   |   40 +
 test/test_webhook_api.py                      |   69 +
 test/test_wf_tags.py                          |   40 +
 tox.ini                                       |   10 +
 wavefront_api_client/__init__.py              |   32 +-
 wavefront_api_client/api/__init__.py          |    3 +
 wavefront_api_client/api/alert_api.py         |  200 ++-
 .../api/cloud_integration_api.py              |    6 +-
 wavefront_api_client/api/dashboard_api.py     |  573 +++++++-
 .../api/derived_metric_api.py                 |   10 +-
 .../api/direct_ingestion_api.py               |  129 ++
 wavefront_api_client/api/event_api.py         |    6 +-
 wavefront_api_client/api/external_link_api.py |    6 +-
 wavefront_api_client/api/integration_api.py   |  384 +++++-
 .../api/maintenance_window_api.py             |    6 +-
 wavefront_api_client/api/message_api.py       |    6 +-
 wavefront_api_client/api/metric_api.py        |    6 +-
 wavefront_api_client/api/notificant_api.py    |    6 +-
 wavefront_api_client/api/proxy_api.py         |    6 +-
 wavefront_api_client/api/query_api.py         |   12 +-
 wavefront_api_client/api/saved_search_api.py  |    6 +-
 wavefront_api_client/api/search_api.py        |  503 +++++--
 wavefront_api_client/api/settings_api.py      |  394 ++++++
 wavefront_api_client/api/source_api.py        |    6 +-
 wavefront_api_client/api/user_api.py          |  789 ++++++++++-
 wavefront_api_client/api/user_group_api.py    |  929 +++++++++++++
 wavefront_api_client/api/webhook_api.py       |    6 +-
 wavefront_api_client/api_client.py            |   31 +-
 wavefront_api_client/configuration.py         |   35 +-
 wavefront_api_client/models/__init__.py       |   29 +-
 .../models/access_control_element.py          |  141 ++
 .../models/access_control_list_simple.py      |  141 ++
 wavefront_api_client/models/acl.py            |  178 +++
 wavefront_api_client/models/alert.py          | 1152 ++++++++++-------
 .../models/avro_backed_standardized_dto.py    |    9 +-
 .../models/aws_base_credentials.py            |    9 +-
 .../azure_activity_log_configuration.py       |    9 +-
 .../models/azure_base_credentials.py          |   73 +-
 .../models/azure_configuration.py             |   63 +-
 .../models/business_action_group_basic_dto.py |  193 +++
 wavefront_api_client/models/chart.py          |  205 +--
 wavefront_api_client/models/chart_settings.py |  293 ++---
 .../models/chart_source_query.py              |  127 +-
 .../models/cloud_integration.py               |   94 +-
 .../models/cloud_trail_configuration.py       |  103 +-
 .../models/cloud_watch_configuration.py       |  127 +-
 .../models/customer_facing_user_object.py     |  137 +-
 .../models/customer_preferences.py            |  532 ++++++++
 .../models/customer_preferences_updating.py   |  289 +++++
 wavefront_api_client/models/dashboard.py      |  206 ++-
 .../models/dashboard_parameter_value.py       |  111 +-
 .../models/dashboard_section.py               |    9 +-
 .../models/dashboard_section_row.py           |    9 +-
 .../models/derived_metric_definition.py       |  337 ++---
 .../models/ec2_configuration.py               |   67 +-
 wavefront_api_client/models/event.py          |  275 ++--
 .../models/event_search_request.py            |    9 +-
 .../models/event_time_range.py                |    9 +-
 wavefront_api_client/models/external_link.py  |  177 +--
 wavefront_api_client/models/facet_response.py |    9 +-
 .../models/facet_search_request_container.py  |    9 +-
 .../models/facets_response_container.py       |    9 +-
 .../models/facets_search_request_container.py |    9 +-
 .../models/gcp_billing_configuration.py       |   79 +-
 .../models/gcp_configuration.py               |  119 +-
 wavefront_api_client/models/history_entry.py  |    9 +-
 .../models/history_response.py                |    9 +-
 wavefront_api_client/models/install_alerts.py |  115 ++
 wavefront_api_client/models/integration.py    |  240 ++--
 .../models/integration_alert.py               |  204 +++
 .../models/integration_alias.py               |   67 +-
 .../models/integration_dashboard.py           |   69 +-
 .../models/integration_manifest_group.py      |    9 +-
 .../models/integration_metrics.py             |  145 ++-
 .../models/integration_status.py              |   55 +-
 .../models/iterator_entry_string_json_node.py |    9 +-
 .../models/iterator_json_node.py              |    9 +-
 .../models/iterator_string.py                 |    9 +-
 wavefront_api_client/models/json_node.py      |    9 +-
 wavefront_api_client/models/logical_type.py   |    9 +-
 .../models/maintenance_window.py              |  129 +-
 wavefront_api_client/models/message.py        |  185 +--
 wavefront_api_client/models/metric_details.py |    9 +-
 .../models/metric_details_response.py         |    9 +-
 wavefront_api_client/models/metric_status.py  |    9 +-
 .../models/new_relic_configuration.py         |  204 +++
 .../models/new_relic_metric_filters.py        |  141 ++
 wavefront_api_client/models/notificant.py     |  189 +--
 wavefront_api_client/models/number.py         |    9 +-
 wavefront_api_client/models/paged_alert.py    |    9 +-
 .../models/paged_alert_with_stats.py          |    9 +-
 .../models/paged_cloud_integration.py         |    9 +-
 .../paged_customer_facing_user_object.py      |    9 +-
 .../models/paged_dashboard.py                 |    9 +-
 .../models/paged_derived_metric_definition.py |    9 +-
 ...ed_derived_metric_definition_with_stats.py |    9 +-
 wavefront_api_client/models/paged_event.py    |    9 +-
 .../models/paged_external_link.py             |    9 +-
 .../models/paged_integration.py               |    9 +-
 .../models/paged_maintenance_window.py        |    9 +-
 wavefront_api_client/models/paged_message.py  |    9 +-
 .../models/paged_notificant.py                |    9 +-
 wavefront_api_client/models/paged_proxy.py    |    9 +-
 .../models/paged_saved_search.py              |    9 +-
 wavefront_api_client/models/paged_source.py   |    9 +-
 .../models/paged_user_group.py                |  282 ++++
 wavefront_api_client/models/point.py          |    9 +-
 wavefront_api_client/models/proxy.py          |   67 +-
 wavefront_api_client/models/query_event.py    |    9 +-
 wavefront_api_client/models/query_result.py   |  119 +-
 wavefront_api_client/models/raw_timeseries.py |    9 +-
 .../models/response_container.py              |    9 +-
 .../models/response_container_alert.py        |    9 +-
 .../response_container_cloud_integration.py   |    9 +-
 .../models/response_container_dashboard.py    |    9 +-
 ...nse_container_derived_metric_definition.py |    9 +-
 .../models/response_container_event.py        |    9 +-
 .../response_container_external_link.py       |    9 +-
 .../response_container_facet_response.py      |    9 +-
 ...nse_container_facets_response_container.py |    9 +-
 .../response_container_history_response.py    |    9 +-
 .../models/response_container_integration.py  |    9 +-
 .../response_container_integration_status.py  |    9 +-
 .../models/response_container_list_acl.py     |  145 +++
 .../response_container_list_integration.py    |  145 +++
 ...ntainer_list_integration_manifest_group.py |    9 +-
 .../models/response_container_list_string.py  |  144 +++
 .../response_container_list_user_group.py     |  145 +++
 .../response_container_maintenance_window.py  |    9 +-
 .../response_container_map_string_integer.py  |    9 +-
 ...container_map_string_integration_status.py |    9 +-
 .../models/response_container_message.py      |    9 +-
 .../models/response_container_notificant.py   |    9 +-
 .../models/response_container_paged_alert.py  |    9 +-
 ...sponse_container_paged_alert_with_stats.py |    9 +-
 ...ponse_container_paged_cloud_integration.py |    9 +-
 ...ainer_paged_customer_facing_user_object.py |    9 +-
 .../response_container_paged_dashboard.py     |    9 +-
 ...ntainer_paged_derived_metric_definition.py |    9 +-
 ...ed_derived_metric_definition_with_stats.py |    9 +-
 .../models/response_container_paged_event.py  |    9 +-
 .../response_container_paged_external_link.py |    9 +-
 .../response_container_paged_integration.py   |    9 +-
 ...onse_container_paged_maintenance_window.py |    9 +-
 .../response_container_paged_message.py       |    9 +-
 .../response_container_paged_notificant.py    |    9 +-
 .../models/response_container_paged_proxy.py  |    9 +-
 .../response_container_paged_saved_search.py  |    9 +-
 .../models/response_container_paged_source.py |    9 +-
 .../response_container_paged_user_group.py    |  145 +++
 .../models/response_container_proxy.py        |    9 +-
 .../models/response_container_saved_search.py |    9 +-
 .../models/response_container_source.py       |    9 +-
 .../response_container_tags_response.py       |    9 +-
 .../models/response_container_user_group.py   |  145 +++
 .../models/response_status.py                 |    9 +-
 wavefront_api_client/models/saved_search.py   |   11 +-
 wavefront_api_client/models/search_query.py   |    9 +-
 .../models/sortable_search_request.py         |    9 +-
 wavefront_api_client/models/sorting.py        |    9 +-
 wavefront_api_client/models/source.py         |   65 +-
 .../models/source_label_pair.py               |   43 +-
 .../models/source_search_request_container.py |    9 +-
 wavefront_api_client/models/stats_model.py    |    9 +-
 wavefront_api_client/models/tags_response.py  |    9 +-
 wavefront_api_client/models/target_info.py    |    9 +-
 .../models/tesla_configuration.py             |    9 +-
 wavefront_api_client/models/timeseries.py     |    9 +-
 wavefront_api_client/models/user.py           |  533 ++++++++
 wavefront_api_client/models/user_group.py     |  289 +++++
 .../models/user_group_properties_dto.py       |  167 +++
 .../models/user_group_write.py                |  229 ++++
 wavefront_api_client/models/user_model.py     |   98 +-
 .../models/user_request_dto.py                |  219 ++++
 wavefront_api_client/models/user_settings.py  |  323 +++++
 wavefront_api_client/models/user_to_create.py |   52 +-
 wavefront_api_client/models/wf_tags.py        |    9 +-
 wavefront_api_client/rest.py                  |    6 +-
 428 files changed, 23079 insertions(+), 2986 deletions(-)
 create mode 100644 .swagger-codegen-ignore
 create mode 100644 .swagger-codegen/config.json
 create mode 100644 .travis.yml
 create mode 100644 docs/ACL.md
 create mode 100644 docs/AccessControlElement.md
 create mode 100644 docs/AccessControlListSimple.md
 create mode 100644 docs/BusinessActionGroupBasicDTO.md
 create mode 100644 docs/CustomerPreferences.md
 create mode 100644 docs/CustomerPreferencesUpdating.md
 create mode 100644 docs/DirectIngestionApi.md
 create mode 100644 docs/InstallAlerts.md
 create mode 100644 docs/IntegrationAlert.md
 create mode 100644 docs/NewRelicConfiguration.md
 create mode 100644 docs/NewRelicMetricFilters.md
 create mode 100644 docs/PagedUserGroup.md
 create mode 100644 docs/ResponseContainerListACL.md
 create mode 100644 docs/ResponseContainerListIntegration.md
 create mode 100644 docs/ResponseContainerListString.md
 create mode 100644 docs/ResponseContainerListUserGroup.md
 create mode 100644 docs/ResponseContainerPagedUserGroup.md
 create mode 100644 docs/ResponseContainerUserGroup.md
 create mode 100644 docs/SettingsApi.md
 create mode 100644 docs/User.md
 create mode 100644 docs/UserGroup.md
 create mode 100644 docs/UserGroupApi.md
 create mode 100644 docs/UserGroupPropertiesDTO.md
 create mode 100644 docs/UserGroupWrite.md
 create mode 100644 docs/UserRequestDTO.md
 create mode 100644 docs/UserSettings.md
 create mode 100644 test-requirements.txt
 create mode 100644 test/__init__.py
 create mode 100644 test/test_access_control_element.py
 create mode 100644 test/test_access_control_list_simple.py
 create mode 100644 test/test_acl.py
 create mode 100644 test/test_alert.py
 create mode 100644 test/test_alert_api.py
 create mode 100644 test/test_avro_backed_standardized_dto.py
 create mode 100644 test/test_aws_base_credentials.py
 create mode 100644 test/test_azure_activity_log_configuration.py
 create mode 100644 test/test_azure_base_credentials.py
 create mode 100644 test/test_azure_configuration.py
 create mode 100644 test/test_business_action_group_basic_dto.py
 create mode 100644 test/test_chart.py
 create mode 100644 test/test_chart_settings.py
 create mode 100644 test/test_chart_source_query.py
 create mode 100644 test/test_cloud_integration.py
 create mode 100644 test/test_cloud_integration_api.py
 create mode 100644 test/test_cloud_trail_configuration.py
 create mode 100644 test/test_cloud_watch_configuration.py
 create mode 100644 test/test_customer_facing_user_object.py
 create mode 100644 test/test_customer_preferences.py
 create mode 100644 test/test_customer_preferences_updating.py
 create mode 100644 test/test_dashboard.py
 create mode 100644 test/test_dashboard_api.py
 create mode 100644 test/test_dashboard_parameter_value.py
 create mode 100644 test/test_dashboard_section.py
 create mode 100644 test/test_dashboard_section_row.py
 create mode 100644 test/test_derived_metric_api.py
 create mode 100644 test/test_derived_metric_definition.py
 create mode 100644 test/test_direct_ingestion_api.py
 create mode 100644 test/test_ec2_configuration.py
 create mode 100644 test/test_event.py
 create mode 100644 test/test_event_api.py
 create mode 100644 test/test_event_search_request.py
 create mode 100644 test/test_event_time_range.py
 create mode 100644 test/test_external_link.py
 create mode 100644 test/test_external_link_api.py
 create mode 100644 test/test_facet_response.py
 create mode 100644 test/test_facet_search_request_container.py
 create mode 100644 test/test_facets_response_container.py
 create mode 100644 test/test_facets_search_request_container.py
 create mode 100644 test/test_gcp_billing_configuration.py
 create mode 100644 test/test_gcp_configuration.py
 create mode 100644 test/test_history_entry.py
 create mode 100644 test/test_history_response.py
 create mode 100644 test/test_install_alerts.py
 create mode 100644 test/test_integration.py
 create mode 100644 test/test_integration_alert.py
 create mode 100644 test/test_integration_alias.py
 create mode 100644 test/test_integration_api.py
 create mode 100644 test/test_integration_dashboard.py
 create mode 100644 test/test_integration_manifest_group.py
 create mode 100644 test/test_integration_metrics.py
 create mode 100644 test/test_integration_status.py
 create mode 100644 test/test_iterator_entry_string_json_node.py
 create mode 100644 test/test_iterator_json_node.py
 create mode 100644 test/test_iterator_string.py
 create mode 100644 test/test_json_node.py
 create mode 100644 test/test_logical_type.py
 create mode 100644 test/test_maintenance_window.py
 create mode 100644 test/test_maintenance_window_api.py
 create mode 100644 test/test_message.py
 create mode 100644 test/test_message_api.py
 create mode 100644 test/test_metric_api.py
 create mode 100644 test/test_metric_details.py
 create mode 100644 test/test_metric_details_response.py
 create mode 100644 test/test_metric_status.py
 create mode 100644 test/test_new_relic_configuration.py
 create mode 100644 test/test_new_relic_metric_filters.py
 create mode 100644 test/test_notificant.py
 create mode 100644 test/test_notificant_api.py
 create mode 100644 test/test_number.py
 create mode 100644 test/test_paged_alert.py
 create mode 100644 test/test_paged_alert_with_stats.py
 create mode 100644 test/test_paged_cloud_integration.py
 create mode 100644 test/test_paged_customer_facing_user_object.py
 create mode 100644 test/test_paged_dashboard.py
 create mode 100644 test/test_paged_derived_metric_definition.py
 create mode 100644 test/test_paged_derived_metric_definition_with_stats.py
 create mode 100644 test/test_paged_event.py
 create mode 100644 test/test_paged_external_link.py
 create mode 100644 test/test_paged_integration.py
 create mode 100644 test/test_paged_maintenance_window.py
 create mode 100644 test/test_paged_message.py
 create mode 100644 test/test_paged_notificant.py
 create mode 100644 test/test_paged_proxy.py
 create mode 100644 test/test_paged_saved_search.py
 create mode 100644 test/test_paged_source.py
 create mode 100644 test/test_paged_user_group.py
 create mode 100644 test/test_point.py
 create mode 100644 test/test_proxy.py
 create mode 100644 test/test_proxy_api.py
 create mode 100644 test/test_query_api.py
 create mode 100644 test/test_query_event.py
 create mode 100644 test/test_query_result.py
 create mode 100644 test/test_raw_timeseries.py
 create mode 100644 test/test_response_container.py
 create mode 100644 test/test_response_container_alert.py
 create mode 100644 test/test_response_container_cloud_integration.py
 create mode 100644 test/test_response_container_dashboard.py
 create mode 100644 test/test_response_container_derived_metric_definition.py
 create mode 100644 test/test_response_container_event.py
 create mode 100644 test/test_response_container_external_link.py
 create mode 100644 test/test_response_container_facet_response.py
 create mode 100644 test/test_response_container_facets_response_container.py
 create mode 100644 test/test_response_container_history_response.py
 create mode 100644 test/test_response_container_integration.py
 create mode 100644 test/test_response_container_integration_status.py
 create mode 100644 test/test_response_container_list_acl.py
 create mode 100644 test/test_response_container_list_integration.py
 create mode 100644 test/test_response_container_list_integration_manifest_group.py
 create mode 100644 test/test_response_container_list_string.py
 create mode 100644 test/test_response_container_list_user_group.py
 create mode 100644 test/test_response_container_maintenance_window.py
 create mode 100644 test/test_response_container_map_string_integer.py
 create mode 100644 test/test_response_container_map_string_integration_status.py
 create mode 100644 test/test_response_container_message.py
 create mode 100644 test/test_response_container_notificant.py
 create mode 100644 test/test_response_container_paged_alert.py
 create mode 100644 test/test_response_container_paged_alert_with_stats.py
 create mode 100644 test/test_response_container_paged_cloud_integration.py
 create mode 100644 test/test_response_container_paged_customer_facing_user_object.py
 create mode 100644 test/test_response_container_paged_dashboard.py
 create mode 100644 test/test_response_container_paged_derived_metric_definition.py
 create mode 100644 test/test_response_container_paged_derived_metric_definition_with_stats.py
 create mode 100644 test/test_response_container_paged_event.py
 create mode 100644 test/test_response_container_paged_external_link.py
 create mode 100644 test/test_response_container_paged_integration.py
 create mode 100644 test/test_response_container_paged_maintenance_window.py
 create mode 100644 test/test_response_container_paged_message.py
 create mode 100644 test/test_response_container_paged_notificant.py
 create mode 100644 test/test_response_container_paged_proxy.py
 create mode 100644 test/test_response_container_paged_saved_search.py
 create mode 100644 test/test_response_container_paged_source.py
 create mode 100644 test/test_response_container_paged_user_group.py
 create mode 100644 test/test_response_container_proxy.py
 create mode 100644 test/test_response_container_saved_search.py
 create mode 100644 test/test_response_container_source.py
 create mode 100644 test/test_response_container_tags_response.py
 create mode 100644 test/test_response_container_user_group.py
 create mode 100644 test/test_response_status.py
 create mode 100644 test/test_saved_search.py
 create mode 100644 test/test_saved_search_api.py
 create mode 100644 test/test_search_api.py
 create mode 100644 test/test_search_query.py
 create mode 100644 test/test_settings_api.py
 create mode 100644 test/test_sortable_search_request.py
 create mode 100644 test/test_sorting.py
 create mode 100644 test/test_source.py
 create mode 100644 test/test_source_api.py
 create mode 100644 test/test_source_label_pair.py
 create mode 100644 test/test_source_search_request_container.py
 create mode 100644 test/test_stats_model.py
 create mode 100644 test/test_tags_response.py
 create mode 100644 test/test_target_info.py
 create mode 100644 test/test_tesla_configuration.py
 create mode 100644 test/test_timeseries.py
 create mode 100644 test/test_user.py
 create mode 100644 test/test_user_api.py
 create mode 100644 test/test_user_group.py
 create mode 100644 test/test_user_group_api.py
 create mode 100644 test/test_user_group_properties_dto.py
 create mode 100644 test/test_user_group_write.py
 create mode 100644 test/test_user_model.py
 create mode 100644 test/test_user_request_dto.py
 create mode 100644 test/test_user_settings.py
 create mode 100644 test/test_user_to_create.py
 create mode 100644 test/test_webhook_api.py
 create mode 100644 test/test_wf_tags.py
 create mode 100644 tox.ini
 create mode 100644 wavefront_api_client/api/direct_ingestion_api.py
 create mode 100644 wavefront_api_client/api/settings_api.py
 create mode 100644 wavefront_api_client/api/user_group_api.py
 create mode 100644 wavefront_api_client/models/access_control_element.py
 create mode 100644 wavefront_api_client/models/access_control_list_simple.py
 create mode 100644 wavefront_api_client/models/acl.py
 create mode 100644 wavefront_api_client/models/business_action_group_basic_dto.py
 create mode 100644 wavefront_api_client/models/customer_preferences.py
 create mode 100644 wavefront_api_client/models/customer_preferences_updating.py
 create mode 100644 wavefront_api_client/models/install_alerts.py
 create mode 100644 wavefront_api_client/models/integration_alert.py
 create mode 100644 wavefront_api_client/models/new_relic_configuration.py
 create mode 100644 wavefront_api_client/models/new_relic_metric_filters.py
 create mode 100644 wavefront_api_client/models/paged_user_group.py
 create mode 100644 wavefront_api_client/models/response_container_list_acl.py
 create mode 100644 wavefront_api_client/models/response_container_list_integration.py
 create mode 100644 wavefront_api_client/models/response_container_list_string.py
 create mode 100644 wavefront_api_client/models/response_container_list_user_group.py
 create mode 100644 wavefront_api_client/models/response_container_paged_user_group.py
 create mode 100644 wavefront_api_client/models/response_container_user_group.py
 create mode 100644 wavefront_api_client/models/user.py
 create mode 100644 wavefront_api_client/models/user_group.py
 create mode 100644 wavefront_api_client/models/user_group_properties_dto.py
 create mode 100644 wavefront_api_client/models/user_group_write.py
 create mode 100644 wavefront_api_client/models/user_request_dto.py
 create mode 100644 wavefront_api_client/models/user_settings.py

diff --git a/.gitignore b/.gitignore
index a21238f..a655050 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,8 +62,3 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
-
-# IntelliJ
-.idea/*
-*.iml
-.DS_Store
diff --git a/.swagger-codegen-ignore b/.swagger-codegen-ignore
new file mode 100644
index 0000000..3df273c
--- /dev/null
+++ b/.swagger-codegen-ignore
@@ -0,0 +1,2 @@
+.travis.yml
+git_push.sh
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index a625450..acdc3f1 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.1
\ No newline at end of file
+2.4.2
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
new file mode 100644
index 0000000..cea429b
--- /dev/null
+++ b/.swagger-codegen/config.json
@@ -0,0 +1,7 @@
+{
+    "gitRepoId": "python-client",
+    "gitUserId": "wavefrontHQ",
+    "packageName": "wavefront_api_client",
+    "packageUrl": "https://github.com/wavefrontHQ/python-client",
+    "packageVersion": "2.9.37"
+}
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..2c886a5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+dist: xenial
+language: python
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+install: "pip install -r test-requirements.txt"
+script: nosetests
+deploy:
+- provider: pypi
+  user: wavefront-cs
+  server: https://test.pypi.org/legacy/
+  password:
+    secure: dWIjYPu1efm3WOHOTZr4Ci2VsdlXq0mMjAujo/WH+7SpymM7QDx9WpYgGzeq/ISsHH5+Tn6fLeovGtVzIGyH2QWTBU8G+bkzKvWD4BEutGqXFZ+cBHf6TYGQ1OIlZQ0VhkGb4mPczSkQN4Q9mqBHJBwFrtACTuTaUvZqmhyxQpFrrnT8wGeBqJ0LA9SK/Vt4992TUMLPCmrqW3bkiLTu81oMVhJb/CIPG+hMMcjdn6loTRsvbpWWCoNvcYueUeYKgEoPirkOAa5xc87rE6Ld9HZSdHKpsvuTICFe9tDqkegAK4pI5pnQvN504WM66Q9iK1jEWTeKm8KBc9wDxi77S/o+y1l98D9ulzpu1SNoy5X+seIe1UTN5L2L8kGUjAU9BLs32h64+KiR8w5LJrcXmqaod3JoPjr9a/e/02hpz1NaLoVIcpqfq9oTgz0BYlmO/2RCoQi6V3q4nSn6DDxgDuHYr3uJz0AYaMc1TEGqHeUkGuJNxuP+m1C9Ite1crZfDRsKviie/CDToM3Lr2dOPk4R90N6tzlP31BV7WaCJfyIAFwW1osrPScZ32cFdvzQBRhHN49kliSF6FOAQiiegB74lOgvkMy4rLtXLSJcUea/3iD9oCpsa+1FJjtKAX0b70F2G1tF2GZ4wH5shT9m9/9zUAFAck056XPIs80ZRkE=
+  on:
+    python: 3.7
+- provider: pypi
+  user: wavefront-cs
+  password:
+    secure: dWIjYPu1efm3WOHOTZr4Ci2VsdlXq0mMjAujo/WH+7SpymM7QDx9WpYgGzeq/ISsHH5+Tn6fLeovGtVzIGyH2QWTBU8G+bkzKvWD4BEutGqXFZ+cBHf6TYGQ1OIlZQ0VhkGb4mPczSkQN4Q9mqBHJBwFrtACTuTaUvZqmhyxQpFrrnT8wGeBqJ0LA9SK/Vt4992TUMLPCmrqW3bkiLTu81oMVhJb/CIPG+hMMcjdn6loTRsvbpWWCoNvcYueUeYKgEoPirkOAa5xc87rE6Ld9HZSdHKpsvuTICFe9tDqkegAK4pI5pnQvN504WM66Q9iK1jEWTeKm8KBc9wDxi77S/o+y1l98D9ulzpu1SNoy5X+seIe1UTN5L2L8kGUjAU9BLs32h64+KiR8w5LJrcXmqaod3JoPjr9a/e/02hpz1NaLoVIcpqfq9oTgz0BYlmO/2RCoQi6V3q4nSn6DDxgDuHYr3uJz0AYaMc1TEGqHeUkGuJNxuP+m1C9Ite1crZfDRsKviie/CDToM3Lr2dOPk4R90N6tzlP31BV7WaCJfyIAFwW1osrPScZ32cFdvzQBRhHN49kliSF6FOAQiiegB74lOgvkMy4rLtXLSJcUea/3iD9oCpsa+1FJjtKAX0b70F2G1tF2GZ4wH5shT9m9/9zUAFAck056XPIs80ZRkE=
+  on:
+    python: 3.7
+    tags: true
diff --git a/README.md b/README.md
index 4742320..3d9bd5d 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Wavefront API Client
-<p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header `"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;"` to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>
+# wavefront-api-client
+<p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>
 
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.3.2
+- Package version: 2.9.37
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -14,11 +14,8 @@ Python 2.7 and 3.4+
 ## Installation & Usage
 ### pip install
 
-```sh
-pip install wavefront-api-client
-```
+If the python package is hosted on Github, you can install directly from Github
 
-Or you can install the latest version directly from Github
 ```sh
 pip install git+https://github.com/wavefrontHQ/python-client.git
 ```
@@ -49,18 +46,19 @@ Please follow the [installation procedure](#installation--usage) and then run th
 
 ```python
 from __future__ import print_function
-
+import time
 import wavefront_api_client
 from wavefront_api_client.rest import ApiException
 from pprint import pprint
 
-_config = wavefront_api_client.Configuration()
-_config.host = 'https://YOUR_INSTANCE.wavefront.com'
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
 
-api_instance = wavefront_api_client.AlertApi(
-    wavefront_api_client.ApiClient(configuration=_config,
-                                   header_name='Authorization',
-                                   header_value='Bearer ' + 'YOUR_API_TOKEN'))
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
 tag_value = 'tag_value_example' # str | 
 
@@ -75,7 +73,7 @@ except ApiException as e:
 
 ## Documentation for API Endpoints
 
-All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+All URIs are relative to *https://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
@@ -88,10 +86,12 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**get_alert_version**](docs/AlertApi.md#get_alert_version) | **GET** /api/v2/alert/{id}/history/{version} | Get a specific historical version of a specific alert
 *AlertApi* | [**get_alerts_summary**](docs/AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 *AlertApi* | [**get_all_alert**](docs/AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
+*AlertApi* | [**hide_alert**](docs/AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
 *AlertApi* | [**remove_alert_tag**](docs/AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
 *AlertApi* | [**set_alert_tags**](docs/AlertApi.md#set_alert_tags) | **POST** /api/v2/alert/{id}/tag | Set all tags associated with a specific alert
 *AlertApi* | [**snooze_alert**](docs/AlertApi.md#snooze_alert) | **POST** /api/v2/alert/{id}/snooze | Snooze a specific alert for some number of seconds
 *AlertApi* | [**undelete_alert**](docs/AlertApi.md#undelete_alert) | **POST** /api/v2/alert/{id}/undelete | Undelete a specific alert
+*AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 *CloudIntegrationApi* | [**create_cloud_integration**](docs/CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
@@ -102,17 +102,23 @@ Class | Method | HTTP request | Description
 *CloudIntegrationApi* | [**get_cloud_integration**](docs/CloudIntegrationApi.md#get_cloud_integration) | **GET** /api/v2/cloudintegration/{id} | Get a specific cloud integration
 *CloudIntegrationApi* | [**undelete_cloud_integration**](docs/CloudIntegrationApi.md#undelete_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/undelete | Undelete a specific cloud integration
 *CloudIntegrationApi* | [**update_cloud_integration**](docs/CloudIntegrationApi.md#update_cloud_integration) | **PUT** /api/v2/cloudintegration/{id} | Update a specific cloud integration
+*DashboardApi* | [**add_access**](docs/DashboardApi.md#add_access) | **POST** /api/v2/dashboard/acl/add | Adds the specified ids to the given dashboards&#39; ACL
 *DashboardApi* | [**add_dashboard_tag**](docs/DashboardApi.md#add_dashboard_tag) | **PUT** /api/v2/dashboard/{id}/tag/{tagValue} | Add a tag to a specific dashboard
 *DashboardApi* | [**create_dashboard**](docs/DashboardApi.md#create_dashboard) | **POST** /api/v2/dashboard | Create a specific dashboard
 *DashboardApi* | [**delete_dashboard**](docs/DashboardApi.md#delete_dashboard) | **DELETE** /api/v2/dashboard/{id} | Delete a specific dashboard
+*DashboardApi* | [**favorite_dashboard**](docs/DashboardApi.md#favorite_dashboard) | **POST** /api/v2/dashboard/{id}/favorite | Mark a dashboard as favorite
+*DashboardApi* | [**get_access_control_list**](docs/DashboardApi.md#get_access_control_list) | **GET** /api/v2/dashboard/acl | Get list of Access Control Lists for the specified dashboards
 *DashboardApi* | [**get_all_dashboard**](docs/DashboardApi.md#get_all_dashboard) | **GET** /api/v2/dashboard | Get all dashboards for a customer
 *DashboardApi* | [**get_dashboard**](docs/DashboardApi.md#get_dashboard) | **GET** /api/v2/dashboard/{id} | Get a specific dashboard
 *DashboardApi* | [**get_dashboard_history**](docs/DashboardApi.md#get_dashboard_history) | **GET** /api/v2/dashboard/{id}/history | Get the version history of a specific dashboard
 *DashboardApi* | [**get_dashboard_tags**](docs/DashboardApi.md#get_dashboard_tags) | **GET** /api/v2/dashboard/{id}/tag | Get all tags associated with a specific dashboard
 *DashboardApi* | [**get_dashboard_version**](docs/DashboardApi.md#get_dashboard_version) | **GET** /api/v2/dashboard/{id}/history/{version} | Get a specific version of a specific dashboard
+*DashboardApi* | [**remove_access**](docs/DashboardApi.md#remove_access) | **POST** /api/v2/dashboard/acl/remove | Removes the specified ids from the given dashboards&#39; ACL
 *DashboardApi* | [**remove_dashboard_tag**](docs/DashboardApi.md#remove_dashboard_tag) | **DELETE** /api/v2/dashboard/{id}/tag/{tagValue} | Remove a tag from a specific dashboard
+*DashboardApi* | [**set_acl**](docs/DashboardApi.md#set_acl) | **PUT** /api/v2/dashboard/acl/set | Set ACL for the specified dashboards
 *DashboardApi* | [**set_dashboard_tags**](docs/DashboardApi.md#set_dashboard_tags) | **POST** /api/v2/dashboard/{id}/tag | Set all tags associated with a specific dashboard
 *DashboardApi* | [**undelete_dashboard**](docs/DashboardApi.md#undelete_dashboard) | **POST** /api/v2/dashboard/{id}/undelete | Undelete a specific dashboard
+*DashboardApi* | [**unfavorite_dashboard**](docs/DashboardApi.md#unfavorite_dashboard) | **POST** /api/v2/dashboard/{id}/unfavorite | Unmark a dashboard as favorite
 *DashboardApi* | [**update_dashboard**](docs/DashboardApi.md#update_dashboard) | **PUT** /api/v2/dashboard/{id} | Update a specific dashboard
 *DerivedMetricApi* | [**add_tag_to_derived_metric**](docs/DerivedMetricApi.md#add_tag_to_derived_metric) | **PUT** /api/v2/derivedmetric/{id}/tag/{tagValue} | Add a tag to a specific Derived Metric
 *DerivedMetricApi* | [**create_derived_metric**](docs/DerivedMetricApi.md#create_derived_metric) | **POST** /api/v2/derivedmetric | Create a specific derived metric definition
@@ -126,6 +132,7 @@ Class | Method | HTTP request | Description
 *DerivedMetricApi* | [**set_derived_metric_tags**](docs/DerivedMetricApi.md#set_derived_metric_tags) | **POST** /api/v2/derivedmetric/{id}/tag | Set all tags associated with a specific derived metric definition
 *DerivedMetricApi* | [**undelete_derived_metric**](docs/DerivedMetricApi.md#undelete_derived_metric) | **POST** /api/v2/derivedmetric/{id}/undelete | Undelete a specific derived metric definition
 *DerivedMetricApi* | [**update_derived_metric**](docs/DerivedMetricApi.md#update_derived_metric) | **PUT** /api/v2/derivedmetric/{id} | Update a specific derived metric definition
+*DirectIngestionApi* | [**report**](docs/DirectIngestionApi.md#report) | **POST** /report | Directly ingest data/data stream with specified format
 *EventApi* | [**add_event_tag**](docs/EventApi.md#add_event_tag) | **PUT** /api/v2/event/{id}/tag/{tagValue} | Add a tag to a specific event
 *EventApi* | [**close_event**](docs/EventApi.md#close_event) | **POST** /api/v2/event/{id}/close | Close a specific event
 *EventApi* | [**create_event**](docs/EventApi.md#create_event) | **POST** /api/v2/event | Create a specific event
@@ -142,11 +149,15 @@ Class | Method | HTTP request | Description
 *ExternalLinkApi* | [**get_external_link**](docs/ExternalLinkApi.md#get_external_link) | **GET** /api/v2/extlink/{id} | Get a specific external link
 *ExternalLinkApi* | [**update_external_link**](docs/ExternalLinkApi.md#update_external_link) | **PUT** /api/v2/extlink/{id} | Update a specific external link
 *IntegrationApi* | [**get_all_integration**](docs/IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Wavefront integrations available, along with their status
-*IntegrationApi* | [**get_all_integration_in_manifests**](docs/IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status
+*IntegrationApi* | [**get_all_integration_in_manifests**](docs/IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
+*IntegrationApi* | [**get_all_integration_in_manifests_min**](docs/IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Wavefront integrations as structured in their integration manifests.
 *IntegrationApi* | [**get_all_integration_statuses**](docs/IntegrationApi.md#get_all_integration_statuses) | **GET** /api/v2/integration/status | Gets the status of all Wavefront integrations
+*IntegrationApi* | [**get_installed_integration**](docs/IntegrationApi.md#get_installed_integration) | **GET** /api/v2/integration/installed | Gets a flat list of all Integrations that are installed, along with their status
 *IntegrationApi* | [**get_integration**](docs/IntegrationApi.md#get_integration) | **GET** /api/v2/integration/{id} | Gets a single Wavefront integration by its id, along with its status
 *IntegrationApi* | [**get_integration_status**](docs/IntegrationApi.md#get_integration_status) | **GET** /api/v2/integration/{id}/status | Gets the status of a single Wavefront integration
+*IntegrationApi* | [**install_all_integration_alerts**](docs/IntegrationApi.md#install_all_integration_alerts) | **POST** /api/v2/integration/{id}/install-all-alerts | Enable all alerts associated with this integration
 *IntegrationApi* | [**install_integration**](docs/IntegrationApi.md#install_integration) | **POST** /api/v2/integration/{id}/install | Installs a Wavefront integration
+*IntegrationApi* | [**uninstall_all_integration_alerts**](docs/IntegrationApi.md#uninstall_all_integration_alerts) | **POST** /api/v2/integration/{id}/uninstall-all-alerts | Disable all alerts associated with this integration
 *IntegrationApi* | [**uninstall_integration**](docs/IntegrationApi.md#uninstall_integration) | **POST** /api/v2/integration/{id}/uninstall | Uninstalls a Wavefront integration
 *MaintenanceWindowApi* | [**create_maintenance_window**](docs/MaintenanceWindowApi.md#create_maintenance_window) | **POST** /api/v2/maintenancewindow | Create a maintenance window
 *MaintenanceWindowApi* | [**delete_maintenance_window**](docs/MaintenanceWindowApi.md#delete_maintenance_window) | **DELETE** /api/v2/maintenancewindow/{id} | Delete a specific maintenance window
@@ -223,9 +234,16 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_user_entities**](docs/SearchApi.md#search_user_entities) | **POST** /api/v2/search/user | Search over a customer&#39;s users
 *SearchApi* | [**search_user_for_facet**](docs/SearchApi.md#search_user_for_facet) | **POST** /api/v2/search/user/{facet} | Lists the values of a specific facet over the customer&#39;s users
 *SearchApi* | [**search_user_for_facets**](docs/SearchApi.md#search_user_for_facets) | **POST** /api/v2/search/user/facets | Lists the values of one or more facets over the customer&#39;s users
+*SearchApi* | [**search_user_group_entities**](docs/SearchApi.md#search_user_group_entities) | **POST** /api/v2/search/usergroup | Search over a customer&#39;s user groups
+*SearchApi* | [**search_user_group_for_facet**](docs/SearchApi.md#search_user_group_for_facet) | **POST** /api/v2/search/usergroup/{facet} | Lists the values of a specific facet over the customer&#39;s user groups
+*SearchApi* | [**search_user_group_for_facets**](docs/SearchApi.md#search_user_group_for_facets) | **POST** /api/v2/search/usergroup/facets | Lists the values of one or more facets over the customer&#39;s user groups
 *SearchApi* | [**search_web_hook_entities**](docs/SearchApi.md#search_web_hook_entities) | **POST** /api/v2/search/webhook | Search over a customer&#39;s webhooks
 *SearchApi* | [**search_web_hook_for_facet**](docs/SearchApi.md#search_web_hook_for_facet) | **POST** /api/v2/search/webhook/{facet} | Lists the values of a specific facet over the customer&#39;s webhooks
 *SearchApi* | [**search_webhook_for_facets**](docs/SearchApi.md#search_webhook_for_facets) | **POST** /api/v2/search/webhook/facets | Lists the values of one or more facets over the customer&#39;s webhooks
+*SettingsApi* | [**get_all_permissions**](docs/SettingsApi.md#get_all_permissions) | **GET** /api/v2/customer/permissions | Get all permissions
+*SettingsApi* | [**get_customer_preferences**](docs/SettingsApi.md#get_customer_preferences) | **GET** /api/v2/customer/preferences | Get customer preferences
+*SettingsApi* | [**get_default_user_groups**](docs/SettingsApi.md#get_default_user_groups) | **GET** /api/v2/customer/preferences/defaultUserGroups | Get default user groups customer preferences
+*SettingsApi* | [**post_customer_preferences**](docs/SettingsApi.md#post_customer_preferences) | **POST** /api/v2/customer/preferences | Update selected fields of customer preferences
 *SourceApi* | [**add_source_tag**](docs/SourceApi.md#add_source_tag) | **PUT** /api/v2/source/{id}/tag/{tagValue} | Add a tag to a specific source
 *SourceApi* | [**create_source**](docs/SourceApi.md#create_source) | **POST** /api/v2/source | Create metadata (description or tags) for a specific source
 *SourceApi* | [**delete_source**](docs/SourceApi.md#delete_source) | **DELETE** /api/v2/source/{id} | Delete metadata (description and tags) for a specific source
@@ -237,12 +255,28 @@ Class | Method | HTTP request | Description
 *SourceApi* | [**set_description**](docs/SourceApi.md#set_description) | **POST** /api/v2/source/{id}/description | Set description associated with a specific source
 *SourceApi* | [**set_source_tags**](docs/SourceApi.md#set_source_tags) | **POST** /api/v2/source/{id}/tag | Set all tags associated with a specific source
 *SourceApi* | [**update_source**](docs/SourceApi.md#update_source) | **PUT** /api/v2/source/{id} | Update metadata (description or tags) for a specific source.
+*UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user
 *UserApi* | [**create_or_update_user**](docs/UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
+*UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users
 *UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user identified by id
 *UserApi* | [**get_all_user**](docs/UserApi.md#get_all_user) | **GET** /api/v2/user | Get all users
 *UserApi* | [**get_user**](docs/UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email addr)
+*UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific user permission to multiple users
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific user permission
+*UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
+*UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user
+*UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific user permission from multiple users
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific user permission
+*UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
+*UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
+*UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
+*UserGroupApi* | [**delete_user_group**](docs/UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
+*UserGroupApi* | [**get_all_user_groups**](docs/UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
+*UserGroupApi* | [**get_user_group**](docs/UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
+*UserGroupApi* | [**grant_permission_to_user_groups**](docs/UserGroupApi.md#grant_permission_to_user_groups) | **POST** /api/v2/usergroup/grant/{permission} | Grants a single permission to user group(s)
+*UserGroupApi* | [**remove_users_from_user_group**](docs/UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
+*UserGroupApi* | [**revoke_permission_from_user_groups**](docs/UserGroupApi.md#revoke_permission_from_user_groups) | **POST** /api/v2/usergroup/revoke/{permission} | Revokes a single permission from user group(s)
+*UserGroupApi* | [**update_user_group**](docs/UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
 *WebhookApi* | [**create_webhook**](docs/WebhookApi.md#create_webhook) | **POST** /api/v2/webhook | Create a specific webhook
 *WebhookApi* | [**delete_webhook**](docs/WebhookApi.md#delete_webhook) | **DELETE** /api/v2/webhook/{id} | Delete a specific webhook
 *WebhookApi* | [**get_all_webhooks**](docs/WebhookApi.md#get_all_webhooks) | **GET** /api/v2/webhook | Get all webhooks for a customer
@@ -252,12 +286,16 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Models
 
+ - [ACL](docs/ACL.md)
  - [AWSBaseCredentials](docs/AWSBaseCredentials.md)
+ - [AccessControlElement](docs/AccessControlElement.md)
+ - [AccessControlListSimple](docs/AccessControlListSimple.md)
  - [Alert](docs/Alert.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
  - [AzureBaseCredentials](docs/AzureBaseCredentials.md)
  - [AzureConfiguration](docs/AzureConfiguration.md)
+ - [BusinessActionGroupBasicDTO](docs/BusinessActionGroupBasicDTO.md)
  - [Chart](docs/Chart.md)
  - [ChartSettings](docs/ChartSettings.md)
  - [ChartSourceQuery](docs/ChartSourceQuery.md)
@@ -265,6 +303,8 @@ Class | Method | HTTP request | Description
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
+ - [CustomerPreferences](docs/CustomerPreferences.md)
+ - [CustomerPreferencesUpdating](docs/CustomerPreferencesUpdating.md)
  - [Dashboard](docs/Dashboard.md)
  - [DashboardParameterValue](docs/DashboardParameterValue.md)
  - [DashboardSection](docs/DashboardSection.md)
@@ -283,7 +323,9 @@ Class | Method | HTTP request | Description
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
+ - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
+ - [IntegrationAlert](docs/IntegrationAlert.md)
  - [IntegrationAlias](docs/IntegrationAlias.md)
  - [IntegrationDashboard](docs/IntegrationDashboard.md)
  - [IntegrationManifestGroup](docs/IntegrationManifestGroup.md)
@@ -299,6 +341,8 @@ Class | Method | HTTP request | Description
  - [MetricDetails](docs/MetricDetails.md)
  - [MetricDetailsResponse](docs/MetricDetailsResponse.md)
  - [MetricStatus](docs/MetricStatus.md)
+ - [NewRelicConfiguration](docs/NewRelicConfiguration.md)
+ - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
  - [Number](docs/Number.md)
  - [PagedAlert](docs/PagedAlert.md)
@@ -317,6 +361,7 @@ Class | Method | HTTP request | Description
  - [PagedProxy](docs/PagedProxy.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
  - [PagedSource](docs/PagedSource.md)
+ - [PagedUserGroup](docs/PagedUserGroup.md)
  - [Point](docs/Point.md)
  - [Proxy](docs/Proxy.md)
  - [QueryEvent](docs/QueryEvent.md)
@@ -334,7 +379,11 @@ Class | Method | HTTP request | Description
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
+ - [ResponseContainerListACL](docs/ResponseContainerListACL.md)
+ - [ResponseContainerListIntegration](docs/ResponseContainerListIntegration.md)
  - [ResponseContainerListIntegrationManifestGroup](docs/ResponseContainerListIntegrationManifestGroup.md)
+ - [ResponseContainerListString](docs/ResponseContainerListString.md)
+ - [ResponseContainerListUserGroup](docs/ResponseContainerListUserGroup.md)
  - [ResponseContainerMaintenanceWindow](docs/ResponseContainerMaintenanceWindow.md)
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
@@ -356,10 +405,12 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
+ - [ResponseContainerPagedUserGroup](docs/ResponseContainerPagedUserGroup.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
+ - [ResponseContainerUserGroup](docs/ResponseContainerUserGroup.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [SavedSearch](docs/SavedSearch.md)
  - [SearchQuery](docs/SearchQuery.md)
@@ -373,7 +424,13 @@ Class | Method | HTTP request | Description
  - [TargetInfo](docs/TargetInfo.md)
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
+ - [User](docs/User.md)
+ - [UserGroup](docs/UserGroup.md)
+ - [UserGroupPropertiesDTO](docs/UserGroupPropertiesDTO.md)
+ - [UserGroupWrite](docs/UserGroupWrite.md)
  - [UserModel](docs/UserModel.md)
+ - [UserRequestDTO](docs/UserRequestDTO.md)
+ - [UserSettings](docs/UserSettings.md)
  - [UserToCreate](docs/UserToCreate.md)
  - [WFTags](docs/WFTags.md)
 
@@ -390,5 +447,5 @@ Class | Method | HTTP request | Description
 
 ## Author
 
-
+support@wavefront.com
 
diff --git a/docs/ACL.md b/docs/ACL.md
new file mode 100644
index 0000000..443dfdb
--- /dev/null
+++ b/docs/ACL.md
@@ -0,0 +1,12 @@
+# ACL
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**entity_id** | **str** | The entity Id | 
+**view_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user group ids that have view permission | 
+**modify_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user groups ids that have modify permission | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AccessControlElement.md b/docs/AccessControlElement.md
new file mode 100644
index 0000000..bc29e72
--- /dev/null
+++ b/docs/AccessControlElement.md
@@ -0,0 +1,11 @@
+# AccessControlElement
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AccessControlListSimple.md b/docs/AccessControlListSimple.md
new file mode 100644
index 0000000..82c259f
--- /dev/null
+++ b/docs/AccessControlListSimple.md
@@ -0,0 +1,11 @@
+# AccessControlListSimple
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**can_view** | **list[str]** |  | [optional] 
+**can_modify** | **list[str]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Alert.md b/docs/Alert.md
index e042693..b173c9a 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -4,56 +4,63 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
+**hidden** | **bool** |  | [optional] 
+**severity** | **str** | Severity of the alert | [optional] 
 **created** | **int** | When this alert was created, in epoch millis | [optional] 
-**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
 **name** | **str** |  | 
 **id** | **str** |  | [optional] 
-**target** | **str** | The email address or integration endpoint (such as PagerDuty or webhook) to notify when the alert status changes | 
+**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
+**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
 **event** | [**Event**](Event.md) |  | [optional] 
 **updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
-**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
-**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
-**update_user_id** | **str** | The user that last updated this alert | [optional] 
+**condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
+**alert_type** | **str** | Alert type. | [optional] 
 **display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
+**failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
+**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
+**active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
-**condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
 **include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
-**severity** | **str** | Severity of the alert | 
-**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
+**targets** | **dict(str, str)** | Targets for severity. | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
+**update_user_id** | **str** | The user that last updated this alert | [optional] 
+**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
+**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
+**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
+**conditions** | **dict(str, str)** | Multi - alert conditions. | [optional] 
 **notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
+**additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
+**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
 **alerts_last_day** | **int** |  | [optional] 
 **alerts_last_week** | **int** |  | [optional] 
 **alerts_last_month** | **int** |  | [optional] 
-**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
-**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
-**failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
-**active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
-**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
-**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
 **in_trash** | **bool** |  | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
 **create_user_id** | **str** |  | [optional] 
-**additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
-**creator_id** | **str** |  | [optional] 
-**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
-**updater_id** | **str** |  | [optional] 
 **last_failed_time** | **int** | The time of the last error encountered when running this alert&#39;s condition query, in epoch millis | [optional] 
-**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
+**last_notification_millis** | **int** | When this alert last caused a notification, in epoch millis | [optional] 
+**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
+**num_points_in_failure_frame** | **int** | Number of points scanned in alert query time frame. | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the alert condition | [optional] 
 **hosts_used** | **list[str]** | Number of hosts checked by the alert condition | [optional] 
-**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
-**last_notification_millis** | **int** | When this alert last caused a notification, in epoch millis | [optional] 
+**system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
+**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
+**creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
 **notification_resend_frequency_minutes** | **int** | How often to re-trigger a continually failing alert. If absent or &lt;&#x3D; 0, no retriggering occurs | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
+**severity_list** | **list[str]** | Alert severity list for multi-threshold type. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index ee1bbb6..eccd37b 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.AlertApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
@@ -13,10 +13,12 @@ Method | HTTP request | Description
 [**get_alert_version**](AlertApi.md#get_alert_version) | **GET** /api/v2/alert/{id}/history/{version} | Get a specific historical version of a specific alert
 [**get_alerts_summary**](AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 [**get_all_alert**](AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
+[**hide_alert**](AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
 [**remove_alert_tag**](AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
 [**set_alert_tags**](AlertApi.md#set_alert_tags) | **POST** /api/v2/alert/{id}/tag | Set all tags associated with a specific alert
 [**snooze_alert**](AlertApi.md#snooze_alert) | **POST** /api/v2/alert/{id}/snooze | Snooze a specific alert for some number of seconds
 [**undelete_alert**](AlertApi.md#undelete_alert) | **POST** /api/v2/alert/{id}/undelete | Undelete a specific alert
+[**unhide_alert**](AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 [**unsnooze_alert**](AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 [**update_alert**](AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 
@@ -100,7 +102,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.Alert() # Alert | Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> (optional)
 
 try:
     # Create a specific alert
@@ -114,7 +116,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Alert**](Alert.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -513,6 +515,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **hide_alert**
+> ResponseContainerAlert hide_alert(id)
+
+Hide a specific integration alert 
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+id = 789 # int | 
+
+try:
+    # Hide a specific integration alert 
+    api_response = api_instance.hide_alert(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->hide_alert: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerAlert**](ResponseContainerAlert.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **remove_alert_tag**
 > ResponseContainer remove_alert_tag(id, tag_value)
 
@@ -735,6 +791,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **unhide_alert**
+> ResponseContainerAlert unhide_alert(id)
+
+Unhide a specific integration alert
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+id = 789 # int | 
+
+try:
+    # Unhide a specific integration alert
+    api_response = api_instance.unhide_alert(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->unhide_alert: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerAlert**](ResponseContainerAlert.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **unsnooze_alert**
 > ResponseContainerAlert unsnooze_alert(id)
 
diff --git a/docs/AzureBaseCredentials.md b/docs/AzureBaseCredentials.md
index cf51c21..0fa788b 100644
--- a/docs/AzureBaseCredentials.md
+++ b/docs/AzureBaseCredentials.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**tenant** | **str** | Tenant Id for an Azure service account within your project. | 
 **client_id** | **str** | Client Id for an Azure service account within your project. | 
 **client_secret** | **str** | Client Secret for an Azure service account within your project. Use &#39;saved_secret&#39; to retain the client secret when updating. | 
-**tenant** | **str** | Tenant Id for an Azure service account within your project. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AzureConfiguration.md b/docs/AzureConfiguration.md
index f99d490..867dc72 100644
--- a/docs/AzureConfiguration.md
+++ b/docs/AzureConfiguration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **base_credentials** | [**AzureBaseCredentials**](AzureBaseCredentials.md) |  | [optional] 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **category_filter** | **list[str]** | A list of Azure services (such as Microsoft.Compute/virtualMachines, Microsoft.Cache/redis etc) from which to pull metrics. | [optional] 
 **resource_group_filter** | **list[str]** | A list of Azure resource groups from which to pull metrics. | [optional] 
 
diff --git a/docs/BusinessActionGroupBasicDTO.md b/docs/BusinessActionGroupBasicDTO.md
new file mode 100644
index 0000000..8d6fd87
--- /dev/null
+++ b/docs/BusinessActionGroupBasicDTO.md
@@ -0,0 +1,13 @@
+# BusinessActionGroupBasicDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**group_name** | **str** |  | [optional] 
+**display_name** | **str** |  | [optional] 
+**description** | **str** |  | [optional] 
+**required_default** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Chart.md b/docs/Chart.md
index c07c4f2..906a37c 100644
--- a/docs/Chart.md
+++ b/docs/Chart.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
 **units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
-**name** | **str** | Name of the source | 
 **description** | **str** | Description of the chart | [optional] 
+**name** | **str** | Name of the source | 
 **sources** | [**list[ChartSourceQuery]**](ChartSourceQuery.md) | Query expression to plot on the chart | 
 **include_obsolete_metrics** | **bool** | Whether to show obsolete metrics.  Default: false | [optional] 
 **no_default_events** | **bool** | Whether to hide events related to the sources in the charts produced. Default false (i.e. shows events) | [optional] 
 **chart_attributes** | [**JsonNode**](JsonNode.md) | Experimental field for chart attributes | [optional] 
-**summarization** | **str** | Summarization strategy for the chart.  MEAN is default | [optional] 
-**base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
-**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
 **interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
+**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
+**summarization** | **str** | Summarization strategy for the chart.  MEAN is default | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index e2b75e2..bf035ac 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -3,13 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
 **type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
+**min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
 **max** | **float** | Max value of Y-axis.  Set to null or leave blank for auto | [optional] 
-**expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
-**fixed_legend_enabled** | **bool** | Whether to enable a fixed tabular legend adjacent to the chart | [optional] 
-**fixed_legend_use_raw_stats** | **bool** | If true, the legend uses non-summarized stats instead of summarized | [optional] 
-**plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
 **line_type** | **str** | Plot interpolation type.  linear is default | [optional] 
 **stack_type** | **str** | Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y&#x3D;0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream | [optional] 
 **windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
@@ -32,6 +28,8 @@ Name | Type | Description | Notes
 **y0_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units | [optional] 
 **y1_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units | [optional] 
 **invert_dynamic_legend_hover_control** | **bool** | Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed) | [optional] 
+**fixed_legend_enabled** | **bool** | Whether to enable a fixed tabular legend adjacent to the chart | [optional] 
+**fixed_legend_use_raw_stats** | **bool** | If true, the legend uses non-summarized stats instead of summarized | [optional] 
 **fixed_legend_position** | **str** | Where the fixed legend should be displayed with respect to the chart | [optional] 
 **fixed_legend_display_stats** | **list[str]** | For a chart with a fixed legend, a list of statistics to display in the legend | [optional] 
 **fixed_legend_filter_sort** | **str** | Whether to display \&quot;Top\&quot;- or \&quot;Bottom\&quot;-ranked series in the fixed legend | [optional] 
@@ -60,6 +58,8 @@ Name | Type | Description | Notes
 **sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
 **sparkline_value_text_map_text** | **list[str]** | For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds | [optional] 
 **sparkline_value_text_map_thresholds** | **list[float]** | For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText | [optional] 
+**expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
+**plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChartSourceQuery.md b/docs/ChartSourceQuery.md
index cdef193..3678150 100644
--- a/docs/ChartSourceQuery.md
+++ b/docs/ChartSourceQuery.md
@@ -5,13 +5,13 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** | Name of the source | 
 **query** | **str** | Query expression to plot on the chart | 
-**disabled** | **bool** | Whether the source is disabled | [optional] 
-**secondary_axis** | **bool** | Determines if this source relates to the right hand Y-axis or not | [optional] 
 **scatter_plot_source** | **str** | For scatter plots, does this query source the X-axis or the Y-axis | [optional] 
 **querybuilder_serialization** | **str** | Opaque representation of the querybuilder | [optional] 
 **querybuilder_enabled** | **bool** | Whether or not this source line should have the query builder enabled | [optional] 
+**secondary_axis** | **bool** | Determines if this source relates to the right hand Y-axis or not | [optional] 
 **source_description** | **str** | A description for the purpose of this source | [optional] 
 **source_color** | **str** | The color used to draw all results from this source (auto if unset) | [optional] 
+**disabled** | **bool** | Whether the source is disabled | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 2593a87..30c7941 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
+**service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **additional_tags** | **dict(str, str)** | A list of point tag key-values to add to every point ingested using this integration | [optional] 
 **last_received_data_point_ms** | **int** | Time that this integration last received a data point, in epoch millis | [optional] 
 **last_metric_count** | **int** | Number of metrics / events ingested by this integration the last time it ran | [optional] 
@@ -19,6 +20,7 @@ Name | Type | Description | Notes
 **ec2** | [**EC2Configuration**](EC2Configuration.md) |  | [optional] 
 **gcp** | [**GCPConfiguration**](GCPConfiguration.md) |  | [optional] 
 **gcp_billing** | [**GCPBillingConfiguration**](GCPBillingConfiguration.md) |  | [optional] 
+**new_relic** | [**NewRelicConfiguration**](NewRelicConfiguration.md) |  | [optional] 
 **tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **azure** | [**AzureConfiguration**](AzureConfiguration.md) |  | [optional] 
 **azure_activity_log** | [**AzureActivityLogConfiguration**](AzureActivityLogConfiguration.md) |  | [optional] 
@@ -29,7 +31,6 @@ Name | Type | Description | Notes
 **last_processing_timestamp** | **int** | Time, in epoch millis, that this integration was last processed | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **deleted** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/CloudIntegrationApi.md b/docs/CloudIntegrationApi.md
index 55a4afb..ce3f8d4 100644
--- a/docs/CloudIntegrationApi.md
+++ b/docs/CloudIntegrationApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.CloudIntegrationApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/CloudTrailConfiguration.md b/docs/CloudTrailConfiguration.md
index 46f257e..766806f 100644
--- a/docs/CloudTrailConfiguration.md
+++ b/docs/CloudTrailConfiguration.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**prefix** | **str** | The common prefix, if any, appended to all CloudTrail log files | [optional] 
 **region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
-**bucket_name** | **str** | Name of the S3 bucket where CloudTrail logs are stored | 
+**prefix** | **str** | The common prefix, if any, appended to all CloudTrail log files | [optional] 
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **filter_rule** | **str** | Rule to filter cloud trail log event. | [optional] 
+**bucket_name** | **str** | Name of the S3 bucket where CloudTrail logs are stored | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index 0288f92..fbb267a 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
-**namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **volume_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
+**namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
+**metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index 9176647..dd8d402 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -3,14 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**user_groups** | **list[str]** | List of user group identifiers this user belongs to | [optional] 
 **identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
 **id** | **str** | The unique identifier of this user, which should be their valid email address | 
+**_self** | **bool** | Whether this user is the one calling the API | 
 **groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
 **customer** | **str** | The id of the customer to which the user belongs | 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
-**_self** | **bool** | Whether this user is the one calling the API | 
-**escaped_identifier** | **str** | URL Escaped Identifier | [optional] 
 **gravatar_url** | **str** | URL id For User&#39;s gravatar (see gravatar.com), if one exists. | [optional] 
+**escaped_identifier** | **str** | URL Escaped Identifier | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerPreferences.md b/docs/CustomerPreferences.md
new file mode 100644
index 0000000..bfeb54f
--- /dev/null
+++ b/docs/CustomerPreferences.md
@@ -0,0 +1,25 @@
+# CustomerPreferences
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**default_user_groups** | [**list[UserGroup]**](UserGroup.md) | List of default user groups of the customer | [optional] 
+**id** | **str** |  | [optional] 
+**customer_id** | **str** | The id of the customer preferences are attached to | 
+**creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+**invite_permissions** | **list[str]** | List of permissions that are assigned to newly invited users | [optional] 
+**hidden_metric_prefixes** | **dict(str, int)** | Metric prefixes which should be hidden from user | [optional] 
+**landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
+**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
+**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
+**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
+**hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
+**blacklisted_emails** | **dict(str, int)** | List of blacklisted emails of the customer | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/CustomerPreferencesUpdating.md b/docs/CustomerPreferencesUpdating.md
new file mode 100644
index 0000000..f966de3
--- /dev/null
+++ b/docs/CustomerPreferencesUpdating.md
@@ -0,0 +1,16 @@
+# CustomerPreferencesUpdating
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
+**hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
+**landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
+**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
+**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
+**default_user_groups** | **list[str]** | List of default user groups of the customer | [optional] 
+**invite_permissions** | **list[str]** | List of invite permissions to apply for each new user | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index ec31888..cd8d9b7 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -3,14 +3,16 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**can_user_modify** | **bool** |  | [optional] 
 **hidden** | **bool** |  | [optional] 
+**description** | **str** | Human-readable description of the dashboard | [optional] 
 **name** | **str** | Name of the dashboard | 
 **id** | **str** | Unique identifier, also URL slug, of the dashboard | 
 **parameters** | **dict(str, str)** | Deprecated.  An obsolete representation of dashboard parameters | [optional] 
-**description** | **str** | Human-readable description of the dashboard | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **customer** | **str** | id of the customer to which this dashboard belongs | [optional] 
 **url** | **str** | Unique identifier, also URL slug, of the dashboard | 
+**system_owned** | **bool** | Whether this dashboard is system-owned and not writeable | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **event_filter_type** | **str** | How charts belonging to this dashboard should display events.  BYCHART is default if unspecified | [optional] 
@@ -29,13 +31,14 @@ Name | Type | Description | Notes
 **views_last_day** | **int** |  | [optional] 
 **views_last_week** | **int** |  | [optional] 
 **views_last_month** | **int** |  | [optional] 
+**acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
-**system_owned** | **bool** | Whether this dashboard is system-owned and not writeable | [optional] 
 **num_charts** | **int** |  | [optional] 
 **favorite** | **bool** |  | [optional] 
 **num_favorites** | **int** |  | [optional] 
+**orphan** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DashboardApi.md b/docs/DashboardApi.md
index 1c380ac..1745c88 100644
--- a/docs/DashboardApi.md
+++ b/docs/DashboardApi.md
@@ -1,23 +1,82 @@
 # wavefront_api_client.DashboardApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_access**](DashboardApi.md#add_access) | **POST** /api/v2/dashboard/acl/add | Adds the specified ids to the given dashboards&#39; ACL
 [**add_dashboard_tag**](DashboardApi.md#add_dashboard_tag) | **PUT** /api/v2/dashboard/{id}/tag/{tagValue} | Add a tag to a specific dashboard
 [**create_dashboard**](DashboardApi.md#create_dashboard) | **POST** /api/v2/dashboard | Create a specific dashboard
 [**delete_dashboard**](DashboardApi.md#delete_dashboard) | **DELETE** /api/v2/dashboard/{id} | Delete a specific dashboard
+[**favorite_dashboard**](DashboardApi.md#favorite_dashboard) | **POST** /api/v2/dashboard/{id}/favorite | Mark a dashboard as favorite
+[**get_access_control_list**](DashboardApi.md#get_access_control_list) | **GET** /api/v2/dashboard/acl | Get list of Access Control Lists for the specified dashboards
 [**get_all_dashboard**](DashboardApi.md#get_all_dashboard) | **GET** /api/v2/dashboard | Get all dashboards for a customer
 [**get_dashboard**](DashboardApi.md#get_dashboard) | **GET** /api/v2/dashboard/{id} | Get a specific dashboard
 [**get_dashboard_history**](DashboardApi.md#get_dashboard_history) | **GET** /api/v2/dashboard/{id}/history | Get the version history of a specific dashboard
 [**get_dashboard_tags**](DashboardApi.md#get_dashboard_tags) | **GET** /api/v2/dashboard/{id}/tag | Get all tags associated with a specific dashboard
 [**get_dashboard_version**](DashboardApi.md#get_dashboard_version) | **GET** /api/v2/dashboard/{id}/history/{version} | Get a specific version of a specific dashboard
+[**remove_access**](DashboardApi.md#remove_access) | **POST** /api/v2/dashboard/acl/remove | Removes the specified ids from the given dashboards&#39; ACL
 [**remove_dashboard_tag**](DashboardApi.md#remove_dashboard_tag) | **DELETE** /api/v2/dashboard/{id}/tag/{tagValue} | Remove a tag from a specific dashboard
+[**set_acl**](DashboardApi.md#set_acl) | **PUT** /api/v2/dashboard/acl/set | Set ACL for the specified dashboards
 [**set_dashboard_tags**](DashboardApi.md#set_dashboard_tags) | **POST** /api/v2/dashboard/{id}/tag | Set all tags associated with a specific dashboard
 [**undelete_dashboard**](DashboardApi.md#undelete_dashboard) | **POST** /api/v2/dashboard/{id}/undelete | Undelete a specific dashboard
+[**unfavorite_dashboard**](DashboardApi.md#unfavorite_dashboard) | **POST** /api/v2/dashboard/{id}/unfavorite | Unmark a dashboard as favorite
 [**update_dashboard**](DashboardApi.md#update_dashboard) | **PUT** /api/v2/dashboard/{id} | Update a specific dashboard
 
 
+# **add_access**
+> add_access(body=body)
+
+Adds the specified ids to the given dashboards' ACL
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.ACL()] # list[ACL] |  (optional)
+
+try:
+    # Adds the specified ids to the given dashboards' ACL
+    api_instance.add_access(body=body)
+except ApiException as e:
+    print("Exception when calling DashboardApi->add_access: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[ACL]**](ACL.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **add_dashboard_tag**
 > ResponseContainer add_dashboard_tag(id, tag_value)
 
@@ -182,6 +241,114 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **favorite_dashboard**
+> ResponseContainer favorite_dashboard(id)
+
+Mark a dashboard as favorite
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Mark a dashboard as favorite
+    api_response = api_instance.favorite_dashboard(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DashboardApi->favorite_dashboard: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_access_control_list**
+> ResponseContainerListACL get_access_control_list(id=id)
+
+Get list of Access Control Lists for the specified dashboards
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
+id = ['id_example'] # list[str] |  (optional)
+
+try:
+    # Get list of Access Control Lists for the specified dashboards
+    api_response = api_instance.get_access_control_list(id=id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DashboardApi->get_access_control_list: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | [**list[str]**](str.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerListACL**](ResponseContainerListACL.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_dashboard**
 > ResponseContainerPagedDashboard get_all_dashboard(offset=offset, limit=limit)
 
@@ -460,6 +627,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_access**
+> remove_access(body=body)
+
+Removes the specified ids from the given dashboards' ACL
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.ACL()] # list[ACL] |  (optional)
+
+try:
+    # Removes the specified ids from the given dashboards' ACL
+    api_instance.remove_access(body=body)
+except ApiException as e:
+    print("Exception when calling DashboardApi->remove_access: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[ACL]**](ACL.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **remove_dashboard_tag**
 > ResponseContainer remove_dashboard_tag(id, tag_value)
 
@@ -516,6 +736,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **set_acl**
+> set_acl(body=body)
+
+Set ACL for the specified dashboards
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.ACL()] # list[ACL] |  (optional)
+
+try:
+    # Set ACL for the specified dashboards
+    api_instance.set_acl(body=body)
+except ApiException as e:
+    print("Exception when calling DashboardApi->set_acl: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[ACL]**](ACL.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **set_dashboard_tags**
 > ResponseContainer set_dashboard_tags(id, body=body)
 
@@ -626,6 +899,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **unfavorite_dashboard**
+> ResponseContainer unfavorite_dashboard(id)
+
+Unmark a dashboard as favorite
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Unmark a dashboard as favorite
+    api_response = api_instance.unfavorite_dashboard(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling DashboardApi->unfavorite_dashboard: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **update_dashboard**
 > ResponseContainerDashboard update_dashboard(id, body=body)
 
diff --git a/docs/DashboardParameterValue.md b/docs/DashboardParameterValue.md
index a623547..904a25c 100644
--- a/docs/DashboardParameterValue.md
+++ b/docs/DashboardParameterValue.md
@@ -4,8 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **label** | **str** |  | [optional] 
-**default_value** | **str** |  | [optional] 
 **description** | **str** |  | [optional] 
+**default_value** | **str** |  | [optional] 
 **parameter_type** | **str** |  | [optional] 
 **values_to_readable_strings** | **dict(str, str)** |  | [optional] 
 **dynamic_field_type** | **str** |  | [optional] 
@@ -13,8 +13,8 @@ Name | Type | Description | Notes
 **hide_from_view** | **bool** |  | [optional] 
 **tag_key** | **str** |  | [optional] 
 **multivalue** | **bool** |  | [optional] 
-**allow_all** | **bool** |  | [optional] 
 **reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
+**allow_all** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DerivedMetricApi.md b/docs/DerivedMetricApi.md
index 94c227c..31f6e5a 100644
--- a/docs/DerivedMetricApi.md
+++ b/docs/DerivedMetricApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.DerivedMetricApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
@@ -97,7 +97,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.DerivedMetricDefinition() # DerivedMetricDefinition | Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derrivedMetricTag1\"     ]   } }</pre> (optional)
+body = wavefront_api_client.DerivedMetricDefinition() # DerivedMetricDefinition | Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derivedMetricTag1\"     ]   } }</pre> (optional)
 
 try:
     # Create a specific derived metric definition
@@ -111,7 +111,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Query Name\&quot;,   \&quot;query\&quot;: \&quot;aliasMetric(ts(~sample.cpu.loadavg.1m), \\\&quot;my.new.metric\\\&quot;)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;derrivedMetricTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
+ **body** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Query Name\&quot;,   \&quot;query\&quot;: \&quot;aliasMetric(ts(~sample.cpu.loadavg.1m), \\\&quot;my.new.metric\\\&quot;)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;derivedMetricTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index 4c7c27f..e785cef 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -4,31 +4,31 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **created** | **int** | When this derived metric was created, in epoch millis | [optional] 
-**minutes** | **int** | How frequently the query generating the derived metric is run | 
 **name** | **str** |  | 
 **id** | **str** |  | [optional] 
 **query** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m). | 
+**minutes** | **int** | How frequently the query generating the derived metric is run | 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **status** | **list[str]** | Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA | [optional] 
 **updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
+**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
 **process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
 **last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
 **update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
-**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
+**additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
 **last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
 **in_trash** | **bool** |  | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the query last ran | [optional] 
 **create_user_id** | **str** |  | [optional] 
-**additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
 **last_failed_time** | **int** | The time of the last error encountered when running the query, in epoch millis | [optional] 
-**last_error_message** | **str** | The last error encountered when running the query | [optional] 
+**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the query | [optional] 
 **hosts_used** | **list[str]** | Number of hosts checked by the query | [optional] 
-**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
+**creator_id** | **str** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **query_qb_enabled** | **bool** | Whether the query was created using the Query Builder. Default false | [optional] 
 **query_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true | [optional] 
+**last_error_message** | **str** | The last error encountered when running the query | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
diff --git a/docs/DirectIngestionApi.md b/docs/DirectIngestionApi.md
new file mode 100644
index 0000000..f5c704f
--- /dev/null
+++ b/docs/DirectIngestionApi.md
@@ -0,0 +1,64 @@
+# wavefront_api_client.DirectIngestionApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**report**](DirectIngestionApi.md#report) | **POST** /report | Directly ingest data/data stream with specified format
+
+
+# **report**
+> report(f=f, body=body)
+
+Directly ingest data/data stream with specified format
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.DirectIngestionApi(wavefront_api_client.ApiClient(configuration))
+f = 'wavefront' # str | Format of data to be ingested (optional) (default to wavefront)
+body = 'body_example' # str | Data to be ingested, in the specified format.  See https://docs.wavefront.com/direct_ingestion.html for more detail on how to format the data. Example in \"wavefront\" format:  <pre>test.metric 100 source=test.source</pre> which ingests a time series point with metric name \"test.metric\", source name \"test.source\", and value of 100 with timestamp of now. (optional)
+
+try:
+    # Directly ingest data/data stream with specified format
+    api_instance.report(f=f, body=body)
+except ApiException as e:
+    print("Exception when calling DirectIngestionApi->report: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **f** | **str**| Format of data to be ingested | [optional] [default to wavefront]
+ **body** | **str**| Data to be ingested, in the specified format.  See https://docs.wavefront.com/direct_ingestion.html for more detail on how to format the data. Example in \&quot;wavefront\&quot; format:  &lt;pre&gt;test.metric 100 source&#x3D;test.source&lt;/pre&gt; which ingests a time series point with metric name \&quot;test.metric\&quot;, source name \&quot;test.source\&quot;, and value of 100 with timestamp of now. | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/octet-stream, application/x-www-form-urlencoded, text/plain
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/EC2Configuration.md b/docs/EC2Configuration.md
index 73f8e6f..bfe95c1 100644
--- a/docs/EC2Configuration.md
+++ b/docs/EC2Configuration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **host_name_tags** | **list[str]** | A list of AWS instance tags that, when found, will be used as the \&quot;source\&quot; name in a series.  Default: [\&quot;hostname\&quot;, \&quot;host\&quot;, \&quot;name\&quot;].  If no tag in this list is found, the series source is set to the instance id. | [optional] 
+**base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Event.md b/docs/Event.md
index 66e4112..4ea01b2 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -4,26 +4,26 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
+**table** | **str** | The customer to which the event belongs | [optional] 
 **end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
 **name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **id** | **str** |  | [optional] 
-**table** | **str** | The customer to which the event belongs | [optional] 
 **tags** | **list[str]** | A list of event tags | [optional] 
 **created_at** | **int** |  | [optional] 
 **is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
+**updated_at** | **int** |  | [optional] 
+**hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
 **is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
 **creator_id** | **str** |  | [optional] 
-**hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
-**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
 **updater_id** | **str** |  | [optional] 
-**updated_at** | **int** |  | [optional] 
+**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**running_state** | **str** |  | [optional] 
 **can_delete** | **bool** |  | [optional] 
 **can_close** | **bool** |  | [optional] 
 **creator_type** | **list[str]** |  | [optional] 
+**running_state** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EventApi.md b/docs/EventApi.md
index dbd0fdb..cd3d7e1 100644
--- a/docs/EventApi.md
+++ b/docs/EventApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.EventApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/ExternalLink.md b/docs/ExternalLink.md
index 05ff500..ed82e7d 100644
--- a/docs/ExternalLink.md
+++ b/docs/ExternalLink.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**description** | **str** | Human-readable description for this external link | 
 **name** | **str** | Name of the external link.  Will be displayed in context (right-click) menus on charts | 
 **id** | **str** |  | [optional] 
-**description** | **str** | Human-readable description for this external link | 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
 **template** | **str** | The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc | 
 **metric_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **source_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **point_tag_filter_regexes** | **dict(str, str)** | Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ExternalLinkApi.md b/docs/ExternalLinkApi.md
index b169a7f..83a8b2c 100644
--- a/docs/ExternalLinkApi.md
+++ b/docs/ExternalLinkApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.ExternalLinkApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/GCPBillingConfiguration.md b/docs/GCPBillingConfiguration.md
index f7f0fba..cd6d0e1 100644
--- a/docs/GCPBillingConfiguration.md
+++ b/docs/GCPBillingConfiguration.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
-**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
 **gcp_api_key** | **str** | API key for Google Cloud Platform (GCP). Use &#39;saved_api_key&#39; to retain existing API key when updating | 
+**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index d3d2abf..02eee12 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
-**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/InstallAlerts.md b/docs/InstallAlerts.md
new file mode 100644
index 0000000..6d9a789
--- /dev/null
+++ b/docs/InstallAlerts.md
@@ -0,0 +1,10 @@
+# InstallAlerts
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**target** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Integration.md b/docs/Integration.md
index d010bef..f65fa44 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -3,21 +3,22 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**icon** | **str** | URI path to the integration icon | 
 **version** | **str** | Integration version string | 
-**name** | **str** | Integration name | 
-**id** | **str** |  | [optional] 
 **metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
+**icon** | **str** | URI path to the integration icon | 
 **description** | **str** | Integration description | 
+**name** | **str** | Integration name | 
+**id** | **str** |  | [optional] 
 **base_url** | **str** | Base URL for this integration&#39;s assets | [optional] 
 **status** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
+**alerts** | [**list[IntegrationAlert]**](IntegrationAlert.md) | A list of alerts belonging to this integration | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**dashboards** | [**list[IntegrationDashboard]**](IntegrationDashboard.md) | A list of dashboards belonging to this integration | [optional] 
 **alias_of** | **str** | If set, designates this integration as an alias integration, of the integration whose id is specified. | [optional] 
 **alias_integrations** | [**list[IntegrationAlias]**](IntegrationAlias.md) | If set, a list of objects describing integrations that alias this one. | [optional] 
+**dashboards** | [**list[IntegrationDashboard]**](IntegrationDashboard.md) | A list of dashboards belonging to this integration | [optional] 
 **deleted** | **bool** |  | [optional] 
 **overview** | **str** | Descriptive text giving an overview of integration functionality | [optional] 
 **setup** | **str** | How the integration will be set-up | [optional] 
diff --git a/docs/IntegrationAlert.md b/docs/IntegrationAlert.md
new file mode 100644
index 0000000..8171907
--- /dev/null
+++ b/docs/IntegrationAlert.md
@@ -0,0 +1,13 @@
+# IntegrationAlert
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** | Alert description | 
+**name** | **str** | Alert name | 
+**url** | **str** | URL path to the JSON definition of this alert | 
+**alert_obj** | [**Alert**](Alert.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IntegrationAlias.md b/docs/IntegrationAlias.md
index f3a72ba..025a152 100644
--- a/docs/IntegrationAlias.md
+++ b/docs/IntegrationAlias.md
@@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **icon** | **str** | Icon path of the alias Integration | [optional] 
+**description** | **str** | Description of the alias Integration | [optional] 
 **name** | **str** | Name of the alias Integration | [optional] 
 **id** | **str** | ID of the alias Integration | [optional] 
-**description** | **str** | Description of the alias Integration | [optional] 
 **base_url** | **str** | Base URL of this alias Integration | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/IntegrationApi.md b/docs/IntegrationApi.md
index 7b772ab..f96fc3c 100644
--- a/docs/IntegrationApi.md
+++ b/docs/IntegrationApi.md
@@ -1,15 +1,19 @@
 # wavefront_api_client.IntegrationApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**get_all_integration**](IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Wavefront integrations available, along with their status
-[**get_all_integration_in_manifests**](IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status
+[**get_all_integration_in_manifests**](IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
+[**get_all_integration_in_manifests_min**](IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Wavefront integrations as structured in their integration manifests.
 [**get_all_integration_statuses**](IntegrationApi.md#get_all_integration_statuses) | **GET** /api/v2/integration/status | Gets the status of all Wavefront integrations
+[**get_installed_integration**](IntegrationApi.md#get_installed_integration) | **GET** /api/v2/integration/installed | Gets a flat list of all Integrations that are installed, along with their status
 [**get_integration**](IntegrationApi.md#get_integration) | **GET** /api/v2/integration/{id} | Gets a single Wavefront integration by its id, along with its status
 [**get_integration_status**](IntegrationApi.md#get_integration_status) | **GET** /api/v2/integration/{id}/status | Gets the status of a single Wavefront integration
+[**install_all_integration_alerts**](IntegrationApi.md#install_all_integration_alerts) | **POST** /api/v2/integration/{id}/install-all-alerts | Enable all alerts associated with this integration
 [**install_integration**](IntegrationApi.md#install_integration) | **POST** /api/v2/integration/{id}/install | Installs a Wavefront integration
+[**uninstall_all_integration_alerts**](IntegrationApi.md#uninstall_all_integration_alerts) | **POST** /api/v2/integration/{id}/uninstall-all-alerts | Disable all alerts associated with this integration
 [**uninstall_integration**](IntegrationApi.md#uninstall_integration) | **POST** /api/v2/integration/{id}/uninstall | Uninstalls a Wavefront integration
 
 
@@ -72,7 +76,7 @@ Name | Type | Description  | Notes
 # **get_all_integration_in_manifests**
 > ResponseContainerListIntegrationManifestGroup get_all_integration_in_manifests()
 
-Gets all Wavefront integrations as structured in their integration manifests, along with their status
+Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
 
 
 
@@ -94,7 +98,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
 
 try:
-    # Gets all Wavefront integrations as structured in their integration manifests, along with their status
+    # Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
     api_response = api_instance.get_all_integration_in_manifests()
     pprint(api_response)
 except ApiException as e:
@@ -119,6 +123,56 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_all_integration_in_manifests_min**
+> ResponseContainerListIntegrationManifestGroup get_all_integration_in_manifests_min()
+
+Gets all Wavefront integrations as structured in their integration manifests.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Gets all Wavefront integrations as structured in their integration manifests.
+    api_response = api_instance.get_all_integration_in_manifests_min()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling IntegrationApi->get_all_integration_in_manifests_min: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListIntegrationManifestGroup**](ResponseContainerListIntegrationManifestGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_integration_statuses**
 > ResponseContainerMapStringIntegrationStatus get_all_integration_statuses()
 
@@ -169,8 +223,58 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_installed_integration**
+> ResponseContainerListIntegration get_installed_integration()
+
+Gets a flat list of all Integrations that are installed, along with their status
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Gets a flat list of all Integrations that are installed, along with their status
+    api_response = api_instance.get_installed_integration()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling IntegrationApi->get_installed_integration: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListIntegration**](ResponseContainerListIntegration.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_integration**
-> ResponseContainerIntegration get_integration(id)
+> ResponseContainerIntegration get_integration(id, refresh=refresh)
 
 Gets a single Wavefront integration by its id, along with its status
 
@@ -193,10 +297,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+refresh = true # bool |  (optional)
 
 try:
     # Gets a single Wavefront integration by its id, along with its status
-    api_response = api_instance.get_integration(id)
+    api_response = api_instance.get_integration(id, refresh=refresh)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling IntegrationApi->get_integration: %s\n" % e)
@@ -207,6 +312,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **refresh** | **bool**|  | [optional] 
 
 ### Return type
 
@@ -277,6 +383,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **install_all_integration_alerts**
+> ResponseContainerIntegrationStatus install_all_integration_alerts(id, body=body)
+
+Enable all alerts associated with this integration
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.InstallAlerts() # InstallAlerts |  (optional)
+
+try:
+    # Enable all alerts associated with this integration
+    api_response = api_instance.install_all_integration_alerts(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling IntegrationApi->install_all_integration_alerts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**InstallAlerts**](InstallAlerts.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerIntegrationStatus**](ResponseContainerIntegrationStatus.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **install_integration**
 > ResponseContainerIntegrationStatus install_integration(id)
 
@@ -331,6 +493,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **uninstall_all_integration_alerts**
+> ResponseContainerIntegrationStatus uninstall_all_integration_alerts(id)
+
+Disable all alerts associated with this integration
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Disable all alerts associated with this integration
+    api_response = api_instance.uninstall_all_integration_alerts(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling IntegrationApi->uninstall_all_integration_alerts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerIntegrationStatus**](ResponseContainerIntegrationStatus.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **uninstall_integration**
 > ResponseContainerIntegrationStatus uninstall_integration(id)
 
diff --git a/docs/IntegrationDashboard.md b/docs/IntegrationDashboard.md
index 33a627e..ed16f69 100644
--- a/docs/IntegrationDashboard.md
+++ b/docs/IntegrationDashboard.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **str** | Dashboard name | 
 **description** | **str** | Dashboard description | 
+**name** | **str** | Dashboard name | 
 **url** | **str** | URL path to the JSON definition of this dashboard | 
 **dashboard_obj** | [**Dashboard**](Dashboard.md) |  | [optional] 
 
diff --git a/docs/IntegrationMetrics.md b/docs/IntegrationMetrics.md
index 3829cd6..e6235da 100644
--- a/docs/IntegrationMetrics.md
+++ b/docs/IntegrationMetrics.md
@@ -4,11 +4,11 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **prefixes** | **list[str]** | Set of metric prefix namespaces belonging to this integration | 
-**display** | **list[str]** | Set of metrics that are displayed in the metric panel during integration setup | 
-**charts** | **list[str]** | URLs for JSON definitions of charts that display info about this integration&#39;s metrics | 
-**chart_objs** | [**list[Chart]**](Chart.md) | Chart JSONs materialized from the links in &#x60;charts&#x60; | [optional] 
 **required** | **list[str]** | Set of \&quot;canary\&quot; metrics that define the \&quot;liveness\&quot; of this integration&#39;s metric ingestion | 
+**charts** | **list[str]** | URLs for JSON definitions of charts that display info about this integration&#39;s metrics | 
 **pps_dimensions** | **list[str]** | For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions | [optional] 
+**display** | **list[str]** | Set of metrics that are displayed in the metric panel during integration setup | 
+**chart_objs** | [**list[Chart]**](Chart.md) | Chart JSONs materialized from the links in &#x60;charts&#x60; | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationStatus.md b/docs/IntegrationStatus.md
index ed0f652..4e4b061 100644
--- a/docs/IntegrationStatus.md
+++ b/docs/IntegrationStatus.md
@@ -4,8 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **content_status** | **str** | Status of integration content, e.g. dashboards | 
-**install_status** | **str** | Whether the customer or an automated process has chosen to install this integration | 
+**install_status** | **str** | Whether the customer or an automated process has installed the dashboards for this integration | 
 **metric_statuses** | [**dict(str, MetricStatus)**](MetricStatus.md) | A Map from names of the required metrics to an object representing their reporting status.  The reporting status object has 3 boolean fields denoting whether the metric has been received during the corresponding time period: &#x60;ever&#x60;, &#x60;recentExceptNow&#x60;, and &#x60;now&#x60;.  &#x60;now&#x60; is on the order of a few hours, and &#x60;recentExceptNow&#x60; is on the order of the past few days, excluding the period considered to be &#x60;now&#x60;. | 
+**alert_statuses** | **dict(str, str)** | A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, &#x60;VISIBLE&#x60;, &#x60;HIDDEN&#x60;, and &#x60;NOT_LOADED&#x60; | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index 45fed30..2bfe861 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -6,10 +6,10 @@ Name | Type | Description | Notes
 **reason** | **str** | The purpose of this maintenance window | 
 **id** | **str** |  | [optional] 
 **customer_id** | **str** |  | [optional] 
-**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
 **title** | **str** | Title of this maintenance window | 
 **start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
 **end_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will end | 
+**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
 **relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
 **relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
 **creator_id** | **str** |  | [optional] 
@@ -19,8 +19,8 @@ Name | Type | Description | Notes
 **relevant_host_tags_anded** | **bool** | Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a source/host must contain one of the tags. Default: false | [optional] 
 **host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
 **event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
-**sort_attr** | **int** | Numeric value used in default sorting | [optional] 
 **running_state** | **str** |  | [optional] 
+**sort_attr** | **int** | Numeric value used in default sorting | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MaintenanceWindowApi.md b/docs/MaintenanceWindowApi.md
index 4e30ae5..0628c96 100644
--- a/docs/MaintenanceWindowApi.md
+++ b/docs/MaintenanceWindowApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.MaintenanceWindowApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/Message.md b/docs/Message.md
index b5cbf8d..396f34d 100644
--- a/docs/Message.md
+++ b/docs/Message.md
@@ -3,14 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
+**scope** | **str** | The audience scope that this message should reach | 
 **attributes** | **dict(str, str)** | A string-&gt;string map of additional properties associated with this message | [optional] 
+**source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
+**severity** | **str** | Message severity | 
 **id** | **str** |  | [optional] 
 **target** | **str** | For scope&#x3D;CUSTOMER or scope&#x3D;USER, the individual customer or user id | [optional] 
 **content** | **str** | Message content | 
-**scope** | **str** | The audience scope that this message should reach | 
 **title** | **str** | Title of this message | 
-**severity** | **str** | Message severity | 
 **start_epoch_millis** | **int** | When this message will begin to be displayed, in epoch millis | 
 **end_epoch_millis** | **int** | When this message will stop being displayed, in epoch millis | 
 **display** | **str** | The form of display for this message | 
diff --git a/docs/MessageApi.md b/docs/MessageApi.md
index 423229d..94d90ba 100644
--- a/docs/MessageApi.md
+++ b/docs/MessageApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.MessageApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/MetricApi.md b/docs/MetricApi.md
index b5eece9..f568d69 100644
--- a/docs/MetricApi.md
+++ b/docs/MetricApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.MetricApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/NewRelicConfiguration.md b/docs/NewRelicConfiguration.md
new file mode 100644
index 0000000..cd1f0c0
--- /dev/null
+++ b/docs/NewRelicConfiguration.md
@@ -0,0 +1,13 @@
+# NewRelicConfiguration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**app_filter_regex** | **str** | A regular expression that a application name must match (case-insensitively) in order to collect metrics. | [optional] 
+**host_filter_regex** | **str** | A regular expression that a host name must match (case-insensitively) in order to collect metrics. | [optional] 
+**new_relic_metric_filters** | [**list[NewRelicMetricFilters]**](NewRelicMetricFilters.md) | Application specific metric filter | [optional] 
+**api_key** | **str** | New Relic REST API Key. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/NewRelicMetricFilters.md b/docs/NewRelicMetricFilters.md
new file mode 100644
index 0000000..cb8e228
--- /dev/null
+++ b/docs/NewRelicMetricFilters.md
@@ -0,0 +1,11 @@
+# NewRelicMetricFilters
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**app_name** | **str** |  | [optional] 
+**metric_filter_regex** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Notificant.md b/docs/Notificant.md
index febee10..c753738 100644
--- a/docs/Notificant.md
+++ b/docs/Notificant.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**method** | **str** | The notification method used for notification target. | 
-**id** | **str** |  | [optional] 
 **content_type** | **str** | The value of the Content-Type header of the webhook POST request. | [optional] 
+**method** | **str** | The notification method used for notification target. | 
 **description** | **str** | Description | 
+**id** | **str** |  | [optional] 
 **customer_id** | **str** |  | [optional] 
 **title** | **str** | Title | 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
 **triggers** | **list[str]** | A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED | 
 **recipient** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
 **custom_http_headers** | **dict(str, str)** | A string-&gt;string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook | [optional] 
diff --git a/docs/NotificantApi.md b/docs/NotificantApi.md
index d8ff00c..7583471 100644
--- a/docs/NotificantApi.md
+++ b/docs/NotificantApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.NotificantApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/PagedUserGroup.md b/docs/PagedUserGroup.md
new file mode 100644
index 0000000..d781e1b
--- /dev/null
+++ b/docs/PagedUserGroup.md
@@ -0,0 +1,16 @@
+# PagedUserGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**items** | [**list[UserGroup]**](UserGroup.md) | List of requested items | [optional] 
+**offset** | **int** |  | [optional] 
+**limit** | **int** |  | [optional] 
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Proxy.md b/docs/Proxy.md
index d42d741..1fb3c23 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **customer_id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
+**last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_known_error** | **str** | deprecated | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
@@ -19,7 +20,6 @@ Name | Type | Description | Notes
 **local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
 **ssh_agent** | **bool** | deprecated | [optional] 
 **ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
-**last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **deleted** | **bool** |  | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
 
diff --git a/docs/ProxyApi.md b/docs/ProxyApi.md
index 4d1a0e3..2c42a7c 100644
--- a/docs/ProxyApi.md
+++ b/docs/ProxyApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.ProxyApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/QueryApi.md b/docs/QueryApi.md
index 90bd407..f454add 100644
--- a/docs/QueryApi.md
+++ b/docs/QueryApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.QueryApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
@@ -9,7 +9,7 @@ Method | HTTP request | Description
 
 
 # **query_api**
-> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted)
+> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
 
 Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
 
@@ -44,10 +44,11 @@ list_mode = true # bool | retrieve events more optimally displayed for a list (o
 strict = true # bool | do not return points outside the query window [s;e), defaults to false (optional)
 include_obsolete_metrics = true # bool | include metrics that have not been reporting recently, defaults to false (optional)
 sorted = false # bool | sorts the output so that returned series are in order, defaults to false (optional) (default to false)
+cached = true # bool | whether the query cache is used, defaults to true (optional) (default to true)
 
 try:
     # Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
-    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted)
+    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling QueryApi->query_api: %s\n" % e)
@@ -70,6 +71,7 @@ Name | Type | Description  | Notes
  **strict** | **bool**| do not return points outside the query window [s;e), defaults to false | [optional] 
  **include_obsolete_metrics** | **bool**| include metrics that have not been reporting recently, defaults to false | [optional] 
  **sorted** | **bool**| sorts the output so that returned series are in order, defaults to false | [optional] [default to false]
+ **cached** | **bool**| whether the query cache is used, defaults to true | [optional] [default to true]
 
 ### Return type
 
diff --git a/docs/QueryResult.md b/docs/QueryResult.md
index 465ccc1..a5b0500 100644
--- a/docs/QueryResult.md
+++ b/docs/QueryResult.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**warnings** | **str** | The warnings incurred by this query | [optional] 
 **name** | **str** | The name of this query | [optional] 
 **query** | **str** | The query used to obtain this result | [optional] 
+**warnings** | **str** | The warnings incurred by this query | [optional] 
+**timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
 **stats** | [**StatsModel**](StatsModel.md) |  | [optional] 
 **events** | [**list[QueryEvent]**](QueryEvent.md) |  | [optional] 
-**timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
 **granularity** | **int** | The granularity of the returned results, in seconds | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/ResponseContainerListACL.md b/docs/ResponseContainerListACL.md
new file mode 100644
index 0000000..57296d2
--- /dev/null
+++ b/docs/ResponseContainerListACL.md
@@ -0,0 +1,11 @@
+# ResponseContainerListACL
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+**response** | [**list[ACL]**](ACL.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListIntegration.md b/docs/ResponseContainerListIntegration.md
new file mode 100644
index 0000000..053e534
--- /dev/null
+++ b/docs/ResponseContainerListIntegration.md
@@ -0,0 +1,11 @@
+# ResponseContainerListIntegration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+**response** | [**list[Integration]**](Integration.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListString.md b/docs/ResponseContainerListString.md
new file mode 100644
index 0000000..b53d0a8
--- /dev/null
+++ b/docs/ResponseContainerListString.md
@@ -0,0 +1,11 @@
+# ResponseContainerListString
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+**response** | **list[str]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListUserGroup.md b/docs/ResponseContainerListUserGroup.md
new file mode 100644
index 0000000..7de1316
--- /dev/null
+++ b/docs/ResponseContainerListUserGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerListUserGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+**response** | [**list[UserGroup]**](UserGroup.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedUserGroup.md b/docs/ResponseContainerPagedUserGroup.md
new file mode 100644
index 0000000..5a8454a
--- /dev/null
+++ b/docs/ResponseContainerPagedUserGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedUserGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+**response** | [**PagedUserGroup**](PagedUserGroup.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerUserGroup.md b/docs/ResponseContainerUserGroup.md
new file mode 100644
index 0000000..0576977
--- /dev/null
+++ b/docs/ResponseContainerUserGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerUserGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+**response** | [**UserGroup**](UserGroup.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedSearchApi.md b/docs/SavedSearchApi.md
index f11a9d4..0ae6d14 100644
--- a/docs/SavedSearchApi.md
+++ b/docs/SavedSearchApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.SavedSearchApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 7770778..b65d3d7 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.SearchApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
@@ -52,6 +52,9 @@ Method | HTTP request | Description
 [**search_user_entities**](SearchApi.md#search_user_entities) | **POST** /api/v2/search/user | Search over a customer&#39;s users
 [**search_user_for_facet**](SearchApi.md#search_user_for_facet) | **POST** /api/v2/search/user/{facet} | Lists the values of a specific facet over the customer&#39;s users
 [**search_user_for_facets**](SearchApi.md#search_user_for_facets) | **POST** /api/v2/search/user/facets | Lists the values of one or more facets over the customer&#39;s users
+[**search_user_group_entities**](SearchApi.md#search_user_group_entities) | **POST** /api/v2/search/usergroup | Search over a customer&#39;s user groups
+[**search_user_group_for_facet**](SearchApi.md#search_user_group_for_facet) | **POST** /api/v2/search/usergroup/{facet} | Lists the values of a specific facet over the customer&#39;s user groups
+[**search_user_group_for_facets**](SearchApi.md#search_user_group_for_facets) | **POST** /api/v2/search/usergroup/facets | Lists the values of one or more facets over the customer&#39;s user groups
 [**search_web_hook_entities**](SearchApi.md#search_web_hook_entities) | **POST** /api/v2/search/webhook | Search over a customer&#39;s webhooks
 [**search_web_hook_for_facet**](SearchApi.md#search_web_hook_for_facet) | **POST** /api/v2/search/webhook/{facet} | Lists the values of a specific facet over the customer&#39;s webhooks
 [**search_webhook_for_facets**](SearchApi.md#search_webhook_for_facets) | **POST** /api/v2/search/webhook/facets | Lists the values of one or more facets over the customer&#39;s webhooks
@@ -2681,6 +2684,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_user_group_entities**
+> ResponseContainerPagedUserGroup search_user_group_entities(body=body)
+
+Search over a customer's user groups
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's user groups
+    api_response = api_instance.search_user_group_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_user_group_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedUserGroup**](ResponseContainerPagedUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_user_group_for_facet**
+> ResponseContainerFacetResponse search_user_group_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's user groups
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's user groups
+    api_response = api_instance.search_user_group_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_user_group_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_user_group_for_facets**
+> ResponseContainerFacetsResponseContainer search_user_group_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's user groups
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's user groups
+    api_response = api_instance.search_user_group_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_user_group_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_web_hook_entities**
 > ResponseContainerPagedNotificant search_web_hook_entities(body=body)
 
diff --git a/docs/SettingsApi.md b/docs/SettingsApi.md
new file mode 100644
index 0000000..cb4cc9d
--- /dev/null
+++ b/docs/SettingsApi.md
@@ -0,0 +1,220 @@
+# wavefront_api_client.SettingsApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_all_permissions**](SettingsApi.md#get_all_permissions) | **GET** /api/v2/customer/permissions | Get all permissions
+[**get_customer_preferences**](SettingsApi.md#get_customer_preferences) | **GET** /api/v2/customer/preferences | Get customer preferences
+[**get_default_user_groups**](SettingsApi.md#get_default_user_groups) | **GET** /api/v2/customer/preferences/defaultUserGroups | Get default user groups customer preferences
+[**post_customer_preferences**](SettingsApi.md#post_customer_preferences) | **POST** /api/v2/customer/preferences | Update selected fields of customer preferences
+
+
+# **get_all_permissions**
+> list[BusinessActionGroupBasicDTO] get_all_permissions()
+
+Get all permissions
+
+Returns all permissions' info data
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all permissions
+    api_response = api_instance.get_all_permissions()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SettingsApi->get_all_permissions: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**list[BusinessActionGroupBasicDTO]**](BusinessActionGroupBasicDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_customer_preferences**
+> CustomerPreferences get_customer_preferences()
+
+Get customer preferences
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get customer preferences
+    api_response = api_instance.get_customer_preferences()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SettingsApi->get_customer_preferences: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**CustomerPreferences**](CustomerPreferences.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_default_user_groups**
+> ResponseContainerListUserGroup get_default_user_groups(body=body)
+
+Get default user groups customer preferences
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.User() # User |  (optional)
+
+try:
+    # Get default user groups customer preferences
+    api_response = api_instance.get_default_user_groups(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SettingsApi->get_default_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerListUserGroup**](ResponseContainerListUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **post_customer_preferences**
+> CustomerPreferences post_customer_preferences(body=body)
+
+Update selected fields of customer preferences
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.CustomerPreferencesUpdating() # CustomerPreferencesUpdating |  (optional)
+
+try:
+    # Update selected fields of customer preferences
+    api_response = api_instance.post_customer_preferences(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SettingsApi->post_customer_preferences: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**CustomerPreferencesUpdating**](CustomerPreferencesUpdating.md)|  | [optional] 
+
+### Return type
+
+[**CustomerPreferences**](CustomerPreferences.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/Source.md b/docs/Source.md
index 18efb0b..58e4000 100644
--- a/docs/Source.md
+++ b/docs/Source.md
@@ -4,8 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **hidden** | **bool** | A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things) | [optional] 
-**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
 **description** | **str** | Description of this source | [optional] 
+**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
 **tags** | **dict(str, bool)** | A Map (String -&gt; boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
diff --git a/docs/SourceApi.md b/docs/SourceApi.md
index 271162f..54d176c 100644
--- a/docs/SourceApi.md
+++ b/docs/SourceApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.SourceApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/docs/SourceLabelPair.md b/docs/SourceLabelPair.md
index c1cc8b2..53d05f8 100644
--- a/docs/SourceLabelPair.md
+++ b/docs/SourceLabelPair.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **label** | **str** |  | [optional] 
+**severity** | **str** |  | [optional] 
 **host** | **str** | Source (or host).  \&quot;Source\&quot; and \&quot;host\&quot; are synonyms in current versions of wavefront, but the host terminology is deprecated | [optional] 
 **tags** | **dict(str, str)** |  | [optional] 
 **firing** | **int** |  | [optional] 
diff --git a/docs/User.md b/docs/User.md
new file mode 100644
index 0000000..c27b135
--- /dev/null
+++ b/docs/User.md
@@ -0,0 +1,26 @@
+# User
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**identifier** | **str** |  | [optional] 
+**customer** | **str** |  | [optional] 
+**credential** | **str** |  | [optional] 
+**provider** | **str** |  | [optional] 
+**groups** | **list[str]** |  | [optional] 
+**user_groups** | **list[str]** |  | [optional] 
+**reset_token** | **str** |  | [optional] 
+**api_token** | **str** |  | [optional] 
+**api_token2** | **str** |  | [optional] 
+**reset_token_creation_millis** | **int** |  | [optional] 
+**invalid_password_attempts** | **int** |  | [optional] 
+**last_successful_login** | **int** |  | [optional] 
+**settings** | [**UserSettings**](UserSettings.md) |  | [optional] 
+**onboarding_state** | **str** |  | [optional] 
+**last_logout** | **int** |  | [optional] 
+**sso_id** | **str** |  | [optional] 
+**super_admin** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserApi.md b/docs/UserApi.md
index a530ef5..77a4ec2 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -1,17 +1,80 @@
 # wavefront_api_client.UserApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_user_to_user_groups**](UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user
 [**create_or_update_user**](UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
+[**delete_multiple_users**](UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users
 [**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user identified by id
 [**get_all_user**](UserApi.md#get_all_user) | **GET** /api/v2/user | Get all users
 [**get_user**](UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email addr)
+[**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific user permission to multiple users
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific user permission
+[**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
+[**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user
+[**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific user permission from multiple users
 [**revoke_user_permission**](UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific user permission
+[**update_user**](UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
 
 
+# **add_user_to_user_groups**
+> UserModel add_user_to_user_groups(id, body=body)
+
+Adds specific user groups to the user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be added to the user (optional)
+
+try:
+    # Adds specific user groups to the user
+    api_response = api_instance.add_user_to_user_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->add_user_to_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| The list of user groups that should be added to the user | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_or_update_user**
 > UserModel create_or_update_user(send_email=send_email, body=body)
 
@@ -36,7 +99,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"browse\"   ] }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre> (optional)
 
 try:
     # Creates or updates a user
@@ -51,7 +114,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;browse\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -68,6 +131,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **delete_multiple_users**
+> ResponseContainerListString delete_multiple_users(body=body)
+
+Deletes multiple users
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of users which should be deleted (optional)
+
+try:
+    # Deletes multiple users
+    api_response = api_instance.delete_multiple_users(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->delete_multiple_users: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**| identifiers of list of users which should be deleted | [optional] 
+
+### Return type
+
+[**ResponseContainerListString**](ResponseContainerListString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **delete_user**
 > delete_user(id)
 
@@ -225,6 +342,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **grant_permission_to_users**
+> UserModel grant_permission_to_users(permission, body=body)
+
+Grants a specific user permission to multiple users
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+body = [wavefront_api_client.list[str]()] # list[str] | list of users which should be revoked by specified permission (optional)
+
+try:
+    # Grants a specific user permission to multiple users
+    api_response = api_instance.grant_permission_to_users(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->grant_permission_to_users: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to grant to the users. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **body** | **list[str]**| list of users which should be revoked by specified permission | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **grant_user_permission**
 > UserModel grant_user_permission(id, group=group)
 
@@ -281,6 +454,172 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **invite_users**
+> UserModel invite_users(body=body)
+
+Invite users with given user groups and permissions.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] } ]</pre> (optional)
+
+try:
+    # Invite users with given user groups and permissions.
+    api_response = api_instance.invite_users(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->invite_users: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_user_from_user_groups**
+> UserModel remove_user_from_user_groups(id, body=body)
+
+Removes specific user groups from the user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be removed from the user (optional)
+
+try:
+    # Removes specific user groups from the user
+    api_response = api_instance.remove_user_from_user_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->remove_user_from_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| The list of user groups that should be removed from the user | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revoke_permission_from_users**
+> UserModel revoke_permission_from_users(permission, body=body)
+
+Revokes a specific user permission from multiple users
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+body = [wavefront_api_client.list[str]()] # list[str] | list of users which should be revoked by specified permission (optional)
+
+try:
+    # Revokes a specific user permission from multiple users
+    api_response = api_instance.revoke_permission_from_users(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->revoke_permission_from_users: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to grant to the users. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **body** | **list[str]**| list of users which should be revoked by specified permission | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **revoke_user_permission**
 > UserModel revoke_user_permission(id, group=group)
 
@@ -337,3 +676,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **update_user**
+> UserModel update_user(id, body=body)
+
+Update user with given user groups and permissions.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre> (optional)
+
+try:
+    # Update user with given user groups and permissions.
+    api_response = api_instance.update_user(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->update_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/UserGroup.md b/docs/UserGroup.md
new file mode 100644
index 0000000..21c07a3
--- /dev/null
+++ b/docs/UserGroup.md
@@ -0,0 +1,16 @@
+# UserGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **str** | Unique ID for the user group | [optional] 
+**name** | **str** | Name of the user group | 
+**permissions** | **list[str]** | Permission assigned to the user group | 
+**customer** | **str** | ID of the customer to which the user group belongs | [optional] 
+**users** | **list[str]** | List of Users that are members of the user group. Maybe incomplete. | [optional] 
+**user_count** | **int** | Total number of users that are members of the user group | [optional] 
+**properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
new file mode 100644
index 0000000..580d8e6
--- /dev/null
+++ b/docs/UserGroupApi.md
@@ -0,0 +1,515 @@
+# wavefront_api_client.UserGroupApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_users_to_user_group**](UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
+[**create_user_group**](UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
+[**delete_user_group**](UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
+[**get_all_user_groups**](UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
+[**get_user_group**](UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
+[**grant_permission_to_user_groups**](UserGroupApi.md#grant_permission_to_user_groups) | **POST** /api/v2/usergroup/grant/{permission} | Grants a single permission to user group(s)
+[**remove_users_from_user_group**](UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
+[**revoke_permission_from_user_groups**](UserGroupApi.md#revoke_permission_from_user_groups) | **POST** /api/v2/usergroup/revoke/{permission} | Revokes a single permission from user group(s)
+[**update_user_group**](UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
+
+
+# **add_users_to_user_group**
+> ResponseContainerUserGroup add_users_to_user_group(id, body=body)
+
+Add multiple users to a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of users that should be added to user group (optional)
+
+try:
+    # Add multiple users to a specific user group
+    api_response = api_instance.add_users_to_user_group(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->add_users_to_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of users that should be added to user group | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_user_group**
+> ResponseContainerUserGroup create_user_group(body=body)
+
+Create a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre> (optional)
+
+try:
+    # Create a specific user group
+    api_response = api_instance.create_user_group(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->create_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_user_group**
+> ResponseContainerUserGroup delete_user_group(id)
+
+Delete a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a specific user group
+    api_response = api_instance.delete_user_group(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->delete_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_user_groups**
+> ResponseContainerPagedUserGroup get_all_user_groups(offset=offset, limit=limit)
+
+Get all user groups for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all user groups for a customer
+    api_response = api_instance.get_all_user_groups(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->get_all_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedUserGroup**](ResponseContainerPagedUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_user_group**
+> ResponseContainerUserGroup get_user_group(id)
+
+Get a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific user group
+    api_response = api_instance.get_user_group(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->get_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **grant_permission_to_user_groups**
+> ResponseContainerUserGroup grant_permission_to_user_groups(permission, body=body)
+
+Grants a single permission to user group(s)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to grant to user group(s).
+body = [wavefront_api_client.list[str]()] # list[str] | List of user groups. (optional)
+
+try:
+    # Grants a single permission to user group(s)
+    api_response = api_instance.grant_permission_to_user_groups(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->grant_permission_to_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to grant to user group(s). | 
+ **body** | **list[str]**| List of user groups. | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_users_from_user_group**
+> ResponseContainerUserGroup remove_users_from_user_group(id, body=body)
+
+Remove multiple users from a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of users that should be removed from user group (optional)
+
+try:
+    # Remove multiple users from a specific user group
+    api_response = api_instance.remove_users_from_user_group(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->remove_users_from_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of users that should be removed from user group | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revoke_permission_from_user_groups**
+> ResponseContainerUserGroup revoke_permission_from_user_groups(permission, body=body)
+
+Revokes a single permission from user group(s)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to revoke from user group(s).
+body = [wavefront_api_client.list[str]()] # list[str] | List of user groups. (optional)
+
+try:
+    # Revokes a single permission from user group(s)
+    api_response = api_instance.revoke_permission_from_user_groups(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->revoke_permission_from_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to revoke from user group(s). | 
+ **body** | **list[str]**| List of user groups. | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_user_group**
+> ResponseContainerUserGroup update_user_group(id, body=body)
+
+Update a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre> (optional)
+
+try:
+    # Update a specific user group
+    api_response = api_instance.update_user_group(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->update_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/UserGroupPropertiesDTO.md b/docs/UserGroupPropertiesDTO.md
new file mode 100644
index 0000000..626cf71
--- /dev/null
+++ b/docs/UserGroupPropertiesDTO.md
@@ -0,0 +1,12 @@
+# UserGroupPropertiesDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name_editable** | **bool** |  | [optional] 
+**permissions_editable** | **bool** |  | [optional] 
+**users_editable** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
new file mode 100644
index 0000000..5e23d3e
--- /dev/null
+++ b/docs/UserGroupWrite.md
@@ -0,0 +1,14 @@
+# UserGroupWrite
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
+**name** | **str** | The name of the user group | 
+**id** | **str** | The unique identifier of the user group | [optional] 
+**customer** | **str** | The id of the customer to which the user group belongs | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 309e3f7..3d2b351 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -5,7 +5,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
 **customer** | **str** | The id of the customer to which this user belongs | 
+**sso_id** | **str** |  | [optional] 
+**last_successful_login** | **int** |  | [optional] 
 **groups** | **list[str]** | The permissions granted to this user | 
+**user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of user groups the user belongs to | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
new file mode 100644
index 0000000..c344a5a
--- /dev/null
+++ b/docs/UserRequestDTO.md
@@ -0,0 +1,14 @@
+# UserRequestDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**identifier** | **str** |  | [optional] 
+**sso_id** | **str** |  | [optional] 
+**customer** | **str** |  | [optional] 
+**groups** | **list[str]** |  | [optional] 
+**user_groups** | **list[str]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
new file mode 100644
index 0000000..863633d
--- /dev/null
+++ b/docs/UserSettings.md
@@ -0,0 +1,18 @@
+# UserSettings
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**preferred_time_zone** | **str** |  | [optional] 
+**chart_title_scalar** | **int** |  | [optional] 
+**show_querybuilder_by_default** | **bool** |  | [optional] 
+**hide_ts_when_querybuilder_shown** | **bool** |  | [optional] 
+**always_hide_querybuilder** | **bool** |  | [optional] 
+**use24_hour_time** | **bool** |  | [optional] 
+**use_dark_theme** | **bool** |  | [optional] 
+**landing_dashboard_slug** | **str** |  | [optional] 
+**show_onboarding** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserToCreate.md b/docs/UserToCreate.md
index 0b4ae56..ef66784 100644
--- a/docs/UserToCreate.md
+++ b/docs/UserToCreate.md
@@ -3,8 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**email_address** | **str** | The (unique) identifier of the user to create.  Must be a valid email address | 
-**groups** | **list[str]** | List of permission groups to grant to this user.  Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are browse, agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management | 
+**email_address** | **str** | The (unique) identifier of the user to create. Must be a valid email address | 
+**groups** | **list[str]** | List of permission groups to grant to this user. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management | 
+**user_groups** | **list[str]** | List of user groups to this user.  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/WebhookApi.md b/docs/WebhookApi.md
index feec29f..b86d3df 100644
--- a/docs/WebhookApi.md
+++ b/docs/WebhookApi.md
@@ -1,6 +1,6 @@
 # wavefront_api_client.WebhookApi
 
-All URIs are relative to *https://localhost*
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/setup.py b/setup.py
index 6a3a7a1..e105680 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.3.2"
+VERSION = "2.9.37"
 # To install the library, run the following
 #
 # python setup.py install
@@ -22,23 +22,24 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["certifi>=2017.4.17",
-            "python-dateutil>=2.1",
-            "six>=1.10",
-            "urllib3>=1.21.1"]
+REQUIRES = [
+    "certifi>=2017.4.17",
+    "python-dateutil>=2.1",
+    "six>=1.10",
+    "urllib3>=1.23"
+]
 
 setup(
     name=NAME,
     version=VERSION,
-    description="Wavefront Public API",
-    author="Wavefront",
+    description="Wavefront REST API",
     author_email="support@wavefront.com",
     url="https://github.com/wavefrontHQ/python-client",
-    keywords=["Swagger", "Wavefront Public API"],
+    keywords=["Swagger", "Wavefront REST API"],
     install_requires=REQUIRES,
     packages=find_packages(),
     include_package_data=True,
     long_description="""\
-    &lt;p&gt;The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.&lt;/p&gt;&lt;p&gt;When you make API calls outside the Wavefront API documentation you must add the header \&quot;Authorization: Bearer &amp;lt;&amp;lt;API-TOKEN&amp;gt;&amp;gt;\&quot; to your HTTP requests.&lt;/p&gt;&lt;p&gt;For legacy versions of the Wavefront API, see the &lt;a href&#x3D;\&quot;/api-docs/ui/deprecated\&quot;&gt;legacy API documentation&lt;/a&gt;.&lt;/p&gt;  # noqa: E501
+    &lt;p&gt;The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.&lt;/p&gt;&lt;p&gt;When you make REST API calls outside the Wavefront REST API documentation you must add the header \&quot;Authorization: Bearer &amp;lt;&amp;lt;API-TOKEN&amp;gt;&amp;gt;\&quot; to your HTTP requests.&lt;/p&gt;  # noqa: E501
     """
 )
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..2702246
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,5 @@
+coverage>=4.0.3
+nose>=1.3.7
+pluggy>=0.3.1
+py>=1.4.31
+randomize>=0.13
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/test_access_control_element.py b/test/test_access_control_element.py
new file mode 100644
index 0000000..93b6623
--- /dev/null
+++ b/test/test_access_control_element.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.access_control_element import AccessControlElement  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessControlElement(unittest.TestCase):
+    """AccessControlElement unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccessControlElement(self):
+        """Test AccessControlElement"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.access_control_element.AccessControlElement()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_access_control_list_simple.py b/test/test_access_control_list_simple.py
new file mode 100644
index 0000000..7b77df9
--- /dev/null
+++ b/test/test_access_control_list_simple.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessControlListSimple(unittest.TestCase):
+    """AccessControlListSimple unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccessControlListSimple(self):
+        """Test AccessControlListSimple"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.access_control_list_simple.AccessControlListSimple()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_acl.py b/test/test_acl.py
new file mode 100644
index 0000000..be28dbe
--- /dev/null
+++ b/test/test_acl.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.acl import ACL  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestACL(unittest.TestCase):
+    """ACL unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testACL(self):
+        """Test ACL"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.acl.ACL()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert.py b/test/test_alert.py
new file mode 100644
index 0000000..fd815b9
--- /dev/null
+++ b/test/test_alert.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert import Alert  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlert(unittest.TestCase):
+    """Alert unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlert(self):
+        """Test Alert"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert.Alert()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_api.py b/test/test_alert_api.py
new file mode 100644
index 0000000..2b07544
--- /dev/null
+++ b/test/test_alert_api.py
@@ -0,0 +1,153 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.alert_api import AlertApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertApi(unittest.TestCase):
+    """AlertApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.alert_api.AlertApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_alert_tag(self):
+        """Test case for add_alert_tag
+
+        Add a tag to a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_create_alert(self):
+        """Test case for create_alert
+
+        Create a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_delete_alert(self):
+        """Test case for delete_alert
+
+        Delete a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_get_alert(self):
+        """Test case for get_alert
+
+        Get a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_history(self):
+        """Test case for get_alert_history
+
+        Get the version history of a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_tags(self):
+        """Test case for get_alert_tags
+
+        Get all tags associated with a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_version(self):
+        """Test case for get_alert_version
+
+        Get a specific historical version of a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_get_alerts_summary(self):
+        """Test case for get_alerts_summary
+
+        Count alerts of various statuses for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_all_alert(self):
+        """Test case for get_all_alert
+
+        Get all alerts for a customer  # noqa: E501
+        """
+        pass
+
+    def test_hide_alert(self):
+        """Test case for hide_alert
+
+        Hide a specific integration alert   # noqa: E501
+        """
+        pass
+
+    def test_remove_alert_tag(self):
+        """Test case for remove_alert_tag
+
+        Remove a tag from a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_set_alert_tags(self):
+        """Test case for set_alert_tags
+
+        Set all tags associated with a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_snooze_alert(self):
+        """Test case for snooze_alert
+
+        Snooze a specific alert for some number of seconds  # noqa: E501
+        """
+        pass
+
+    def test_undelete_alert(self):
+        """Test case for undelete_alert
+
+        Undelete a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_unhide_alert(self):
+        """Test case for unhide_alert
+
+        Unhide a specific integration alert  # noqa: E501
+        """
+        pass
+
+    def test_unsnooze_alert(self):
+        """Test case for unsnooze_alert
+
+        Unsnooze a specific alert  # noqa: E501
+        """
+        pass
+
+    def test_update_alert(self):
+        """Test case for update_alert
+
+        Update a specific alert  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_avro_backed_standardized_dto.py b/test/test_avro_backed_standardized_dto.py
new file mode 100644
index 0000000..e916bbc
--- /dev/null
+++ b/test/test_avro_backed_standardized_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAvroBackedStandardizedDTO(unittest.TestCase):
+    """AvroBackedStandardizedDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAvroBackedStandardizedDTO(self):
+        """Test AvroBackedStandardizedDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.avro_backed_standardized_dto.AvroBackedStandardizedDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_aws_base_credentials.py b/test/test_aws_base_credentials.py
new file mode 100644
index 0000000..96cb5c0
--- /dev/null
+++ b/test/test_aws_base_credentials.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAWSBaseCredentials(unittest.TestCase):
+    """AWSBaseCredentials unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAWSBaseCredentials(self):
+        """Test AWSBaseCredentials"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.aws_base_credentials.AWSBaseCredentials()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_azure_activity_log_configuration.py b/test/test_azure_activity_log_configuration.py
new file mode 100644
index 0000000..f8e7295
--- /dev/null
+++ b/test/test_azure_activity_log_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAzureActivityLogConfiguration(unittest.TestCase):
+    """AzureActivityLogConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAzureActivityLogConfiguration(self):
+        """Test AzureActivityLogConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.azure_activity_log_configuration.AzureActivityLogConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_azure_base_credentials.py b/test/test_azure_base_credentials.py
new file mode 100644
index 0000000..dc19590
--- /dev/null
+++ b/test/test_azure_base_credentials.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAzureBaseCredentials(unittest.TestCase):
+    """AzureBaseCredentials unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAzureBaseCredentials(self):
+        """Test AzureBaseCredentials"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.azure_base_credentials.AzureBaseCredentials()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_azure_configuration.py b/test/test_azure_configuration.py
new file mode 100644
index 0000000..b08bd20
--- /dev/null
+++ b/test/test_azure_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.azure_configuration import AzureConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAzureConfiguration(unittest.TestCase):
+    """AzureConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAzureConfiguration(self):
+        """Test AzureConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.azure_configuration.AzureConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_business_action_group_basic_dto.py b/test/test_business_action_group_basic_dto.py
new file mode 100644
index 0000000..8308ddd
--- /dev/null
+++ b/test/test_business_action_group_basic_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.business_action_group_basic_dto import BusinessActionGroupBasicDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestBusinessActionGroupBasicDTO(unittest.TestCase):
+    """BusinessActionGroupBasicDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testBusinessActionGroupBasicDTO(self):
+        """Test BusinessActionGroupBasicDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.business_action_group_basic_dto.BusinessActionGroupBasicDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_chart.py b/test/test_chart.py
new file mode 100644
index 0000000..03b728b
--- /dev/null
+++ b/test/test_chart.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.chart import Chart  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestChart(unittest.TestCase):
+    """Chart unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testChart(self):
+        """Test Chart"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.chart.Chart()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_chart_settings.py b/test/test_chart_settings.py
new file mode 100644
index 0000000..40fc2c8
--- /dev/null
+++ b/test/test_chart_settings.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.chart_settings import ChartSettings  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestChartSettings(unittest.TestCase):
+    """ChartSettings unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testChartSettings(self):
+        """Test ChartSettings"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.chart_settings.ChartSettings()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_chart_source_query.py b/test/test_chart_source_query.py
new file mode 100644
index 0000000..1267104
--- /dev/null
+++ b/test/test_chart_source_query.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.chart_source_query import ChartSourceQuery  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestChartSourceQuery(unittest.TestCase):
+    """ChartSourceQuery unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testChartSourceQuery(self):
+        """Test ChartSourceQuery"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.chart_source_query.ChartSourceQuery()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_cloud_integration.py b/test/test_cloud_integration.py
new file mode 100644
index 0000000..a3e6d11
--- /dev/null
+++ b/test/test_cloud_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.cloud_integration import CloudIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCloudIntegration(unittest.TestCase):
+    """CloudIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testCloudIntegration(self):
+        """Test CloudIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.cloud_integration.CloudIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_cloud_integration_api.py b/test/test_cloud_integration_api.py
new file mode 100644
index 0000000..2f2a7eb
--- /dev/null
+++ b/test/test_cloud_integration_api.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCloudIntegrationApi(unittest.TestCase):
+    """CloudIntegrationApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.cloud_integration_api.CloudIntegrationApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_cloud_integration(self):
+        """Test case for create_cloud_integration
+
+        Create a cloud integration  # noqa: E501
+        """
+        pass
+
+    def test_delete_cloud_integration(self):
+        """Test case for delete_cloud_integration
+
+        Delete a specific cloud integration  # noqa: E501
+        """
+        pass
+
+    def test_disable_cloud_integration(self):
+        """Test case for disable_cloud_integration
+
+        Disable a specific cloud integration  # noqa: E501
+        """
+        pass
+
+    def test_enable_cloud_integration(self):
+        """Test case for enable_cloud_integration
+
+        Enable a specific cloud integration  # noqa: E501
+        """
+        pass
+
+    def test_get_all_cloud_integration(self):
+        """Test case for get_all_cloud_integration
+
+        Get all cloud integrations for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_cloud_integration(self):
+        """Test case for get_cloud_integration
+
+        Get a specific cloud integration  # noqa: E501
+        """
+        pass
+
+    def test_undelete_cloud_integration(self):
+        """Test case for undelete_cloud_integration
+
+        Undelete a specific cloud integration  # noqa: E501
+        """
+        pass
+
+    def test_update_cloud_integration(self):
+        """Test case for update_cloud_integration
+
+        Update a specific cloud integration  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_cloud_trail_configuration.py b/test/test_cloud_trail_configuration.py
new file mode 100644
index 0000000..b84875a
--- /dev/null
+++ b/test/test_cloud_trail_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCloudTrailConfiguration(unittest.TestCase):
+    """CloudTrailConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testCloudTrailConfiguration(self):
+        """Test CloudTrailConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.cloud_trail_configuration.CloudTrailConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_cloud_watch_configuration.py b/test/test_cloud_watch_configuration.py
new file mode 100644
index 0000000..32012a3
--- /dev/null
+++ b/test/test_cloud_watch_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCloudWatchConfiguration(unittest.TestCase):
+    """CloudWatchConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testCloudWatchConfiguration(self):
+        """Test CloudWatchConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.cloud_watch_configuration.CloudWatchConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_customer_facing_user_object.py b/test/test_customer_facing_user_object.py
new file mode 100644
index 0000000..ff71a6f
--- /dev/null
+++ b/test/test_customer_facing_user_object.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCustomerFacingUserObject(unittest.TestCase):
+    """CustomerFacingUserObject unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testCustomerFacingUserObject(self):
+        """Test CustomerFacingUserObject"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.customer_facing_user_object.CustomerFacingUserObject()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_customer_preferences.py b/test/test_customer_preferences.py
new file mode 100644
index 0000000..4ddbf42
--- /dev/null
+++ b/test/test_customer_preferences.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.customer_preferences import CustomerPreferences  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCustomerPreferences(unittest.TestCase):
+    """CustomerPreferences unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testCustomerPreferences(self):
+        """Test CustomerPreferences"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.customer_preferences.CustomerPreferences()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_customer_preferences_updating.py b/test/test_customer_preferences_updating.py
new file mode 100644
index 0000000..3ebc904
--- /dev/null
+++ b/test/test_customer_preferences_updating.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestCustomerPreferencesUpdating(unittest.TestCase):
+    """CustomerPreferencesUpdating unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testCustomerPreferencesUpdating(self):
+        """Test CustomerPreferencesUpdating"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.customer_preferences_updating.CustomerPreferencesUpdating()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_dashboard.py b/test/test_dashboard.py
new file mode 100644
index 0000000..3422df4
--- /dev/null
+++ b/test/test_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.dashboard import Dashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDashboard(unittest.TestCase):
+    """Dashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDashboard(self):
+        """Test Dashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.dashboard.Dashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_dashboard_api.py b/test/test_dashboard_api.py
new file mode 100644
index 0000000..a62a9ca
--- /dev/null
+++ b/test/test_dashboard_api.py
@@ -0,0 +1,160 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.dashboard_api import DashboardApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDashboardApi(unittest.TestCase):
+    """DashboardApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.dashboard_api.DashboardApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_access(self):
+        """Test case for add_access
+
+        Adds the specified ids to the given dashboards' ACL  # noqa: E501
+        """
+        pass
+
+    def test_add_dashboard_tag(self):
+        """Test case for add_dashboard_tag
+
+        Add a tag to a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_create_dashboard(self):
+        """Test case for create_dashboard
+
+        Create a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_delete_dashboard(self):
+        """Test case for delete_dashboard
+
+        Delete a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_favorite_dashboard(self):
+        """Test case for favorite_dashboard
+
+        Mark a dashboard as favorite  # noqa: E501
+        """
+        pass
+
+    def test_get_access_control_list(self):
+        """Test case for get_access_control_list
+
+        Get list of Access Control Lists for the specified dashboards  # noqa: E501
+        """
+        pass
+
+    def test_get_all_dashboard(self):
+        """Test case for get_all_dashboard
+
+        Get all dashboards for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_dashboard(self):
+        """Test case for get_dashboard
+
+        Get a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_get_dashboard_history(self):
+        """Test case for get_dashboard_history
+
+        Get the version history of a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_get_dashboard_tags(self):
+        """Test case for get_dashboard_tags
+
+        Get all tags associated with a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_get_dashboard_version(self):
+        """Test case for get_dashboard_version
+
+        Get a specific version of a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_remove_access(self):
+        """Test case for remove_access
+
+        Removes the specified ids from the given dashboards' ACL  # noqa: E501
+        """
+        pass
+
+    def test_remove_dashboard_tag(self):
+        """Test case for remove_dashboard_tag
+
+        Remove a tag from a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_set_acl(self):
+        """Test case for set_acl
+
+        Set ACL for the specified dashboards  # noqa: E501
+        """
+        pass
+
+    def test_set_dashboard_tags(self):
+        """Test case for set_dashboard_tags
+
+        Set all tags associated with a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_undelete_dashboard(self):
+        """Test case for undelete_dashboard
+
+        Undelete a specific dashboard  # noqa: E501
+        """
+        pass
+
+    def test_unfavorite_dashboard(self):
+        """Test case for unfavorite_dashboard
+
+        Unmark a dashboard as favorite  # noqa: E501
+        """
+        pass
+
+    def test_update_dashboard(self):
+        """Test case for update_dashboard
+
+        Update a specific dashboard  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_dashboard_parameter_value.py b/test/test_dashboard_parameter_value.py
new file mode 100644
index 0000000..ec1f559
--- /dev/null
+++ b/test/test_dashboard_parameter_value.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDashboardParameterValue(unittest.TestCase):
+    """DashboardParameterValue unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDashboardParameterValue(self):
+        """Test DashboardParameterValue"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.dashboard_parameter_value.DashboardParameterValue()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_dashboard_section.py b/test/test_dashboard_section.py
new file mode 100644
index 0000000..6a3102e
--- /dev/null
+++ b/test/test_dashboard_section.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.dashboard_section import DashboardSection  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDashboardSection(unittest.TestCase):
+    """DashboardSection unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDashboardSection(self):
+        """Test DashboardSection"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.dashboard_section.DashboardSection()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_dashboard_section_row.py b/test/test_dashboard_section_row.py
new file mode 100644
index 0000000..75234fa
--- /dev/null
+++ b/test/test_dashboard_section_row.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDashboardSectionRow(unittest.TestCase):
+    """DashboardSectionRow unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDashboardSectionRow(self):
+        """Test DashboardSectionRow"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.dashboard_section_row.DashboardSectionRow()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_derived_metric_api.py b/test/test_derived_metric_api.py
new file mode 100644
index 0000000..4a04d2f
--- /dev/null
+++ b/test/test_derived_metric_api.py
@@ -0,0 +1,118 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.derived_metric_api import DerivedMetricApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDerivedMetricApi(unittest.TestCase):
+    """DerivedMetricApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.derived_metric_api.DerivedMetricApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_tag_to_derived_metric(self):
+        """Test case for add_tag_to_derived_metric
+
+        Add a tag to a specific Derived Metric  # noqa: E501
+        """
+        pass
+
+    def test_create_derived_metric(self):
+        """Test case for create_derived_metric
+
+        Create a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_delete_derived_metric(self):
+        """Test case for delete_derived_metric
+
+        Delete a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_get_all_derived_metrics(self):
+        """Test case for get_all_derived_metrics
+
+        Get all derived metric definitions for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_derived_metric(self):
+        """Test case for get_derived_metric
+
+        Get a specific registered query  # noqa: E501
+        """
+        pass
+
+    def test_get_derived_metric_by_version(self):
+        """Test case for get_derived_metric_by_version
+
+        Get a specific historical version of a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_get_derived_metric_history(self):
+        """Test case for get_derived_metric_history
+
+        Get the version history of a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_get_derived_metric_tags(self):
+        """Test case for get_derived_metric_tags
+
+        Get all tags associated with a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_remove_tag_from_derived_metric(self):
+        """Test case for remove_tag_from_derived_metric
+
+        Remove a tag from a specific Derived Metric  # noqa: E501
+        """
+        pass
+
+    def test_set_derived_metric_tags(self):
+        """Test case for set_derived_metric_tags
+
+        Set all tags associated with a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_undelete_derived_metric(self):
+        """Test case for undelete_derived_metric
+
+        Undelete a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_update_derived_metric(self):
+        """Test case for update_derived_metric
+
+        Update a specific derived metric definition  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_derived_metric_definition.py b/test/test_derived_metric_definition.py
new file mode 100644
index 0000000..87297df
--- /dev/null
+++ b/test/test_derived_metric_definition.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDerivedMetricDefinition(unittest.TestCase):
+    """DerivedMetricDefinition unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDerivedMetricDefinition(self):
+        """Test DerivedMetricDefinition"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.derived_metric_definition.DerivedMetricDefinition()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_direct_ingestion_api.py b/test/test_direct_ingestion_api.py
new file mode 100644
index 0000000..75803ec
--- /dev/null
+++ b/test/test_direct_ingestion_api.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.direct_ingestion_api import DirectIngestionApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDirectIngestionApi(unittest.TestCase):
+    """DirectIngestionApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.direct_ingestion_api.DirectIngestionApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_report(self):
+        """Test case for report
+
+        Directly ingest data/data stream with specified format  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_ec2_configuration.py b/test/test_ec2_configuration.py
new file mode 100644
index 0000000..a65ab09
--- /dev/null
+++ b/test/test_ec2_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ec2_configuration import EC2Configuration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestEC2Configuration(unittest.TestCase):
+    """EC2Configuration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testEC2Configuration(self):
+        """Test EC2Configuration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ec2_configuration.EC2Configuration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_event.py b/test/test_event.py
new file mode 100644
index 0000000..18aa45b
--- /dev/null
+++ b/test/test_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.event import Event  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestEvent(unittest.TestCase):
+    """Event unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testEvent(self):
+        """Test Event"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.event.Event()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_event_api.py b/test/test_event_api.py
new file mode 100644
index 0000000..5a4818f
--- /dev/null
+++ b/test/test_event_api.py
@@ -0,0 +1,104 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.event_api import EventApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestEventApi(unittest.TestCase):
+    """EventApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.event_api.EventApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_event_tag(self):
+        """Test case for add_event_tag
+
+        Add a tag to a specific event  # noqa: E501
+        """
+        pass
+
+    def test_close_event(self):
+        """Test case for close_event
+
+        Close a specific event  # noqa: E501
+        """
+        pass
+
+    def test_create_event(self):
+        """Test case for create_event
+
+        Create a specific event  # noqa: E501
+        """
+        pass
+
+    def test_delete_event(self):
+        """Test case for delete_event
+
+        Delete a specific event  # noqa: E501
+        """
+        pass
+
+    def test_get_all_events_with_time_range(self):
+        """Test case for get_all_events_with_time_range
+
+        List all the events for a customer within a time range  # noqa: E501
+        """
+        pass
+
+    def test_get_event(self):
+        """Test case for get_event
+
+        Get a specific event  # noqa: E501
+        """
+        pass
+
+    def test_get_event_tags(self):
+        """Test case for get_event_tags
+
+        Get all tags associated with a specific event  # noqa: E501
+        """
+        pass
+
+    def test_remove_event_tag(self):
+        """Test case for remove_event_tag
+
+        Remove a tag from a specific event  # noqa: E501
+        """
+        pass
+
+    def test_set_event_tags(self):
+        """Test case for set_event_tags
+
+        Set all tags associated with a specific event  # noqa: E501
+        """
+        pass
+
+    def test_update_event(self):
+        """Test case for update_event
+
+        Update a specific event  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_event_search_request.py b/test/test_event_search_request.py
new file mode 100644
index 0000000..534573c
--- /dev/null
+++ b/test/test_event_search_request.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.event_search_request import EventSearchRequest  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestEventSearchRequest(unittest.TestCase):
+    """EventSearchRequest unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testEventSearchRequest(self):
+        """Test EventSearchRequest"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.event_search_request.EventSearchRequest()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_event_time_range.py b/test/test_event_time_range.py
new file mode 100644
index 0000000..cc0b178
--- /dev/null
+++ b/test/test_event_time_range.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.event_time_range import EventTimeRange  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestEventTimeRange(unittest.TestCase):
+    """EventTimeRange unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testEventTimeRange(self):
+        """Test EventTimeRange"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.event_time_range.EventTimeRange()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_external_link.py b/test/test_external_link.py
new file mode 100644
index 0000000..1415ba3
--- /dev/null
+++ b/test/test_external_link.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.external_link import ExternalLink  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestExternalLink(unittest.TestCase):
+    """ExternalLink unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testExternalLink(self):
+        """Test ExternalLink"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.external_link.ExternalLink()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_external_link_api.py b/test/test_external_link_api.py
new file mode 100644
index 0000000..4b9777c
--- /dev/null
+++ b/test/test_external_link_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.external_link_api import ExternalLinkApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestExternalLinkApi(unittest.TestCase):
+    """ExternalLinkApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.external_link_api.ExternalLinkApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_external_link(self):
+        """Test case for create_external_link
+
+        Create a specific external link  # noqa: E501
+        """
+        pass
+
+    def test_delete_external_link(self):
+        """Test case for delete_external_link
+
+        Delete a specific external link  # noqa: E501
+        """
+        pass
+
+    def test_get_all_external_link(self):
+        """Test case for get_all_external_link
+
+        Get all external links for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_external_link(self):
+        """Test case for get_external_link
+
+        Get a specific external link  # noqa: E501
+        """
+        pass
+
+    def test_update_external_link(self):
+        """Test case for update_external_link
+
+        Update a specific external link  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_facet_response.py b/test/test_facet_response.py
new file mode 100644
index 0000000..1a0c440
--- /dev/null
+++ b/test/test_facet_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.facet_response import FacetResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestFacetResponse(unittest.TestCase):
+    """FacetResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testFacetResponse(self):
+        """Test FacetResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.facet_response.FacetResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_facet_search_request_container.py b/test/test_facet_search_request_container.py
new file mode 100644
index 0000000..43fc472
--- /dev/null
+++ b/test/test_facet_search_request_container.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.facet_search_request_container import FacetSearchRequestContainer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestFacetSearchRequestContainer(unittest.TestCase):
+    """FacetSearchRequestContainer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testFacetSearchRequestContainer(self):
+        """Test FacetSearchRequestContainer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.facet_search_request_container.FacetSearchRequestContainer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_facets_response_container.py b/test/test_facets_response_container.py
new file mode 100644
index 0000000..3c7952a
--- /dev/null
+++ b/test/test_facets_response_container.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.facets_response_container import FacetsResponseContainer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestFacetsResponseContainer(unittest.TestCase):
+    """FacetsResponseContainer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testFacetsResponseContainer(self):
+        """Test FacetsResponseContainer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.facets_response_container.FacetsResponseContainer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_facets_search_request_container.py b/test/test_facets_search_request_container.py
new file mode 100644
index 0000000..c6bb16b
--- /dev/null
+++ b/test/test_facets_search_request_container.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestFacetsSearchRequestContainer(unittest.TestCase):
+    """FacetsSearchRequestContainer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testFacetsSearchRequestContainer(self):
+        """Test FacetsSearchRequestContainer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.facets_search_request_container.FacetsSearchRequestContainer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_gcp_billing_configuration.py b/test/test_gcp_billing_configuration.py
new file mode 100644
index 0000000..28c7488
--- /dev/null
+++ b/test/test_gcp_billing_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestGCPBillingConfiguration(unittest.TestCase):
+    """GCPBillingConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testGCPBillingConfiguration(self):
+        """Test GCPBillingConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.gcp_billing_configuration.GCPBillingConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_gcp_configuration.py b/test/test_gcp_configuration.py
new file mode 100644
index 0000000..893ca10
--- /dev/null
+++ b/test/test_gcp_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.gcp_configuration import GCPConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestGCPConfiguration(unittest.TestCase):
+    """GCPConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testGCPConfiguration(self):
+        """Test GCPConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.gcp_configuration.GCPConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_history_entry.py b/test/test_history_entry.py
new file mode 100644
index 0000000..7686610
--- /dev/null
+++ b/test/test_history_entry.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.history_entry import HistoryEntry  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestHistoryEntry(unittest.TestCase):
+    """HistoryEntry unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testHistoryEntry(self):
+        """Test HistoryEntry"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.history_entry.HistoryEntry()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_history_response.py b/test/test_history_response.py
new file mode 100644
index 0000000..ac2e48f
--- /dev/null
+++ b/test/test_history_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.history_response import HistoryResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestHistoryResponse(unittest.TestCase):
+    """HistoryResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testHistoryResponse(self):
+        """Test HistoryResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.history_response.HistoryResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_install_alerts.py b/test/test_install_alerts.py
new file mode 100644
index 0000000..645ea83
--- /dev/null
+++ b/test/test_install_alerts.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.install_alerts import InstallAlerts  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestInstallAlerts(unittest.TestCase):
+    """InstallAlerts unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testInstallAlerts(self):
+        """Test InstallAlerts"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.install_alerts.InstallAlerts()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration.py b/test/test_integration.py
new file mode 100644
index 0000000..072611e
--- /dev/null
+++ b/test/test_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration import Integration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegration(unittest.TestCase):
+    """Integration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegration(self):
+        """Test Integration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration.Integration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_alert.py b/test/test_integration_alert.py
new file mode 100644
index 0000000..1a47596
--- /dev/null
+++ b/test/test_integration_alert.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration_alert import IntegrationAlert  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationAlert(unittest.TestCase):
+    """IntegrationAlert unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegrationAlert(self):
+        """Test IntegrationAlert"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration_alert.IntegrationAlert()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_alias.py b/test/test_integration_alias.py
new file mode 100644
index 0000000..a1b99bf
--- /dev/null
+++ b/test/test_integration_alias.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration_alias import IntegrationAlias  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationAlias(unittest.TestCase):
+    """IntegrationAlias unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegrationAlias(self):
+        """Test IntegrationAlias"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration_alias.IntegrationAlias()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_api.py b/test/test_integration_api.py
new file mode 100644
index 0000000..c6859e0
--- /dev/null
+++ b/test/test_integration_api.py
@@ -0,0 +1,111 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.integration_api import IntegrationApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationApi(unittest.TestCase):
+    """IntegrationApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.integration_api.IntegrationApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_all_integration(self):
+        """Test case for get_all_integration
+
+        Gets a flat list of all Wavefront integrations available, along with their status  # noqa: E501
+        """
+        pass
+
+    def test_get_all_integration_in_manifests(self):
+        """Test case for get_all_integration_in_manifests
+
+        Gets all Wavefront integrations as structured in their integration manifests, along with their status and content  # noqa: E501
+        """
+        pass
+
+    def test_get_all_integration_in_manifests_min(self):
+        """Test case for get_all_integration_in_manifests_min
+
+        Gets all Wavefront integrations as structured in their integration manifests.  # noqa: E501
+        """
+        pass
+
+    def test_get_all_integration_statuses(self):
+        """Test case for get_all_integration_statuses
+
+        Gets the status of all Wavefront integrations  # noqa: E501
+        """
+        pass
+
+    def test_get_installed_integration(self):
+        """Test case for get_installed_integration
+
+        Gets a flat list of all Integrations that are installed, along with their status  # noqa: E501
+        """
+        pass
+
+    def test_get_integration(self):
+        """Test case for get_integration
+
+        Gets a single Wavefront integration by its id, along with its status  # noqa: E501
+        """
+        pass
+
+    def test_get_integration_status(self):
+        """Test case for get_integration_status
+
+        Gets the status of a single Wavefront integration  # noqa: E501
+        """
+        pass
+
+    def test_install_all_integration_alerts(self):
+        """Test case for install_all_integration_alerts
+
+        Enable all alerts associated with this integration  # noqa: E501
+        """
+        pass
+
+    def test_install_integration(self):
+        """Test case for install_integration
+
+        Installs a Wavefront integration  # noqa: E501
+        """
+        pass
+
+    def test_uninstall_all_integration_alerts(self):
+        """Test case for uninstall_all_integration_alerts
+
+        Disable all alerts associated with this integration  # noqa: E501
+        """
+        pass
+
+    def test_uninstall_integration(self):
+        """Test case for uninstall_integration
+
+        Uninstalls a Wavefront integration  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_dashboard.py b/test/test_integration_dashboard.py
new file mode 100644
index 0000000..f978edd
--- /dev/null
+++ b/test/test_integration_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration_dashboard import IntegrationDashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationDashboard(unittest.TestCase):
+    """IntegrationDashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegrationDashboard(self):
+        """Test IntegrationDashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration_dashboard.IntegrationDashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_manifest_group.py b/test/test_integration_manifest_group.py
new file mode 100644
index 0000000..423c236
--- /dev/null
+++ b/test/test_integration_manifest_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationManifestGroup(unittest.TestCase):
+    """IntegrationManifestGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegrationManifestGroup(self):
+        """Test IntegrationManifestGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration_manifest_group.IntegrationManifestGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_metrics.py b/test/test_integration_metrics.py
new file mode 100644
index 0000000..0e3ff5e
--- /dev/null
+++ b/test/test_integration_metrics.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration_metrics import IntegrationMetrics  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationMetrics(unittest.TestCase):
+    """IntegrationMetrics unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegrationMetrics(self):
+        """Test IntegrationMetrics"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration_metrics.IntegrationMetrics()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_integration_status.py b/test/test_integration_status.py
new file mode 100644
index 0000000..eb99345
--- /dev/null
+++ b/test/test_integration_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.integration_status import IntegrationStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIntegrationStatus(unittest.TestCase):
+    """IntegrationStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIntegrationStatus(self):
+        """Test IntegrationStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.integration_status.IntegrationStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_iterator_entry_string_json_node.py b/test/test_iterator_entry_string_json_node.py
new file mode 100644
index 0000000..9fd9dca
--- /dev/null
+++ b/test/test_iterator_entry_string_json_node.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIteratorEntryStringJsonNode(unittest.TestCase):
+    """IteratorEntryStringJsonNode unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIteratorEntryStringJsonNode(self):
+        """Test IteratorEntryStringJsonNode"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.iterator_entry_string_json_node.IteratorEntryStringJsonNode()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_iterator_json_node.py b/test/test_iterator_json_node.py
new file mode 100644
index 0000000..0b7eb08
--- /dev/null
+++ b/test/test_iterator_json_node.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.iterator_json_node import IteratorJsonNode  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIteratorJsonNode(unittest.TestCase):
+    """IteratorJsonNode unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIteratorJsonNode(self):
+        """Test IteratorJsonNode"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.iterator_json_node.IteratorJsonNode()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_iterator_string.py b/test/test_iterator_string.py
new file mode 100644
index 0000000..247458c
--- /dev/null
+++ b/test/test_iterator_string.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.iterator_string import IteratorString  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIteratorString(unittest.TestCase):
+    """IteratorString unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIteratorString(self):
+        """Test IteratorString"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.iterator_string.IteratorString()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_json_node.py b/test/test_json_node.py
new file mode 100644
index 0000000..56c9814
--- /dev/null
+++ b/test/test_json_node.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.json_node import JsonNode  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestJsonNode(unittest.TestCase):
+    """JsonNode unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testJsonNode(self):
+        """Test JsonNode"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.json_node.JsonNode()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_logical_type.py b/test/test_logical_type.py
new file mode 100644
index 0000000..9611707
--- /dev/null
+++ b/test/test_logical_type.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.logical_type import LogicalType  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestLogicalType(unittest.TestCase):
+    """LogicalType unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testLogicalType(self):
+        """Test LogicalType"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.logical_type.LogicalType()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_maintenance_window.py b/test/test_maintenance_window.py
new file mode 100644
index 0000000..c0c6837
--- /dev/null
+++ b/test/test_maintenance_window.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.maintenance_window import MaintenanceWindow  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMaintenanceWindow(unittest.TestCase):
+    """MaintenanceWindow unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMaintenanceWindow(self):
+        """Test MaintenanceWindow"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.maintenance_window.MaintenanceWindow()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_maintenance_window_api.py b/test/test_maintenance_window_api.py
new file mode 100644
index 0000000..93c6037
--- /dev/null
+++ b/test/test_maintenance_window_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMaintenanceWindowApi(unittest.TestCase):
+    """MaintenanceWindowApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.maintenance_window_api.MaintenanceWindowApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_maintenance_window(self):
+        """Test case for create_maintenance_window
+
+        Create a maintenance window  # noqa: E501
+        """
+        pass
+
+    def test_delete_maintenance_window(self):
+        """Test case for delete_maintenance_window
+
+        Delete a specific maintenance window  # noqa: E501
+        """
+        pass
+
+    def test_get_all_maintenance_window(self):
+        """Test case for get_all_maintenance_window
+
+        Get all maintenance windows for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_maintenance_window(self):
+        """Test case for get_maintenance_window
+
+        Get a specific maintenance window  # noqa: E501
+        """
+        pass
+
+    def test_update_maintenance_window(self):
+        """Test case for update_maintenance_window
+
+        Update a specific maintenance window  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_message.py b/test/test_message.py
new file mode 100644
index 0000000..8a7cb25
--- /dev/null
+++ b/test/test_message.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.message import Message  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMessage(unittest.TestCase):
+    """Message unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMessage(self):
+        """Test Message"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.message.Message()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_message_api.py b/test/test_message_api.py
new file mode 100644
index 0000000..a60740a
--- /dev/null
+++ b/test/test_message_api.py
@@ -0,0 +1,48 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.message_api import MessageApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMessageApi(unittest.TestCase):
+    """MessageApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.message_api.MessageApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_user_get_messages(self):
+        """Test case for user_get_messages
+
+        Gets messages applicable to the current user, i.e. within time range and distribution scope  # noqa: E501
+        """
+        pass
+
+    def test_user_read_message(self):
+        """Test case for user_read_message
+
+        Mark a specific message as read  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metric_api.py b/test/test_metric_api.py
new file mode 100644
index 0000000..811cbed
--- /dev/null
+++ b/test/test_metric_api.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.metric_api import MetricApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricApi(unittest.TestCase):
+    """MetricApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.metric_api.MetricApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_metric_details(self):
+        """Test case for get_metric_details
+
+        Get more details on a metric, including reporting sources and approximate last time reported  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metric_details.py b/test/test_metric_details.py
new file mode 100644
index 0000000..a9e398b
--- /dev/null
+++ b/test/test_metric_details.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.metric_details import MetricDetails  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricDetails(unittest.TestCase):
+    """MetricDetails unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMetricDetails(self):
+        """Test MetricDetails"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.metric_details.MetricDetails()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metric_details_response.py b/test/test_metric_details_response.py
new file mode 100644
index 0000000..50554cc
--- /dev/null
+++ b/test/test_metric_details_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.metric_details_response import MetricDetailsResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricDetailsResponse(unittest.TestCase):
+    """MetricDetailsResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMetricDetailsResponse(self):
+        """Test MetricDetailsResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.metric_details_response.MetricDetailsResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metric_status.py b/test/test_metric_status.py
new file mode 100644
index 0000000..391d42d
--- /dev/null
+++ b/test/test_metric_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.metric_status import MetricStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricStatus(unittest.TestCase):
+    """MetricStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMetricStatus(self):
+        """Test MetricStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.metric_status.MetricStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_new_relic_configuration.py b/test/test_new_relic_configuration.py
new file mode 100644
index 0000000..229064b
--- /dev/null
+++ b/test/test_new_relic_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestNewRelicConfiguration(unittest.TestCase):
+    """NewRelicConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testNewRelicConfiguration(self):
+        """Test NewRelicConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.new_relic_configuration.NewRelicConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_new_relic_metric_filters.py b/test/test_new_relic_metric_filters.py
new file mode 100644
index 0000000..15fa27c
--- /dev/null
+++ b/test/test_new_relic_metric_filters.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestNewRelicMetricFilters(unittest.TestCase):
+    """NewRelicMetricFilters unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testNewRelicMetricFilters(self):
+        """Test NewRelicMetricFilters"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.new_relic_metric_filters.NewRelicMetricFilters()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_notificant.py b/test/test_notificant.py
new file mode 100644
index 0000000..4e8ba71
--- /dev/null
+++ b/test/test_notificant.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.notificant import Notificant  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestNotificant(unittest.TestCase):
+    """Notificant unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testNotificant(self):
+        """Test Notificant"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.notificant.Notificant()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_notificant_api.py b/test/test_notificant_api.py
new file mode 100644
index 0000000..0c0dba5
--- /dev/null
+++ b/test/test_notificant_api.py
@@ -0,0 +1,76 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.notificant_api import NotificantApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestNotificantApi(unittest.TestCase):
+    """NotificantApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.notificant_api.NotificantApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_notificant(self):
+        """Test case for create_notificant
+
+        Create a notification target  # noqa: E501
+        """
+        pass
+
+    def test_delete_notificant(self):
+        """Test case for delete_notificant
+
+        Delete a specific notification target  # noqa: E501
+        """
+        pass
+
+    def test_get_all_notificants(self):
+        """Test case for get_all_notificants
+
+        Get all notification targets for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_notificant(self):
+        """Test case for get_notificant
+
+        Get a specific notification target  # noqa: E501
+        """
+        pass
+
+    def test_test_notificant(self):
+        """Test case for test_notificant
+
+        Test a specific notification target  # noqa: E501
+        """
+        pass
+
+    def test_update_notificant(self):
+        """Test case for update_notificant
+
+        Update a specific notification target  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_number.py b/test/test_number.py
new file mode 100644
index 0000000..14a94e3
--- /dev/null
+++ b/test/test_number.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.number import Number  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestNumber(unittest.TestCase):
+    """Number unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testNumber(self):
+        """Test Number"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.number.Number()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_alert.py b/test/test_paged_alert.py
new file mode 100644
index 0000000..1acb3ee
--- /dev/null
+++ b/test/test_paged_alert.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_alert import PagedAlert  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedAlert(unittest.TestCase):
+    """PagedAlert unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedAlert(self):
+        """Test PagedAlert"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_alert.PagedAlert()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_alert_with_stats.py b/test/test_paged_alert_with_stats.py
new file mode 100644
index 0000000..44233e5
--- /dev/null
+++ b/test/test_paged_alert_with_stats.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedAlertWithStats(unittest.TestCase):
+    """PagedAlertWithStats unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedAlertWithStats(self):
+        """Test PagedAlertWithStats"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_alert_with_stats.PagedAlertWithStats()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_cloud_integration.py b/test/test_paged_cloud_integration.py
new file mode 100644
index 0000000..6a8bb67
--- /dev/null
+++ b/test/test_paged_cloud_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedCloudIntegration(unittest.TestCase):
+    """PagedCloudIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedCloudIntegration(self):
+        """Test PagedCloudIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_cloud_integration.PagedCloudIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_customer_facing_user_object.py b/test/test_paged_customer_facing_user_object.py
new file mode 100644
index 0000000..f49bfe5
--- /dev/null
+++ b/test/test_paged_customer_facing_user_object.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_customer_facing_user_object import PagedCustomerFacingUserObject  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedCustomerFacingUserObject(unittest.TestCase):
+    """PagedCustomerFacingUserObject unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedCustomerFacingUserObject(self):
+        """Test PagedCustomerFacingUserObject"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_customer_facing_user_object.PagedCustomerFacingUserObject()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_dashboard.py b/test/test_paged_dashboard.py
new file mode 100644
index 0000000..f54bd62
--- /dev/null
+++ b/test/test_paged_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_dashboard import PagedDashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedDashboard(unittest.TestCase):
+    """PagedDashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedDashboard(self):
+        """Test PagedDashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_dashboard.PagedDashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_derived_metric_definition.py b/test/test_paged_derived_metric_definition.py
new file mode 100644
index 0000000..6e9db5b
--- /dev/null
+++ b/test/test_paged_derived_metric_definition.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_derived_metric_definition import PagedDerivedMetricDefinition  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedDerivedMetricDefinition(unittest.TestCase):
+    """PagedDerivedMetricDefinition unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedDerivedMetricDefinition(self):
+        """Test PagedDerivedMetricDefinition"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_derived_metric_definition.PagedDerivedMetricDefinition()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_derived_metric_definition_with_stats.py b/test/test_paged_derived_metric_definition_with_stats.py
new file mode 100644
index 0000000..ffe7459
--- /dev/null
+++ b/test/test_paged_derived_metric_definition_with_stats.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedDerivedMetricDefinitionWithStats(unittest.TestCase):
+    """PagedDerivedMetricDefinitionWithStats unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedDerivedMetricDefinitionWithStats(self):
+        """Test PagedDerivedMetricDefinitionWithStats"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_derived_metric_definition_with_stats.PagedDerivedMetricDefinitionWithStats()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_event.py b/test/test_paged_event.py
new file mode 100644
index 0000000..679eb0d
--- /dev/null
+++ b/test/test_paged_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_event import PagedEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedEvent(unittest.TestCase):
+    """PagedEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedEvent(self):
+        """Test PagedEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_event.PagedEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_external_link.py b/test/test_paged_external_link.py
new file mode 100644
index 0000000..25ca6af
--- /dev/null
+++ b/test/test_paged_external_link.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_external_link import PagedExternalLink  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedExternalLink(unittest.TestCase):
+    """PagedExternalLink unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedExternalLink(self):
+        """Test PagedExternalLink"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_external_link.PagedExternalLink()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_integration.py b/test/test_paged_integration.py
new file mode 100644
index 0000000..961b639
--- /dev/null
+++ b/test/test_paged_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_integration import PagedIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedIntegration(unittest.TestCase):
+    """PagedIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedIntegration(self):
+        """Test PagedIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_integration.PagedIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_maintenance_window.py b/test/test_paged_maintenance_window.py
new file mode 100644
index 0000000..cf6ada9
--- /dev/null
+++ b/test/test_paged_maintenance_window.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedMaintenanceWindow(unittest.TestCase):
+    """PagedMaintenanceWindow unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedMaintenanceWindow(self):
+        """Test PagedMaintenanceWindow"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_maintenance_window.PagedMaintenanceWindow()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_message.py b/test/test_paged_message.py
new file mode 100644
index 0000000..e2c1b81
--- /dev/null
+++ b/test/test_paged_message.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_message import PagedMessage  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedMessage(unittest.TestCase):
+    """PagedMessage unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedMessage(self):
+        """Test PagedMessage"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_message.PagedMessage()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_notificant.py b/test/test_paged_notificant.py
new file mode 100644
index 0000000..891f1f3
--- /dev/null
+++ b/test/test_paged_notificant.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_notificant import PagedNotificant  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedNotificant(unittest.TestCase):
+    """PagedNotificant unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedNotificant(self):
+        """Test PagedNotificant"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_notificant.PagedNotificant()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_proxy.py b/test/test_paged_proxy.py
new file mode 100644
index 0000000..498cf9f
--- /dev/null
+++ b/test/test_paged_proxy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_proxy import PagedProxy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedProxy(unittest.TestCase):
+    """PagedProxy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedProxy(self):
+        """Test PagedProxy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_proxy.PagedProxy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_saved_search.py b/test/test_paged_saved_search.py
new file mode 100644
index 0000000..0c12c02
--- /dev/null
+++ b/test/test_paged_saved_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_saved_search import PagedSavedSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSavedSearch(unittest.TestCase):
+    """PagedSavedSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSavedSearch(self):
+        """Test PagedSavedSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_saved_search.PagedSavedSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_source.py b/test/test_paged_source.py
new file mode 100644
index 0000000..341374a
--- /dev/null
+++ b/test/test_paged_source.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_source import PagedSource  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSource(unittest.TestCase):
+    """PagedSource unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSource(self):
+        """Test PagedSource"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_source.PagedSource()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_user_group.py b/test/test_paged_user_group.py
new file mode 100644
index 0000000..c7c41c1
--- /dev/null
+++ b/test/test_paged_user_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_user_group import PagedUserGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedUserGroup(unittest.TestCase):
+    """PagedUserGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedUserGroup(self):
+        """Test PagedUserGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_user_group.PagedUserGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_point.py b/test/test_point.py
new file mode 100644
index 0000000..32a45b6
--- /dev/null
+++ b/test/test_point.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.point import Point  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPoint(unittest.TestCase):
+    """Point unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPoint(self):
+        """Test Point"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.point.Point()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_proxy.py b/test/test_proxy.py
new file mode 100644
index 0000000..bba07f0
--- /dev/null
+++ b/test/test_proxy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.proxy import Proxy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestProxy(unittest.TestCase):
+    """Proxy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testProxy(self):
+        """Test Proxy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.proxy.Proxy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_proxy_api.py b/test/test_proxy_api.py
new file mode 100644
index 0000000..8ec30ad
--- /dev/null
+++ b/test/test_proxy_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.proxy_api import ProxyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestProxyApi(unittest.TestCase):
+    """ProxyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.proxy_api.ProxyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_delete_proxy(self):
+        """Test case for delete_proxy
+
+        Delete a specific proxy  # noqa: E501
+        """
+        pass
+
+    def test_get_all_proxy(self):
+        """Test case for get_all_proxy
+
+        Get all proxies for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_proxy(self):
+        """Test case for get_proxy
+
+        Get a specific proxy  # noqa: E501
+        """
+        pass
+
+    def test_undelete_proxy(self):
+        """Test case for undelete_proxy
+
+        Undelete a specific proxy  # noqa: E501
+        """
+        pass
+
+    def test_update_proxy(self):
+        """Test case for update_proxy
+
+        Update the name of a specific proxy  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_query_api.py b/test/test_query_api.py
new file mode 100644
index 0000000..bfdabbb
--- /dev/null
+++ b/test/test_query_api.py
@@ -0,0 +1,48 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.query_api import QueryApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestQueryApi(unittest.TestCase):
+    """QueryApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.query_api.QueryApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_query_api(self):
+        """Test case for query_api
+
+        Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity  # noqa: E501
+        """
+        pass
+
+    def test_query_raw(self):
+        """Test case for query_raw
+
+        Perform a raw data query against Wavefront servers that returns second granularity points grouped by tags  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_query_event.py b/test/test_query_event.py
new file mode 100644
index 0000000..b0f19d5
--- /dev/null
+++ b/test/test_query_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.query_event import QueryEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestQueryEvent(unittest.TestCase):
+    """QueryEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testQueryEvent(self):
+        """Test QueryEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.query_event.QueryEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_query_result.py b/test/test_query_result.py
new file mode 100644
index 0000000..46ede40
--- /dev/null
+++ b/test/test_query_result.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.query_result import QueryResult  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestQueryResult(unittest.TestCase):
+    """QueryResult unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testQueryResult(self):
+        """Test QueryResult"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.query_result.QueryResult()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_raw_timeseries.py b/test/test_raw_timeseries.py
new file mode 100644
index 0000000..befccf1
--- /dev/null
+++ b/test/test_raw_timeseries.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.raw_timeseries import RawTimeseries  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRawTimeseries(unittest.TestCase):
+    """RawTimeseries unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRawTimeseries(self):
+        """Test RawTimeseries"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.raw_timeseries.RawTimeseries()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container.py b/test/test_response_container.py
new file mode 100644
index 0000000..bb797ec
--- /dev/null
+++ b/test/test_response_container.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container import ResponseContainer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainer(unittest.TestCase):
+    """ResponseContainer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainer(self):
+        """Test ResponseContainer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container.ResponseContainer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_alert.py b/test/test_response_container_alert.py
new file mode 100644
index 0000000..a30765e
--- /dev/null
+++ b/test/test_response_container_alert.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_alert import ResponseContainerAlert  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerAlert(unittest.TestCase):
+    """ResponseContainerAlert unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerAlert(self):
+        """Test ResponseContainerAlert"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_alert.ResponseContainerAlert()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_cloud_integration.py b/test/test_response_container_cloud_integration.py
new file mode 100644
index 0000000..6c4602f
--- /dev/null
+++ b/test/test_response_container_cloud_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerCloudIntegration(unittest.TestCase):
+    """ResponseContainerCloudIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerCloudIntegration(self):
+        """Test ResponseContainerCloudIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_cloud_integration.ResponseContainerCloudIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_dashboard.py b/test/test_response_container_dashboard.py
new file mode 100644
index 0000000..392a0ad
--- /dev/null
+++ b/test/test_response_container_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerDashboard(unittest.TestCase):
+    """ResponseContainerDashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerDashboard(self):
+        """Test ResponseContainerDashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_dashboard.ResponseContainerDashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_derived_metric_definition.py b/test/test_response_container_derived_metric_definition.py
new file mode 100644
index 0000000..d14ce39
--- /dev/null
+++ b/test/test_response_container_derived_metric_definition.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_derived_metric_definition import ResponseContainerDerivedMetricDefinition  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerDerivedMetricDefinition(unittest.TestCase):
+    """ResponseContainerDerivedMetricDefinition unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerDerivedMetricDefinition(self):
+        """Test ResponseContainerDerivedMetricDefinition"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_derived_metric_definition.ResponseContainerDerivedMetricDefinition()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_event.py b/test/test_response_container_event.py
new file mode 100644
index 0000000..d996858
--- /dev/null
+++ b/test/test_response_container_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_event import ResponseContainerEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerEvent(unittest.TestCase):
+    """ResponseContainerEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerEvent(self):
+        """Test ResponseContainerEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_event.ResponseContainerEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_external_link.py b/test/test_response_container_external_link.py
new file mode 100644
index 0000000..e09c631
--- /dev/null
+++ b/test/test_response_container_external_link.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerExternalLink(unittest.TestCase):
+    """ResponseContainerExternalLink unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerExternalLink(self):
+        """Test ResponseContainerExternalLink"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_external_link.ResponseContainerExternalLink()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_facet_response.py b/test/test_response_container_facet_response.py
new file mode 100644
index 0000000..49831e2
--- /dev/null
+++ b/test/test_response_container_facet_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerFacetResponse(unittest.TestCase):
+    """ResponseContainerFacetResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerFacetResponse(self):
+        """Test ResponseContainerFacetResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_facet_response.ResponseContainerFacetResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_facets_response_container.py b/test/test_response_container_facets_response_container.py
new file mode 100644
index 0000000..5bfd77e
--- /dev/null
+++ b/test/test_response_container_facets_response_container.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerFacetsResponseContainer(unittest.TestCase):
+    """ResponseContainerFacetsResponseContainer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerFacetsResponseContainer(self):
+        """Test ResponseContainerFacetsResponseContainer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_facets_response_container.ResponseContainerFacetsResponseContainer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_history_response.py b/test/test_response_container_history_response.py
new file mode 100644
index 0000000..e410fa2
--- /dev/null
+++ b/test/test_response_container_history_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerHistoryResponse(unittest.TestCase):
+    """ResponseContainerHistoryResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerHistoryResponse(self):
+        """Test ResponseContainerHistoryResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_history_response.ResponseContainerHistoryResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_integration.py b/test/test_response_container_integration.py
new file mode 100644
index 0000000..e330051
--- /dev/null
+++ b/test/test_response_container_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerIntegration(unittest.TestCase):
+    """ResponseContainerIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerIntegration(self):
+        """Test ResponseContainerIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_integration.ResponseContainerIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_integration_status.py b/test/test_response_container_integration_status.py
new file mode 100644
index 0000000..95f47e4
--- /dev/null
+++ b/test/test_response_container_integration_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerIntegrationStatus(unittest.TestCase):
+    """ResponseContainerIntegrationStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerIntegrationStatus(self):
+        """Test ResponseContainerIntegrationStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_integration_status.ResponseContainerIntegrationStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_acl.py b/test/test_response_container_list_acl.py
new file mode 100644
index 0000000..becf093
--- /dev/null
+++ b/test/test_response_container_list_acl.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_acl import ResponseContainerListACL  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListACL(unittest.TestCase):
+    """ResponseContainerListACL unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListACL(self):
+        """Test ResponseContainerListACL"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_acl.ResponseContainerListACL()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_integration.py b/test/test_response_container_list_integration.py
new file mode 100644
index 0000000..7d07ec8
--- /dev/null
+++ b/test/test_response_container_list_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListIntegration(unittest.TestCase):
+    """ResponseContainerListIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListIntegration(self):
+        """Test ResponseContainerListIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_integration.ResponseContainerListIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_integration_manifest_group.py b/test/test_response_container_list_integration_manifest_group.py
new file mode 100644
index 0000000..5dc8103
--- /dev/null
+++ b/test/test_response_container_list_integration_manifest_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListIntegrationManifestGroup(unittest.TestCase):
+    """ResponseContainerListIntegrationManifestGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListIntegrationManifestGroup(self):
+        """Test ResponseContainerListIntegrationManifestGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_integration_manifest_group.ResponseContainerListIntegrationManifestGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_string.py b/test/test_response_container_list_string.py
new file mode 100644
index 0000000..0494c43
--- /dev/null
+++ b/test/test_response_container_list_string.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_string import ResponseContainerListString  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListString(unittest.TestCase):
+    """ResponseContainerListString unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListString(self):
+        """Test ResponseContainerListString"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_string.ResponseContainerListString()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_user_group.py b/test/test_response_container_list_user_group.py
new file mode 100644
index 0000000..3614c30
--- /dev/null
+++ b/test/test_response_container_list_user_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_user_group import ResponseContainerListUserGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListUserGroup(unittest.TestCase):
+    """ResponseContainerListUserGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListUserGroup(self):
+        """Test ResponseContainerListUserGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_user_group.ResponseContainerListUserGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_maintenance_window.py b/test/test_response_container_maintenance_window.py
new file mode 100644
index 0000000..e0fa8da
--- /dev/null
+++ b/test/test_response_container_maintenance_window.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMaintenanceWindow(unittest.TestCase):
+    """ResponseContainerMaintenanceWindow unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMaintenanceWindow(self):
+        """Test ResponseContainerMaintenanceWindow"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_maintenance_window.ResponseContainerMaintenanceWindow()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_map_string_integer.py b/test/test_response_container_map_string_integer.py
new file mode 100644
index 0000000..1d8127d
--- /dev/null
+++ b/test/test_response_container_map_string_integer.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMapStringInteger(unittest.TestCase):
+    """ResponseContainerMapStringInteger unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMapStringInteger(self):
+        """Test ResponseContainerMapStringInteger"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_map_string_integer.ResponseContainerMapStringInteger()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_map_string_integration_status.py b/test/test_response_container_map_string_integration_status.py
new file mode 100644
index 0000000..04376cf
--- /dev/null
+++ b/test/test_response_container_map_string_integration_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMapStringIntegrationStatus(unittest.TestCase):
+    """ResponseContainerMapStringIntegrationStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMapStringIntegrationStatus(self):
+        """Test ResponseContainerMapStringIntegrationStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_map_string_integration_status.ResponseContainerMapStringIntegrationStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_message.py b/test/test_response_container_message.py
new file mode 100644
index 0000000..5bce86a
--- /dev/null
+++ b/test/test_response_container_message.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_message import ResponseContainerMessage  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMessage(unittest.TestCase):
+    """ResponseContainerMessage unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMessage(self):
+        """Test ResponseContainerMessage"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_message.ResponseContainerMessage()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_notificant.py b/test/test_response_container_notificant.py
new file mode 100644
index 0000000..800324e
--- /dev/null
+++ b/test/test_response_container_notificant.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerNotificant(unittest.TestCase):
+    """ResponseContainerNotificant unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerNotificant(self):
+        """Test ResponseContainerNotificant"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_notificant.ResponseContainerNotificant()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_alert.py b/test/test_response_container_paged_alert.py
new file mode 100644
index 0000000..b24b1e0
--- /dev/null
+++ b/test/test_response_container_paged_alert.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedAlert(unittest.TestCase):
+    """ResponseContainerPagedAlert unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedAlert(self):
+        """Test ResponseContainerPagedAlert"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_alert.ResponseContainerPagedAlert()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_alert_with_stats.py b/test/test_response_container_paged_alert_with_stats.py
new file mode 100644
index 0000000..d49f540
--- /dev/null
+++ b/test/test_response_container_paged_alert_with_stats.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedAlertWithStats(unittest.TestCase):
+    """ResponseContainerPagedAlertWithStats unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedAlertWithStats(self):
+        """Test ResponseContainerPagedAlertWithStats"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_alert_with_stats.ResponseContainerPagedAlertWithStats()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_cloud_integration.py b/test/test_response_container_paged_cloud_integration.py
new file mode 100644
index 0000000..a52561b
--- /dev/null
+++ b/test/test_response_container_paged_cloud_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedCloudIntegration(unittest.TestCase):
+    """ResponseContainerPagedCloudIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedCloudIntegration(self):
+        """Test ResponseContainerPagedCloudIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_cloud_integration.ResponseContainerPagedCloudIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_customer_facing_user_object.py b/test/test_response_container_paged_customer_facing_user_object.py
new file mode 100644
index 0000000..c9e5c95
--- /dev/null
+++ b/test/test_response_container_paged_customer_facing_user_object.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_customer_facing_user_object import ResponseContainerPagedCustomerFacingUserObject  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedCustomerFacingUserObject(unittest.TestCase):
+    """ResponseContainerPagedCustomerFacingUserObject unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedCustomerFacingUserObject(self):
+        """Test ResponseContainerPagedCustomerFacingUserObject"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_customer_facing_user_object.ResponseContainerPagedCustomerFacingUserObject()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_dashboard.py b/test/test_response_container_paged_dashboard.py
new file mode 100644
index 0000000..f4c5751
--- /dev/null
+++ b/test/test_response_container_paged_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_dashboard import ResponseContainerPagedDashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedDashboard(unittest.TestCase):
+    """ResponseContainerPagedDashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedDashboard(self):
+        """Test ResponseContainerPagedDashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_dashboard.ResponseContainerPagedDashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_derived_metric_definition.py b/test/test_response_container_paged_derived_metric_definition.py
new file mode 100644
index 0000000..1a056b2
--- /dev/null
+++ b/test/test_response_container_paged_derived_metric_definition.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_derived_metric_definition import ResponseContainerPagedDerivedMetricDefinition  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedDerivedMetricDefinition(unittest.TestCase):
+    """ResponseContainerPagedDerivedMetricDefinition unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedDerivedMetricDefinition(self):
+        """Test ResponseContainerPagedDerivedMetricDefinition"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_derived_metric_definition.ResponseContainerPagedDerivedMetricDefinition()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_derived_metric_definition_with_stats.py b/test/test_response_container_paged_derived_metric_definition_with_stats.py
new file mode 100644
index 0000000..f43f870
--- /dev/null
+++ b/test/test_response_container_paged_derived_metric_definition_with_stats.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedDerivedMetricDefinitionWithStats(unittest.TestCase):
+    """ResponseContainerPagedDerivedMetricDefinitionWithStats unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedDerivedMetricDefinitionWithStats(self):
+        """Test ResponseContainerPagedDerivedMetricDefinitionWithStats"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats.ResponseContainerPagedDerivedMetricDefinitionWithStats()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_event.py b/test/test_response_container_paged_event.py
new file mode 100644
index 0000000..207d05a
--- /dev/null
+++ b/test/test_response_container_paged_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedEvent(unittest.TestCase):
+    """ResponseContainerPagedEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedEvent(self):
+        """Test ResponseContainerPagedEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_event.ResponseContainerPagedEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_external_link.py b/test/test_response_container_paged_external_link.py
new file mode 100644
index 0000000..7e9ce96
--- /dev/null
+++ b/test/test_response_container_paged_external_link.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedExternalLink(unittest.TestCase):
+    """ResponseContainerPagedExternalLink unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedExternalLink(self):
+        """Test ResponseContainerPagedExternalLink"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_external_link.ResponseContainerPagedExternalLink()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_integration.py b/test/test_response_container_paged_integration.py
new file mode 100644
index 0000000..5a7b946
--- /dev/null
+++ b/test/test_response_container_paged_integration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedIntegration(unittest.TestCase):
+    """ResponseContainerPagedIntegration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedIntegration(self):
+        """Test ResponseContainerPagedIntegration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_integration.ResponseContainerPagedIntegration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_maintenance_window.py b/test/test_response_container_paged_maintenance_window.py
new file mode 100644
index 0000000..14dd9b2
--- /dev/null
+++ b/test/test_response_container_paged_maintenance_window.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedMaintenanceWindow(unittest.TestCase):
+    """ResponseContainerPagedMaintenanceWindow unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedMaintenanceWindow(self):
+        """Test ResponseContainerPagedMaintenanceWindow"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_maintenance_window.ResponseContainerPagedMaintenanceWindow()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_message.py b/test/test_response_container_paged_message.py
new file mode 100644
index 0000000..9d20dda
--- /dev/null
+++ b/test/test_response_container_paged_message.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedMessage(unittest.TestCase):
+    """ResponseContainerPagedMessage unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedMessage(self):
+        """Test ResponseContainerPagedMessage"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_message.ResponseContainerPagedMessage()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_notificant.py b/test/test_response_container_paged_notificant.py
new file mode 100644
index 0000000..e109f62
--- /dev/null
+++ b/test/test_response_container_paged_notificant.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedNotificant(unittest.TestCase):
+    """ResponseContainerPagedNotificant unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedNotificant(self):
+        """Test ResponseContainerPagedNotificant"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_notificant.ResponseContainerPagedNotificant()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_proxy.py b/test/test_response_container_paged_proxy.py
new file mode 100644
index 0000000..5324bf9
--- /dev/null
+++ b/test/test_response_container_paged_proxy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedProxy(unittest.TestCase):
+    """ResponseContainerPagedProxy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedProxy(self):
+        """Test ResponseContainerPagedProxy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_proxy.ResponseContainerPagedProxy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_saved_search.py b/test/test_response_container_paged_saved_search.py
new file mode 100644
index 0000000..173d9ea
--- /dev/null
+++ b/test/test_response_container_paged_saved_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSavedSearch(unittest.TestCase):
+    """ResponseContainerPagedSavedSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSavedSearch(self):
+        """Test ResponseContainerPagedSavedSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_saved_search.ResponseContainerPagedSavedSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_source.py b/test/test_response_container_paged_source.py
new file mode 100644
index 0000000..6bf2bcd
--- /dev/null
+++ b/test/test_response_container_paged_source.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSource(unittest.TestCase):
+    """ResponseContainerPagedSource unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSource(self):
+        """Test ResponseContainerPagedSource"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_source.ResponseContainerPagedSource()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_user_group.py b/test/test_response_container_paged_user_group.py
new file mode 100644
index 0000000..6cd5db7
--- /dev/null
+++ b/test/test_response_container_paged_user_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_user_group import ResponseContainerPagedUserGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedUserGroup(unittest.TestCase):
+    """ResponseContainerPagedUserGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedUserGroup(self):
+        """Test ResponseContainerPagedUserGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_user_group.ResponseContainerPagedUserGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_proxy.py b/test/test_response_container_proxy.py
new file mode 100644
index 0000000..d2a2c98
--- /dev/null
+++ b/test/test_response_container_proxy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerProxy(unittest.TestCase):
+    """ResponseContainerProxy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerProxy(self):
+        """Test ResponseContainerProxy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_proxy.ResponseContainerProxy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_saved_search.py b/test/test_response_container_saved_search.py
new file mode 100644
index 0000000..4284c4e
--- /dev/null
+++ b/test/test_response_container_saved_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSavedSearch(unittest.TestCase):
+    """ResponseContainerSavedSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSavedSearch(self):
+        """Test ResponseContainerSavedSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_saved_search.ResponseContainerSavedSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_source.py b/test/test_response_container_source.py
new file mode 100644
index 0000000..99c4b71
--- /dev/null
+++ b/test/test_response_container_source.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_source import ResponseContainerSource  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSource(unittest.TestCase):
+    """ResponseContainerSource unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSource(self):
+        """Test ResponseContainerSource"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_source.ResponseContainerSource()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_tags_response.py b/test/test_response_container_tags_response.py
new file mode 100644
index 0000000..66794cc
--- /dev/null
+++ b/test/test_response_container_tags_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerTagsResponse(unittest.TestCase):
+    """ResponseContainerTagsResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerTagsResponse(self):
+        """Test ResponseContainerTagsResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_tags_response.ResponseContainerTagsResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_user_group.py b/test/test_response_container_user_group.py
new file mode 100644
index 0000000..b823ea6
--- /dev/null
+++ b/test/test_response_container_user_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerUserGroup(unittest.TestCase):
+    """ResponseContainerUserGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerUserGroup(self):
+        """Test ResponseContainerUserGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_user_group.ResponseContainerUserGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_status.py b/test/test_response_status.py
new file mode 100644
index 0000000..ae7bc6f
--- /dev/null
+++ b/test/test_response_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseStatus(unittest.TestCase):
+    """ResponseStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseStatus(self):
+        """Test ResponseStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_status.ResponseStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_search.py b/test/test_saved_search.py
new file mode 100644
index 0000000..476067b
--- /dev/null
+++ b/test/test_saved_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.saved_search import SavedSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedSearch(unittest.TestCase):
+    """SavedSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSavedSearch(self):
+        """Test SavedSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.saved_search.SavedSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_search_api.py b/test/test_saved_search_api.py
new file mode 100644
index 0000000..fed9536
--- /dev/null
+++ b/test/test_saved_search_api.py
@@ -0,0 +1,76 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.saved_search_api import SavedSearchApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedSearchApi(unittest.TestCase):
+    """SavedSearchApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.saved_search_api.SavedSearchApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_saved_search(self):
+        """Test case for create_saved_search
+
+        Create a saved search  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_search(self):
+        """Test case for delete_saved_search
+
+        Delete a specific saved search  # noqa: E501
+        """
+        pass
+
+    def test_get_all_entity_type_saved_searches(self):
+        """Test case for get_all_entity_type_saved_searches
+
+        Get all saved searches for a specific entity type for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_searches(self):
+        """Test case for get_all_saved_searches
+
+        Get all saved searches for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_search(self):
+        """Test case for get_saved_search
+
+        Get a specific saved search  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_search(self):
+        """Test case for update_saved_search
+
+        Update a specific saved search  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_search_api.py b/test/test_search_api.py
new file mode 100644
index 0000000..c11929a
--- /dev/null
+++ b/test/test_search_api.py
@@ -0,0 +1,412 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.search_api import SearchApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSearchApi(unittest.TestCase):
+    """SearchApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.search_api.SearchApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_search_alert_deleted_entities(self):
+        """Test case for search_alert_deleted_entities
+
+        Search over a customer's deleted alerts  # noqa: E501
+        """
+        pass
+
+    def test_search_alert_deleted_for_facet(self):
+        """Test case for search_alert_deleted_for_facet
+
+        Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
+        """
+        pass
+
+    def test_search_alert_deleted_for_facets(self):
+        """Test case for search_alert_deleted_for_facets
+
+        Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
+        """
+        pass
+
+    def test_search_alert_entities(self):
+        """Test case for search_alert_entities
+
+        Search over a customer's non-deleted alerts  # noqa: E501
+        """
+        pass
+
+    def test_search_alert_for_facet(self):
+        """Test case for search_alert_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
+        """
+        pass
+
+    def test_search_alert_for_facets(self):
+        """Test case for search_alert_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
+        """
+        pass
+
+    def test_search_cloud_integration_deleted_entities(self):
+        """Test case for search_cloud_integration_deleted_entities
+
+        Search over a customer's deleted cloud integrations  # noqa: E501
+        """
+        pass
+
+    def test_search_cloud_integration_deleted_for_facet(self):
+        """Test case for search_cloud_integration_deleted_for_facet
+
+        Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
+        """
+        pass
+
+    def test_search_cloud_integration_deleted_for_facets(self):
+        """Test case for search_cloud_integration_deleted_for_facets
+
+        Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
+        """
+        pass
+
+    def test_search_cloud_integration_entities(self):
+        """Test case for search_cloud_integration_entities
+
+        Search over a customer's non-deleted cloud integrations  # noqa: E501
+        """
+        pass
+
+    def test_search_cloud_integration_for_facet(self):
+        """Test case for search_cloud_integration_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
+        """
+        pass
+
+    def test_search_cloud_integration_for_facets(self):
+        """Test case for search_cloud_integration_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
+        """
+        pass
+
+    def test_search_dashboard_deleted_entities(self):
+        """Test case for search_dashboard_deleted_entities
+
+        Search over a customer's deleted dashboards  # noqa: E501
+        """
+        pass
+
+    def test_search_dashboard_deleted_for_facet(self):
+        """Test case for search_dashboard_deleted_for_facet
+
+        Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
+        """
+        pass
+
+    def test_search_dashboard_deleted_for_facets(self):
+        """Test case for search_dashboard_deleted_for_facets
+
+        Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
+        """
+        pass
+
+    def test_search_dashboard_entities(self):
+        """Test case for search_dashboard_entities
+
+        Search over a customer's non-deleted dashboards  # noqa: E501
+        """
+        pass
+
+    def test_search_dashboard_for_facet(self):
+        """Test case for search_dashboard_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
+        """
+        pass
+
+    def test_search_dashboard_for_facets(self):
+        """Test case for search_dashboard_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
+        """
+        pass
+
+    def test_search_external_link_entities(self):
+        """Test case for search_external_link_entities
+
+        Search over a customer's external links  # noqa: E501
+        """
+        pass
+
+    def test_search_external_links_for_facet(self):
+        """Test case for search_external_links_for_facet
+
+        Lists the values of a specific facet over the customer's external links  # noqa: E501
+        """
+        pass
+
+    def test_search_external_links_for_facets(self):
+        """Test case for search_external_links_for_facets
+
+        Lists the values of one or more facets over the customer's external links  # noqa: E501
+        """
+        pass
+
+    def test_search_maintenance_window_entities(self):
+        """Test case for search_maintenance_window_entities
+
+        Search over a customer's maintenance windows  # noqa: E501
+        """
+        pass
+
+    def test_search_maintenance_window_for_facet(self):
+        """Test case for search_maintenance_window_for_facet
+
+        Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
+        """
+        pass
+
+    def test_search_maintenance_window_for_facets(self):
+        """Test case for search_maintenance_window_for_facets
+
+        Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
+        """
+        pass
+
+    def test_search_notficant_for_facets(self):
+        """Test case for search_notficant_for_facets
+
+        Lists the values of one or more facets over the customer's notificants  # noqa: E501
+        """
+        pass
+
+    def test_search_notificant_entities(self):
+        """Test case for search_notificant_entities
+
+        Search over a customer's notificants  # noqa: E501
+        """
+        pass
+
+    def test_search_notificant_for_facet(self):
+        """Test case for search_notificant_for_facet
+
+        Lists the values of a specific facet over the customer's notificants  # noqa: E501
+        """
+        pass
+
+    def test_search_proxy_deleted_entities(self):
+        """Test case for search_proxy_deleted_entities
+
+        Search over a customer's deleted proxies  # noqa: E501
+        """
+        pass
+
+    def test_search_proxy_deleted_for_facet(self):
+        """Test case for search_proxy_deleted_for_facet
+
+        Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
+        """
+        pass
+
+    def test_search_proxy_deleted_for_facets(self):
+        """Test case for search_proxy_deleted_for_facets
+
+        Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
+        """
+        pass
+
+    def test_search_proxy_entities(self):
+        """Test case for search_proxy_entities
+
+        Search over a customer's non-deleted proxies  # noqa: E501
+        """
+        pass
+
+    def test_search_proxy_for_facet(self):
+        """Test case for search_proxy_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
+        """
+        pass
+
+    def test_search_proxy_for_facets(self):
+        """Test case for search_proxy_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
+        """
+        pass
+
+    def test_search_registered_query_deleted_entities(self):
+        """Test case for search_registered_query_deleted_entities
+
+        Search over a customer's deleted derived metric definitions  # noqa: E501
+        """
+        pass
+
+    def test_search_registered_query_deleted_for_facet(self):
+        """Test case for search_registered_query_deleted_for_facet
+
+        Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
+        """
+        pass
+
+    def test_search_registered_query_deleted_for_facets(self):
+        """Test case for search_registered_query_deleted_for_facets
+
+        Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
+        """
+        pass
+
+    def test_search_registered_query_entities(self):
+        """Test case for search_registered_query_entities
+
+        Search over a customer's non-deleted derived metric definitions  # noqa: E501
+        """
+        pass
+
+    def test_search_registered_query_for_facet(self):
+        """Test case for search_registered_query_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
+        """
+        pass
+
+    def test_search_registered_query_for_facets(self):
+        """Test case for search_registered_query_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
+        """
+        pass
+
+    def test_search_report_event_entities(self):
+        """Test case for search_report_event_entities
+
+        Search over a customer's events  # noqa: E501
+        """
+        pass
+
+    def test_search_report_event_for_facet(self):
+        """Test case for search_report_event_for_facet
+
+        Lists the values of a specific facet over the customer's events  # noqa: E501
+        """
+        pass
+
+    def test_search_report_event_for_facets(self):
+        """Test case for search_report_event_for_facets
+
+        Lists the values of one or more facets over the customer's events  # noqa: E501
+        """
+        pass
+
+    def test_search_tagged_source_entities(self):
+        """Test case for search_tagged_source_entities
+
+        Search over a customer's sources  # noqa: E501
+        """
+        pass
+
+    def test_search_tagged_source_for_facet(self):
+        """Test case for search_tagged_source_for_facet
+
+        Lists the values of a specific facet over the customer's sources  # noqa: E501
+        """
+        pass
+
+    def test_search_tagged_source_for_facets(self):
+        """Test case for search_tagged_source_for_facets
+
+        Lists the values of one or more facets over the customer's sources  # noqa: E501
+        """
+        pass
+
+    def test_search_user_entities(self):
+        """Test case for search_user_entities
+
+        Search over a customer's users  # noqa: E501
+        """
+        pass
+
+    def test_search_user_for_facet(self):
+        """Test case for search_user_for_facet
+
+        Lists the values of a specific facet over the customer's users  # noqa: E501
+        """
+        pass
+
+    def test_search_user_for_facets(self):
+        """Test case for search_user_for_facets
+
+        Lists the values of one or more facets over the customer's users  # noqa: E501
+        """
+        pass
+
+    def test_search_user_group_entities(self):
+        """Test case for search_user_group_entities
+
+        Search over a customer's user groups  # noqa: E501
+        """
+        pass
+
+    def test_search_user_group_for_facet(self):
+        """Test case for search_user_group_for_facet
+
+        Lists the values of a specific facet over the customer's user groups  # noqa: E501
+        """
+        pass
+
+    def test_search_user_group_for_facets(self):
+        """Test case for search_user_group_for_facets
+
+        Lists the values of one or more facets over the customer's user groups  # noqa: E501
+        """
+        pass
+
+    def test_search_web_hook_entities(self):
+        """Test case for search_web_hook_entities
+
+        Search over a customer's webhooks  # noqa: E501
+        """
+        pass
+
+    def test_search_web_hook_for_facet(self):
+        """Test case for search_web_hook_for_facet
+
+        Lists the values of a specific facet over the customer's webhooks  # noqa: E501
+        """
+        pass
+
+    def test_search_webhook_for_facets(self):
+        """Test case for search_webhook_for_facets
+
+        Lists the values of one or more facets over the customer's webhooks  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_search_query.py b/test/test_search_query.py
new file mode 100644
index 0000000..ad4f39e
--- /dev/null
+++ b/test/test_search_query.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.search_query import SearchQuery  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSearchQuery(unittest.TestCase):
+    """SearchQuery unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSearchQuery(self):
+        """Test SearchQuery"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.search_query.SearchQuery()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_settings_api.py b/test/test_settings_api.py
new file mode 100644
index 0000000..b22238b
--- /dev/null
+++ b/test/test_settings_api.py
@@ -0,0 +1,62 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.settings_api import SettingsApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSettingsApi(unittest.TestCase):
+    """SettingsApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.settings_api.SettingsApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_all_permissions(self):
+        """Test case for get_all_permissions
+
+        Get all permissions  # noqa: E501
+        """
+        pass
+
+    def test_get_customer_preferences(self):
+        """Test case for get_customer_preferences
+
+        Get customer preferences  # noqa: E501
+        """
+        pass
+
+    def test_get_default_user_groups(self):
+        """Test case for get_default_user_groups
+
+        Get default user groups customer preferences  # noqa: E501
+        """
+        pass
+
+    def test_post_customer_preferences(self):
+        """Test case for post_customer_preferences
+
+        Update selected fields of customer preferences  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_sortable_search_request.py b/test/test_sortable_search_request.py
new file mode 100644
index 0000000..d4817c7
--- /dev/null
+++ b/test/test_sortable_search_request.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.sortable_search_request import SortableSearchRequest  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSortableSearchRequest(unittest.TestCase):
+    """SortableSearchRequest unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSortableSearchRequest(self):
+        """Test SortableSearchRequest"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.sortable_search_request.SortableSearchRequest()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_sorting.py b/test/test_sorting.py
new file mode 100644
index 0000000..76a657b
--- /dev/null
+++ b/test/test_sorting.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.sorting import Sorting  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSorting(unittest.TestCase):
+    """Sorting unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSorting(self):
+        """Test Sorting"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.sorting.Sorting()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_source.py b/test/test_source.py
new file mode 100644
index 0000000..7eb2ae1
--- /dev/null
+++ b/test/test_source.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.source import Source  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSource(unittest.TestCase):
+    """Source unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSource(self):
+        """Test Source"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.source.Source()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_source_api.py b/test/test_source_api.py
new file mode 100644
index 0000000..3a9c2e8
--- /dev/null
+++ b/test/test_source_api.py
@@ -0,0 +1,111 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.source_api import SourceApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSourceApi(unittest.TestCase):
+    """SourceApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.source_api.SourceApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_source_tag(self):
+        """Test case for add_source_tag
+
+        Add a tag to a specific source  # noqa: E501
+        """
+        pass
+
+    def test_create_source(self):
+        """Test case for create_source
+
+        Create metadata (description or tags) for a specific source  # noqa: E501
+        """
+        pass
+
+    def test_delete_source(self):
+        """Test case for delete_source
+
+        Delete metadata (description and tags) for a specific source  # noqa: E501
+        """
+        pass
+
+    def test_get_all_source(self):
+        """Test case for get_all_source
+
+        Get all sources for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_source(self):
+        """Test case for get_source
+
+        Get a specific source for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_source_tags(self):
+        """Test case for get_source_tags
+
+        Get all tags associated with a specific source  # noqa: E501
+        """
+        pass
+
+    def test_remove_description(self):
+        """Test case for remove_description
+
+        Remove description from a specific source  # noqa: E501
+        """
+        pass
+
+    def test_remove_source_tag(self):
+        """Test case for remove_source_tag
+
+        Remove a tag from a specific source  # noqa: E501
+        """
+        pass
+
+    def test_set_description(self):
+        """Test case for set_description
+
+        Set description associated with a specific source  # noqa: E501
+        """
+        pass
+
+    def test_set_source_tags(self):
+        """Test case for set_source_tags
+
+        Set all tags associated with a specific source  # noqa: E501
+        """
+        pass
+
+    def test_update_source(self):
+        """Test case for update_source
+
+        Update metadata (description or tags) for a specific source.  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_source_label_pair.py b/test/test_source_label_pair.py
new file mode 100644
index 0000000..bcbbb2a
--- /dev/null
+++ b/test/test_source_label_pair.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.source_label_pair import SourceLabelPair  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSourceLabelPair(unittest.TestCase):
+    """SourceLabelPair unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSourceLabelPair(self):
+        """Test SourceLabelPair"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.source_label_pair.SourceLabelPair()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_source_search_request_container.py b/test/test_source_search_request_container.py
new file mode 100644
index 0000000..93ffb88
--- /dev/null
+++ b/test/test_source_search_request_container.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSourceSearchRequestContainer(unittest.TestCase):
+    """SourceSearchRequestContainer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSourceSearchRequestContainer(self):
+        """Test SourceSearchRequestContainer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.source_search_request_container.SourceSearchRequestContainer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_stats_model.py b/test/test_stats_model.py
new file mode 100644
index 0000000..ff3aa15
--- /dev/null
+++ b/test/test_stats_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.stats_model import StatsModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestStatsModel(unittest.TestCase):
+    """StatsModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testStatsModel(self):
+        """Test StatsModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.stats_model.StatsModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_tags_response.py b/test/test_tags_response.py
new file mode 100644
index 0000000..0a7fea9
--- /dev/null
+++ b/test/test_tags_response.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.tags_response import TagsResponse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTagsResponse(unittest.TestCase):
+    """TagsResponse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTagsResponse(self):
+        """Test TagsResponse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.tags_response.TagsResponse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_target_info.py b/test/test_target_info.py
new file mode 100644
index 0000000..7b197b3
--- /dev/null
+++ b/test/test_target_info.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.target_info import TargetInfo  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTargetInfo(unittest.TestCase):
+    """TargetInfo unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTargetInfo(self):
+        """Test TargetInfo"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.target_info.TargetInfo()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_tesla_configuration.py b/test/test_tesla_configuration.py
new file mode 100644
index 0000000..7476cab
--- /dev/null
+++ b/test/test_tesla_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.tesla_configuration import TeslaConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTeslaConfiguration(unittest.TestCase):
+    """TeslaConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTeslaConfiguration(self):
+        """Test TeslaConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.tesla_configuration.TeslaConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_timeseries.py b/test/test_timeseries.py
new file mode 100644
index 0000000..3a3b497
--- /dev/null
+++ b/test/test_timeseries.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.timeseries import Timeseries  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTimeseries(unittest.TestCase):
+    """Timeseries unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTimeseries(self):
+        """Test Timeseries"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.timeseries.Timeseries()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user.py b/test/test_user.py
new file mode 100644
index 0000000..c5334d9
--- /dev/null
+++ b/test/test_user.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user import User  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUser(unittest.TestCase):
+    """User unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUser(self):
+        """Test User"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user.User()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_api.py b/test/test_user_api.py
new file mode 100644
index 0000000..c3b9933
--- /dev/null
+++ b/test/test_user_api.py
@@ -0,0 +1,125 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.user_api import UserApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserApi(unittest.TestCase):
+    """UserApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.user_api.UserApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_user_to_user_groups(self):
+        """Test case for add_user_to_user_groups
+
+        Adds specific user groups to the user  # noqa: E501
+        """
+        pass
+
+    def test_create_or_update_user(self):
+        """Test case for create_or_update_user
+
+        Creates or updates a user  # noqa: E501
+        """
+        pass
+
+    def test_delete_multiple_users(self):
+        """Test case for delete_multiple_users
+
+        Deletes multiple users  # noqa: E501
+        """
+        pass
+
+    def test_delete_user(self):
+        """Test case for delete_user
+
+        Deletes a user identified by id  # noqa: E501
+        """
+        pass
+
+    def test_get_all_user(self):
+        """Test case for get_all_user
+
+        Get all users  # noqa: E501
+        """
+        pass
+
+    def test_get_user(self):
+        """Test case for get_user
+
+        Retrieves a user by identifier (email addr)  # noqa: E501
+        """
+        pass
+
+    def test_grant_permission_to_users(self):
+        """Test case for grant_permission_to_users
+
+        Grants a specific user permission to multiple users  # noqa: E501
+        """
+        pass
+
+    def test_grant_user_permission(self):
+        """Test case for grant_user_permission
+
+        Grants a specific user permission  # noqa: E501
+        """
+        pass
+
+    def test_invite_users(self):
+        """Test case for invite_users
+
+        Invite users with given user groups and permissions.  # noqa: E501
+        """
+        pass
+
+    def test_remove_user_from_user_groups(self):
+        """Test case for remove_user_from_user_groups
+
+        Removes specific user groups from the user  # noqa: E501
+        """
+        pass
+
+    def test_revoke_permission_from_users(self):
+        """Test case for revoke_permission_from_users
+
+        Revokes a specific user permission from multiple users  # noqa: E501
+        """
+        pass
+
+    def test_revoke_user_permission(self):
+        """Test case for revoke_user_permission
+
+        Revokes a specific user permission  # noqa: E501
+        """
+        pass
+
+    def test_update_user(self):
+        """Test case for update_user
+
+        Update user with given user groups and permissions.  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_group.py b/test/test_user_group.py
new file mode 100644
index 0000000..8ad2a9e
--- /dev/null
+++ b/test/test_user_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_group import UserGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserGroup(unittest.TestCase):
+    """UserGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserGroup(self):
+        """Test UserGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_group.UserGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_group_api.py b/test/test_user_group_api.py
new file mode 100644
index 0000000..fb80a3c
--- /dev/null
+++ b/test/test_user_group_api.py
@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.user_group_api import UserGroupApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserGroupApi(unittest.TestCase):
+    """UserGroupApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.user_group_api.UserGroupApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_users_to_user_group(self):
+        """Test case for add_users_to_user_group
+
+        Add multiple users to a specific user group  # noqa: E501
+        """
+        pass
+
+    def test_create_user_group(self):
+        """Test case for create_user_group
+
+        Create a specific user group  # noqa: E501
+        """
+        pass
+
+    def test_delete_user_group(self):
+        """Test case for delete_user_group
+
+        Delete a specific user group  # noqa: E501
+        """
+        pass
+
+    def test_get_all_user_groups(self):
+        """Test case for get_all_user_groups
+
+        Get all user groups for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_user_group(self):
+        """Test case for get_user_group
+
+        Get a specific user group  # noqa: E501
+        """
+        pass
+
+    def test_grant_permission_to_user_groups(self):
+        """Test case for grant_permission_to_user_groups
+
+        Grants a single permission to user group(s)  # noqa: E501
+        """
+        pass
+
+    def test_remove_users_from_user_group(self):
+        """Test case for remove_users_from_user_group
+
+        Remove multiple users from a specific user group  # noqa: E501
+        """
+        pass
+
+    def test_revoke_permission_from_user_groups(self):
+        """Test case for revoke_permission_from_user_groups
+
+        Revokes a single permission from user group(s)  # noqa: E501
+        """
+        pass
+
+    def test_update_user_group(self):
+        """Test case for update_user_group
+
+        Update a specific user group  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_group_properties_dto.py b/test/test_user_group_properties_dto.py
new file mode 100644
index 0000000..54a107f
--- /dev/null
+++ b/test/test_user_group_properties_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserGroupPropertiesDTO(unittest.TestCase):
+    """UserGroupPropertiesDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserGroupPropertiesDTO(self):
+        """Test UserGroupPropertiesDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_group_properties_dto.UserGroupPropertiesDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_group_write.py b/test/test_user_group_write.py
new file mode 100644
index 0000000..e535d9f
--- /dev/null
+++ b/test/test_user_group_write.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_group_write import UserGroupWrite  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserGroupWrite(unittest.TestCase):
+    """UserGroupWrite unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserGroupWrite(self):
+        """Test UserGroupWrite"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_group_write.UserGroupWrite()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_model.py b/test/test_user_model.py
new file mode 100644
index 0000000..0a80e75
--- /dev/null
+++ b/test/test_user_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_model import UserModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserModel(unittest.TestCase):
+    """UserModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserModel(self):
+        """Test UserModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_model.UserModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_request_dto.py b/test/test_user_request_dto.py
new file mode 100644
index 0000000..42abb41
--- /dev/null
+++ b/test/test_user_request_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_request_dto import UserRequestDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserRequestDTO(unittest.TestCase):
+    """UserRequestDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserRequestDTO(self):
+        """Test UserRequestDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_request_dto.UserRequestDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_settings.py b/test/test_user_settings.py
new file mode 100644
index 0000000..267adfa
--- /dev/null
+++ b/test/test_user_settings.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_settings import UserSettings  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserSettings(unittest.TestCase):
+    """UserSettings unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserSettings(self):
+        """Test UserSettings"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_settings.UserSettings()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_to_create.py b/test/test_user_to_create.py
new file mode 100644
index 0000000..ca0a39a
--- /dev/null
+++ b/test/test_user_to_create.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_to_create import UserToCreate  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserToCreate(unittest.TestCase):
+    """UserToCreate unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserToCreate(self):
+        """Test UserToCreate"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_to_create.UserToCreate()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_webhook_api.py b/test/test_webhook_api.py
new file mode 100644
index 0000000..6cf1d98
--- /dev/null
+++ b/test/test_webhook_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.webhook_api import WebhookApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestWebhookApi(unittest.TestCase):
+    """WebhookApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.webhook_api.WebhookApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_webhook(self):
+        """Test case for create_webhook
+
+        Create a specific webhook  # noqa: E501
+        """
+        pass
+
+    def test_delete_webhook(self):
+        """Test case for delete_webhook
+
+        Delete a specific webhook  # noqa: E501
+        """
+        pass
+
+    def test_get_all_webhooks(self):
+        """Test case for get_all_webhooks
+
+        Get all webhooks for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_webhook(self):
+        """Test case for get_webhook
+
+        Get a specific webhook  # noqa: E501
+        """
+        pass
+
+    def test_update_webhook(self):
+        """Test case for update_webhook
+
+        Update a specific webhook  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_wf_tags.py b/test/test_wf_tags.py
new file mode 100644
index 0000000..ab936f9
--- /dev/null
+++ b/test/test_wf_tags.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.wf_tags import WFTags  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestWFTags(unittest.TestCase):
+    """WFTags unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testWFTags(self):
+        """Test WFTags"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.wf_tags.WFTags()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..3d0be61
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = py27, py3
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+
+commands=
+   nosetests \
+      []
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 88d4e85..ad7c4dd 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -3,12 +3,12 @@
 # flake8: noqa
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -20,6 +20,7 @@
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
 from wavefront_api_client.api.derived_metric_api import DerivedMetricApi
+from wavefront_api_client.api.direct_ingestion_api import DirectIngestionApi
 from wavefront_api_client.api.event_api import EventApi
 from wavefront_api_client.api.external_link_api import ExternalLinkApi
 from wavefront_api_client.api.integration_api import IntegrationApi
@@ -31,20 +32,26 @@
 from wavefront_api_client.api.query_api import QueryApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
+from wavefront_api_client.api.settings_api import SettingsApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.user_api import UserApi
+from wavefront_api_client.api.user_group_api import UserGroupApi
 from wavefront_api_client.api.webhook_api import WebhookApi
 
 # import ApiClient
 from wavefront_api_client.api_client import ApiClient
 from wavefront_api_client.configuration import Configuration
 # import models into sdk package
+from wavefront_api_client.models.acl import ACL
 from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials
+from wavefront_api_client.models.access_control_element import AccessControlElement
+from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
+from wavefront_api_client.models.business_action_group_basic_dto import BusinessActionGroupBasicDTO
 from wavefront_api_client.models.chart import Chart
 from wavefront_api_client.models.chart_settings import ChartSettings
 from wavefront_api_client.models.chart_source_query import ChartSourceQuery
@@ -52,6 +59,8 @@
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
+from wavefront_api_client.models.customer_preferences import CustomerPreferences
+from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
 from wavefront_api_client.models.dashboard_section import DashboardSection
@@ -70,7 +79,9 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
+from wavefront_api_client.models.integration_alert import IntegrationAlert
 from wavefront_api_client.models.integration_alias import IntegrationAlias
 from wavefront_api_client.models.integration_dashboard import IntegrationDashboard
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
@@ -86,6 +97,8 @@
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
+from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
 from wavefront_api_client.models.number import Number
 from wavefront_api_client.models.paged_alert import PagedAlert
@@ -104,6 +117,7 @@
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_source import PagedSource
+from wavefront_api_client.models.paged_user_group import PagedUserGroup
 from wavefront_api_client.models.point import Point
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
@@ -121,7 +135,11 @@
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
+from wavefront_api_client.models.response_container_list_acl import ResponseContainerListACL
+from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
+from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
+from wavefront_api_client.models.response_container_list_user_group import ResponseContainerListUserGroup
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
@@ -143,10 +161,12 @@
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
+from wavefront_api_client.models.response_container_paged_user_group import ResponseContainerPagedUserGroup
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
+from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
@@ -160,6 +180,12 @@
 from wavefront_api_client.models.target_info import TargetInfo
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
+from wavefront_api_client.models.user import User
+from wavefront_api_client.models.user_group import UserGroup
+from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
+from wavefront_api_client.models.user_group_write import UserGroupWrite
 from wavefront_api_client.models.user_model import UserModel
+from wavefront_api_client.models.user_request_dto import UserRequestDTO
+from wavefront_api_client.models.user_settings import UserSettings
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 20526ea..7bcb6c4 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -7,6 +7,7 @@
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
 from wavefront_api_client.api.derived_metric_api import DerivedMetricApi
+from wavefront_api_client.api.direct_ingestion_api import DirectIngestionApi
 from wavefront_api_client.api.event_api import EventApi
 from wavefront_api_client.api.external_link_api import ExternalLinkApi
 from wavefront_api_client.api.integration_api import IntegrationApi
@@ -18,6 +19,8 @@
 from wavefront_api_client.api.query_api import QueryApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
+from wavefront_api_client.api.settings_api import SettingsApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.user_api import UserApi
+from wavefront_api_client.api.user_group_api import UserGroupApi
 from wavefront_api_client.api.webhook_api import WebhookApi
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 55677ef..5d11d08 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -150,7 +150,7 @@ def create_alert(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre>
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -172,7 +172,7 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre>
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -908,6 +908,101 @@ def get_all_alert_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def hide_alert(self, id, **kwargs):  # noqa: E501
+        """Hide a specific integration alert   # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.hide_alert(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int id: (required)
+        :return: ResponseContainerAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.hide_alert_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.hide_alert_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def hide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Hide a specific integration alert   # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.hide_alert_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int id: (required)
+        :return: ResponseContainerAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method hide_alert" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `hide_alert`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/{id}/uninstall', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAlert',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
         """Remove a tag from a specific alert  # noqa: E501
 
@@ -1308,6 +1403,101 @@ def undelete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def unhide_alert(self, id, **kwargs):  # noqa: E501
+        """Unhide a specific integration alert  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.unhide_alert(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int id: (required)
+        :return: ResponseContainerAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.unhide_alert_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.unhide_alert_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def unhide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Unhide a specific integration alert  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.unhide_alert_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int id: (required)
+        :return: ResponseContainerAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method unhide_alert" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `unhide_alert`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/{id}/install', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAlert',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def unsnooze_alert(self, id, **kwargs):  # noqa: E501
         """Unsnooze a specific alert  # noqa: E501
 
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 51d1fe5..13c5fe8 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index f1f2f14..c84fba8 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,6 +33,101 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_access(self, **kwargs):  # noqa: E501
+        """Adds the specified ids to the given dashboards' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_access(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[ACL] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_access_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_access_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_access_with_http_info(self, **kwargs):  # noqa: E501
+        """Adds the specified ids to the given dashboards' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_access_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[ACL] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_access" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/dashboard/acl/add', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def add_dashboard_tag(self, id, tag_value, **kwargs):  # noqa: E501
         """Add a tag to a specific dashboard  # noqa: E501
 
@@ -330,6 +425,193 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def favorite_dashboard(self, id, **kwargs):  # noqa: E501
+        """Mark a dashboard as favorite  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.favorite_dashboard(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.favorite_dashboard_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.favorite_dashboard_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def favorite_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Mark a dashboard as favorite  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.favorite_dashboard_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method favorite_dashboard" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `favorite_dashboard`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/dashboard/{id}/favorite', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_access_control_list(self, **kwargs):  # noqa: E501
+        """Get list of Access Control Lists for the specified dashboards  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_access_control_list(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] id:
+        :return: ResponseContainerListACL
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
+        """Get list of Access Control Lists for the specified dashboards  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_access_control_list_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] id:
+        :return: ResponseContainerListACL
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_access_control_list" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'id' in params:
+            query_params.append(('id', params['id']))  # noqa: E501
+            collection_formats['id'] = 'multi'  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/dashboard/acl', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListACL',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_dashboard(self, **kwargs):  # noqa: E501
         """Get all dashboards for a customer  # noqa: E501
 
@@ -821,6 +1103,101 @@ def get_dashboard_version_with_http_info(self, id, version, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_access(self, **kwargs):  # noqa: E501
+        """Removes the specified ids from the given dashboards' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_access(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[ACL] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_access_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_access_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_access_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes the specified ids from the given dashboards' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_access_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[ACL] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_access" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/dashboard/acl/remove', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_dashboard_tag(self, id, tag_value, **kwargs):  # noqa: E501
         """Remove a tag from a specific dashboard  # noqa: E501
 
@@ -924,6 +1301,101 @@ def remove_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def set_acl(self, **kwargs):  # noqa: E501
+        """Set ACL for the specified dashboards  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_acl(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[ACL] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.set_acl_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.set_acl_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def set_acl_with_http_info(self, **kwargs):  # noqa: E501
+        """Set ACL for the specified dashboards  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_acl_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[ACL] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method set_acl" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/dashboard/acl/set', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def set_dashboard_tags(self, id, **kwargs):  # noqa: E501
         """Set all tags associated with a specific dashboard  # noqa: E501
 
@@ -1122,6 +1594,101 @@ def undelete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def unfavorite_dashboard(self, id, **kwargs):  # noqa: E501
+        """Unmark a dashboard as favorite  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.unfavorite_dashboard(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.unfavorite_dashboard_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.unfavorite_dashboard_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def unfavorite_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Unmark a dashboard as favorite  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.unfavorite_dashboard_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method unfavorite_dashboard" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `unfavorite_dashboard`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/dashboard/{id}/unfavorite', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def update_dashboard(self, id, **kwargs):  # noqa: E501
         """Update a specific dashboard  # noqa: E501
 
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index 153a486..a7b5dcd 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -150,7 +150,7 @@ def create_derived_metric(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derrivedMetricTag1\"     ]   } }</pre>
+        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derivedMetricTag1\"     ]   } }</pre>
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
@@ -172,7 +172,7 @@ def create_derived_metric_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derrivedMetricTag1\"     ]   } }</pre>
+        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"derivedMetricTag1\"     ]   } }</pre>
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/direct_ingestion_api.py b/wavefront_api_client/api/direct_ingestion_api.py
new file mode 100644
index 0000000..4bce041
--- /dev/null
+++ b/wavefront_api_client/api/direct_ingestion_api.py
@@ -0,0 +1,129 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class DirectIngestionApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def report(self, **kwargs):  # noqa: E501
+        """Directly ingest data/data stream with specified format  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.report(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str f: Format of data to be ingested
+        :param str body: Data to be ingested, in the specified format.  See https://docs.wavefront.com/direct_ingestion.html for more detail on how to format the data. Example in \"wavefront\" format:  <pre>test.metric 100 source=test.source</pre> which ingests a time series point with metric name \"test.metric\", source name \"test.source\", and value of 100 with timestamp of now.
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.report_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.report_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def report_with_http_info(self, **kwargs):  # noqa: E501
+        """Directly ingest data/data stream with specified format  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.report_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str f: Format of data to be ingested
+        :param str body: Data to be ingested, in the specified format.  See https://docs.wavefront.com/direct_ingestion.html for more detail on how to format the data. Example in \"wavefront\" format:  <pre>test.metric 100 source=test.source</pre> which ingests a time series point with metric name \"test.metric\", source name \"test.source\", and value of 100 with timestamp of now.
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['f', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method report" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'f' in params:
+            query_params.append(('f', params['f']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/octet-stream', 'application/x-www-form-urlencoded', 'text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/report', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index 71f9997..f26a531 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index cddea20..4114a28 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index e80b366..5aa7ce7 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -129,7 +129,7 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_all_integration_in_manifests(self, **kwargs):  # noqa: E501
-        """Gets all Wavefront integrations as structured in their integration manifests, along with their status  # noqa: E501
+        """Gets all Wavefront integrations as structured in their integration manifests, along with their status and content  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -150,7 +150,7 @@ def get_all_integration_in_manifests(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_integration_in_manifests_with_http_info(self, **kwargs):  # noqa: E501
-        """Gets all Wavefront integrations as structured in their integration manifests, along with their status  # noqa: E501
+        """Gets all Wavefront integrations as structured in their integration manifests, along with their status and content  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -215,6 +215,93 @@ def get_all_integration_in_manifests_with_http_info(self, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_all_integration_in_manifests_min(self, **kwargs):  # noqa: E501
+        """Gets all Wavefront integrations as structured in their integration manifests.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_in_manifests_min(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListIntegrationManifestGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_integration_in_manifests_min_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_integration_in_manifests_min_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_integration_in_manifests_min_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets all Wavefront integrations as structured in their integration manifests.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_integration_in_manifests_min_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListIntegrationManifestGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_integration_in_manifests_min" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/integration/manifests/min', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListIntegrationManifestGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_integration_statuses(self, **kwargs):  # noqa: E501
         """Gets the status of all Wavefront integrations  # noqa: E501
 
@@ -302,6 +389,93 @@ def get_all_integration_statuses_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_installed_integration(self, **kwargs):  # noqa: E501
+        """Gets a flat list of all Integrations that are installed, along with their status  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_installed_integration(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListIntegration
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_installed_integration_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_installed_integration_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_installed_integration_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets a flat list of all Integrations that are installed, along with their status  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_installed_integration_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListIntegration
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_installed_integration" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/integration/installed', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListIntegration',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_integration(self, id, **kwargs):  # noqa: E501
         """Gets a single Wavefront integration by its id, along with its status  # noqa: E501
 
@@ -313,6 +487,7 @@ def get_integration(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool refresh:
         :return: ResponseContainerIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -335,12 +510,13 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool refresh:
         :return: ResponseContainerIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'refresh']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -367,6 +543,8 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'refresh' in params:
+            query_params.append(('refresh', params['refresh']))  # noqa: E501
 
         header_params = {}
 
@@ -492,6 +670,105 @@ def get_integration_status_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def install_all_integration_alerts(self, id, **kwargs):  # noqa: E501
+        """Enable all alerts associated with this integration  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.install_all_integration_alerts(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param InstallAlerts body:
+        :return: ResponseContainerIntegrationStatus
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.install_all_integration_alerts_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.install_all_integration_alerts_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def install_all_integration_alerts_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Enable all alerts associated with this integration  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.install_all_integration_alerts_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param InstallAlerts body:
+        :return: ResponseContainerIntegrationStatus
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method install_all_integration_alerts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `install_all_integration_alerts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/integration/{id}/install-all-alerts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIntegrationStatus',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def install_integration(self, id, **kwargs):  # noqa: E501
         """Installs a Wavefront integration  # noqa: E501
 
@@ -587,6 +864,101 @@ def install_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def uninstall_all_integration_alerts(self, id, **kwargs):  # noqa: E501
+        """Disable all alerts associated with this integration  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.uninstall_all_integration_alerts(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerIntegrationStatus
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.uninstall_all_integration_alerts_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.uninstall_all_integration_alerts_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def uninstall_all_integration_alerts_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Disable all alerts associated with this integration  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.uninstall_all_integration_alerts_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerIntegrationStatus
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method uninstall_all_integration_alerts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `uninstall_all_integration_alerts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/integration/{id}/uninstall-all-alerts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIntegrationStatus',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def uninstall_integration(self, id, **kwargs):  # noqa: E501
         """Uninstalls a Wavefront integration  # noqa: E501
 
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index a204511..099ee51 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index 7179dd8..2fa3443 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index d900ce5..70c0103 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 48ea8b4..877fd34 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 5c51e07..31c57e7 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index 16915bf..fb8a6ad 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -56,6 +56,7 @@ def query_api(self, q, s, g, **kwargs):  # noqa: E501
         :param bool strict: do not return points outside the query window [s;e), defaults to false
         :param bool include_obsolete_metrics: include metrics that have not been reporting recently, defaults to false
         :param bool sorted: sorts the output so that returned series are in order, defaults to false
+        :param bool cached: whether the query cache is used, defaults to true
         :return: QueryResult
                  If the method is called asynchronously,
                  returns the request thread.
@@ -90,12 +91,13 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
         :param bool strict: do not return points outside the query window [s;e), defaults to false
         :param bool include_obsolete_metrics: include metrics that have not been reporting recently, defaults to false
         :param bool sorted: sorts the output so that returned series are in order, defaults to false
+        :param bool cached: whether the query cache is used, defaults to true
         :return: QueryResult
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'include_obsolete_metrics', 'sorted']  # noqa: E501
+        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'include_obsolete_metrics', 'sorted', 'cached']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -154,6 +156,8 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
             query_params.append(('includeObsoleteMetrics', params['include_obsolete_metrics']))  # noqa: E501
         if 'sorted' in params:
             query_params.append(('sorted', params['sorted']))  # noqa: E501
+        if 'cached' in params:
+            query_params.append(('cached', params['cached']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index 450ec2d..87e18c9 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index abdf3ca..e74332c 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -34,7 +34,7 @@ def __init__(self, api_client=None):
         self.api_client = api_client
 
     def search_alert_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted alerts  # noqa: E501
+        """Search over a customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -56,7 +56,7 @@ def search_alert_deleted_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted alerts  # noqa: E501
+        """Search over a customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -129,7 +129,7 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted alerts  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -152,7 +152,7 @@ def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted alerts  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -232,7 +232,7 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             collection_formats=collection_formats)
 
     def search_alert_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted alerts  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -254,7 +254,7 @@ def search_alert_deleted_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted alerts  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -327,7 +327,7 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             collection_formats=collection_formats)
 
     def search_alert_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted alerts  # noqa: E501
+        """Search over a customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -349,7 +349,7 @@ def search_alert_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted alerts  # noqa: E501
+        """Search over a customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -422,7 +422,7 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted alerts  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -445,7 +445,7 @@ def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted alerts  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -525,7 +525,7 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_alert_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted alerts  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -547,7 +547,7 @@ def search_alert_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted alerts  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -620,7 +620,7 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_cloud_integration_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted cloud integrations  # noqa: E501
+        """Search over a customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -642,7 +642,7 @@ def search_cloud_integration_deleted_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted cloud integrations  # noqa: E501
+        """Search over a customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -715,7 +715,7 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
             collection_formats=collection_formats)
 
     def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted cloud integrations  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -738,7 +738,7 @@ def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa:
             return data
 
     def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted cloud integrations  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -818,7 +818,7 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
             collection_formats=collection_formats)
 
     def search_cloud_integration_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted cloud integrations  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -840,7 +840,7 @@ def search_cloud_integration_deleted_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted cloud integrations  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -913,7 +913,7 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
             collection_formats=collection_formats)
 
     def search_cloud_integration_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted cloud integrations  # noqa: E501
+        """Search over a customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -935,7 +935,7 @@ def search_cloud_integration_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted cloud integrations  # noqa: E501
+        """Search over a customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1008,7 +1008,7 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
             collection_formats=collection_formats)
 
     def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted cloud integrations  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1031,7 +1031,7 @@ def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted cloud integrations  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1111,7 +1111,7 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
             collection_formats=collection_formats)
 
     def search_cloud_integration_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted cloud integrations  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1133,7 +1133,7 @@ def search_cloud_integration_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted cloud integrations  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1206,7 +1206,7 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
             collection_formats=collection_formats)
 
     def search_dashboard_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted dashboards  # noqa: E501
+        """Search over a customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1228,7 +1228,7 @@ def search_dashboard_deleted_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted dashboards  # noqa: E501
+        """Search over a customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1301,7 +1301,7 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
             collection_formats=collection_formats)
 
     def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted dashboards  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1324,7 +1324,7 @@ def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted dashboards  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1404,7 +1404,7 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
             collection_formats=collection_formats)
 
     def search_dashboard_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted dashboards  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1426,7 +1426,7 @@ def search_dashboard_deleted_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted dashboards  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1499,7 +1499,7 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
             collection_formats=collection_formats)
 
     def search_dashboard_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted dashboards  # noqa: E501
+        """Search over a customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1521,7 +1521,7 @@ def search_dashboard_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted dashboards  # noqa: E501
+        """Search over a customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1594,7 +1594,7 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted dashboards  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1617,7 +1617,7 @@ def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted dashboards  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1697,7 +1697,7 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
             collection_formats=collection_formats)
 
     def search_dashboard_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted dashboards  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1719,7 +1719,7 @@ def search_dashboard_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted dashboards  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1792,7 +1792,7 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_external_link_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s external links  # noqa: E501
+        """Search over a customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1814,7 +1814,7 @@ def search_external_link_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s external links  # noqa: E501
+        """Search over a customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1887,7 +1887,7 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s external links  # noqa: E501
+        """Lists the values of a specific facet over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1910,7 +1910,7 @@ def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s external links  # noqa: E501
+        """Lists the values of a specific facet over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1990,7 +1990,7 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
             collection_formats=collection_formats)
 
     def search_external_links_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s external links  # noqa: E501
+        """Lists the values of one or more facets over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2012,7 +2012,7 @@ def search_external_links_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s external links  # noqa: E501
+        """Lists the values of one or more facets over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2085,7 +2085,7 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
             collection_formats=collection_formats)
 
     def search_maintenance_window_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s maintenance windows  # noqa: E501
+        """Search over a customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2107,7 +2107,7 @@ def search_maintenance_window_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s maintenance windows  # noqa: E501
+        """Search over a customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2180,7 +2180,7 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
             collection_formats=collection_formats)
 
     def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s maintenance windows  # noqa: E501
+        """Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2203,7 +2203,7 @@ def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s maintenance windows  # noqa: E501
+        """Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2283,7 +2283,7 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
             collection_formats=collection_formats)
 
     def search_maintenance_window_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s maintenance windows  # noqa: E501
+        """Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2305,7 +2305,7 @@ def search_maintenance_window_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s maintenance windows  # noqa: E501
+        """Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2378,7 +2378,7 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             collection_formats=collection_formats)
 
     def search_notficant_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s notificants  # noqa: E501
+        """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2400,7 +2400,7 @@ def search_notficant_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s notificants  # noqa: E501
+        """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2473,7 +2473,7 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_notificant_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s notificants  # noqa: E501
+        """Search over a customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2495,7 +2495,7 @@ def search_notificant_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s notificants  # noqa: E501
+        """Search over a customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2568,7 +2568,7 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s notificants  # noqa: E501
+        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2591,7 +2591,7 @@ def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s notificants  # noqa: E501
+        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2671,7 +2671,7 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             collection_formats=collection_formats)
 
     def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted proxies  # noqa: E501
+        """Search over a customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2693,7 +2693,7 @@ def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted proxies  # noqa: E501
+        """Search over a customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2766,7 +2766,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted proxies  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2789,7 +2789,7 @@ def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted proxies  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2869,7 +2869,7 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             collection_formats=collection_formats)
 
     def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted proxies  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2891,7 +2891,7 @@ def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted proxies  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2964,7 +2964,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             collection_formats=collection_formats)
 
     def search_proxy_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted proxies  # noqa: E501
+        """Search over a customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2986,7 +2986,7 @@ def search_proxy_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted proxies  # noqa: E501
+        """Search over a customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3059,7 +3059,7 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted proxies  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3082,7 +3082,7 @@ def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted proxies  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3162,7 +3162,7 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_proxy_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted proxies  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3184,7 +3184,7 @@ def search_proxy_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted proxies  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3257,7 +3257,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted derived metric definitions  # noqa: E501
+        """Search over a customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3279,7 +3279,7 @@ def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s deleted derived metric definitions  # noqa: E501
+        """Search over a customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3352,7 +3352,7 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
             collection_formats=collection_formats)
 
     def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted derived metric definitions  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3375,7 +3375,7 @@ def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E
             return data
 
     def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s deleted derived metric definitions  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3455,7 +3455,7 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             collection_formats=collection_formats)
 
     def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted derived metric definitions  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3477,7 +3477,7 @@ def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s deleted derived metric definitions  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3550,7 +3550,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
             collection_formats=collection_formats)
 
     def search_registered_query_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted derived metric definitions  # noqa: E501
+        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3572,7 +3572,7 @@ def search_registered_query_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s non-deleted derived metric definitions  # noqa: E501
+        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3645,7 +3645,7 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
             collection_formats=collection_formats)
 
     def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3668,7 +3668,7 @@ def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3748,7 +3748,7 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             collection_formats=collection_formats)
 
     def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3770,7 +3770,7 @@ def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3843,7 +3843,7 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             collection_formats=collection_formats)
 
     def search_report_event_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s events  # noqa: E501
+        """Search over a customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3865,7 +3865,7 @@ def search_report_event_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s events  # noqa: E501
+        """Search over a customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3938,7 +3938,7 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s events  # noqa: E501
+        """Lists the values of a specific facet over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -3961,7 +3961,7 @@ def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s events  # noqa: E501
+        """Lists the values of a specific facet over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4041,7 +4041,7 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             collection_formats=collection_formats)
 
     def search_report_event_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s events  # noqa: E501
+        """Lists the values of one or more facets over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4063,7 +4063,7 @@ def search_report_event_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s events  # noqa: E501
+        """Lists the values of one or more facets over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4136,7 +4136,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_tagged_source_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s sources  # noqa: E501
+        """Search over a customer's sources  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4158,7 +4158,7 @@ def search_tagged_source_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_tagged_source_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s sources  # noqa: E501
+        """Search over a customer's sources  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4231,7 +4231,7 @@ def search_tagged_source_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_tagged_source_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s sources  # noqa: E501
+        """Lists the values of a specific facet over the customer's sources  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4254,7 +4254,7 @@ def search_tagged_source_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_tagged_source_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s sources  # noqa: E501
+        """Lists the values of a specific facet over the customer's sources  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4334,7 +4334,7 @@ def search_tagged_source_for_facet_with_http_info(self, facet, **kwargs):  # noq
             collection_formats=collection_formats)
 
     def search_tagged_source_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s sources  # noqa: E501
+        """Lists the values of one or more facets over the customer's sources  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4356,7 +4356,7 @@ def search_tagged_source_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s sources  # noqa: E501
+        """Lists the values of one or more facets over the customer's sources  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4429,7 +4429,7 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             collection_formats=collection_formats)
 
     def search_user_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s users  # noqa: E501
+        """Search over a customer's users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4451,7 +4451,7 @@ def search_user_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s users  # noqa: E501
+        """Search over a customer's users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4524,7 +4524,7 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s users  # noqa: E501
+        """Lists the values of a specific facet over the customer's users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4547,7 +4547,7 @@ def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s users  # noqa: E501
+        """Lists the values of a specific facet over the customer's users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4627,7 +4627,7 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_user_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s users  # noqa: E501
+        """Lists the values of one or more facets over the customer's users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4649,7 +4649,7 @@ def search_user_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s users  # noqa: E501
+        """Lists the values of one or more facets over the customer's users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4721,8 +4721,301 @@ def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_user_group_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's user groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_group_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_user_group_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_user_group_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_user_group_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's user groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_group_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_user_group_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/usergroup', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_user_group_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's user groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_group_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_user_group_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_user_group_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_user_group_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's user groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_group_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_user_group_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_user_group_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/usergroup/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_user_group_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's user groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_group_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_user_group_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_user_group_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_user_group_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's user groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_user_group_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_user_group_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/usergroup/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_web_hook_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s webhooks  # noqa: E501
+        """Search over a customer's webhooks  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4744,7 +5037,7 @@ def search_web_hook_entities(self, **kwargs):  # noqa: E501
             return data
 
     def search_web_hook_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer&#39;s webhooks  # noqa: E501
+        """Search over a customer's webhooks  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4817,7 +5110,7 @@ def search_web_hook_entities_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def search_web_hook_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s webhooks  # noqa: E501
+        """Lists the values of a specific facet over the customer's webhooks  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4840,7 +5133,7 @@ def search_web_hook_for_facet(self, facet, **kwargs):  # noqa: E501
             return data
 
     def search_web_hook_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer&#39;s webhooks  # noqa: E501
+        """Lists the values of a specific facet over the customer's webhooks  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4920,7 +5213,7 @@ def search_web_hook_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E5
             collection_formats=collection_formats)
 
     def search_webhook_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s webhooks  # noqa: E501
+        """Lists the values of one or more facets over the customer's webhooks  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -4942,7 +5235,7 @@ def search_webhook_for_facets(self, **kwargs):  # noqa: E501
             return data
 
     def search_webhook_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer&#39;s webhooks  # noqa: E501
+        """Lists the values of one or more facets over the customer's webhooks  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
diff --git a/wavefront_api_client/api/settings_api.py b/wavefront_api_client/api/settings_api.py
new file mode 100644
index 0000000..5346429
--- /dev/null
+++ b/wavefront_api_client/api/settings_api.py
@@ -0,0 +1,394 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SettingsApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_all_permissions(self, **kwargs):  # noqa: E501
+        """Get all permissions  # noqa: E501
+
+        Returns all permissions' info data  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_permissions(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: list[BusinessActionGroupBasicDTO]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_permissions_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_permissions_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_permissions_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all permissions  # noqa: E501
+
+        Returns all permissions' info data  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_permissions_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: list[BusinessActionGroupBasicDTO]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_permissions" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/customer/permissions', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='list[BusinessActionGroupBasicDTO]',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_customer_preferences(self, **kwargs):  # noqa: E501
+        """Get customer preferences  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_customer_preferences(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: CustomerPreferences
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_customer_preferences_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_customer_preferences_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_customer_preferences_with_http_info(self, **kwargs):  # noqa: E501
+        """Get customer preferences  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_customer_preferences_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: CustomerPreferences
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_customer_preferences" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/customer/preferences', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='CustomerPreferences',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_default_user_groups(self, **kwargs):  # noqa: E501
+        """Get default user groups customer preferences  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_default_user_groups(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param User body:
+        :return: ResponseContainerListUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_default_user_groups_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_default_user_groups_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_default_user_groups_with_http_info(self, **kwargs):  # noqa: E501
+        """Get default user groups customer preferences  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_default_user_groups_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param User body:
+        :return: ResponseContainerListUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_default_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/customer/preferences/defaultUserGroups', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def post_customer_preferences(self, **kwargs):  # noqa: E501
+        """Update selected fields of customer preferences  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.post_customer_preferences(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param CustomerPreferencesUpdating body:
+        :return: CustomerPreferences
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.post_customer_preferences_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.post_customer_preferences_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def post_customer_preferences_with_http_info(self, **kwargs):  # noqa: E501
+        """Update selected fields of customer preferences  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.post_customer_preferences_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param CustomerPreferencesUpdating body:
+        :return: CustomerPreferences
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method post_customer_preferences" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/customer/preferences', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='CustomerPreferences',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 015ef15..169634f 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 41a49fe..cd50465 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,6 +33,109 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
+        """Adds specific user groups to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_user_to_user_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be added to the user
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_user_to_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_user_to_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Adds specific user groups to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_user_to_user_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be added to the user
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_user_to_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_user_to_user_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/{id}/addUserGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_or_update_user(self, **kwargs):  # noqa: E501
         """Creates or updates a user  # noqa: E501
 
@@ -44,7 +147,7 @@ def create_or_update_user(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"browse\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -67,7 +170,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"browse\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -132,6 +235,101 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def delete_multiple_users(self, **kwargs):  # noqa: E501
+        """Deletes multiple users  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_multiple_users(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of users which should be deleted
+        :return: ResponseContainerListString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_multiple_users_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_multiple_users_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
+        """Deletes multiple users  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_multiple_users_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of users which should be deleted
+        :return: ResponseContainerListString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_multiple_users" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/deleteUsers', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_user(self, id, **kwargs):  # noqa: E501
         """Deletes a user identified by id  # noqa: E501
 
@@ -409,47 +607,47 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def grant_user_permission(self, id, **kwargs):  # noqa: E501
-        """Grants a specific user permission  # noqa: E501
+    def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
+        """Grants a specific user permission to multiple users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.grant_user_permission(id, async_req=True)
+        >>> thread = api.grant_permission_to_users(permission, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+        :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: list of users which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.grant_user_permission_with_http_info(id, **kwargs)  # noqa: E501
+            return self.grant_permission_to_users_with_http_info(permission, **kwargs)  # noqa: E501
         else:
-            (data) = self.grant_user_permission_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.grant_permission_to_users_with_http_info(permission, **kwargs)  # noqa: E501
             return data
 
-    def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Grants a specific user permission  # noqa: E501
+    def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Grants a specific user permission to multiple users  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.grant_user_permission_with_http_info(id, async_req=True)
+        >>> thread = api.grant_permission_to_users_with_http_info(permission, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+        :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: list of users which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id', 'group']  # noqa: E501
+        all_params = ['permission', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -460,20 +658,20 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method grant_user_permission" % key
+                    " to method grant_permission_to_users" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `grant_user_permission`")  # noqa: E501
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_users`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
 
         query_params = []
 
@@ -481,23 +679,23 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
 
         form_params = []
         local_var_files = {}
-        if 'group' in params:
-            form_params.append(('group', params['group']))  # noqa: E501
 
         body_params = None
+        if 'body' in params:
+            body_params = params['body']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/x-www-form-urlencoded'])  # noqa: E501
+            ['application/json'])  # noqa: E501
 
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/user/{id}/grant', 'POST',
+            '/api/v2/user/grant/{permission}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -512,41 +710,41 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def revoke_user_permission(self, id, **kwargs):  # noqa: E501
-        """Revokes a specific user permission  # noqa: E501
+    def grant_user_permission(self, id, **kwargs):  # noqa: E501
+        """Grants a specific user permission  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.revoke_user_permission(id, async_req=True)
+        >>> thread = api.grant_user_permission(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param str group:
+        :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.revoke_user_permission_with_http_info(id, **kwargs)  # noqa: E501
+            return self.grant_user_permission_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.revoke_user_permission_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.grant_user_permission_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Revokes a specific user permission  # noqa: E501
+    def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Grants a specific user permission  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.revoke_user_permission_with_http_info(id, async_req=True)
+        >>> thread = api.grant_user_permission_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param str group:
+        :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -563,14 +761,14 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method revoke_user_permission" % key
+                    " to method grant_user_permission" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if ('id' not in params or
                 params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `revoke_user_permission`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `grant_user_permission`")  # noqa: E501
 
         collection_formats = {}
 
@@ -600,7 +798,514 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/user/{id}/revoke', 'POST',
+            '/api/v2/user/{id}/grant', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def invite_users(self, **kwargs):  # noqa: E501
+        """Invite users with given user groups and permissions.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.invite_users(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] } ]</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.invite_users_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.invite_users_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def invite_users_with_http_info(self, **kwargs):  # noqa: E501
+        """Invite users with given user groups and permissions.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.invite_users_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] } ]</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method invite_users" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/invite', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
+        """Removes specific user groups from the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_user_from_user_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be removed from the user
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_user_from_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_user_from_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Removes specific user groups from the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_user_from_user_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be removed from the user
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_user_from_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_user_from_user_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/{id}/removeUserGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
+        """Revokes a specific user permission from multiple users  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_users(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: list of users which should be revoked by specified permission
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revoke_permission_from_users_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revoke_permission_from_users_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Revokes a specific user permission from multiple users  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_users_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: list of users which should be revoked by specified permission
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revoke_permission_from_users" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_users`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/revoke/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revoke_user_permission(self, id, **kwargs):  # noqa: E501
+        """Revokes a specific user permission  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_user_permission(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str group:
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revoke_user_permission_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revoke_user_permission_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Revokes a specific user permission  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_user_permission_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str group:
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'group']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revoke_user_permission" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `revoke_user_permission`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+        if 'group' in params:
+            form_params.append(('group', params['group']))  # noqa: E501
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/x-www-form-urlencoded'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/{id}/revoke', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_user(self, id, **kwargs):  # noqa: E501
+        """Update user with given user groups and permissions.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_user(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_user_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_user_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update user with given user groups and permissions.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_user_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_user`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/{id}', 'PUT',
             path_params,
             query_params,
             header_params,
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
new file mode 100644
index 0000000..d2363d8
--- /dev/null
+++ b/wavefront_api_client/api/user_group_api.py
@@ -0,0 +1,929 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class UserGroupApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
+        """Add multiple users to a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_users_to_user_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users that should be added to user group
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_users_to_user_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_users_to_user_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add multiple users to a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_users_to_user_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users that should be added to user group
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_users_to_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_users_to_user_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/{id}/addUsers', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_user_group(self, **kwargs):  # noqa: E501
+        """Create a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_user_group(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_user_group_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_user_group_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_user_group_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_user_group(self, id, **kwargs):  # noqa: E501
+        """Delete a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_user_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_user_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_user_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_user_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_user_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_user_groups(self, **kwargs):  # noqa: E501
+        """Get all user groups for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_user_groups(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_user_groups_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_user_groups_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all user groups for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_user_groups_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_user_group(self, id, **kwargs):  # noqa: E501
+        """Get a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_user_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_user_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_user_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def grant_permission_to_user_groups(self, permission, **kwargs):  # noqa: E501
+        """Grants a single permission to user group(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_permission_to_user_groups(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to user group(s). (required)
+        :param list[str] body: List of user groups.
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.grant_permission_to_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.grant_permission_to_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def grant_permission_to_user_groups_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Grants a single permission to user group(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_permission_to_user_groups_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to user group(s). (required)
+        :param list[str] body: List of user groups.
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method grant_permission_to_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_user_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/grant/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
+        """Remove multiple users from a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_users_from_user_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users that should be removed from user group
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_users_from_user_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_users_from_user_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove multiple users from a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_users_from_user_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users that should be removed from user group
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_users_from_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_users_from_user_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/{id}/removeUsers', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revoke_permission_from_user_groups(self, permission, **kwargs):  # noqa: E501
+        """Revokes a single permission from user group(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_user_groups(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to revoke from user group(s). (required)
+        :param list[str] body: List of user groups.
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revoke_permission_from_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revoke_permission_from_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def revoke_permission_from_user_groups_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Revokes a single permission from user group(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_user_groups_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to revoke from user group(s). (required)
+        :param list[str] body: List of user groups.
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revoke_permission_from_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_user_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/revoke/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_user_group(self, id, **kwargs):  # noqa: E501
+        """Update a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_user_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_user_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_user_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_user_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
+        :return: ResponseContainerUserGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_user_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 673f856..9babce9 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4b64eef..30d8d6c 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -1,11 +1,11 @@
 # coding: utf-8
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -73,7 +73,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.3.2/python'
+        self.user_agent = 'Swagger-Codegen/2.9.37/python'
 
     def __del__(self):
         self.pool.close()
@@ -245,12 +245,12 @@ def __deserialize(self, data, klass):
 
         if type(klass) == str:
             if klass.startswith('list['):
-                sub_kls = re.match('list\[(.*)\]', klass).group(1)
+                sub_kls = re.match(r'list\[(.*)\]', klass).group(1)
                 return [self.__deserialize(sub_data, sub_kls)
                         for sub_data in data]
 
             if klass.startswith('dict('):
-                sub_kls = re.match('dict\(([^,]*), (.*)\)', klass).group(2)
+                sub_kls = re.match(r'dict\(([^,]*), (.*)\)', klass).group(2)
                 return {k: self.__deserialize(v, sub_kls)
                         for k, v in six.iteritems(data)}
 
@@ -279,7 +279,7 @@ def call_api(self, resource_path, method,
                  _preload_content=True, _request_timeout=None):
         """Makes the HTTP request (synchronous) and returns deserialized data.
 
-        To make an asynchronous request, set the async_req parameter.
+        To make an async request, set the async_req parameter.
 
         :param resource_path: Path to method endpoint.
         :param method: Method to call.
@@ -541,7 +541,7 @@ def __deserialize_primitive(self, data, klass):
         try:
             return klass(data)
         except UnicodeEncodeError:
-            return six.u(data)
+            return six.text_type(data)
         except TypeError:
             return data
 
@@ -591,6 +591,9 @@ def __deserialize_datatime(self, string):
                 )
             )
 
+    def __hasattr(self, object, name):
+        return name in object.__class__.__dict__
+
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.
 
@@ -599,8 +602,8 @@ def __deserialize_model(self, data, klass):
         :return: model object.
         """
 
-        if not klass.swagger_types and not hasattr(klass,
-                                                   'get_real_child_model'):
+        if (not klass.swagger_types and
+                not self.__hasattr(klass, 'get_real_child_model')):
             return data
 
         kwargs = {}
@@ -614,7 +617,13 @@ def __deserialize_model(self, data, klass):
 
         instance = klass(**kwargs)
 
-        if hasattr(instance, 'get_real_child_model'):
+        if (isinstance(instance, dict) and
+                klass.swagger_types is not None and
+                isinstance(data, dict)):
+            for key, value in data.items():
+                if key not in klass.swagger_types:
+                    instance[key] = value
+        if self.__hasattr(instance, 'get_real_child_model'):
             klass_name = instance.get_real_child_model(data)
             if klass_name:
                 instance = self.__deserialize(data, klass_name)
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 00d6177..85c51d7 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -23,29 +23,22 @@
 from six.moves import http_client as httplib
 
 
-class TypeWithDefault(type):
-    def __init__(cls, name, bases, dct):
-        super(TypeWithDefault, cls).__init__(name, bases, dct)
-        cls._default = None
-
-    def __call__(cls):
-        if cls._default is None:
-            cls._default = type.__call__(cls)
-        return copy.copy(cls._default)
-
-    def set_default(cls, default):
-        cls._default = copy.copy(default)
-
-
-class Configuration(six.with_metaclass(TypeWithDefault, object)):
+class Configuration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Ref: https://github.com/swagger-api/swagger-codegen
     Do not edit the class manually.
     """
 
+    _default = None
+
     def __init__(self):
         """Constructor"""
+        if self._default:
+            for key in self._default.__dict__.keys():
+                self.__dict__[key] = copy.copy(self._default.__dict__[key])
+            return
+
         # Default Base url
         self.host = "https://localhost"
         # Temp file folder for downloading files
@@ -101,6 +94,10 @@ def __init__(self):
         # Safe chars for path_param
         self.safe_chars_for_path_param = ''
 
+    @classmethod
+    def set_default(cls, default):
+        cls._default = default
+
     @property
     def logger_file(self):
         """The logger file.
@@ -243,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.3.2".\
+               "SDK Package Version: 2.9.37".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 33d150c..4ae97f0 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -2,12 +2,12 @@
 
 # flake8: noqa
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -15,12 +15,16 @@
 from __future__ import absolute_import
 
 # import models into model package
+from wavefront_api_client.models.acl import ACL
 from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials
+from wavefront_api_client.models.access_control_element import AccessControlElement
+from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
+from wavefront_api_client.models.business_action_group_basic_dto import BusinessActionGroupBasicDTO
 from wavefront_api_client.models.chart import Chart
 from wavefront_api_client.models.chart_settings import ChartSettings
 from wavefront_api_client.models.chart_source_query import ChartSourceQuery
@@ -28,6 +32,8 @@
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
+from wavefront_api_client.models.customer_preferences import CustomerPreferences
+from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
 from wavefront_api_client.models.dashboard_section import DashboardSection
@@ -46,7 +52,9 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
+from wavefront_api_client.models.integration_alert import IntegrationAlert
 from wavefront_api_client.models.integration_alias import IntegrationAlias
 from wavefront_api_client.models.integration_dashboard import IntegrationDashboard
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
@@ -62,6 +70,8 @@
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
+from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
 from wavefront_api_client.models.number import Number
 from wavefront_api_client.models.paged_alert import PagedAlert
@@ -80,6 +90,7 @@
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_source import PagedSource
+from wavefront_api_client.models.paged_user_group import PagedUserGroup
 from wavefront_api_client.models.point import Point
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
@@ -97,7 +108,11 @@
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
+from wavefront_api_client.models.response_container_list_acl import ResponseContainerListACL
+from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
+from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
+from wavefront_api_client.models.response_container_list_user_group import ResponseContainerListUserGroup
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
@@ -119,10 +134,12 @@
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
+from wavefront_api_client.models.response_container_paged_user_group import ResponseContainerPagedUserGroup
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
+from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
@@ -136,6 +153,12 @@
 from wavefront_api_client.models.target_info import TargetInfo
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
+from wavefront_api_client.models.user import User
+from wavefront_api_client.models.user_group import UserGroup
+from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
+from wavefront_api_client.models.user_group_write import UserGroupWrite
 from wavefront_api_client.models.user_model import UserModel
+from wavefront_api_client.models.user_request_dto import UserRequestDTO
+from wavefront_api_client.models.user_settings import UserSettings
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
new file mode 100644
index 0000000..332b9f0
--- /dev/null
+++ b/wavefront_api_client/models/access_control_element.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AccessControlElement(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'name': 'str',
+        'id': 'str'
+    }
+
+    attribute_map = {
+        'name': 'name',
+        'id': 'id'
+    }
+
+    def __init__(self, name=None, id=None):  # noqa: E501
+        """AccessControlElement - a model defined in Swagger"""  # noqa: E501
+
+        self._name = None
+        self._id = None
+        self.discriminator = None
+
+        if name is not None:
+            self.name = name
+        if id is not None:
+            self.id = id
+
+    @property
+    def name(self):
+        """Gets the name of this AccessControlElement.  # noqa: E501
+
+
+        :return: The name of this AccessControlElement.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this AccessControlElement.
+
+
+        :param name: The name of this AccessControlElement.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def id(self):
+        """Gets the id of this AccessControlElement.  # noqa: E501
+
+
+        :return: The id of this AccessControlElement.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this AccessControlElement.
+
+
+        :param id: The id of this AccessControlElement.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessControlElement, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessControlElement):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
new file mode 100644
index 0000000..3f9e5f6
--- /dev/null
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AccessControlListSimple(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'can_view': 'list[str]',
+        'can_modify': 'list[str]'
+    }
+
+    attribute_map = {
+        'can_view': 'canView',
+        'can_modify': 'canModify'
+    }
+
+    def __init__(self, can_view=None, can_modify=None):  # noqa: E501
+        """AccessControlListSimple - a model defined in Swagger"""  # noqa: E501
+
+        self._can_view = None
+        self._can_modify = None
+        self.discriminator = None
+
+        if can_view is not None:
+            self.can_view = can_view
+        if can_modify is not None:
+            self.can_modify = can_modify
+
+    @property
+    def can_view(self):
+        """Gets the can_view of this AccessControlListSimple.  # noqa: E501
+
+
+        :return: The can_view of this AccessControlListSimple.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._can_view
+
+    @can_view.setter
+    def can_view(self, can_view):
+        """Sets the can_view of this AccessControlListSimple.
+
+
+        :param can_view: The can_view of this AccessControlListSimple.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._can_view = can_view
+
+    @property
+    def can_modify(self):
+        """Gets the can_modify of this AccessControlListSimple.  # noqa: E501
+
+
+        :return: The can_modify of this AccessControlListSimple.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._can_modify
+
+    @can_modify.setter
+    def can_modify(self, can_modify):
+        """Sets the can_modify of this AccessControlListSimple.
+
+
+        :param can_modify: The can_modify of this AccessControlListSimple.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._can_modify = can_modify
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessControlListSimple, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessControlListSimple):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/acl.py b/wavefront_api_client/models/acl.py
new file mode 100644
index 0000000..a4e467b
--- /dev/null
+++ b/wavefront_api_client/models/acl.py
@@ -0,0 +1,178 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.access_control_element import AccessControlElement  # noqa: F401,E501
+
+
+class ACL(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'entity_id': 'str',
+        'view_acl': 'list[AccessControlElement]',
+        'modify_acl': 'list[AccessControlElement]'
+    }
+
+    attribute_map = {
+        'entity_id': 'entityId',
+        'view_acl': 'viewAcl',
+        'modify_acl': 'modifyAcl'
+    }
+
+    def __init__(self, entity_id=None, view_acl=None, modify_acl=None):  # noqa: E501
+        """ACL - a model defined in Swagger"""  # noqa: E501
+
+        self._entity_id = None
+        self._view_acl = None
+        self._modify_acl = None
+        self.discriminator = None
+
+        self.entity_id = entity_id
+        self.view_acl = view_acl
+        self.modify_acl = modify_acl
+
+    @property
+    def entity_id(self):
+        """Gets the entity_id of this ACL.  # noqa: E501
+
+        The entity Id  # noqa: E501
+
+        :return: The entity_id of this ACL.  # noqa: E501
+        :rtype: str
+        """
+        return self._entity_id
+
+    @entity_id.setter
+    def entity_id(self, entity_id):
+        """Sets the entity_id of this ACL.
+
+        The entity Id  # noqa: E501
+
+        :param entity_id: The entity_id of this ACL.  # noqa: E501
+        :type: str
+        """
+        if entity_id is None:
+            raise ValueError("Invalid value for `entity_id`, must not be `None`")  # noqa: E501
+
+        self._entity_id = entity_id
+
+    @property
+    def view_acl(self):
+        """Gets the view_acl of this ACL.  # noqa: E501
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :return: The view_acl of this ACL.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._view_acl
+
+    @view_acl.setter
+    def view_acl(self, view_acl):
+        """Sets the view_acl of this ACL.
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :param view_acl: The view_acl of this ACL.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+        if view_acl is None:
+            raise ValueError("Invalid value for `view_acl`, must not be `None`")  # noqa: E501
+
+        self._view_acl = view_acl
+
+    @property
+    def modify_acl(self):
+        """Gets the modify_acl of this ACL.  # noqa: E501
+
+        List of users and user groups ids that have modify permission  # noqa: E501
+
+        :return: The modify_acl of this ACL.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._modify_acl
+
+    @modify_acl.setter
+    def modify_acl(self, modify_acl):
+        """Sets the modify_acl of this ACL.
+
+        List of users and user groups ids that have modify permission  # noqa: E501
+
+        :param modify_acl: The modify_acl of this ACL.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+        if modify_acl is None:
+            raise ValueError("Invalid value for `modify_acl`, must not be `None`")  # noqa: E501
+
+        self._modify_acl = modify_acl
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ACL, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ACL):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 98af7f3..37738ae 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -37,177 +37,203 @@ class Alert(object):
     """
     swagger_types = {
         'last_event_time': 'int',
+        'hidden': 'bool',
+        'severity': 'str',
         'created': 'int',
-        'minutes': 'int',
         'name': 'str',
         'id': 'str',
         'target': 'str',
+        'minutes': 'int',
         'tags': 'WFTags',
         'status': 'list[str]',
         'event': 'Event',
         'updated': 'int',
-        'process_rate_minutes': 'int',
-        'last_processed_millis': 'int',
-        'update_user_id': 'str',
+        'condition': 'str',
+        'alert_type': 'str',
         'display_expression': 'str',
+        'failing_host_label_pairs': 'list[SourceLabelPair]',
+        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
+        'active_maintenance_windows': 'list[str]',
         'condition_qb_enabled': 'bool',
         'display_expression_qb_enabled': 'bool',
-        'condition': 'str',
         'condition_qb_serialization': 'str',
         'display_expression_qb_serialization': 'str',
         'include_obsolete_metrics': 'bool',
-        'severity': 'str',
-        'last_query_time': 'int',
+        'targets': 'dict(str, str)',
+        'process_rate_minutes': 'int',
+        'last_processed_millis': 'int',
+        'update_user_id': 'str',
+        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
+        'no_data_event': 'Event',
+        'snoozed': 'int',
+        'conditions': 'dict(str, str)',
         'notificants': 'list[str]',
+        'additional_information': 'str',
+        'last_query_time': 'int',
         'alerts_last_day': 'int',
         'alerts_last_week': 'int',
         'alerts_last_month': 'int',
-        'snoozed': 'int',
-        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
-        'failing_host_label_pairs': 'list[SourceLabelPair]',
-        'active_maintenance_windows': 'list[str]',
-        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
-        'no_data_event': 'Event',
         'in_trash': 'bool',
         'query_failing': 'bool',
         'create_user_id': 'str',
-        'additional_information': 'str',
-        'creator_id': 'str',
-        'resolve_after_minutes': 'int',
-        'updater_id': 'str',
         'last_failed_time': 'int',
-        'last_error_message': 'str',
+        'last_notification_millis': 'int',
+        'points_scanned_at_last_query': 'int',
+        'num_points_in_failure_frame': 'int',
         'metrics_used': 'list[str]',
         'hosts_used': 'list[str]',
-        'points_scanned_at_last_query': 'int',
-        'last_notification_millis': 'int',
+        'system_owned': 'bool',
+        'resolve_after_minutes': 'int',
+        'creator_id': 'str',
+        'updater_id': 'str',
+        'last_error_message': 'str',
         'notification_resend_frequency_minutes': 'int',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'deleted': 'bool',
         'target_info': 'list[TargetInfo]',
-        'sort_attr': 'int'
+        'sort_attr': 'int',
+        'severity_list': 'list[str]'
     }
 
     attribute_map = {
         'last_event_time': 'lastEventTime',
+        'hidden': 'hidden',
+        'severity': 'severity',
         'created': 'created',
-        'minutes': 'minutes',
         'name': 'name',
         'id': 'id',
         'target': 'target',
+        'minutes': 'minutes',
         'tags': 'tags',
         'status': 'status',
         'event': 'event',
         'updated': 'updated',
-        'process_rate_minutes': 'processRateMinutes',
-        'last_processed_millis': 'lastProcessedMillis',
-        'update_user_id': 'updateUserId',
+        'condition': 'condition',
+        'alert_type': 'alertType',
         'display_expression': 'displayExpression',
+        'failing_host_label_pairs': 'failingHostLabelPairs',
+        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
+        'active_maintenance_windows': 'activeMaintenanceWindows',
         'condition_qb_enabled': 'conditionQBEnabled',
         'display_expression_qb_enabled': 'displayExpressionQBEnabled',
-        'condition': 'condition',
         'condition_qb_serialization': 'conditionQBSerialization',
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
-        'severity': 'severity',
-        'last_query_time': 'lastQueryTime',
+        'targets': 'targets',
+        'process_rate_minutes': 'processRateMinutes',
+        'last_processed_millis': 'lastProcessedMillis',
+        'update_user_id': 'updateUserId',
+        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
+        'no_data_event': 'noDataEvent',
+        'snoozed': 'snoozed',
+        'conditions': 'conditions',
         'notificants': 'notificants',
+        'additional_information': 'additionalInformation',
+        'last_query_time': 'lastQueryTime',
         'alerts_last_day': 'alertsLastDay',
         'alerts_last_week': 'alertsLastWeek',
         'alerts_last_month': 'alertsLastMonth',
-        'snoozed': 'snoozed',
-        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
-        'failing_host_label_pairs': 'failingHostLabelPairs',
-        'active_maintenance_windows': 'activeMaintenanceWindows',
-        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
-        'no_data_event': 'noDataEvent',
         'in_trash': 'inTrash',
         'query_failing': 'queryFailing',
         'create_user_id': 'createUserId',
-        'additional_information': 'additionalInformation',
-        'creator_id': 'creatorId',
-        'resolve_after_minutes': 'resolveAfterMinutes',
-        'updater_id': 'updaterId',
         'last_failed_time': 'lastFailedTime',
-        'last_error_message': 'lastErrorMessage',
+        'last_notification_millis': 'lastNotificationMillis',
+        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
+        'num_points_in_failure_frame': 'numPointsInFailureFrame',
         'metrics_used': 'metricsUsed',
         'hosts_used': 'hostsUsed',
-        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
-        'last_notification_millis': 'lastNotificationMillis',
+        'system_owned': 'systemOwned',
+        'resolve_after_minutes': 'resolveAfterMinutes',
+        'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
+        'last_error_message': 'lastErrorMessage',
         'notification_resend_frequency_minutes': 'notificationResendFrequencyMinutes',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted',
         'target_info': 'targetInfo',
-        'sort_attr': 'sortAttr'
+        'sort_attr': 'sortAttr',
+        'severity_list': 'severityList'
     }
 
-    def __init__(self, last_event_time=None, created=None, minutes=None, name=None, id=None, target=None, tags=None, status=None, event=None, updated=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, display_expression=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, severity=None, last_query_time=None, notificants=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, snoozed=None, in_maintenance_host_label_pairs=None, failing_host_label_pairs=None, active_maintenance_windows=None, prefiring_host_label_pairs=None, no_data_event=None, in_trash=None, query_failing=None, create_user_id=None, additional_information=None, creator_id=None, resolve_after_minutes=None, updater_id=None, last_failed_time=None, last_error_message=None, metrics_used=None, hosts_used=None, points_scanned_at_last_query=None, last_notification_millis=None, notification_resend_frequency_minutes=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, target_info=None, sort_attr=None):  # noqa: E501
+    def __init__(self, last_event_time=None, hidden=None, severity=None, created=None, name=None, id=None, target=None, minutes=None, tags=None, status=None, event=None, updated=None, condition=None, alert_type=None, display_expression=None, failing_host_label_pairs=None, in_maintenance_host_label_pairs=None, active_maintenance_windows=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, targets=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, prefiring_host_label_pairs=None, no_data_event=None, snoozed=None, conditions=None, notificants=None, additional_information=None, last_query_time=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, last_notification_millis=None, points_scanned_at_last_query=None, num_points_in_failure_frame=None, metrics_used=None, hosts_used=None, system_owned=None, resolve_after_minutes=None, creator_id=None, updater_id=None, last_error_message=None, notification_resend_frequency_minutes=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, target_info=None, sort_attr=None, severity_list=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._last_event_time = None
+        self._hidden = None
+        self._severity = None
         self._created = None
-        self._minutes = None
         self._name = None
         self._id = None
         self._target = None
+        self._minutes = None
         self._tags = None
         self._status = None
         self._event = None
         self._updated = None
-        self._process_rate_minutes = None
-        self._last_processed_millis = None
-        self._update_user_id = None
+        self._condition = None
+        self._alert_type = None
         self._display_expression = None
+        self._failing_host_label_pairs = None
+        self._in_maintenance_host_label_pairs = None
+        self._active_maintenance_windows = None
         self._condition_qb_enabled = None
         self._display_expression_qb_enabled = None
-        self._condition = None
         self._condition_qb_serialization = None
         self._display_expression_qb_serialization = None
         self._include_obsolete_metrics = None
-        self._severity = None
-        self._last_query_time = None
+        self._targets = None
+        self._process_rate_minutes = None
+        self._last_processed_millis = None
+        self._update_user_id = None
+        self._prefiring_host_label_pairs = None
+        self._no_data_event = None
+        self._snoozed = None
+        self._conditions = None
         self._notificants = None
+        self._additional_information = None
+        self._last_query_time = None
         self._alerts_last_day = None
         self._alerts_last_week = None
         self._alerts_last_month = None
-        self._snoozed = None
-        self._in_maintenance_host_label_pairs = None
-        self._failing_host_label_pairs = None
-        self._active_maintenance_windows = None
-        self._prefiring_host_label_pairs = None
-        self._no_data_event = None
         self._in_trash = None
         self._query_failing = None
         self._create_user_id = None
-        self._additional_information = None
-        self._creator_id = None
-        self._resolve_after_minutes = None
-        self._updater_id = None
         self._last_failed_time = None
-        self._last_error_message = None
+        self._last_notification_millis = None
+        self._points_scanned_at_last_query = None
+        self._num_points_in_failure_frame = None
         self._metrics_used = None
         self._hosts_used = None
-        self._points_scanned_at_last_query = None
-        self._last_notification_millis = None
+        self._system_owned = None
+        self._resolve_after_minutes = None
+        self._creator_id = None
+        self._updater_id = None
+        self._last_error_message = None
         self._notification_resend_frequency_minutes = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._deleted = None
         self._target_info = None
         self._sort_attr = None
+        self._severity_list = None
         self.discriminator = None
 
         if last_event_time is not None:
             self.last_event_time = last_event_time
+        if hidden is not None:
+            self.hidden = hidden
+        if severity is not None:
+            self.severity = severity
         if created is not None:
             self.created = created
-        self.minutes = minutes
         self.name = name
         if id is not None:
             self.id = id
-        self.target = target
+        if target is not None:
+            self.target = target
+        self.minutes = minutes
         if tags is not None:
             self.tags = tags
         if status is not None:
@@ -216,74 +242,83 @@ def __init__(self, last_event_time=None, created=None, minutes=None, name=None,
             self.event = event
         if updated is not None:
             self.updated = updated
-        if process_rate_minutes is not None:
-            self.process_rate_minutes = process_rate_minutes
-        if last_processed_millis is not None:
-            self.last_processed_millis = last_processed_millis
-        if update_user_id is not None:
-            self.update_user_id = update_user_id
+        self.condition = condition
+        if alert_type is not None:
+            self.alert_type = alert_type
         if display_expression is not None:
             self.display_expression = display_expression
+        if failing_host_label_pairs is not None:
+            self.failing_host_label_pairs = failing_host_label_pairs
+        if in_maintenance_host_label_pairs is not None:
+            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+        if active_maintenance_windows is not None:
+            self.active_maintenance_windows = active_maintenance_windows
         if condition_qb_enabled is not None:
             self.condition_qb_enabled = condition_qb_enabled
         if display_expression_qb_enabled is not None:
             self.display_expression_qb_enabled = display_expression_qb_enabled
-        self.condition = condition
         if condition_qb_serialization is not None:
             self.condition_qb_serialization = condition_qb_serialization
         if display_expression_qb_serialization is not None:
             self.display_expression_qb_serialization = display_expression_qb_serialization
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
-        self.severity = severity
-        if last_query_time is not None:
-            self.last_query_time = last_query_time
+        if targets is not None:
+            self.targets = targets
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
+        if prefiring_host_label_pairs is not None:
+            self.prefiring_host_label_pairs = prefiring_host_label_pairs
+        if no_data_event is not None:
+            self.no_data_event = no_data_event
+        if snoozed is not None:
+            self.snoozed = snoozed
+        if conditions is not None:
+            self.conditions = conditions
         if notificants is not None:
             self.notificants = notificants
+        if additional_information is not None:
+            self.additional_information = additional_information
+        if last_query_time is not None:
+            self.last_query_time = last_query_time
         if alerts_last_day is not None:
             self.alerts_last_day = alerts_last_day
         if alerts_last_week is not None:
             self.alerts_last_week = alerts_last_week
         if alerts_last_month is not None:
             self.alerts_last_month = alerts_last_month
-        if snoozed is not None:
-            self.snoozed = snoozed
-        if in_maintenance_host_label_pairs is not None:
-            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
-        if failing_host_label_pairs is not None:
-            self.failing_host_label_pairs = failing_host_label_pairs
-        if active_maintenance_windows is not None:
-            self.active_maintenance_windows = active_maintenance_windows
-        if prefiring_host_label_pairs is not None:
-            self.prefiring_host_label_pairs = prefiring_host_label_pairs
-        if no_data_event is not None:
-            self.no_data_event = no_data_event
         if in_trash is not None:
             self.in_trash = in_trash
         if query_failing is not None:
             self.query_failing = query_failing
         if create_user_id is not None:
             self.create_user_id = create_user_id
-        if additional_information is not None:
-            self.additional_information = additional_information
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if resolve_after_minutes is not None:
-            self.resolve_after_minutes = resolve_after_minutes
-        if updater_id is not None:
-            self.updater_id = updater_id
         if last_failed_time is not None:
             self.last_failed_time = last_failed_time
-        if last_error_message is not None:
-            self.last_error_message = last_error_message
+        if last_notification_millis is not None:
+            self.last_notification_millis = last_notification_millis
+        if points_scanned_at_last_query is not None:
+            self.points_scanned_at_last_query = points_scanned_at_last_query
+        if num_points_in_failure_frame is not None:
+            self.num_points_in_failure_frame = num_points_in_failure_frame
         if metrics_used is not None:
             self.metrics_used = metrics_used
         if hosts_used is not None:
             self.hosts_used = hosts_used
-        if points_scanned_at_last_query is not None:
-            self.points_scanned_at_last_query = points_scanned_at_last_query
-        if last_notification_millis is not None:
-            self.last_notification_millis = last_notification_millis
+        if system_owned is not None:
+            self.system_owned = system_owned
+        if resolve_after_minutes is not None:
+            self.resolve_after_minutes = resolve_after_minutes
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
+        if last_error_message is not None:
+            self.last_error_message = last_error_message
         if notification_resend_frequency_minutes is not None:
             self.notification_resend_frequency_minutes = notification_resend_frequency_minutes
         if created_epoch_millis is not None:
@@ -296,6 +331,8 @@ def __init__(self, last_event_time=None, created=None, minutes=None, name=None,
             self.target_info = target_info
         if sort_attr is not None:
             self.sort_attr = sort_attr
+        if severity_list is not None:
+            self.severity_list = severity_list
 
     @property
     def last_event_time(self):
@@ -320,6 +357,56 @@ def last_event_time(self, last_event_time):
 
         self._last_event_time = last_event_time
 
+    @property
+    def hidden(self):
+        """Gets the hidden of this Alert.  # noqa: E501
+
+
+        :return: The hidden of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Alert.
+
+
+        :param hidden: The hidden of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def severity(self):
+        """Gets the severity of this Alert.  # noqa: E501
+
+        Severity of the alert  # noqa: E501
+
+        :return: The severity of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._severity
+
+    @severity.setter
+    def severity(self, severity):
+        """Sets the severity of this Alert.
+
+        Severity of the alert  # noqa: E501
+
+        :param severity: The severity of this Alert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if severity not in allowed_values:
+            raise ValueError(
+                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(severity, allowed_values)
+            )
+
+        self._severity = severity
+
     @property
     def created(self):
         """Gets the created of this Alert.  # noqa: E501
@@ -344,47 +431,22 @@ def created(self, created):
         self._created = created
 
     @property
-    def minutes(self):
-        """Gets the minutes of this Alert.  # noqa: E501
+    def name(self):
+        """Gets the name of this Alert.  # noqa: E501
 
-        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
 
-        :return: The minutes of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The name of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._minutes
+        return self._name
 
-    @minutes.setter
-    def minutes(self, minutes):
-        """Sets the minutes of this Alert.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Alert.
 
-        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
 
-        :param minutes: The minutes of this Alert.  # noqa: E501
-        :type: int
-        """
-        if minutes is None:
-            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
-
-        self._minutes = minutes
-
-    @property
-    def name(self):
-        """Gets the name of this Alert.  # noqa: E501
-
-
-        :return: The name of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Alert.
-
-
-        :param name: The name of this Alert.  # noqa: E501
-        :type: str
+        :param name: The name of this Alert.  # noqa: E501
+        :type: str
         """
         if name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -416,7 +478,7 @@ def id(self, id):
     def target(self):
         """Gets the target of this Alert.  # noqa: E501
 
-        The email address or integration endpoint (such as PagerDuty or webhook) to notify when the alert status changes  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
 
         :return: The target of this Alert.  # noqa: E501
         :rtype: str
@@ -427,16 +489,39 @@ def target(self):
     def target(self, target):
         """Sets the target of this Alert.
 
-        The email address or integration endpoint (such as PagerDuty or webhook) to notify when the alert status changes  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
 
         :param target: The target of this Alert.  # noqa: E501
         :type: str
         """
-        if target is None:
-            raise ValueError("Invalid value for `target`, must not be `None`")  # noqa: E501
 
         self._target = target
 
+    @property
+    def minutes(self):
+        """Gets the minutes of this Alert.  # noqa: E501
+
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+
+        :return: The minutes of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._minutes
+
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this Alert.
+
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+
+        :param minutes: The minutes of this Alert.  # noqa: E501
+        :type: int
+        """
+        if minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
+
+        self._minutes = minutes
+
     @property
     def tags(self):
         """Gets the tags of this Alert.  # noqa: E501
@@ -526,73 +611,58 @@ def updated(self, updated):
         self._updated = updated
 
     @property
-    def process_rate_minutes(self):
-        """Gets the process_rate_minutes of this Alert.  # noqa: E501
-
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
-
-        :return: The process_rate_minutes of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._process_rate_minutes
-
-    @process_rate_minutes.setter
-    def process_rate_minutes(self, process_rate_minutes):
-        """Sets the process_rate_minutes of this Alert.
-
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
-
-        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._process_rate_minutes = process_rate_minutes
-
-    @property
-    def last_processed_millis(self):
-        """Gets the last_processed_millis of this Alert.  # noqa: E501
+    def condition(self):
+        """Gets the condition of this Alert.  # noqa: E501
 
-        The time when this alert was last checked, in epoch millis  # noqa: E501
+        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
 
-        :return: The last_processed_millis of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The condition of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._last_processed_millis
+        return self._condition
 
-    @last_processed_millis.setter
-    def last_processed_millis(self, last_processed_millis):
-        """Sets the last_processed_millis of this Alert.
+    @condition.setter
+    def condition(self, condition):
+        """Sets the condition of this Alert.
 
-        The time when this alert was last checked, in epoch millis  # noqa: E501
+        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
 
-        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
-        :type: int
+        :param condition: The condition of this Alert.  # noqa: E501
+        :type: str
         """
+        if condition is None:
+            raise ValueError("Invalid value for `condition`, must not be `None`")  # noqa: E501
 
-        self._last_processed_millis = last_processed_millis
+        self._condition = condition
 
     @property
-    def update_user_id(self):
-        """Gets the update_user_id of this Alert.  # noqa: E501
+    def alert_type(self):
+        """Gets the alert_type of this Alert.  # noqa: E501
 
-        The user that last updated this alert  # noqa: E501
+        Alert type.  # noqa: E501
 
-        :return: The update_user_id of this Alert.  # noqa: E501
+        :return: The alert_type of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._update_user_id
+        return self._alert_type
 
-    @update_user_id.setter
-    def update_user_id(self, update_user_id):
-        """Sets the update_user_id of this Alert.
+    @alert_type.setter
+    def alert_type(self, alert_type):
+        """Sets the alert_type of this Alert.
 
-        The user that last updated this alert  # noqa: E501
+        Alert type.  # noqa: E501
 
-        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
+        :param alert_type: The alert_type of this Alert.  # noqa: E501
         :type: str
         """
+        allowed_values = ["CLASSIC", "THRESHOLD"]  # noqa: E501
+        if alert_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `alert_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(alert_type, allowed_values)
+            )
 
-        self._update_user_id = update_user_id
+        self._alert_type = alert_type
 
     @property
     def display_expression(self):
@@ -617,6 +687,75 @@ def display_expression(self, display_expression):
 
         self._display_expression = display_expression
 
+    @property
+    def failing_host_label_pairs(self):
+        """Gets the failing_host_label_pairs of this Alert.  # noqa: E501
+
+        Failing host/metric pairs  # noqa: E501
+
+        :return: The failing_host_label_pairs of this Alert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._failing_host_label_pairs
+
+    @failing_host_label_pairs.setter
+    def failing_host_label_pairs(self, failing_host_label_pairs):
+        """Sets the failing_host_label_pairs of this Alert.
+
+        Failing host/metric pairs  # noqa: E501
+
+        :param failing_host_label_pairs: The failing_host_label_pairs of this Alert.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._failing_host_label_pairs = failing_host_label_pairs
+
+    @property
+    def in_maintenance_host_label_pairs(self):
+        """Gets the in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+
+        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
+
+        :return: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._in_maintenance_host_label_pairs
+
+    @in_maintenance_host_label_pairs.setter
+    def in_maintenance_host_label_pairs(self, in_maintenance_host_label_pairs):
+        """Sets the in_maintenance_host_label_pairs of this Alert.
+
+        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
+
+        :param in_maintenance_host_label_pairs: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+
+    @property
+    def active_maintenance_windows(self):
+        """Gets the active_maintenance_windows of this Alert.  # noqa: E501
+
+        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+
+        :return: The active_maintenance_windows of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._active_maintenance_windows
+
+    @active_maintenance_windows.setter
+    def active_maintenance_windows(self, active_maintenance_windows):
+        """Sets the active_maintenance_windows of this Alert.
+
+        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+
+        :param active_maintenance_windows: The active_maintenance_windows of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._active_maintenance_windows = active_maintenance_windows
+
     @property
     def condition_qb_enabled(self):
         """Gets the condition_qb_enabled of this Alert.  # noqa: E501
@@ -663,31 +802,6 @@ def display_expression_qb_enabled(self, display_expression_qb_enabled):
 
         self._display_expression_qb_enabled = display_expression_qb_enabled
 
-    @property
-    def condition(self):
-        """Gets the condition of this Alert.  # noqa: E501
-
-        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
-
-        :return: The condition of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._condition
-
-    @condition.setter
-    def condition(self, condition):
-        """Sets the condition of this Alert.
-
-        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
-
-        :param condition: The condition of this Alert.  # noqa: E501
-        :type: str
-        """
-        if condition is None:
-            raise ValueError("Invalid value for `condition`, must not be `None`")  # noqa: E501
-
-        self._condition = condition
-
     @property
     def condition_qb_serialization(self):
         """Gets the condition_qb_serialization of this Alert.  # noqa: E501
@@ -758,144 +872,142 @@ def include_obsolete_metrics(self, include_obsolete_metrics):
         self._include_obsolete_metrics = include_obsolete_metrics
 
     @property
-    def severity(self):
-        """Gets the severity of this Alert.  # noqa: E501
+    def targets(self):
+        """Gets the targets of this Alert.  # noqa: E501
 
-        Severity of the alert  # noqa: E501
+        Targets for severity.  # noqa: E501
 
-        :return: The severity of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The targets of this Alert.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._severity
+        return self._targets
 
-    @severity.setter
-    def severity(self, severity):
-        """Sets the severity of this Alert.
+    @targets.setter
+    def targets(self, targets):
+        """Sets the targets of this Alert.
 
-        Severity of the alert  # noqa: E501
+        Targets for severity.  # noqa: E501
 
-        :param severity: The severity of this Alert.  # noqa: E501
-        :type: str
+        :param targets: The targets of this Alert.  # noqa: E501
+        :type: dict(str, str)
         """
-        if severity is None:
-            raise ValueError("Invalid value for `severity`, must not be `None`")  # noqa: E501
-        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
-            raise ValueError(
-                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
-                .format(severity, allowed_values)
-            )
 
-        self._severity = severity
+        self._targets = targets
 
     @property
-    def last_query_time(self):
-        """Gets the last_query_time of this Alert.  # noqa: E501
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this Alert.  # noqa: E501
 
-        Last query time of the alert, averaged on hourly basis  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :return: The last_query_time of this Alert.  # noqa: E501
+        :return: The process_rate_minutes of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_query_time
+        return self._process_rate_minutes
 
-    @last_query_time.setter
-    def last_query_time(self, last_query_time):
-        """Sets the last_query_time of this Alert.
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this Alert.
 
-        Last query time of the alert, averaged on hourly basis  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :param last_query_time: The last_query_time of this Alert.  # noqa: E501
+        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_query_time = last_query_time
+        self._process_rate_minutes = process_rate_minutes
 
     @property
-    def notificants(self):
-        """Gets the notificants of this Alert.  # noqa: E501
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this Alert.  # noqa: E501
 
-        A derived field listing the webhook ids used by this alert  # noqa: E501
+        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :return: The notificants of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The last_processed_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._notificants
+        return self._last_processed_millis
 
-    @notificants.setter
-    def notificants(self, notificants):
-        """Sets the notificants of this Alert.
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this Alert.
 
-        A derived field listing the webhook ids used by this alert  # noqa: E501
+        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :param notificants: The notificants of this Alert.  # noqa: E501
-        :type: list[str]
+        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._notificants = notificants
+        self._last_processed_millis = last_processed_millis
 
     @property
-    def alerts_last_day(self):
-        """Gets the alerts_last_day of this Alert.  # noqa: E501
+    def update_user_id(self):
+        """Gets the update_user_id of this Alert.  # noqa: E501
 
+        The user that last updated this alert  # noqa: E501
 
-        :return: The alerts_last_day of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The update_user_id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._alerts_last_day
+        return self._update_user_id
 
-    @alerts_last_day.setter
-    def alerts_last_day(self, alerts_last_day):
-        """Sets the alerts_last_day of this Alert.
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this Alert.
 
+        The user that last updated this alert  # noqa: E501
 
-        :param alerts_last_day: The alerts_last_day of this Alert.  # noqa: E501
-        :type: int
+        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._alerts_last_day = alerts_last_day
+        self._update_user_id = update_user_id
 
     @property
-    def alerts_last_week(self):
-        """Gets the alerts_last_week of this Alert.  # noqa: E501
+    def prefiring_host_label_pairs(self):
+        """Gets the prefiring_host_label_pairs of this Alert.  # noqa: E501
 
+        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
 
-        :return: The alerts_last_week of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The prefiring_host_label_pairs of this Alert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
         """
-        return self._alerts_last_week
+        return self._prefiring_host_label_pairs
 
-    @alerts_last_week.setter
-    def alerts_last_week(self, alerts_last_week):
-        """Sets the alerts_last_week of this Alert.
+    @prefiring_host_label_pairs.setter
+    def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
+        """Sets the prefiring_host_label_pairs of this Alert.
 
+        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
 
-        :param alerts_last_week: The alerts_last_week of this Alert.  # noqa: E501
-        :type: int
+        :param prefiring_host_label_pairs: The prefiring_host_label_pairs of this Alert.  # noqa: E501
+        :type: list[SourceLabelPair]
         """
 
-        self._alerts_last_week = alerts_last_week
+        self._prefiring_host_label_pairs = prefiring_host_label_pairs
 
     @property
-    def alerts_last_month(self):
-        """Gets the alerts_last_month of this Alert.  # noqa: E501
+    def no_data_event(self):
+        """Gets the no_data_event of this Alert.  # noqa: E501
 
+        No data event related to the alert  # noqa: E501
 
-        :return: The alerts_last_month of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The no_data_event of this Alert.  # noqa: E501
+        :rtype: Event
         """
-        return self._alerts_last_month
+        return self._no_data_event
 
-    @alerts_last_month.setter
-    def alerts_last_month(self, alerts_last_month):
-        """Sets the alerts_last_month of this Alert.
+    @no_data_event.setter
+    def no_data_event(self, no_data_event):
+        """Sets the no_data_event of this Alert.
 
+        No data event related to the alert  # noqa: E501
 
-        :param alerts_last_month: The alerts_last_month of this Alert.  # noqa: E501
-        :type: int
+        :param no_data_event: The no_data_event of this Alert.  # noqa: E501
+        :type: Event
         """
 
-        self._alerts_last_month = alerts_last_month
+        self._no_data_event = no_data_event
 
     @property
     def snoozed(self):
@@ -921,119 +1033,159 @@ def snoozed(self, snoozed):
         self._snoozed = snoozed
 
     @property
-    def in_maintenance_host_label_pairs(self):
-        """Gets the in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+    def conditions(self):
+        """Gets the conditions of this Alert.  # noqa: E501
 
-        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
+        Multi - alert conditions.  # noqa: E501
 
-        :return: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
-        :rtype: list[SourceLabelPair]
+        :return: The conditions of this Alert.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._in_maintenance_host_label_pairs
+        return self._conditions
 
-    @in_maintenance_host_label_pairs.setter
-    def in_maintenance_host_label_pairs(self, in_maintenance_host_label_pairs):
-        """Sets the in_maintenance_host_label_pairs of this Alert.
+    @conditions.setter
+    def conditions(self, conditions):
+        """Sets the conditions of this Alert.
 
-        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
+        Multi - alert conditions.  # noqa: E501
 
-        :param in_maintenance_host_label_pairs: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
-        :type: list[SourceLabelPair]
+        :param conditions: The conditions of this Alert.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+        self._conditions = conditions
 
     @property
-    def failing_host_label_pairs(self):
-        """Gets the failing_host_label_pairs of this Alert.  # noqa: E501
+    def notificants(self):
+        """Gets the notificants of this Alert.  # noqa: E501
 
-        Failing host/metric pairs  # noqa: E501
+        A derived field listing the webhook ids used by this alert  # noqa: E501
 
-        :return: The failing_host_label_pairs of this Alert.  # noqa: E501
-        :rtype: list[SourceLabelPair]
+        :return: The notificants of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._failing_host_label_pairs
+        return self._notificants
 
-    @failing_host_label_pairs.setter
-    def failing_host_label_pairs(self, failing_host_label_pairs):
-        """Sets the failing_host_label_pairs of this Alert.
+    @notificants.setter
+    def notificants(self, notificants):
+        """Sets the notificants of this Alert.
 
-        Failing host/metric pairs  # noqa: E501
+        A derived field listing the webhook ids used by this alert  # noqa: E501
 
-        :param failing_host_label_pairs: The failing_host_label_pairs of this Alert.  # noqa: E501
-        :type: list[SourceLabelPair]
+        :param notificants: The notificants of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._failing_host_label_pairs = failing_host_label_pairs
+        self._notificants = notificants
 
     @property
-    def active_maintenance_windows(self):
-        """Gets the active_maintenance_windows of this Alert.  # noqa: E501
+    def additional_information(self):
+        """Gets the additional_information of this Alert.  # noqa: E501
 
-        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
 
-        :return: The active_maintenance_windows of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The additional_information of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._active_maintenance_windows
+        return self._additional_information
 
-    @active_maintenance_windows.setter
-    def active_maintenance_windows(self, active_maintenance_windows):
-        """Sets the active_maintenance_windows of this Alert.
+    @additional_information.setter
+    def additional_information(self, additional_information):
+        """Sets the additional_information of this Alert.
 
-        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
 
-        :param active_maintenance_windows: The active_maintenance_windows of this Alert.  # noqa: E501
-        :type: list[str]
+        :param additional_information: The additional_information of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._active_maintenance_windows = active_maintenance_windows
+        self._additional_information = additional_information
 
     @property
-    def prefiring_host_label_pairs(self):
-        """Gets the prefiring_host_label_pairs of this Alert.  # noqa: E501
+    def last_query_time(self):
+        """Gets the last_query_time of this Alert.  # noqa: E501
 
-        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
+        Last query time of the alert, averaged on hourly basis  # noqa: E501
 
-        :return: The prefiring_host_label_pairs of this Alert.  # noqa: E501
-        :rtype: list[SourceLabelPair]
+        :return: The last_query_time of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._prefiring_host_label_pairs
+        return self._last_query_time
 
-    @prefiring_host_label_pairs.setter
-    def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
-        """Sets the prefiring_host_label_pairs of this Alert.
+    @last_query_time.setter
+    def last_query_time(self, last_query_time):
+        """Sets the last_query_time of this Alert.
 
-        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
+        Last query time of the alert, averaged on hourly basis  # noqa: E501
 
-        :param prefiring_host_label_pairs: The prefiring_host_label_pairs of this Alert.  # noqa: E501
-        :type: list[SourceLabelPair]
+        :param last_query_time: The last_query_time of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._prefiring_host_label_pairs = prefiring_host_label_pairs
+        self._last_query_time = last_query_time
 
     @property
-    def no_data_event(self):
-        """Gets the no_data_event of this Alert.  # noqa: E501
+    def alerts_last_day(self):
+        """Gets the alerts_last_day of this Alert.  # noqa: E501
 
-        No data event related to the alert  # noqa: E501
 
-        :return: The no_data_event of this Alert.  # noqa: E501
-        :rtype: Event
+        :return: The alerts_last_day of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._no_data_event
+        return self._alerts_last_day
 
-    @no_data_event.setter
-    def no_data_event(self, no_data_event):
-        """Sets the no_data_event of this Alert.
+    @alerts_last_day.setter
+    def alerts_last_day(self, alerts_last_day):
+        """Sets the alerts_last_day of this Alert.
+
+
+        :param alerts_last_day: The alerts_last_day of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._alerts_last_day = alerts_last_day
+
+    @property
+    def alerts_last_week(self):
+        """Gets the alerts_last_week of this Alert.  # noqa: E501
+
+
+        :return: The alerts_last_week of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alerts_last_week
+
+    @alerts_last_week.setter
+    def alerts_last_week(self, alerts_last_week):
+        """Sets the alerts_last_week of this Alert.
+
+
+        :param alerts_last_week: The alerts_last_week of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._alerts_last_week = alerts_last_week
+
+    @property
+    def alerts_last_month(self):
+        """Gets the alerts_last_month of this Alert.  # noqa: E501
+
+
+        :return: The alerts_last_month of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alerts_last_month
 
-        No data event related to the alert  # noqa: E501
+    @alerts_last_month.setter
+    def alerts_last_month(self, alerts_last_month):
+        """Sets the alerts_last_month of this Alert.
 
-        :param no_data_event: The no_data_event of this Alert.  # noqa: E501
-        :type: Event
+
+        :param alerts_last_month: The alerts_last_month of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._no_data_event = no_data_event
+        self._alerts_last_month = alerts_last_month
 
     @property
     def in_trash(self):
@@ -1101,138 +1253,96 @@ def create_user_id(self, create_user_id):
         self._create_user_id = create_user_id
 
     @property
-    def additional_information(self):
-        """Gets the additional_information of this Alert.  # noqa: E501
-
-        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
-
-        :return: The additional_information of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._additional_information
-
-    @additional_information.setter
-    def additional_information(self, additional_information):
-        """Sets the additional_information of this Alert.
-
-        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
-
-        :param additional_information: The additional_information of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._additional_information = additional_information
-
-    @property
-    def creator_id(self):
-        """Gets the creator_id of this Alert.  # noqa: E501
-
-
-        :return: The creator_id of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._creator_id
-
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Alert.
-
-
-        :param creator_id: The creator_id of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._creator_id = creator_id
-
-    @property
-    def resolve_after_minutes(self):
-        """Gets the resolve_after_minutes of this Alert.  # noqa: E501
+    def last_failed_time(self):
+        """Gets the last_failed_time of this Alert.  # noqa: E501
 
-        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :return: The resolve_after_minutes of this Alert.  # noqa: E501
+        :return: The last_failed_time of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._resolve_after_minutes
+        return self._last_failed_time
 
-    @resolve_after_minutes.setter
-    def resolve_after_minutes(self, resolve_after_minutes):
-        """Sets the resolve_after_minutes of this Alert.
+    @last_failed_time.setter
+    def last_failed_time(self, last_failed_time):
+        """Sets the last_failed_time of this Alert.
 
-        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :param resolve_after_minutes: The resolve_after_minutes of this Alert.  # noqa: E501
+        :param last_failed_time: The last_failed_time of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._resolve_after_minutes = resolve_after_minutes
+        self._last_failed_time = last_failed_time
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this Alert.  # noqa: E501
+    def last_notification_millis(self):
+        """Gets the last_notification_millis of this Alert.  # noqa: E501
 
+        When this alert last caused a notification, in epoch millis  # noqa: E501
 
-        :return: The updater_id of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The last_notification_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._updater_id
+        return self._last_notification_millis
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Alert.
+    @last_notification_millis.setter
+    def last_notification_millis(self, last_notification_millis):
+        """Sets the last_notification_millis of this Alert.
 
+        When this alert last caused a notification, in epoch millis  # noqa: E501
 
-        :param updater_id: The updater_id of this Alert.  # noqa: E501
-        :type: str
+        :param last_notification_millis: The last_notification_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._updater_id = updater_id
+        self._last_notification_millis = last_notification_millis
 
     @property
-    def last_failed_time(self):
-        """Gets the last_failed_time of this Alert.  # noqa: E501
+    def points_scanned_at_last_query(self):
+        """Gets the points_scanned_at_last_query of this Alert.  # noqa: E501
 
-        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
+        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
 
-        :return: The last_failed_time of this Alert.  # noqa: E501
+        :return: The points_scanned_at_last_query of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_failed_time
+        return self._points_scanned_at_last_query
 
-    @last_failed_time.setter
-    def last_failed_time(self, last_failed_time):
-        """Sets the last_failed_time of this Alert.
+    @points_scanned_at_last_query.setter
+    def points_scanned_at_last_query(self, points_scanned_at_last_query):
+        """Sets the points_scanned_at_last_query of this Alert.
 
-        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
+        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
 
-        :param last_failed_time: The last_failed_time of this Alert.  # noqa: E501
+        :param points_scanned_at_last_query: The points_scanned_at_last_query of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_failed_time = last_failed_time
+        self._points_scanned_at_last_query = points_scanned_at_last_query
 
     @property
-    def last_error_message(self):
-        """Gets the last_error_message of this Alert.  # noqa: E501
+    def num_points_in_failure_frame(self):
+        """Gets the num_points_in_failure_frame of this Alert.  # noqa: E501
 
-        The last error encountered when running this alert's condition query  # noqa: E501
+        Number of points scanned in alert query time frame.  # noqa: E501
 
-        :return: The last_error_message of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The num_points_in_failure_frame of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._last_error_message
+        return self._num_points_in_failure_frame
 
-    @last_error_message.setter
-    def last_error_message(self, last_error_message):
-        """Sets the last_error_message of this Alert.
+    @num_points_in_failure_frame.setter
+    def num_points_in_failure_frame(self, num_points_in_failure_frame):
+        """Sets the num_points_in_failure_frame of this Alert.
 
-        The last error encountered when running this alert's condition query  # noqa: E501
+        Number of points scanned in alert query time frame.  # noqa: E501
 
-        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
-        :type: str
+        :param num_points_in_failure_frame: The num_points_in_failure_frame of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._last_error_message = last_error_message
+        self._num_points_in_failure_frame = num_points_in_failure_frame
 
     @property
     def metrics_used(self):
@@ -1281,50 +1391,115 @@ def hosts_used(self, hosts_used):
         self._hosts_used = hosts_used
 
     @property
-    def points_scanned_at_last_query(self):
-        """Gets the points_scanned_at_last_query of this Alert.  # noqa: E501
+    def system_owned(self):
+        """Gets the system_owned of this Alert.  # noqa: E501
 
-        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
+        Whether this alert is system-owned and not writeable  # noqa: E501
 
-        :return: The points_scanned_at_last_query of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The system_owned of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._points_scanned_at_last_query
+        return self._system_owned
 
-    @points_scanned_at_last_query.setter
-    def points_scanned_at_last_query(self, points_scanned_at_last_query):
-        """Sets the points_scanned_at_last_query of this Alert.
+    @system_owned.setter
+    def system_owned(self, system_owned):
+        """Sets the system_owned of this Alert.
 
-        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
+        Whether this alert is system-owned and not writeable  # noqa: E501
 
-        :param points_scanned_at_last_query: The points_scanned_at_last_query of this Alert.  # noqa: E501
-        :type: int
+        :param system_owned: The system_owned of this Alert.  # noqa: E501
+        :type: bool
         """
 
-        self._points_scanned_at_last_query = points_scanned_at_last_query
+        self._system_owned = system_owned
 
     @property
-    def last_notification_millis(self):
-        """Gets the last_notification_millis of this Alert.  # noqa: E501
+    def resolve_after_minutes(self):
+        """Gets the resolve_after_minutes of this Alert.  # noqa: E501
 
-        When this alert last caused a notification, in epoch millis  # noqa: E501
+        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
 
-        :return: The last_notification_millis of this Alert.  # noqa: E501
+        :return: The resolve_after_minutes of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_notification_millis
+        return self._resolve_after_minutes
 
-    @last_notification_millis.setter
-    def last_notification_millis(self, last_notification_millis):
-        """Sets the last_notification_millis of this Alert.
+    @resolve_after_minutes.setter
+    def resolve_after_minutes(self, resolve_after_minutes):
+        """Sets the resolve_after_minutes of this Alert.
 
-        When this alert last caused a notification, in epoch millis  # noqa: E501
+        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
 
-        :param last_notification_millis: The last_notification_millis of this Alert.  # noqa: E501
+        :param resolve_after_minutes: The resolve_after_minutes of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_notification_millis = last_notification_millis
+        self._resolve_after_minutes = resolve_after_minutes
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this Alert.  # noqa: E501
+
+
+        :return: The creator_id of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Alert.
+
+
+        :param creator_id: The creator_id of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this Alert.  # noqa: E501
+
+
+        :return: The updater_id of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Alert.
+
+
+        :param updater_id: The updater_id of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    @property
+    def last_error_message(self):
+        """Gets the last_error_message of this Alert.  # noqa: E501
+
+        The last error encountered when running this alert's condition query  # noqa: E501
+
+        :return: The last_error_message of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_error_message
+
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this Alert.
+
+        The last error encountered when running this alert's condition query  # noqa: E501
+
+        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._last_error_message = last_error_message
 
     @property
     def notification_resend_frequency_minutes(self):
@@ -1458,6 +1633,36 @@ def sort_attr(self, sort_attr):
 
         self._sort_attr = sort_attr
 
+    @property
+    def severity_list(self):
+        """Gets the severity_list of this Alert.  # noqa: E501
+
+        Alert severity list for multi-threshold type.  # noqa: E501
+
+        :return: The severity_list of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._severity_list
+
+    @severity_list.setter
+    def severity_list(self, severity_list):
+        """Sets the severity_list of this Alert.
+
+        Alert severity list for multi-threshold type.  # noqa: E501
+
+        :param severity_list: The severity_list of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if not set(severity_list).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `severity_list` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(severity_list) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._severity_list = severity_list
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -1479,6 +1684,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Alert, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/avro_backed_standardized_dto.py b/wavefront_api_client/models/avro_backed_standardized_dto.py
index 62d0a39..194021c 100644
--- a/wavefront_api_client/models/avro_backed_standardized_dto.py
+++ b/wavefront_api_client/models/avro_backed_standardized_dto.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -219,6 +219,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(AvroBackedStandardizedDTO, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index 6b11dd9..8ba9a8b 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -121,6 +121,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(AWSBaseCredentials, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index 488a5d2..f7c9ec6 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -126,6 +126,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(AzureActivityLogConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 033b45d..7254211 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,28 +31,53 @@ class AzureBaseCredentials(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'tenant': 'str',
         'client_id': 'str',
-        'client_secret': 'str',
-        'tenant': 'str'
+        'client_secret': 'str'
     }
 
     attribute_map = {
+        'tenant': 'tenant',
         'client_id': 'clientId',
-        'client_secret': 'clientSecret',
-        'tenant': 'tenant'
+        'client_secret': 'clientSecret'
     }
 
-    def __init__(self, client_id=None, client_secret=None, tenant=None):  # noqa: E501
+    def __init__(self, tenant=None, client_id=None, client_secret=None):  # noqa: E501
         """AzureBaseCredentials - a model defined in Swagger"""  # noqa: E501
 
+        self._tenant = None
         self._client_id = None
         self._client_secret = None
-        self._tenant = None
         self.discriminator = None
 
+        self.tenant = tenant
         self.client_id = client_id
         self.client_secret = client_secret
-        self.tenant = tenant
+
+    @property
+    def tenant(self):
+        """Gets the tenant of this AzureBaseCredentials.  # noqa: E501
+
+        Tenant Id for an Azure service account within your project.  # noqa: E501
+
+        :return: The tenant of this AzureBaseCredentials.  # noqa: E501
+        :rtype: str
+        """
+        return self._tenant
+
+    @tenant.setter
+    def tenant(self, tenant):
+        """Sets the tenant of this AzureBaseCredentials.
+
+        Tenant Id for an Azure service account within your project.  # noqa: E501
+
+        :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
+        :type: str
+        """
+        if tenant is None:
+            raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
+
+        self._tenant = tenant
 
     @property
     def client_id(self):
@@ -104,31 +129,6 @@ def client_secret(self, client_secret):
 
         self._client_secret = client_secret
 
-    @property
-    def tenant(self):
-        """Gets the tenant of this AzureBaseCredentials.  # noqa: E501
-
-        Tenant Id for an Azure service account within your project.  # noqa: E501
-
-        :return: The tenant of this AzureBaseCredentials.  # noqa: E501
-        :rtype: str
-        """
-        return self._tenant
-
-    @tenant.setter
-    def tenant(self, tenant):
-        """Sets the tenant of this AzureBaseCredentials.
-
-        Tenant Id for an Azure service account within your project.  # noqa: E501
-
-        :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
-        :type: str
-        """
-        if tenant is None:
-            raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
-
-        self._tenant = tenant
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -150,6 +150,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(AzureBaseCredentials, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index c1905e3..3b6b9fc 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,37 +33,58 @@ class AzureConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'metric_filter_regex': 'str',
         'base_credentials': 'AzureBaseCredentials',
+        'metric_filter_regex': 'str',
         'category_filter': 'list[str]',
         'resource_group_filter': 'list[str]'
     }
 
     attribute_map = {
-        'metric_filter_regex': 'metricFilterRegex',
         'base_credentials': 'baseCredentials',
+        'metric_filter_regex': 'metricFilterRegex',
         'category_filter': 'categoryFilter',
         'resource_group_filter': 'resourceGroupFilter'
     }
 
-    def __init__(self, metric_filter_regex=None, base_credentials=None, category_filter=None, resource_group_filter=None):  # noqa: E501
+    def __init__(self, base_credentials=None, metric_filter_regex=None, category_filter=None, resource_group_filter=None):  # noqa: E501
         """AzureConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._metric_filter_regex = None
         self._base_credentials = None
+        self._metric_filter_regex = None
         self._category_filter = None
         self._resource_group_filter = None
         self.discriminator = None
 
-        if metric_filter_regex is not None:
-            self.metric_filter_regex = metric_filter_regex
         if base_credentials is not None:
             self.base_credentials = base_credentials
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
         if category_filter is not None:
             self.category_filter = category_filter
         if resource_group_filter is not None:
             self.resource_group_filter = resource_group_filter
 
+    @property
+    def base_credentials(self):
+        """Gets the base_credentials of this AzureConfiguration.  # noqa: E501
+
+
+        :return: The base_credentials of this AzureConfiguration.  # noqa: E501
+        :rtype: AzureBaseCredentials
+        """
+        return self._base_credentials
+
+    @base_credentials.setter
+    def base_credentials(self, base_credentials):
+        """Sets the base_credentials of this AzureConfiguration.
+
+
+        :param base_credentials: The base_credentials of this AzureConfiguration.  # noqa: E501
+        :type: AzureBaseCredentials
+        """
+
+        self._base_credentials = base_credentials
+
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this AzureConfiguration.  # noqa: E501
@@ -87,27 +108,6 @@ def metric_filter_regex(self, metric_filter_regex):
 
         self._metric_filter_regex = metric_filter_regex
 
-    @property
-    def base_credentials(self):
-        """Gets the base_credentials of this AzureConfiguration.  # noqa: E501
-
-
-        :return: The base_credentials of this AzureConfiguration.  # noqa: E501
-        :rtype: AzureBaseCredentials
-        """
-        return self._base_credentials
-
-    @base_credentials.setter
-    def base_credentials(self, base_credentials):
-        """Sets the base_credentials of this AzureConfiguration.
-
-
-        :param base_credentials: The base_credentials of this AzureConfiguration.  # noqa: E501
-        :type: AzureBaseCredentials
-        """
-
-        self._base_credentials = base_credentials
-
     @property
     def category_filter(self):
         """Gets the category_filter of this AzureConfiguration.  # noqa: E501
@@ -175,6 +175,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(AzureConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/business_action_group_basic_dto.py b/wavefront_api_client/models/business_action_group_basic_dto.py
new file mode 100644
index 0000000..763b45a
--- /dev/null
+++ b/wavefront_api_client/models/business_action_group_basic_dto.py
@@ -0,0 +1,193 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class BusinessActionGroupBasicDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'group_name': 'str',
+        'display_name': 'str',
+        'description': 'str',
+        'required_default': 'bool'
+    }
+
+    attribute_map = {
+        'group_name': 'groupName',
+        'display_name': 'displayName',
+        'description': 'description',
+        'required_default': 'requiredDefault'
+    }
+
+    def __init__(self, group_name=None, display_name=None, description=None, required_default=None):  # noqa: E501
+        """BusinessActionGroupBasicDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._group_name = None
+        self._display_name = None
+        self._description = None
+        self._required_default = None
+        self.discriminator = None
+
+        if group_name is not None:
+            self.group_name = group_name
+        if display_name is not None:
+            self.display_name = display_name
+        if description is not None:
+            self.description = description
+        if required_default is not None:
+            self.required_default = required_default
+
+    @property
+    def group_name(self):
+        """Gets the group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+
+
+        :return: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._group_name
+
+    @group_name.setter
+    def group_name(self, group_name):
+        """Sets the group_name of this BusinessActionGroupBasicDTO.
+
+
+        :param group_name: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._group_name = group_name
+
+    @property
+    def display_name(self):
+        """Gets the display_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+
+
+        :return: The display_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._display_name
+
+    @display_name.setter
+    def display_name(self, display_name):
+        """Sets the display_name of this BusinessActionGroupBasicDTO.
+
+
+        :param display_name: The display_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._display_name = display_name
+
+    @property
+    def description(self):
+        """Gets the description of this BusinessActionGroupBasicDTO.  # noqa: E501
+
+
+        :return: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this BusinessActionGroupBasicDTO.
+
+
+        :param description: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def required_default(self):
+        """Gets the required_default of this BusinessActionGroupBasicDTO.  # noqa: E501
+
+
+        :return: The required_default of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._required_default
+
+    @required_default.setter
+    def required_default(self, required_default):
+        """Sets the required_default of this BusinessActionGroupBasicDTO.
+
+
+        :param required_default: The required_default of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._required_default = required_default
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(BusinessActionGroupBasicDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, BusinessActionGroupBasicDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index c1373c6..5712c68 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -35,54 +35,56 @@ class Chart(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'base': 'int',
         'units': 'str',
-        'name': 'str',
         'description': 'str',
+        'name': 'str',
         'sources': 'list[ChartSourceQuery]',
         'include_obsolete_metrics': 'bool',
         'no_default_events': 'bool',
         'chart_attributes': 'JsonNode',
-        'summarization': 'str',
-        'base': 'int',
+        'interpolate_points': 'bool',
         'chart_settings': 'ChartSettings',
-        'interpolate_points': 'bool'
+        'summarization': 'str'
     }
 
     attribute_map = {
+        'base': 'base',
         'units': 'units',
-        'name': 'name',
         'description': 'description',
+        'name': 'name',
         'sources': 'sources',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
         'no_default_events': 'noDefaultEvents',
         'chart_attributes': 'chartAttributes',
-        'summarization': 'summarization',
-        'base': 'base',
+        'interpolate_points': 'interpolatePoints',
         'chart_settings': 'chartSettings',
-        'interpolate_points': 'interpolatePoints'
+        'summarization': 'summarization'
     }
 
-    def __init__(self, units=None, name=None, description=None, sources=None, include_obsolete_metrics=None, no_default_events=None, chart_attributes=None, summarization=None, base=None, chart_settings=None, interpolate_points=None):  # noqa: E501
+    def __init__(self, base=None, units=None, description=None, name=None, sources=None, include_obsolete_metrics=None, no_default_events=None, chart_attributes=None, interpolate_points=None, chart_settings=None, summarization=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
 
+        self._base = None
         self._units = None
-        self._name = None
         self._description = None
+        self._name = None
         self._sources = None
         self._include_obsolete_metrics = None
         self._no_default_events = None
         self._chart_attributes = None
-        self._summarization = None
-        self._base = None
-        self._chart_settings = None
         self._interpolate_points = None
+        self._chart_settings = None
+        self._summarization = None
         self.discriminator = None
 
+        if base is not None:
+            self.base = base
         if units is not None:
             self.units = units
-        self.name = name
         if description is not None:
             self.description = description
+        self.name = name
         self.sources = sources
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
@@ -90,14 +92,35 @@ def __init__(self, units=None, name=None, description=None, sources=None, includ
             self.no_default_events = no_default_events
         if chart_attributes is not None:
             self.chart_attributes = chart_attributes
-        if summarization is not None:
-            self.summarization = summarization
-        if base is not None:
-            self.base = base
-        if chart_settings is not None:
-            self.chart_settings = chart_settings
         if interpolate_points is not None:
             self.interpolate_points = interpolate_points
+        if chart_settings is not None:
+            self.chart_settings = chart_settings
+        if summarization is not None:
+            self.summarization = summarization
+
+    @property
+    def base(self):
+        """Gets the base of this Chart.  # noqa: E501
+
+        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
+
+        :return: The base of this Chart.  # noqa: E501
+        :rtype: int
+        """
+        return self._base
+
+    @base.setter
+    def base(self, base):
+        """Sets the base of this Chart.
+
+        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
+
+        :param base: The base of this Chart.  # noqa: E501
+        :type: int
+        """
+
+        self._base = base
 
     @property
     def units(self):
@@ -122,6 +145,29 @@ def units(self, units):
 
         self._units = units
 
+    @property
+    def description(self):
+        """Gets the description of this Chart.  # noqa: E501
+
+        Description of the chart  # noqa: E501
+
+        :return: The description of this Chart.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Chart.
+
+        Description of the chart  # noqa: E501
+
+        :param description: The description of this Chart.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def name(self):
         """Gets the name of this Chart.  # noqa: E501
@@ -147,29 +193,6 @@ def name(self, name):
 
         self._name = name
 
-    @property
-    def description(self):
-        """Gets the description of this Chart.  # noqa: E501
-
-        Description of the chart  # noqa: E501
-
-        :return: The description of this Chart.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Chart.
-
-        Description of the chart  # noqa: E501
-
-        :param description: The description of this Chart.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
     @property
     def sources(self):
         """Gets the sources of this Chart.  # noqa: E501
@@ -265,56 +288,27 @@ def chart_attributes(self, chart_attributes):
         self._chart_attributes = chart_attributes
 
     @property
-    def summarization(self):
-        """Gets the summarization of this Chart.  # noqa: E501
-
-        Summarization strategy for the chart.  MEAN is default  # noqa: E501
-
-        :return: The summarization of this Chart.  # noqa: E501
-        :rtype: str
-        """
-        return self._summarization
-
-    @summarization.setter
-    def summarization(self, summarization):
-        """Sets the summarization of this Chart.
-
-        Summarization strategy for the chart.  MEAN is default  # noqa: E501
-
-        :param summarization: The summarization of this Chart.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
-        if summarization not in allowed_values:
-            raise ValueError(
-                "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
-                .format(summarization, allowed_values)
-            )
-
-        self._summarization = summarization
-
-    @property
-    def base(self):
-        """Gets the base of this Chart.  # noqa: E501
+    def interpolate_points(self):
+        """Gets the interpolate_points of this Chart.  # noqa: E501
 
-        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
+        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
 
-        :return: The base of this Chart.  # noqa: E501
-        :rtype: int
+        :return: The interpolate_points of this Chart.  # noqa: E501
+        :rtype: bool
         """
-        return self._base
+        return self._interpolate_points
 
-    @base.setter
-    def base(self, base):
-        """Sets the base of this Chart.
+    @interpolate_points.setter
+    def interpolate_points(self, interpolate_points):
+        """Sets the interpolate_points of this Chart.
 
-        If the chart has a log-scale Y-axis, the base for the logarithms  # noqa: E501
+        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
 
-        :param base: The base of this Chart.  # noqa: E501
-        :type: int
+        :param interpolate_points: The interpolate_points of this Chart.  # noqa: E501
+        :type: bool
         """
 
-        self._base = base
+        self._interpolate_points = interpolate_points
 
     @property
     def chart_settings(self):
@@ -338,27 +332,33 @@ def chart_settings(self, chart_settings):
         self._chart_settings = chart_settings
 
     @property
-    def interpolate_points(self):
-        """Gets the interpolate_points of this Chart.  # noqa: E501
+    def summarization(self):
+        """Gets the summarization of this Chart.  # noqa: E501
 
-        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+        Summarization strategy for the chart.  MEAN is default  # noqa: E501
 
-        :return: The interpolate_points of this Chart.  # noqa: E501
-        :rtype: bool
+        :return: The summarization of this Chart.  # noqa: E501
+        :rtype: str
         """
-        return self._interpolate_points
+        return self._summarization
 
-    @interpolate_points.setter
-    def interpolate_points(self, interpolate_points):
-        """Sets the interpolate_points of this Chart.
+    @summarization.setter
+    def summarization(self, summarization):
+        """Sets the summarization of this Chart.
 
-        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+        Summarization strategy for the chart.  MEAN is default  # noqa: E501
 
-        :param interpolate_points: The interpolate_points of this Chart.  # noqa: E501
-        :type: bool
+        :param summarization: The summarization of this Chart.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
+        if summarization not in allowed_values:
+            raise ValueError(
+                "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
+                .format(summarization, allowed_values)
+            )
 
-        self._interpolate_points = interpolate_points
+        self._summarization = summarization
 
     def to_dict(self):
         """Returns the model properties as a dict"""
@@ -381,6 +381,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Chart, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 85aeb25..2dad384 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,13 +31,9 @@ class ChartSettings(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'min': 'float',
         'type': 'str',
+        'min': 'float',
         'max': 'float',
-        'expected_data_spacing': 'int',
-        'fixed_legend_enabled': 'bool',
-        'fixed_legend_use_raw_stats': 'bool',
-        'plain_markdown_content': 'str',
         'line_type': 'str',
         'stack_type': 'str',
         'windowing': 'str',
@@ -60,6 +56,8 @@ class ChartSettings(object):
         'y0_unit_autoscaling': 'bool',
         'y1_unit_autoscaling': 'bool',
         'invert_dynamic_legend_hover_control': 'bool',
+        'fixed_legend_enabled': 'bool',
+        'fixed_legend_use_raw_stats': 'bool',
         'fixed_legend_position': 'str',
         'fixed_legend_display_stats': 'list[str]',
         'fixed_legend_filter_sort': 'str',
@@ -87,17 +85,15 @@ class ChartSettings(object):
         'sparkline_value_color_map_apply_to': 'str',
         'sparkline_decimal_precision': 'int',
         'sparkline_value_text_map_text': 'list[str]',
-        'sparkline_value_text_map_thresholds': 'list[float]'
+        'sparkline_value_text_map_thresholds': 'list[float]',
+        'expected_data_spacing': 'int',
+        'plain_markdown_content': 'str'
     }
 
     attribute_map = {
-        'min': 'min',
         'type': 'type',
+        'min': 'min',
         'max': 'max',
-        'expected_data_spacing': 'expectedDataSpacing',
-        'fixed_legend_enabled': 'fixedLegendEnabled',
-        'fixed_legend_use_raw_stats': 'fixedLegendUseRawStats',
-        'plain_markdown_content': 'plainMarkdownContent',
         'line_type': 'lineType',
         'stack_type': 'stackType',
         'windowing': 'windowing',
@@ -120,6 +116,8 @@ class ChartSettings(object):
         'y0_unit_autoscaling': 'y0UnitAutoscaling',
         'y1_unit_autoscaling': 'y1UnitAutoscaling',
         'invert_dynamic_legend_hover_control': 'invertDynamicLegendHoverControl',
+        'fixed_legend_enabled': 'fixedLegendEnabled',
+        'fixed_legend_use_raw_stats': 'fixedLegendUseRawStats',
         'fixed_legend_position': 'fixedLegendPosition',
         'fixed_legend_display_stats': 'fixedLegendDisplayStats',
         'fixed_legend_filter_sort': 'fixedLegendFilterSort',
@@ -147,19 +145,17 @@ class ChartSettings(object):
         'sparkline_value_color_map_apply_to': 'sparklineValueColorMapApplyTo',
         'sparkline_decimal_precision': 'sparklineDecimalPrecision',
         'sparkline_value_text_map_text': 'sparklineValueTextMapText',
-        'sparkline_value_text_map_thresholds': 'sparklineValueTextMapThresholds'
+        'sparkline_value_text_map_thresholds': 'sparklineValueTextMapThresholds',
+        'expected_data_spacing': 'expectedDataSpacing',
+        'plain_markdown_content': 'plainMarkdownContent'
     }
 
-    def __init__(self, min=None, type=None, max=None, expected_data_spacing=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, plain_markdown_content=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None):  # noqa: E501
+    def __init__(self, type=None, min=None, max=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, expected_data_spacing=None, plain_markdown_content=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
-        self._min = None
         self._type = None
+        self._min = None
         self._max = None
-        self._expected_data_spacing = None
-        self._fixed_legend_enabled = None
-        self._fixed_legend_use_raw_stats = None
-        self._plain_markdown_content = None
         self._line_type = None
         self._stack_type = None
         self._windowing = None
@@ -182,6 +178,8 @@ def __init__(self, min=None, type=None, max=None, expected_data_spacing=None, fi
         self._y0_unit_autoscaling = None
         self._y1_unit_autoscaling = None
         self._invert_dynamic_legend_hover_control = None
+        self._fixed_legend_enabled = None
+        self._fixed_legend_use_raw_stats = None
         self._fixed_legend_position = None
         self._fixed_legend_display_stats = None
         self._fixed_legend_filter_sort = None
@@ -210,21 +208,15 @@ def __init__(self, min=None, type=None, max=None, expected_data_spacing=None, fi
         self._sparkline_decimal_precision = None
         self._sparkline_value_text_map_text = None
         self._sparkline_value_text_map_thresholds = None
+        self._expected_data_spacing = None
+        self._plain_markdown_content = None
         self.discriminator = None
 
+        self.type = type
         if min is not None:
             self.min = min
-        self.type = type
         if max is not None:
             self.max = max
-        if expected_data_spacing is not None:
-            self.expected_data_spacing = expected_data_spacing
-        if fixed_legend_enabled is not None:
-            self.fixed_legend_enabled = fixed_legend_enabled
-        if fixed_legend_use_raw_stats is not None:
-            self.fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
-        if plain_markdown_content is not None:
-            self.plain_markdown_content = plain_markdown_content
         if line_type is not None:
             self.line_type = line_type
         if stack_type is not None:
@@ -269,6 +261,10 @@ def __init__(self, min=None, type=None, max=None, expected_data_spacing=None, fi
             self.y1_unit_autoscaling = y1_unit_autoscaling
         if invert_dynamic_legend_hover_control is not None:
             self.invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
+        if fixed_legend_enabled is not None:
+            self.fixed_legend_enabled = fixed_legend_enabled
+        if fixed_legend_use_raw_stats is not None:
+            self.fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
         if fixed_legend_position is not None:
             self.fixed_legend_position = fixed_legend_position
         if fixed_legend_display_stats is not None:
@@ -325,29 +321,10 @@ def __init__(self, min=None, type=None, max=None, expected_data_spacing=None, fi
             self.sparkline_value_text_map_text = sparkline_value_text_map_text
         if sparkline_value_text_map_thresholds is not None:
             self.sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
-
-    @property
-    def min(self):
-        """Gets the min of this ChartSettings.  # noqa: E501
-
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
-
-        :return: The min of this ChartSettings.  # noqa: E501
-        :rtype: float
-        """
-        return self._min
-
-    @min.setter
-    def min(self, min):
-        """Sets the min of this ChartSettings.
-
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
-
-        :param min: The min of this ChartSettings.  # noqa: E501
-        :type: float
-        """
-
-        self._min = min
+        if expected_data_spacing is not None:
+            self.expected_data_spacing = expected_data_spacing
+        if plain_markdown_content is not None:
+            self.plain_markdown_content = plain_markdown_content
 
     @property
     def type(self):
@@ -380,6 +357,29 @@ def type(self, type):
 
         self._type = type
 
+    @property
+    def min(self):
+        """Gets the min of this ChartSettings.  # noqa: E501
+
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+
+        :return: The min of this ChartSettings.  # noqa: E501
+        :rtype: float
+        """
+        return self._min
+
+    @min.setter
+    def min(self, min):
+        """Sets the min of this ChartSettings.
+
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+
+        :param min: The min of this ChartSettings.  # noqa: E501
+        :type: float
+        """
+
+        self._min = min
+
     @property
     def max(self):
         """Gets the max of this ChartSettings.  # noqa: E501
@@ -403,98 +403,6 @@ def max(self, max):
 
         self._max = max
 
-    @property
-    def expected_data_spacing(self):
-        """Gets the expected_data_spacing of this ChartSettings.  # noqa: E501
-
-        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
-
-        :return: The expected_data_spacing of this ChartSettings.  # noqa: E501
-        :rtype: int
-        """
-        return self._expected_data_spacing
-
-    @expected_data_spacing.setter
-    def expected_data_spacing(self, expected_data_spacing):
-        """Sets the expected_data_spacing of this ChartSettings.
-
-        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
-
-        :param expected_data_spacing: The expected_data_spacing of this ChartSettings.  # noqa: E501
-        :type: int
-        """
-
-        self._expected_data_spacing = expected_data_spacing
-
-    @property
-    def fixed_legend_enabled(self):
-        """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
-
-        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
-
-        :return: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._fixed_legend_enabled
-
-    @fixed_legend_enabled.setter
-    def fixed_legend_enabled(self, fixed_legend_enabled):
-        """Sets the fixed_legend_enabled of this ChartSettings.
-
-        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
-
-        :param fixed_legend_enabled: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._fixed_legend_enabled = fixed_legend_enabled
-
-    @property
-    def fixed_legend_use_raw_stats(self):
-        """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
-
-        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
-
-        :return: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._fixed_legend_use_raw_stats
-
-    @fixed_legend_use_raw_stats.setter
-    def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
-        """Sets the fixed_legend_use_raw_stats of this ChartSettings.
-
-        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
-
-        :param fixed_legend_use_raw_stats: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
-
-    @property
-    def plain_markdown_content(self):
-        """Gets the plain_markdown_content of this ChartSettings.  # noqa: E501
-
-        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
-
-        :return: The plain_markdown_content of this ChartSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._plain_markdown_content
-
-    @plain_markdown_content.setter
-    def plain_markdown_content(self, plain_markdown_content):
-        """Sets the plain_markdown_content of this ChartSettings.
-
-        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
-
-        :param plain_markdown_content: The plain_markdown_content of this ChartSettings.  # noqa: E501
-        :type: str
-        """
-
-        self._plain_markdown_content = plain_markdown_content
-
     @property
     def line_type(self):
         """Gets the line_type of this ChartSettings.  # noqa: E501
@@ -1025,6 +933,52 @@ def invert_dynamic_legend_hover_control(self, invert_dynamic_legend_hover_contro
 
         self._invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
 
+    @property
+    def fixed_legend_enabled(self):
+        """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
+
+        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
+
+        :return: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._fixed_legend_enabled
+
+    @fixed_legend_enabled.setter
+    def fixed_legend_enabled(self, fixed_legend_enabled):
+        """Sets the fixed_legend_enabled of this ChartSettings.
+
+        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
+
+        :param fixed_legend_enabled: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._fixed_legend_enabled = fixed_legend_enabled
+
+    @property
+    def fixed_legend_use_raw_stats(self):
+        """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+
+        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+
+        :return: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._fixed_legend_use_raw_stats
+
+    @fixed_legend_use_raw_stats.setter
+    def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
+        """Sets the fixed_legend_use_raw_stats of this ChartSettings.
+
+        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+
+        :param fixed_legend_use_raw_stats: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
+
     @property
     def fixed_legend_position(self):
         """Gets the fixed_legend_position of this ChartSettings.  # noqa: E501
@@ -1711,6 +1665,52 @@ def sparkline_value_text_map_thresholds(self, sparkline_value_text_map_threshold
 
         self._sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
 
+    @property
+    def expected_data_spacing(self):
+        """Gets the expected_data_spacing of this ChartSettings.  # noqa: E501
+
+        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
+
+        :return: The expected_data_spacing of this ChartSettings.  # noqa: E501
+        :rtype: int
+        """
+        return self._expected_data_spacing
+
+    @expected_data_spacing.setter
+    def expected_data_spacing(self, expected_data_spacing):
+        """Sets the expected_data_spacing of this ChartSettings.
+
+        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
+
+        :param expected_data_spacing: The expected_data_spacing of this ChartSettings.  # noqa: E501
+        :type: int
+        """
+
+        self._expected_data_spacing = expected_data_spacing
+
+    @property
+    def plain_markdown_content(self):
+        """Gets the plain_markdown_content of this ChartSettings.  # noqa: E501
+
+        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
+
+        :return: The plain_markdown_content of this ChartSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._plain_markdown_content
+
+    @plain_markdown_content.setter
+    def plain_markdown_content(self, plain_markdown_content):
+        """Sets the plain_markdown_content of this ChartSettings.
+
+        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
+
+        :param plain_markdown_content: The plain_markdown_content of this ChartSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._plain_markdown_content = plain_markdown_content
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -1732,6 +1732,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ChartSettings, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index ad73e26..51e0565 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,57 +33,57 @@ class ChartSourceQuery(object):
     swagger_types = {
         'name': 'str',
         'query': 'str',
-        'disabled': 'bool',
-        'secondary_axis': 'bool',
         'scatter_plot_source': 'str',
         'querybuilder_serialization': 'str',
         'querybuilder_enabled': 'bool',
+        'secondary_axis': 'bool',
         'source_description': 'str',
-        'source_color': 'str'
+        'source_color': 'str',
+        'disabled': 'bool'
     }
 
     attribute_map = {
         'name': 'name',
         'query': 'query',
-        'disabled': 'disabled',
-        'secondary_axis': 'secondaryAxis',
         'scatter_plot_source': 'scatterPlotSource',
         'querybuilder_serialization': 'querybuilderSerialization',
         'querybuilder_enabled': 'querybuilderEnabled',
+        'secondary_axis': 'secondaryAxis',
         'source_description': 'sourceDescription',
-        'source_color': 'sourceColor'
+        'source_color': 'sourceColor',
+        'disabled': 'disabled'
     }
 
-    def __init__(self, name=None, query=None, disabled=None, secondary_axis=None, scatter_plot_source=None, querybuilder_serialization=None, querybuilder_enabled=None, source_description=None, source_color=None):  # noqa: E501
+    def __init__(self, name=None, query=None, scatter_plot_source=None, querybuilder_serialization=None, querybuilder_enabled=None, secondary_axis=None, source_description=None, source_color=None, disabled=None):  # noqa: E501
         """ChartSourceQuery - a model defined in Swagger"""  # noqa: E501
 
         self._name = None
         self._query = None
-        self._disabled = None
-        self._secondary_axis = None
         self._scatter_plot_source = None
         self._querybuilder_serialization = None
         self._querybuilder_enabled = None
+        self._secondary_axis = None
         self._source_description = None
         self._source_color = None
+        self._disabled = None
         self.discriminator = None
 
         self.name = name
         self.query = query
-        if disabled is not None:
-            self.disabled = disabled
-        if secondary_axis is not None:
-            self.secondary_axis = secondary_axis
         if scatter_plot_source is not None:
             self.scatter_plot_source = scatter_plot_source
         if querybuilder_serialization is not None:
             self.querybuilder_serialization = querybuilder_serialization
         if querybuilder_enabled is not None:
             self.querybuilder_enabled = querybuilder_enabled
+        if secondary_axis is not None:
+            self.secondary_axis = secondary_axis
         if source_description is not None:
             self.source_description = source_description
         if source_color is not None:
             self.source_color = source_color
+        if disabled is not None:
+            self.disabled = disabled
 
     @property
     def name(self):
@@ -135,52 +135,6 @@ def query(self, query):
 
         self._query = query
 
-    @property
-    def disabled(self):
-        """Gets the disabled of this ChartSourceQuery.  # noqa: E501
-
-        Whether the source is disabled  # noqa: E501
-
-        :return: The disabled of this ChartSourceQuery.  # noqa: E501
-        :rtype: bool
-        """
-        return self._disabled
-
-    @disabled.setter
-    def disabled(self, disabled):
-        """Sets the disabled of this ChartSourceQuery.
-
-        Whether the source is disabled  # noqa: E501
-
-        :param disabled: The disabled of this ChartSourceQuery.  # noqa: E501
-        :type: bool
-        """
-
-        self._disabled = disabled
-
-    @property
-    def secondary_axis(self):
-        """Gets the secondary_axis of this ChartSourceQuery.  # noqa: E501
-
-        Determines if this source relates to the right hand Y-axis or not  # noqa: E501
-
-        :return: The secondary_axis of this ChartSourceQuery.  # noqa: E501
-        :rtype: bool
-        """
-        return self._secondary_axis
-
-    @secondary_axis.setter
-    def secondary_axis(self, secondary_axis):
-        """Sets the secondary_axis of this ChartSourceQuery.
-
-        Determines if this source relates to the right hand Y-axis or not  # noqa: E501
-
-        :param secondary_axis: The secondary_axis of this ChartSourceQuery.  # noqa: E501
-        :type: bool
-        """
-
-        self._secondary_axis = secondary_axis
-
     @property
     def scatter_plot_source(self):
         """Gets the scatter_plot_source of this ChartSourceQuery.  # noqa: E501
@@ -256,6 +210,29 @@ def querybuilder_enabled(self, querybuilder_enabled):
 
         self._querybuilder_enabled = querybuilder_enabled
 
+    @property
+    def secondary_axis(self):
+        """Gets the secondary_axis of this ChartSourceQuery.  # noqa: E501
+
+        Determines if this source relates to the right hand Y-axis or not  # noqa: E501
+
+        :return: The secondary_axis of this ChartSourceQuery.  # noqa: E501
+        :rtype: bool
+        """
+        return self._secondary_axis
+
+    @secondary_axis.setter
+    def secondary_axis(self, secondary_axis):
+        """Sets the secondary_axis of this ChartSourceQuery.
+
+        Determines if this source relates to the right hand Y-axis or not  # noqa: E501
+
+        :param secondary_axis: The secondary_axis of this ChartSourceQuery.  # noqa: E501
+        :type: bool
+        """
+
+        self._secondary_axis = secondary_axis
+
     @property
     def source_description(self):
         """Gets the source_description of this ChartSourceQuery.  # noqa: E501
@@ -302,6 +279,29 @@ def source_color(self, source_color):
 
         self._source_color = source_color
 
+    @property
+    def disabled(self):
+        """Gets the disabled of this ChartSourceQuery.  # noqa: E501
+
+        Whether the source is disabled  # noqa: E501
+
+        :return: The disabled of this ChartSourceQuery.  # noqa: E501
+        :rtype: bool
+        """
+        return self._disabled
+
+    @disabled.setter
+    def disabled(self, disabled):
+        """Sets the disabled of this ChartSourceQuery.
+
+        Whether the source is disabled  # noqa: E501
+
+        :param disabled: The disabled of this ChartSourceQuery.  # noqa: E501
+        :type: bool
+        """
+
+        self._disabled = disabled
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -323,6 +323,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ChartSourceQuery, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 56d9c45..c94eb54 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -24,6 +24,7 @@
 from wavefront_api_client.models.event import Event  # noqa: F401,E501
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration  # noqa: F401,E501
+from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration  # noqa: F401,E501
 
 
@@ -49,6 +50,7 @@ class CloudIntegration(object):
         'creator_id': 'str',
         'updater_id': 'str',
         'last_error_event': 'Event',
+        'service_refresh_rate_in_mins': 'int',
         'additional_tags': 'dict(str, str)',
         'last_received_data_point_ms': 'int',
         'last_metric_count': 'int',
@@ -57,6 +59,7 @@ class CloudIntegration(object):
         'ec2': 'EC2Configuration',
         'gcp': 'GCPConfiguration',
         'gcp_billing': 'GCPBillingConfiguration',
+        'new_relic': 'NewRelicConfiguration',
         'tesla': 'TeslaConfiguration',
         'azure': 'AzureConfiguration',
         'azure_activity_log': 'AzureActivityLogConfiguration',
@@ -67,7 +70,6 @@ class CloudIntegration(object):
         'last_processing_timestamp': 'int',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'service_refresh_rate_in_mins': 'int',
         'deleted': 'bool'
     }
 
@@ -80,6 +82,7 @@ class CloudIntegration(object):
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
         'last_error_event': 'lastErrorEvent',
+        'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'additional_tags': 'additionalTags',
         'last_received_data_point_ms': 'lastReceivedDataPointMs',
         'last_metric_count': 'lastMetricCount',
@@ -88,6 +91,7 @@ class CloudIntegration(object):
         'ec2': 'ec2',
         'gcp': 'gcp',
         'gcp_billing': 'gcpBilling',
+        'new_relic': 'newRelic',
         'tesla': 'tesla',
         'azure': 'azure',
         'azure_activity_log': 'azureActivityLog',
@@ -98,11 +102,10 @@ class CloudIntegration(object):
         'last_processing_timestamp': 'lastProcessingTimestamp',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'deleted': 'deleted'
     }
 
-    def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=None, creator_id=None, updater_id=None, last_error_event=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, gcp_billing=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, service_refresh_rate_in_mins=None, deleted=None):  # noqa: E501
+    def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=None, creator_id=None, updater_id=None, last_error_event=None, service_refresh_rate_in_mins=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, gcp_billing=None, new_relic=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
 
         self._force_save = None
@@ -113,6 +116,7 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
         self._creator_id = None
         self._updater_id = None
         self._last_error_event = None
+        self._service_refresh_rate_in_mins = None
         self._additional_tags = None
         self._last_received_data_point_ms = None
         self._last_metric_count = None
@@ -121,6 +125,7 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
         self._ec2 = None
         self._gcp = None
         self._gcp_billing = None
+        self._new_relic = None
         self._tesla = None
         self._azure = None
         self._azure_activity_log = None
@@ -131,7 +136,6 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
         self._last_processing_timestamp = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._service_refresh_rate_in_mins = None
         self._deleted = None
         self.discriminator = None
 
@@ -149,6 +153,8 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
             self.updater_id = updater_id
         if last_error_event is not None:
             self.last_error_event = last_error_event
+        if service_refresh_rate_in_mins is not None:
+            self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if additional_tags is not None:
             self.additional_tags = additional_tags
         if last_received_data_point_ms is not None:
@@ -165,6 +171,8 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
             self.gcp = gcp
         if gcp_billing is not None:
             self.gcp_billing = gcp_billing
+        if new_relic is not None:
+            self.new_relic = new_relic
         if tesla is not None:
             self.tesla = tesla
         if azure is not None:
@@ -185,8 +193,6 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if service_refresh_rate_in_mins is not None:
-            self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if deleted is not None:
             self.deleted = deleted
 
@@ -372,6 +378,29 @@ def last_error_event(self, last_error_event):
 
         self._last_error_event = last_error_event
 
+    @property
+    def service_refresh_rate_in_mins(self):
+        """Gets the service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
+
+        Service refresh rate in minutes.  # noqa: E501
+
+        :return: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._service_refresh_rate_in_mins
+
+    @service_refresh_rate_in_mins.setter
+    def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
+        """Sets the service_refresh_rate_in_mins of this CloudIntegration.
+
+        Service refresh rate in minutes.  # noqa: E501
+
+        :param service_refresh_rate_in_mins: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
+
     @property
     def additional_tags(self):
         """Gets the additional_tags of this CloudIntegration.  # noqa: E501
@@ -546,6 +575,27 @@ def gcp_billing(self, gcp_billing):
 
         self._gcp_billing = gcp_billing
 
+    @property
+    def new_relic(self):
+        """Gets the new_relic of this CloudIntegration.  # noqa: E501
+
+
+        :return: The new_relic of this CloudIntegration.  # noqa: E501
+        :rtype: NewRelicConfiguration
+        """
+        return self._new_relic
+
+    @new_relic.setter
+    def new_relic(self, new_relic):
+        """Sets the new_relic of this CloudIntegration.
+
+
+        :param new_relic: The new_relic of this CloudIntegration.  # noqa: E501
+        :type: NewRelicConfiguration
+        """
+
+        self._new_relic = new_relic
+
     @property
     def tesla(self):
         """Gets the tesla of this CloudIntegration.  # noqa: E501
@@ -766,29 +816,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def service_refresh_rate_in_mins(self):
-        """Gets the service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
-
-        Service refresh rate in minutes.  # noqa: E501
-
-        :return: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
-        :rtype: int
-        """
-        return self._service_refresh_rate_in_mins
-
-    @service_refresh_rate_in_mins.setter
-    def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
-        """Sets the service_refresh_rate_in_mins of this CloudIntegration.
-
-        Service refresh rate in minutes.  # noqa: E501
-
-        :param service_refresh_rate_in_mins: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
-        :type: int
-        """
-
-        self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
-
     @property
     def deleted(self):
         """Gets the deleted of this CloudIntegration.  # noqa: E501
@@ -831,6 +858,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(CloudIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index d05e1d9..22912ad 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,62 +33,39 @@ class CloudTrailConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'prefix': 'str',
         'region': 'str',
-        'bucket_name': 'str',
+        'prefix': 'str',
         'base_credentials': 'AWSBaseCredentials',
-        'filter_rule': 'str'
+        'filter_rule': 'str',
+        'bucket_name': 'str'
     }
 
     attribute_map = {
-        'prefix': 'prefix',
         'region': 'region',
-        'bucket_name': 'bucketName',
+        'prefix': 'prefix',
         'base_credentials': 'baseCredentials',
-        'filter_rule': 'filterRule'
+        'filter_rule': 'filterRule',
+        'bucket_name': 'bucketName'
     }
 
-    def __init__(self, prefix=None, region=None, bucket_name=None, base_credentials=None, filter_rule=None):  # noqa: E501
+    def __init__(self, region=None, prefix=None, base_credentials=None, filter_rule=None, bucket_name=None):  # noqa: E501
         """CloudTrailConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._prefix = None
         self._region = None
-        self._bucket_name = None
+        self._prefix = None
         self._base_credentials = None
         self._filter_rule = None
+        self._bucket_name = None
         self.discriminator = None
 
+        self.region = region
         if prefix is not None:
             self.prefix = prefix
-        self.region = region
-        self.bucket_name = bucket_name
         if base_credentials is not None:
             self.base_credentials = base_credentials
         if filter_rule is not None:
             self.filter_rule = filter_rule
-
-    @property
-    def prefix(self):
-        """Gets the prefix of this CloudTrailConfiguration.  # noqa: E501
-
-        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
-
-        :return: The prefix of this CloudTrailConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._prefix
-
-    @prefix.setter
-    def prefix(self, prefix):
-        """Sets the prefix of this CloudTrailConfiguration.
-
-        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
-
-        :param prefix: The prefix of this CloudTrailConfiguration.  # noqa: E501
-        :type: str
-        """
-
-        self._prefix = prefix
+        self.bucket_name = bucket_name
 
     @property
     def region(self):
@@ -116,29 +93,27 @@ def region(self, region):
         self._region = region
 
     @property
-    def bucket_name(self):
-        """Gets the bucket_name of this CloudTrailConfiguration.  # noqa: E501
+    def prefix(self):
+        """Gets the prefix of this CloudTrailConfiguration.  # noqa: E501
 
-        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
 
-        :return: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
+        :return: The prefix of this CloudTrailConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._bucket_name
+        return self._prefix
 
-    @bucket_name.setter
-    def bucket_name(self, bucket_name):
-        """Sets the bucket_name of this CloudTrailConfiguration.
+    @prefix.setter
+    def prefix(self, prefix):
+        """Sets the prefix of this CloudTrailConfiguration.
 
-        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
 
-        :param bucket_name: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
+        :param prefix: The prefix of this CloudTrailConfiguration.  # noqa: E501
         :type: str
         """
-        if bucket_name is None:
-            raise ValueError("Invalid value for `bucket_name`, must not be `None`")  # noqa: E501
 
-        self._bucket_name = bucket_name
+        self._prefix = prefix
 
     @property
     def base_credentials(self):
@@ -184,6 +159,31 @@ def filter_rule(self, filter_rule):
 
         self._filter_rule = filter_rule
 
+    @property
+    def bucket_name(self):
+        """Gets the bucket_name of this CloudTrailConfiguration.  # noqa: E501
+
+        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+
+        :return: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._bucket_name
+
+    @bucket_name.setter
+    def bucket_name(self, bucket_name):
+        """Sets the bucket_name of this CloudTrailConfiguration.
+
+        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+
+        :param bucket_name: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
+        :type: str
+        """
+        if bucket_name is None:
+            raise ValueError("Invalid value for `bucket_name`, must not be `None`")  # noqa: E501
+
+        self._bucket_name = bucket_name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -205,6 +205,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(CloudTrailConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 243df7d..c999e7c 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,38 +33,34 @@ class CloudWatchConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'metric_filter_regex': 'str',
-        'namespaces': 'list[str]',
         'base_credentials': 'AWSBaseCredentials',
         'instance_selection_tags': 'dict(str, str)',
         'volume_selection_tags': 'dict(str, str)',
-        'point_tag_filter_regex': 'str'
+        'point_tag_filter_regex': 'str',
+        'namespaces': 'list[str]',
+        'metric_filter_regex': 'str'
     }
 
     attribute_map = {
-        'metric_filter_regex': 'metricFilterRegex',
-        'namespaces': 'namespaces',
         'base_credentials': 'baseCredentials',
         'instance_selection_tags': 'instanceSelectionTags',
         'volume_selection_tags': 'volumeSelectionTags',
-        'point_tag_filter_regex': 'pointTagFilterRegex'
+        'point_tag_filter_regex': 'pointTagFilterRegex',
+        'namespaces': 'namespaces',
+        'metric_filter_regex': 'metricFilterRegex'
     }
 
-    def __init__(self, metric_filter_regex=None, namespaces=None, base_credentials=None, instance_selection_tags=None, volume_selection_tags=None, point_tag_filter_regex=None):  # noqa: E501
+    def __init__(self, base_credentials=None, instance_selection_tags=None, volume_selection_tags=None, point_tag_filter_regex=None, namespaces=None, metric_filter_regex=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._metric_filter_regex = None
-        self._namespaces = None
         self._base_credentials = None
         self._instance_selection_tags = None
         self._volume_selection_tags = None
         self._point_tag_filter_regex = None
+        self._namespaces = None
+        self._metric_filter_regex = None
         self.discriminator = None
 
-        if metric_filter_regex is not None:
-            self.metric_filter_regex = metric_filter_regex
-        if namespaces is not None:
-            self.namespaces = namespaces
         if base_credentials is not None:
             self.base_credentials = base_credentials
         if instance_selection_tags is not None:
@@ -73,52 +69,10 @@ def __init__(self, metric_filter_regex=None, namespaces=None, base_credentials=N
             self.volume_selection_tags = volume_selection_tags
         if point_tag_filter_regex is not None:
             self.point_tag_filter_regex = point_tag_filter_regex
-
-    @property
-    def metric_filter_regex(self):
-        """Gets the metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
-
-        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
-
-        :return: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._metric_filter_regex
-
-    @metric_filter_regex.setter
-    def metric_filter_regex(self, metric_filter_regex):
-        """Sets the metric_filter_regex of this CloudWatchConfiguration.
-
-        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
-
-        :param metric_filter_regex: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
-        :type: str
-        """
-
-        self._metric_filter_regex = metric_filter_regex
-
-    @property
-    def namespaces(self):
-        """Gets the namespaces of this CloudWatchConfiguration.  # noqa: E501
-
-        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
-
-        :return: The namespaces of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._namespaces
-
-    @namespaces.setter
-    def namespaces(self, namespaces):
-        """Sets the namespaces of this CloudWatchConfiguration.
-
-        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
-
-        :param namespaces: The namespaces of this CloudWatchConfiguration.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._namespaces = namespaces
+        if namespaces is not None:
+            self.namespaces = namespaces
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
 
     @property
     def base_credentials(self):
@@ -210,6 +164,52 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
 
         self._point_tag_filter_regex = point_tag_filter_regex
 
+    @property
+    def namespaces(self):
+        """Gets the namespaces of this CloudWatchConfiguration.  # noqa: E501
+
+        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
+
+        :return: The namespaces of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._namespaces
+
+    @namespaces.setter
+    def namespaces(self, namespaces):
+        """Sets the namespaces of this CloudWatchConfiguration.
+
+        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
+
+        :param namespaces: The namespaces of this CloudWatchConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._namespaces = namespaces
+
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+
+        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this CloudWatchConfiguration.
+
+        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param metric_filter_regex: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -231,6 +231,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(CloudWatchConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index c81ffae..e1a3bb5 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,52 +31,80 @@ class CustomerFacingUserObject(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'user_groups': 'list[str]',
         'identifier': 'str',
         'id': 'str',
+        '_self': 'bool',
         'groups': 'list[str]',
         'customer': 'str',
         'last_successful_login': 'int',
-        '_self': 'bool',
-        'escaped_identifier': 'str',
-        'gravatar_url': 'str'
+        'gravatar_url': 'str',
+        'escaped_identifier': 'str'
     }
 
     attribute_map = {
+        'user_groups': 'userGroups',
         'identifier': 'identifier',
         'id': 'id',
+        '_self': 'self',
         'groups': 'groups',
         'customer': 'customer',
         'last_successful_login': 'lastSuccessfulLogin',
-        '_self': 'self',
-        'escaped_identifier': 'escapedIdentifier',
-        'gravatar_url': 'gravatarUrl'
+        'gravatar_url': 'gravatarUrl',
+        'escaped_identifier': 'escapedIdentifier'
     }
 
-    def __init__(self, identifier=None, id=None, groups=None, customer=None, last_successful_login=None, _self=None, escaped_identifier=None, gravatar_url=None):  # noqa: E501
+    def __init__(self, user_groups=None, identifier=None, id=None, _self=None, groups=None, customer=None, last_successful_login=None, gravatar_url=None, escaped_identifier=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
+        self._user_groups = None
         self._identifier = None
         self._id = None
+        self.__self = None
         self._groups = None
         self._customer = None
         self._last_successful_login = None
-        self.__self = None
-        self._escaped_identifier = None
         self._gravatar_url = None
+        self._escaped_identifier = None
         self.discriminator = None
 
+        if user_groups is not None:
+            self.user_groups = user_groups
         self.identifier = identifier
         self.id = id
+        self._self = _self
         if groups is not None:
             self.groups = groups
         self.customer = customer
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
-        self._self = _self
-        if escaped_identifier is not None:
-            self.escaped_identifier = escaped_identifier
         if gravatar_url is not None:
             self.gravatar_url = gravatar_url
+        if escaped_identifier is not None:
+            self.escaped_identifier = escaped_identifier
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this CustomerFacingUserObject.  # noqa: E501
+
+        List of user group identifiers this user belongs to  # noqa: E501
+
+        :return: The user_groups of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this CustomerFacingUserObject.
+
+        List of user group identifiers this user belongs to  # noqa: E501
+
+        :param user_groups: The user_groups of this CustomerFacingUserObject.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
 
     @property
     def identifier(self):
@@ -128,6 +156,31 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def _self(self):
+        """Gets the _self of this CustomerFacingUserObject.  # noqa: E501
+
+        Whether this user is the one calling the API  # noqa: E501
+
+        :return: The _self of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: bool
+        """
+        return self.__self
+
+    @_self.setter
+    def _self(self, _self):
+        """Sets the _self of this CustomerFacingUserObject.
+
+        Whether this user is the one calling the API  # noqa: E501
+
+        :param _self: The _self of this CustomerFacingUserObject.  # noqa: E501
+        :type: bool
+        """
+        if _self is None:
+            raise ValueError("Invalid value for `_self`, must not be `None`")  # noqa: E501
+
+        self.__self = _self
+
     @property
     def groups(self):
         """Gets the groups of this CustomerFacingUserObject.  # noqa: E501
@@ -200,29 +253,27 @@ def last_successful_login(self, last_successful_login):
         self._last_successful_login = last_successful_login
 
     @property
-    def _self(self):
-        """Gets the _self of this CustomerFacingUserObject.  # noqa: E501
+    def gravatar_url(self):
+        """Gets the gravatar_url of this CustomerFacingUserObject.  # noqa: E501
 
-        Whether this user is the one calling the API  # noqa: E501
+        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
 
-        :return: The _self of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: bool
+        :return: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: str
         """
-        return self.__self
+        return self._gravatar_url
 
-    @_self.setter
-    def _self(self, _self):
-        """Sets the _self of this CustomerFacingUserObject.
+    @gravatar_url.setter
+    def gravatar_url(self, gravatar_url):
+        """Sets the gravatar_url of this CustomerFacingUserObject.
 
-        Whether this user is the one calling the API  # noqa: E501
+        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
 
-        :param _self: The _self of this CustomerFacingUserObject.  # noqa: E501
-        :type: bool
+        :param gravatar_url: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
+        :type: str
         """
-        if _self is None:
-            raise ValueError("Invalid value for `_self`, must not be `None`")  # noqa: E501
 
-        self.__self = _self
+        self._gravatar_url = gravatar_url
 
     @property
     def escaped_identifier(self):
@@ -247,29 +298,6 @@ def escaped_identifier(self, escaped_identifier):
 
         self._escaped_identifier = escaped_identifier
 
-    @property
-    def gravatar_url(self):
-        """Gets the gravatar_url of this CustomerFacingUserObject.  # noqa: E501
-
-        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
-
-        :return: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: str
-        """
-        return self._gravatar_url
-
-    @gravatar_url.setter
-    def gravatar_url(self, gravatar_url):
-        """Sets the gravatar_url of this CustomerFacingUserObject.
-
-        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
-
-        :param gravatar_url: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
-        :type: str
-        """
-
-        self._gravatar_url = gravatar_url
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -291,6 +319,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(CustomerFacingUserObject, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
new file mode 100644
index 0000000..cea741f
--- /dev/null
+++ b/wavefront_api_client/models/customer_preferences.py
@@ -0,0 +1,532 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
+
+class CustomerPreferences(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'default_user_groups': 'list[UserGroup]',
+        'id': 'str',
+        'customer_id': 'str',
+        'creator_id': 'str',
+        'updater_id': 'str',
+        'invite_permissions': 'list[str]',
+        'hidden_metric_prefixes': 'dict(str, int)',
+        'landing_dashboard_slug': 'str',
+        'show_onboarding': 'bool',
+        'grant_modify_access_to_everyone': 'bool',
+        'show_querybuilder_by_default': 'bool',
+        'hide_ts_when_querybuilder_shown': 'bool',
+        'blacklisted_emails': 'dict(str, int)',
+        'created_epoch_millis': 'int',
+        'updated_epoch_millis': 'int',
+        'deleted': 'bool'
+    }
+
+    attribute_map = {
+        'default_user_groups': 'defaultUserGroups',
+        'id': 'id',
+        'customer_id': 'customerId',
+        'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
+        'invite_permissions': 'invitePermissions',
+        'hidden_metric_prefixes': 'hiddenMetricPrefixes',
+        'landing_dashboard_slug': 'landingDashboardSlug',
+        'show_onboarding': 'showOnboarding',
+        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
+        'blacklisted_emails': 'blacklistedEmails',
+        'created_epoch_millis': 'createdEpochMillis',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'deleted': 'deleted'
+    }
+
+    def __init__(self, default_user_groups=None, id=None, customer_id=None, creator_id=None, updater_id=None, invite_permissions=None, hidden_metric_prefixes=None, landing_dashboard_slug=None, show_onboarding=None, grant_modify_access_to_everyone=None, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, blacklisted_emails=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+        """CustomerPreferences - a model defined in Swagger"""  # noqa: E501
+
+        self._default_user_groups = None
+        self._id = None
+        self._customer_id = None
+        self._creator_id = None
+        self._updater_id = None
+        self._invite_permissions = None
+        self._hidden_metric_prefixes = None
+        self._landing_dashboard_slug = None
+        self._show_onboarding = None
+        self._grant_modify_access_to_everyone = None
+        self._show_querybuilder_by_default = None
+        self._hide_ts_when_querybuilder_shown = None
+        self._blacklisted_emails = None
+        self._created_epoch_millis = None
+        self._updated_epoch_millis = None
+        self._deleted = None
+        self.discriminator = None
+
+        if default_user_groups is not None:
+            self.default_user_groups = default_user_groups
+        if id is not None:
+            self.id = id
+        self.customer_id = customer_id
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
+        if invite_permissions is not None:
+            self.invite_permissions = invite_permissions
+        if hidden_metric_prefixes is not None:
+            self.hidden_metric_prefixes = hidden_metric_prefixes
+        if landing_dashboard_slug is not None:
+            self.landing_dashboard_slug = landing_dashboard_slug
+        self.show_onboarding = show_onboarding
+        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
+        self.show_querybuilder_by_default = show_querybuilder_by_default
+        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+        if blacklisted_emails is not None:
+            self.blacklisted_emails = blacklisted_emails
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if deleted is not None:
+            self.deleted = deleted
+
+    @property
+    def default_user_groups(self):
+        """Gets the default_user_groups of this CustomerPreferences.  # noqa: E501
+
+        List of default user groups of the customer  # noqa: E501
+
+        :return: The default_user_groups of this CustomerPreferences.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._default_user_groups
+
+    @default_user_groups.setter
+    def default_user_groups(self, default_user_groups):
+        """Sets the default_user_groups of this CustomerPreferences.
+
+        List of default user groups of the customer  # noqa: E501
+
+        :param default_user_groups: The default_user_groups of this CustomerPreferences.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._default_user_groups = default_user_groups
+
+    @property
+    def id(self):
+        """Gets the id of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CustomerPreferences.
+
+
+        :param id: The id of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def customer_id(self):
+        """Gets the customer_id of this CustomerPreferences.  # noqa: E501
+
+        The id of the customer preferences are attached to  # noqa: E501
+
+        :return: The customer_id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer_id
+
+    @customer_id.setter
+    def customer_id(self, customer_id):
+        """Sets the customer_id of this CustomerPreferences.
+
+        The id of the customer preferences are attached to  # noqa: E501
+
+        :param customer_id: The customer_id of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+        if customer_id is None:
+            raise ValueError("Invalid value for `customer_id`, must not be `None`")  # noqa: E501
+
+        self._customer_id = customer_id
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The creator_id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this CustomerPreferences.
+
+
+        :param creator_id: The creator_id of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The updater_id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this CustomerPreferences.
+
+
+        :param updater_id: The updater_id of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    @property
+    def invite_permissions(self):
+        """Gets the invite_permissions of this CustomerPreferences.  # noqa: E501
+
+        List of permissions that are assigned to newly invited users  # noqa: E501
+
+        :return: The invite_permissions of this CustomerPreferences.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._invite_permissions
+
+    @invite_permissions.setter
+    def invite_permissions(self, invite_permissions):
+        """Sets the invite_permissions of this CustomerPreferences.
+
+        List of permissions that are assigned to newly invited users  # noqa: E501
+
+        :param invite_permissions: The invite_permissions of this CustomerPreferences.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._invite_permissions = invite_permissions
+
+    @property
+    def hidden_metric_prefixes(self):
+        """Gets the hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
+
+        Metric prefixes which should be hidden from user  # noqa: E501
+
+        :return: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
+        :rtype: dict(str, int)
+        """
+        return self._hidden_metric_prefixes
+
+    @hidden_metric_prefixes.setter
+    def hidden_metric_prefixes(self, hidden_metric_prefixes):
+        """Sets the hidden_metric_prefixes of this CustomerPreferences.
+
+        Metric prefixes which should be hidden from user  # noqa: E501
+
+        :param hidden_metric_prefixes: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
+        :type: dict(str, int)
+        """
+
+        self._hidden_metric_prefixes = hidden_metric_prefixes
+
+    @property
+    def landing_dashboard_slug(self):
+        """Gets the landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
+
+        Dashboard where user will be redirected from landing page  # noqa: E501
+
+        :return: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._landing_dashboard_slug
+
+    @landing_dashboard_slug.setter
+    def landing_dashboard_slug(self, landing_dashboard_slug):
+        """Sets the landing_dashboard_slug of this CustomerPreferences.
+
+        Dashboard where user will be redirected from landing page  # noqa: E501
+
+        :param landing_dashboard_slug: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+
+        self._landing_dashboard_slug = landing_dashboard_slug
+
+    @property
+    def show_onboarding(self):
+        """Gets the show_onboarding of this CustomerPreferences.  # noqa: E501
+
+        Whether to show onboarding for any new user without an override  # noqa: E501
+
+        :return: The show_onboarding of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_onboarding
+
+    @show_onboarding.setter
+    def show_onboarding(self, show_onboarding):
+        """Sets the show_onboarding of this CustomerPreferences.
+
+        Whether to show onboarding for any new user without an override  # noqa: E501
+
+        :param show_onboarding: The show_onboarding of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+        if show_onboarding is None:
+            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
+
+        self._show_onboarding = show_onboarding
+
+    @property
+    def grant_modify_access_to_everyone(self):
+        """Gets the grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
+
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+
+        :return: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._grant_modify_access_to_everyone
+
+    @grant_modify_access_to_everyone.setter
+    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
+        """Sets the grant_modify_access_to_everyone of this CustomerPreferences.
+
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+
+        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+        if grant_modify_access_to_everyone is None:
+            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
+
+        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
+
+    @property
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+
+        Whether the Querybuilder is shown by default  # noqa: E501
+
+        :return: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_querybuilder_by_default
+
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this CustomerPreferences.
+
+        Whether the Querybuilder is shown by default  # noqa: E501
+
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+        if show_querybuilder_by_default is None:
+            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
+
+        self._show_querybuilder_by_default = show_querybuilder_by_default
+
+    @property
+    def hide_ts_when_querybuilder_shown(self):
+        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
+
+        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hide_ts_when_querybuilder_shown
+
+    @hide_ts_when_querybuilder_shown.setter
+    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
+        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferences.
+
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
+
+        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+        if hide_ts_when_querybuilder_shown is None:
+            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
+
+        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+
+    @property
+    def blacklisted_emails(self):
+        """Gets the blacklisted_emails of this CustomerPreferences.  # noqa: E501
+
+        List of blacklisted emails of the customer  # noqa: E501
+
+        :return: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
+        :rtype: dict(str, int)
+        """
+        return self._blacklisted_emails
+
+    @blacklisted_emails.setter
+    def blacklisted_emails(self, blacklisted_emails):
+        """Sets the blacklisted_emails of this CustomerPreferences.
+
+        List of blacklisted emails of the customer  # noqa: E501
+
+        :param blacklisted_emails: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
+        :type: dict(str, int)
+        """
+
+        self._blacklisted_emails = blacklisted_emails
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this CustomerPreferences.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this CustomerPreferences.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The deleted of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this CustomerPreferences.
+
+
+        :param deleted: The deleted of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(CustomerPreferences, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, CustomerPreferences):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/customer_preferences_updating.py b/wavefront_api_client/models/customer_preferences_updating.py
new file mode 100644
index 0000000..a7e52c6
--- /dev/null
+++ b/wavefront_api_client/models/customer_preferences_updating.py
@@ -0,0 +1,289 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class CustomerPreferencesUpdating(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'show_querybuilder_by_default': 'bool',
+        'hide_ts_when_querybuilder_shown': 'bool',
+        'landing_dashboard_slug': 'str',
+        'show_onboarding': 'bool',
+        'grant_modify_access_to_everyone': 'bool',
+        'default_user_groups': 'list[str]',
+        'invite_permissions': 'list[str]'
+    }
+
+    attribute_map = {
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
+        'landing_dashboard_slug': 'landingDashboardSlug',
+        'show_onboarding': 'showOnboarding',
+        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
+        'default_user_groups': 'defaultUserGroups',
+        'invite_permissions': 'invitePermissions'
+    }
+
+    def __init__(self, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, show_onboarding=None, grant_modify_access_to_everyone=None, default_user_groups=None, invite_permissions=None):  # noqa: E501
+        """CustomerPreferencesUpdating - a model defined in Swagger"""  # noqa: E501
+
+        self._show_querybuilder_by_default = None
+        self._hide_ts_when_querybuilder_shown = None
+        self._landing_dashboard_slug = None
+        self._show_onboarding = None
+        self._grant_modify_access_to_everyone = None
+        self._default_user_groups = None
+        self._invite_permissions = None
+        self.discriminator = None
+
+        self.show_querybuilder_by_default = show_querybuilder_by_default
+        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+        if landing_dashboard_slug is not None:
+            self.landing_dashboard_slug = landing_dashboard_slug
+        self.show_onboarding = show_onboarding
+        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
+        if default_user_groups is not None:
+            self.default_user_groups = default_user_groups
+        if invite_permissions is not None:
+            self.invite_permissions = invite_permissions
+
+    @property
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
+
+        Whether the Querybuilder is shown by default  # noqa: E501
+
+        :return: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_querybuilder_by_default
+
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this CustomerPreferencesUpdating.
+
+        Whether the Querybuilder is shown by default  # noqa: E501
+
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: bool
+        """
+        if show_querybuilder_by_default is None:
+            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
+
+        self._show_querybuilder_by_default = show_querybuilder_by_default
+
+    @property
+    def hide_ts_when_querybuilder_shown(self):
+        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.  # noqa: E501
+
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
+
+        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hide_ts_when_querybuilder_shown
+
+    @hide_ts_when_querybuilder_shown.setter
+    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
+        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.
+
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
+
+        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: bool
+        """
+        if hide_ts_when_querybuilder_shown is None:
+            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
+
+        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+
+    @property
+    def landing_dashboard_slug(self):
+        """Gets the landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
+
+        Dashboard where user will be redirected from landing page  # noqa: E501
+
+        :return: The landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: str
+        """
+        return self._landing_dashboard_slug
+
+    @landing_dashboard_slug.setter
+    def landing_dashboard_slug(self, landing_dashboard_slug):
+        """Sets the landing_dashboard_slug of this CustomerPreferencesUpdating.
+
+        Dashboard where user will be redirected from landing page  # noqa: E501
+
+        :param landing_dashboard_slug: The landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: str
+        """
+
+        self._landing_dashboard_slug = landing_dashboard_slug
+
+    @property
+    def show_onboarding(self):
+        """Gets the show_onboarding of this CustomerPreferencesUpdating.  # noqa: E501
+
+        Whether to show onboarding for any new user without an override  # noqa: E501
+
+        :return: The show_onboarding of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_onboarding
+
+    @show_onboarding.setter
+    def show_onboarding(self, show_onboarding):
+        """Sets the show_onboarding of this CustomerPreferencesUpdating.
+
+        Whether to show onboarding for any new user without an override  # noqa: E501
+
+        :param show_onboarding: The show_onboarding of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: bool
+        """
+        if show_onboarding is None:
+            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
+
+        self._show_onboarding = show_onboarding
+
+    @property
+    def grant_modify_access_to_everyone(self):
+        """Gets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+
+        :return: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: bool
+        """
+        return self._grant_modify_access_to_everyone
+
+    @grant_modify_access_to_everyone.setter
+    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
+        """Sets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.
+
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+
+        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: bool
+        """
+        if grant_modify_access_to_everyone is None:
+            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
+
+        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
+
+    @property
+    def default_user_groups(self):
+        """Gets the default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
+
+        List of default user groups of the customer  # noqa: E501
+
+        :return: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._default_user_groups
+
+    @default_user_groups.setter
+    def default_user_groups(self, default_user_groups):
+        """Sets the default_user_groups of this CustomerPreferencesUpdating.
+
+        List of default user groups of the customer  # noqa: E501
+
+        :param default_user_groups: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._default_user_groups = default_user_groups
+
+    @property
+    def invite_permissions(self):
+        """Gets the invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
+
+        List of invite permissions to apply for each new user  # noqa: E501
+
+        :return: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._invite_permissions
+
+    @invite_permissions.setter
+    def invite_permissions(self, invite_permissions):
+        """Sets the invite_permissions of this CustomerPreferencesUpdating.
+
+        List of invite permissions to apply for each new user  # noqa: E501
+
+        :param invite_permissions: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._invite_permissions = invite_permissions
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(CustomerPreferencesUpdating, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, CustomerPreferencesUpdating):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 58a3d35..8dcb380 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -16,6 +16,7 @@
 
 import six
 
+from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple  # noqa: F401,E501
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue  # noqa: F401,E501
 from wavefront_api_client.models.dashboard_section import DashboardSection  # noqa: F401,E501
 from wavefront_api_client.models.wf_tags import WFTags  # noqa: F401,E501
@@ -35,14 +36,16 @@ class Dashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'can_user_modify': 'bool',
         'hidden': 'bool',
+        'description': 'str',
         'name': 'str',
         'id': 'str',
         'parameters': 'dict(str, str)',
-        'description': 'str',
         'tags': 'WFTags',
         'customer': 'str',
         'url': 'str',
+        'system_owned': 'bool',
         'creator_id': 'str',
         'updater_id': 'str',
         'event_filter_type': 'str',
@@ -61,24 +64,27 @@ class Dashboard(object):
         'views_last_day': 'int',
         'views_last_week': 'int',
         'views_last_month': 'int',
+        'acl': 'AccessControlListSimple',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'deleted': 'bool',
-        'system_owned': 'bool',
         'num_charts': 'int',
         'favorite': 'bool',
-        'num_favorites': 'int'
+        'num_favorites': 'int',
+        'orphan': 'bool'
     }
 
     attribute_map = {
+        'can_user_modify': 'canUserModify',
         'hidden': 'hidden',
+        'description': 'description',
         'name': 'name',
         'id': 'id',
         'parameters': 'parameters',
-        'description': 'description',
         'tags': 'tags',
         'customer': 'customer',
         'url': 'url',
+        'system_owned': 'systemOwned',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
         'event_filter_type': 'eventFilterType',
@@ -97,26 +103,29 @@ class Dashboard(object):
         'views_last_day': 'viewsLastDay',
         'views_last_week': 'viewsLastWeek',
         'views_last_month': 'viewsLastMonth',
+        'acl': 'acl',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted',
-        'system_owned': 'systemOwned',
         'num_charts': 'numCharts',
         'favorite': 'favorite',
-        'num_favorites': 'numFavorites'
+        'num_favorites': 'numFavorites',
+        'orphan': 'orphan'
     }
 
-    def __init__(self, hidden=None, name=None, id=None, parameters=None, description=None, tags=None, customer=None, url=None, creator_id=None, updater_id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, system_owned=None, num_charts=None, favorite=None, num_favorites=None):  # noqa: E501
+    def __init__(self, can_user_modify=None, hidden=None, description=None, name=None, id=None, parameters=None, tags=None, customer=None, url=None, system_owned=None, creator_id=None, updater_id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, acl=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, num_charts=None, favorite=None, num_favorites=None, orphan=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
 
+        self._can_user_modify = None
         self._hidden = None
+        self._description = None
         self._name = None
         self._id = None
         self._parameters = None
-        self._description = None
         self._tags = None
         self._customer = None
         self._url = None
+        self._system_owned = None
         self._creator_id = None
         self._updater_id = None
         self._event_filter_type = None
@@ -135,28 +144,33 @@ def __init__(self, hidden=None, name=None, id=None, parameters=None, description
         self._views_last_day = None
         self._views_last_week = None
         self._views_last_month = None
+        self._acl = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._deleted = None
-        self._system_owned = None
         self._num_charts = None
         self._favorite = None
         self._num_favorites = None
+        self._orphan = None
         self.discriminator = None
 
+        if can_user_modify is not None:
+            self.can_user_modify = can_user_modify
         if hidden is not None:
             self.hidden = hidden
+        if description is not None:
+            self.description = description
         self.name = name
         self.id = id
         if parameters is not None:
             self.parameters = parameters
-        if description is not None:
-            self.description = description
         if tags is not None:
             self.tags = tags
         if customer is not None:
             self.customer = customer
         self.url = url
+        if system_owned is not None:
+            self.system_owned = system_owned
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
@@ -192,20 +206,43 @@ def __init__(self, hidden=None, name=None, id=None, parameters=None, description
             self.views_last_week = views_last_week
         if views_last_month is not None:
             self.views_last_month = views_last_month
+        if acl is not None:
+            self.acl = acl
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if deleted is not None:
             self.deleted = deleted
-        if system_owned is not None:
-            self.system_owned = system_owned
         if num_charts is not None:
             self.num_charts = num_charts
         if favorite is not None:
             self.favorite = favorite
         if num_favorites is not None:
             self.num_favorites = num_favorites
+        if orphan is not None:
+            self.orphan = orphan
+
+    @property
+    def can_user_modify(self):
+        """Gets the can_user_modify of this Dashboard.  # noqa: E501
+
+
+        :return: The can_user_modify of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._can_user_modify
+
+    @can_user_modify.setter
+    def can_user_modify(self, can_user_modify):
+        """Sets the can_user_modify of this Dashboard.
+
+
+        :param can_user_modify: The can_user_modify of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._can_user_modify = can_user_modify
 
     @property
     def hidden(self):
@@ -228,6 +265,29 @@ def hidden(self, hidden):
 
         self._hidden = hidden
 
+    @property
+    def description(self):
+        """Gets the description of this Dashboard.  # noqa: E501
+
+        Human-readable description of the dashboard  # noqa: E501
+
+        :return: The description of this Dashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Dashboard.
+
+        Human-readable description of the dashboard  # noqa: E501
+
+        :param description: The description of this Dashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def name(self):
         """Gets the name of this Dashboard.  # noqa: E501
@@ -301,29 +361,6 @@ def parameters(self, parameters):
 
         self._parameters = parameters
 
-    @property
-    def description(self):
-        """Gets the description of this Dashboard.  # noqa: E501
-
-        Human-readable description of the dashboard  # noqa: E501
-
-        :return: The description of this Dashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Dashboard.
-
-        Human-readable description of the dashboard  # noqa: E501
-
-        :param description: The description of this Dashboard.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
     @property
     def tags(self):
         """Gets the tags of this Dashboard.  # noqa: E501
@@ -393,6 +430,29 @@ def url(self, url):
 
         self._url = url
 
+    @property
+    def system_owned(self):
+        """Gets the system_owned of this Dashboard.  # noqa: E501
+
+        Whether this dashboard is system-owned and not writeable  # noqa: E501
+
+        :return: The system_owned of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._system_owned
+
+    @system_owned.setter
+    def system_owned(self, system_owned):
+        """Sets the system_owned of this Dashboard.
+
+        Whether this dashboard is system-owned and not writeable  # noqa: E501
+
+        :param system_owned: The system_owned of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._system_owned = system_owned
+
     @property
     def creator_id(self):
         """Gets the creator_id of this Dashboard.  # noqa: E501
@@ -805,6 +865,27 @@ def views_last_month(self, views_last_month):
 
         self._views_last_month = views_last_month
 
+    @property
+    def acl(self):
+        """Gets the acl of this Dashboard.  # noqa: E501
+
+
+        :return: The acl of this Dashboard.  # noqa: E501
+        :rtype: AccessControlListSimple
+        """
+        return self._acl
+
+    @acl.setter
+    def acl(self, acl):
+        """Sets the acl of this Dashboard.
+
+
+        :param acl: The acl of this Dashboard.  # noqa: E501
+        :type: AccessControlListSimple
+        """
+
+        self._acl = acl
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this Dashboard.  # noqa: E501
@@ -868,29 +949,6 @@ def deleted(self, deleted):
 
         self._deleted = deleted
 
-    @property
-    def system_owned(self):
-        """Gets the system_owned of this Dashboard.  # noqa: E501
-
-        Whether this dashboard is system-owned and not writeable  # noqa: E501
-
-        :return: The system_owned of this Dashboard.  # noqa: E501
-        :rtype: bool
-        """
-        return self._system_owned
-
-    @system_owned.setter
-    def system_owned(self, system_owned):
-        """Sets the system_owned of this Dashboard.
-
-        Whether this dashboard is system-owned and not writeable  # noqa: E501
-
-        :param system_owned: The system_owned of this Dashboard.  # noqa: E501
-        :type: bool
-        """
-
-        self._system_owned = system_owned
-
     @property
     def num_charts(self):
         """Gets the num_charts of this Dashboard.  # noqa: E501
@@ -954,6 +1012,27 @@ def num_favorites(self, num_favorites):
 
         self._num_favorites = num_favorites
 
+    @property
+    def orphan(self):
+        """Gets the orphan of this Dashboard.  # noqa: E501
+
+
+        :return: The orphan of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._orphan
+
+    @orphan.setter
+    def orphan(self, orphan):
+        """Sets the orphan of this Dashboard.
+
+
+        :param orphan: The orphan of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._orphan = orphan
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -975,6 +1054,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Dashboard, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index 6777002..d3f65cd 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,8 +32,8 @@ class DashboardParameterValue(object):
     """
     swagger_types = {
         'label': 'str',
-        'default_value': 'str',
         'description': 'str',
+        'default_value': 'str',
         'parameter_type': 'str',
         'values_to_readable_strings': 'dict(str, str)',
         'dynamic_field_type': 'str',
@@ -41,14 +41,14 @@ class DashboardParameterValue(object):
         'hide_from_view': 'bool',
         'tag_key': 'str',
         'multivalue': 'bool',
-        'allow_all': 'bool',
-        'reverse_dyn_sort': 'bool'
+        'reverse_dyn_sort': 'bool',
+        'allow_all': 'bool'
     }
 
     attribute_map = {
         'label': 'label',
-        'default_value': 'defaultValue',
         'description': 'description',
+        'default_value': 'defaultValue',
         'parameter_type': 'parameterType',
         'values_to_readable_strings': 'valuesToReadableStrings',
         'dynamic_field_type': 'dynamicFieldType',
@@ -56,16 +56,16 @@ class DashboardParameterValue(object):
         'hide_from_view': 'hideFromView',
         'tag_key': 'tagKey',
         'multivalue': 'multivalue',
-        'allow_all': 'allowAll',
-        'reverse_dyn_sort': 'reverseDynSort'
+        'reverse_dyn_sort': 'reverseDynSort',
+        'allow_all': 'allowAll'
     }
 
-    def __init__(self, label=None, default_value=None, description=None, parameter_type=None, values_to_readable_strings=None, dynamic_field_type=None, query_value=None, hide_from_view=None, tag_key=None, multivalue=None, allow_all=None, reverse_dyn_sort=None):  # noqa: E501
+    def __init__(self, label=None, description=None, default_value=None, parameter_type=None, values_to_readable_strings=None, dynamic_field_type=None, query_value=None, hide_from_view=None, tag_key=None, multivalue=None, reverse_dyn_sort=None, allow_all=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
 
         self._label = None
-        self._default_value = None
         self._description = None
+        self._default_value = None
         self._parameter_type = None
         self._values_to_readable_strings = None
         self._dynamic_field_type = None
@@ -73,16 +73,16 @@ def __init__(self, label=None, default_value=None, description=None, parameter_t
         self._hide_from_view = None
         self._tag_key = None
         self._multivalue = None
-        self._allow_all = None
         self._reverse_dyn_sort = None
+        self._allow_all = None
         self.discriminator = None
 
         if label is not None:
             self.label = label
-        if default_value is not None:
-            self.default_value = default_value
         if description is not None:
             self.description = description
+        if default_value is not None:
+            self.default_value = default_value
         if parameter_type is not None:
             self.parameter_type = parameter_type
         if values_to_readable_strings is not None:
@@ -97,10 +97,10 @@ def __init__(self, label=None, default_value=None, description=None, parameter_t
             self.tag_key = tag_key
         if multivalue is not None:
             self.multivalue = multivalue
-        if allow_all is not None:
-            self.allow_all = allow_all
         if reverse_dyn_sort is not None:
             self.reverse_dyn_sort = reverse_dyn_sort
+        if allow_all is not None:
+            self.allow_all = allow_all
 
     @property
     def label(self):
@@ -124,46 +124,46 @@ def label(self, label):
         self._label = label
 
     @property
-    def default_value(self):
-        """Gets the default_value of this DashboardParameterValue.  # noqa: E501
+    def description(self):
+        """Gets the description of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The default_value of this DashboardParameterValue.  # noqa: E501
+        :return: The description of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._default_value
+        return self._description
 
-    @default_value.setter
-    def default_value(self, default_value):
-        """Sets the default_value of this DashboardParameterValue.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DashboardParameterValue.
 
 
-        :param default_value: The default_value of this DashboardParameterValue.  # noqa: E501
+        :param description: The description of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._default_value = default_value
+        self._description = description
 
     @property
-    def description(self):
-        """Gets the description of this DashboardParameterValue.  # noqa: E501
+    def default_value(self):
+        """Gets the default_value of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The description of this DashboardParameterValue.  # noqa: E501
+        :return: The default_value of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._default_value
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this DashboardParameterValue.
+    @default_value.setter
+    def default_value(self, default_value):
+        """Sets the default_value of this DashboardParameterValue.
 
 
-        :param description: The description of this DashboardParameterValue.  # noqa: E501
+        :param default_value: The default_value of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._description = description
+        self._default_value = default_value
 
     @property
     def parameter_type(self):
@@ -325,48 +325,48 @@ def multivalue(self, multivalue):
         self._multivalue = multivalue
 
     @property
-    def allow_all(self):
-        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
+    def reverse_dyn_sort(self):
+        """Gets the reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
 
+        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :return: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
         :rtype: bool
         """
-        return self._allow_all
+        return self._reverse_dyn_sort
 
-    @allow_all.setter
-    def allow_all(self, allow_all):
-        """Sets the allow_all of this DashboardParameterValue.
+    @reverse_dyn_sort.setter
+    def reverse_dyn_sort(self, reverse_dyn_sort):
+        """Sets the reverse_dyn_sort of this DashboardParameterValue.
 
+        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :param reverse_dyn_sort: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
         :type: bool
         """
 
-        self._allow_all = allow_all
+        self._reverse_dyn_sort = reverse_dyn_sort
 
     @property
-    def reverse_dyn_sort(self):
-        """Gets the reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
+    def allow_all(self):
+        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
 
-        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :return: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
+        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
         :rtype: bool
         """
-        return self._reverse_dyn_sort
+        return self._allow_all
 
-    @reverse_dyn_sort.setter
-    def reverse_dyn_sort(self, reverse_dyn_sort):
-        """Sets the reverse_dyn_sort of this DashboardParameterValue.
+    @allow_all.setter
+    def allow_all(self, allow_all):
+        """Sets the allow_all of this DashboardParameterValue.
 
-        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :param reverse_dyn_sort: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
+        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
         :type: bool
         """
 
-        self._reverse_dyn_sort = reverse_dyn_sort
+        self._allow_all = allow_all
 
     def to_dict(self):
         """Returns the model properties as a dict"""
@@ -389,6 +389,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(DashboardParameterValue, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index e7de9ab..f3fe571 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -123,6 +123,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(DashboardSection, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index f53cae1..ae5d0aa 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -122,6 +122,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(DashboardSectionRow, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 2501ec0..0079d03 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -34,31 +34,31 @@ class DerivedMetricDefinition(object):
     """
     swagger_types = {
         'created': 'int',
-        'minutes': 'int',
         'name': 'str',
         'id': 'str',
         'query': 'str',
+        'minutes': 'int',
         'tags': 'WFTags',
         'status': 'list[str]',
         'updated': 'int',
+        'include_obsolete_metrics': 'bool',
         'process_rate_minutes': 'int',
         'last_processed_millis': 'int',
         'update_user_id': 'str',
-        'include_obsolete_metrics': 'bool',
+        'additional_information': 'str',
         'last_query_time': 'int',
         'in_trash': 'bool',
         'query_failing': 'bool',
         'create_user_id': 'str',
-        'additional_information': 'str',
-        'creator_id': 'str',
-        'updater_id': 'str',
         'last_failed_time': 'int',
-        'last_error_message': 'str',
+        'points_scanned_at_last_query': 'int',
         'metrics_used': 'list[str]',
         'hosts_used': 'list[str]',
-        'points_scanned_at_last_query': 'int',
+        'creator_id': 'str',
+        'updater_id': 'str',
         'query_qb_enabled': 'bool',
         'query_qb_serialization': 'str',
+        'last_error_message': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'deleted': 'bool'
@@ -66,65 +66,65 @@ class DerivedMetricDefinition(object):
 
     attribute_map = {
         'created': 'created',
-        'minutes': 'minutes',
         'name': 'name',
         'id': 'id',
         'query': 'query',
+        'minutes': 'minutes',
         'tags': 'tags',
         'status': 'status',
         'updated': 'updated',
+        'include_obsolete_metrics': 'includeObsoleteMetrics',
         'process_rate_minutes': 'processRateMinutes',
         'last_processed_millis': 'lastProcessedMillis',
         'update_user_id': 'updateUserId',
-        'include_obsolete_metrics': 'includeObsoleteMetrics',
+        'additional_information': 'additionalInformation',
         'last_query_time': 'lastQueryTime',
         'in_trash': 'inTrash',
         'query_failing': 'queryFailing',
         'create_user_id': 'createUserId',
-        'additional_information': 'additionalInformation',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
         'last_failed_time': 'lastFailedTime',
-        'last_error_message': 'lastErrorMessage',
+        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
         'metrics_used': 'metricsUsed',
         'hosts_used': 'hostsUsed',
-        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
+        'creator_id': 'creatorId',
+        'updater_id': 'updaterId',
         'query_qb_enabled': 'queryQBEnabled',
         'query_qb_serialization': 'queryQBSerialization',
+        'last_error_message': 'lastErrorMessage',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted'
     }
 
-    def __init__(self, created=None, minutes=None, name=None, id=None, query=None, tags=None, status=None, updated=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, include_obsolete_metrics=None, last_query_time=None, in_trash=None, query_failing=None, create_user_id=None, additional_information=None, creator_id=None, updater_id=None, last_failed_time=None, last_error_message=None, metrics_used=None, hosts_used=None, points_scanned_at_last_query=None, query_qb_enabled=None, query_qb_serialization=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+    def __init__(self, created=None, name=None, id=None, query=None, minutes=None, tags=None, status=None, updated=None, include_obsolete_metrics=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, additional_information=None, last_query_time=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, points_scanned_at_last_query=None, metrics_used=None, hosts_used=None, creator_id=None, updater_id=None, query_qb_enabled=None, query_qb_serialization=None, last_error_message=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
         """DerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
         self._created = None
-        self._minutes = None
         self._name = None
         self._id = None
         self._query = None
+        self._minutes = None
         self._tags = None
         self._status = None
         self._updated = None
+        self._include_obsolete_metrics = None
         self._process_rate_minutes = None
         self._last_processed_millis = None
         self._update_user_id = None
-        self._include_obsolete_metrics = None
+        self._additional_information = None
         self._last_query_time = None
         self._in_trash = None
         self._query_failing = None
         self._create_user_id = None
-        self._additional_information = None
-        self._creator_id = None
-        self._updater_id = None
         self._last_failed_time = None
-        self._last_error_message = None
+        self._points_scanned_at_last_query = None
         self._metrics_used = None
         self._hosts_used = None
-        self._points_scanned_at_last_query = None
+        self._creator_id = None
+        self._updater_id = None
         self._query_qb_enabled = None
         self._query_qb_serialization = None
+        self._last_error_message = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._deleted = None
@@ -132,25 +132,27 @@ def __init__(self, created=None, minutes=None, name=None, id=None, query=None, t
 
         if created is not None:
             self.created = created
-        self.minutes = minutes
         self.name = name
         if id is not None:
             self.id = id
         self.query = query
+        self.minutes = minutes
         if tags is not None:
             self.tags = tags
         if status is not None:
             self.status = status
         if updated is not None:
             self.updated = updated
+        if include_obsolete_metrics is not None:
+            self.include_obsolete_metrics = include_obsolete_metrics
         if process_rate_minutes is not None:
             self.process_rate_minutes = process_rate_minutes
         if last_processed_millis is not None:
             self.last_processed_millis = last_processed_millis
         if update_user_id is not None:
             self.update_user_id = update_user_id
-        if include_obsolete_metrics is not None:
-            self.include_obsolete_metrics = include_obsolete_metrics
+        if additional_information is not None:
+            self.additional_information = additional_information
         if last_query_time is not None:
             self.last_query_time = last_query_time
         if in_trash is not None:
@@ -159,26 +161,24 @@ def __init__(self, created=None, minutes=None, name=None, id=None, query=None, t
             self.query_failing = query_failing
         if create_user_id is not None:
             self.create_user_id = create_user_id
-        if additional_information is not None:
-            self.additional_information = additional_information
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
         if last_failed_time is not None:
             self.last_failed_time = last_failed_time
-        if last_error_message is not None:
-            self.last_error_message = last_error_message
+        if points_scanned_at_last_query is not None:
+            self.points_scanned_at_last_query = points_scanned_at_last_query
         if metrics_used is not None:
             self.metrics_used = metrics_used
         if hosts_used is not None:
             self.hosts_used = hosts_used
-        if points_scanned_at_last_query is not None:
-            self.points_scanned_at_last_query = points_scanned_at_last_query
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if updater_id is not None:
+            self.updater_id = updater_id
         if query_qb_enabled is not None:
             self.query_qb_enabled = query_qb_enabled
         if query_qb_serialization is not None:
             self.query_qb_serialization = query_qb_serialization
+        if last_error_message is not None:
+            self.last_error_message = last_error_message
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
@@ -209,31 +209,6 @@ def created(self, created):
 
         self._created = created
 
-    @property
-    def minutes(self):
-        """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
-
-        How frequently the query generating the derived metric is run  # noqa: E501
-
-        :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._minutes
-
-    @minutes.setter
-    def minutes(self, minutes):
-        """Sets the minutes of this DerivedMetricDefinition.
-
-        How frequently the query generating the derived metric is run  # noqa: E501
-
-        :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-        if minutes is None:
-            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
-
-        self._minutes = minutes
-
     @property
     def name(self):
         """Gets the name of this DerivedMetricDefinition.  # noqa: E501
@@ -303,6 +278,31 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def minutes(self):
+        """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
+
+        How frequently the query generating the derived metric is run  # noqa: E501
+
+        :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._minutes
+
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this DerivedMetricDefinition.
+
+        How frequently the query generating the derived metric is run  # noqa: E501
+
+        :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+        if minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
+
+        self._minutes = minutes
+
     @property
     def tags(self):
         """Gets the tags of this DerivedMetricDefinition.  # noqa: E501
@@ -370,6 +370,29 @@ def updated(self, updated):
 
         self._updated = updated
 
+    @property
+    def include_obsolete_metrics(self):
+        """Gets the include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+
+        Whether to include obsolete metrics in query  # noqa: E501
+
+        :return: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
+        """
+        return self._include_obsolete_metrics
+
+    @include_obsolete_metrics.setter
+    def include_obsolete_metrics(self, include_obsolete_metrics):
+        """Sets the include_obsolete_metrics of this DerivedMetricDefinition.
+
+        Whether to include obsolete metrics in query  # noqa: E501
+
+        :param include_obsolete_metrics: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
+        """
+
+        self._include_obsolete_metrics = include_obsolete_metrics
+
     @property
     def process_rate_minutes(self):
         """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
@@ -440,27 +463,27 @@ def update_user_id(self, update_user_id):
         self._update_user_id = update_user_id
 
     @property
-    def include_obsolete_metrics(self):
-        """Gets the include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+    def additional_information(self):
+        """Gets the additional_information of this DerivedMetricDefinition.  # noqa: E501
 
-        Whether to include obsolete metrics in query  # noqa: E501
+        User-supplied additional explanatory information for the derived metric  # noqa: E501
 
-        :return: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
+        :return: The additional_information of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._include_obsolete_metrics
+        return self._additional_information
 
-    @include_obsolete_metrics.setter
-    def include_obsolete_metrics(self, include_obsolete_metrics):
-        """Sets the include_obsolete_metrics of this DerivedMetricDefinition.
+    @additional_information.setter
+    def additional_information(self, additional_information):
+        """Sets the additional_information of this DerivedMetricDefinition.
 
-        Whether to include obsolete metrics in query  # noqa: E501
+        User-supplied additional explanatory information for the derived metric  # noqa: E501
 
-        :param include_obsolete_metrics: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
+        :param additional_information: The additional_information of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
 
-        self._include_obsolete_metrics = include_obsolete_metrics
+        self._additional_information = additional_information
 
     @property
     def last_query_time(self):
@@ -550,71 +573,6 @@ def create_user_id(self, create_user_id):
 
         self._create_user_id = create_user_id
 
-    @property
-    def additional_information(self):
-        """Gets the additional_information of this DerivedMetricDefinition.  # noqa: E501
-
-        User-supplied additional explanatory information for the derived metric  # noqa: E501
-
-        :return: The additional_information of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._additional_information
-
-    @additional_information.setter
-    def additional_information(self, additional_information):
-        """Sets the additional_information of this DerivedMetricDefinition.
-
-        User-supplied additional explanatory information for the derived metric  # noqa: E501
-
-        :param additional_information: The additional_information of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._additional_information = additional_information
-
-    @property
-    def creator_id(self):
-        """Gets the creator_id of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The creator_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._creator_id
-
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this DerivedMetricDefinition.
-
-
-        :param creator_id: The creator_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._creator_id = creator_id
-
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The updater_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this DerivedMetricDefinition.
-
-
-        :param updater_id: The updater_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
     @property
     def last_failed_time(self):
         """Gets the last_failed_time of this DerivedMetricDefinition.  # noqa: E501
@@ -639,27 +597,27 @@ def last_failed_time(self, last_failed_time):
         self._last_failed_time = last_failed_time
 
     @property
-    def last_error_message(self):
-        """Gets the last_error_message of this DerivedMetricDefinition.  # noqa: E501
+    def points_scanned_at_last_query(self):
+        """Gets the points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
 
-        The last error encountered when running the query  # noqa: E501
+        A derived field recording the number of data points scanned when the system last computed the query  # noqa: E501
 
-        :return: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
+        :return: The points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
         """
-        return self._last_error_message
+        return self._points_scanned_at_last_query
 
-    @last_error_message.setter
-    def last_error_message(self, last_error_message):
-        """Sets the last_error_message of this DerivedMetricDefinition.
+    @points_scanned_at_last_query.setter
+    def points_scanned_at_last_query(self, points_scanned_at_last_query):
+        """Sets the points_scanned_at_last_query of this DerivedMetricDefinition.
 
-        The last error encountered when running the query  # noqa: E501
+        A derived field recording the number of data points scanned when the system last computed the query  # noqa: E501
 
-        :param last_error_message: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
+        :param points_scanned_at_last_query: The points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
         """
 
-        self._last_error_message = last_error_message
+        self._points_scanned_at_last_query = points_scanned_at_last_query
 
     @property
     def metrics_used(self):
@@ -708,27 +666,46 @@ def hosts_used(self, hosts_used):
         self._hosts_used = hosts_used
 
     @property
-    def points_scanned_at_last_query(self):
-        """Gets the points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this DerivedMetricDefinition.  # noqa: E501
 
-        A derived field recording the number of data points scanned when the system last computed the query  # noqa: E501
 
-        :return: The points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._points_scanned_at_last_query
+        return self._creator_id
 
-    @points_scanned_at_last_query.setter
-    def points_scanned_at_last_query(self, points_scanned_at_last_query):
-        """Sets the points_scanned_at_last_query of this DerivedMetricDefinition.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this DerivedMetricDefinition.
 
-        A derived field recording the number of data points scanned when the system last computed the query  # noqa: E501
 
-        :param points_scanned_at_last_query: The points_scanned_at_last_query of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
 
-        self._points_scanned_at_last_query = points_scanned_at_last_query
+        self._creator_id = creator_id
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The updater_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this DerivedMetricDefinition.
+
+
+        :param updater_id: The updater_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
 
     @property
     def query_qb_enabled(self):
@@ -776,6 +753,29 @@ def query_qb_serialization(self, query_qb_serialization):
 
         self._query_qb_serialization = query_qb_serialization
 
+    @property
+    def last_error_message(self):
+        """Gets the last_error_message of this DerivedMetricDefinition.  # noqa: E501
+
+        The last error encountered when running the query  # noqa: E501
+
+        :return: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_error_message
+
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this DerivedMetricDefinition.
+
+        The last error encountered when running the query  # noqa: E501
+
+        :param last_error_message: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+
+        self._last_error_message = last_error_message
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
@@ -860,6 +860,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(DerivedMetricDefinition, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 78b0e24..9fbc93a 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,47 +33,26 @@ class EC2Configuration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'base_credentials': 'AWSBaseCredentials',
-        'host_name_tags': 'list[str]'
+        'host_name_tags': 'list[str]',
+        'base_credentials': 'AWSBaseCredentials'
     }
 
     attribute_map = {
-        'base_credentials': 'baseCredentials',
-        'host_name_tags': 'hostNameTags'
+        'host_name_tags': 'hostNameTags',
+        'base_credentials': 'baseCredentials'
     }
 
-    def __init__(self, base_credentials=None, host_name_tags=None):  # noqa: E501
+    def __init__(self, host_name_tags=None, base_credentials=None):  # noqa: E501
         """EC2Configuration - a model defined in Swagger"""  # noqa: E501
 
-        self._base_credentials = None
         self._host_name_tags = None
+        self._base_credentials = None
         self.discriminator = None
 
-        if base_credentials is not None:
-            self.base_credentials = base_credentials
         if host_name_tags is not None:
             self.host_name_tags = host_name_tags
-
-    @property
-    def base_credentials(self):
-        """Gets the base_credentials of this EC2Configuration.  # noqa: E501
-
-
-        :return: The base_credentials of this EC2Configuration.  # noqa: E501
-        :rtype: AWSBaseCredentials
-        """
-        return self._base_credentials
-
-    @base_credentials.setter
-    def base_credentials(self, base_credentials):
-        """Sets the base_credentials of this EC2Configuration.
-
-
-        :param base_credentials: The base_credentials of this EC2Configuration.  # noqa: E501
-        :type: AWSBaseCredentials
-        """
-
-        self._base_credentials = base_credentials
+        if base_credentials is not None:
+            self.base_credentials = base_credentials
 
     @property
     def host_name_tags(self):
@@ -98,6 +77,27 @@ def host_name_tags(self, host_name_tags):
 
         self._host_name_tags = host_name_tags
 
+    @property
+    def base_credentials(self):
+        """Gets the base_credentials of this EC2Configuration.  # noqa: E501
+
+
+        :return: The base_credentials of this EC2Configuration.  # noqa: E501
+        :rtype: AWSBaseCredentials
+        """
+        return self._base_credentials
+
+    @base_credentials.setter
+    def base_credentials(self, base_credentials):
+        """Sets the base_credentials of this EC2Configuration.
+
+
+        :param base_credentials: The base_credentials of this EC2Configuration.  # noqa: E501
+        :type: AWSBaseCredentials
+        """
+
+        self._base_credentials = base_credentials
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(EC2Configuration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 041425d..e0cbac8 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,117 +32,117 @@ class Event(object):
     """
     swagger_types = {
         'start_time': 'int',
+        'table': 'str',
         'end_time': 'int',
         'name': 'str',
         'annotations': 'dict(str, str)',
         'id': 'str',
-        'table': 'str',
         'tags': 'list[str]',
         'created_at': 'int',
         'is_user_event': 'bool',
+        'updated_at': 'int',
+        'hosts': 'list[str]',
         'is_ephemeral': 'bool',
         'creator_id': 'str',
-        'hosts': 'list[str]',
-        'summarized_events': 'int',
         'updater_id': 'str',
-        'updated_at': 'int',
+        'summarized_events': 'int',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'running_state': 'str',
         'can_delete': 'bool',
         'can_close': 'bool',
-        'creator_type': 'list[str]'
+        'creator_type': 'list[str]',
+        'running_state': 'str'
     }
 
     attribute_map = {
         'start_time': 'startTime',
+        'table': 'table',
         'end_time': 'endTime',
         'name': 'name',
         'annotations': 'annotations',
         'id': 'id',
-        'table': 'table',
         'tags': 'tags',
         'created_at': 'createdAt',
         'is_user_event': 'isUserEvent',
+        'updated_at': 'updatedAt',
+        'hosts': 'hosts',
         'is_ephemeral': 'isEphemeral',
         'creator_id': 'creatorId',
-        'hosts': 'hosts',
-        'summarized_events': 'summarizedEvents',
         'updater_id': 'updaterId',
-        'updated_at': 'updatedAt',
+        'summarized_events': 'summarizedEvents',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'running_state': 'runningState',
         'can_delete': 'canDelete',
         'can_close': 'canClose',
-        'creator_type': 'creatorType'
+        'creator_type': 'creatorType',
+        'running_state': 'runningState'
     }
 
-    def __init__(self, start_time=None, end_time=None, name=None, annotations=None, id=None, table=None, tags=None, created_at=None, is_user_event=None, is_ephemeral=None, creator_id=None, hosts=None, summarized_events=None, updater_id=None, updated_at=None, created_epoch_millis=None, updated_epoch_millis=None, running_state=None, can_delete=None, can_close=None, creator_type=None):  # noqa: E501
+    def __init__(self, start_time=None, table=None, end_time=None, name=None, annotations=None, id=None, tags=None, created_at=None, is_user_event=None, updated_at=None, hosts=None, is_ephemeral=None, creator_id=None, updater_id=None, summarized_events=None, created_epoch_millis=None, updated_epoch_millis=None, can_delete=None, can_close=None, creator_type=None, running_state=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
         self._start_time = None
+        self._table = None
         self._end_time = None
         self._name = None
         self._annotations = None
         self._id = None
-        self._table = None
         self._tags = None
         self._created_at = None
         self._is_user_event = None
+        self._updated_at = None
+        self._hosts = None
         self._is_ephemeral = None
         self._creator_id = None
-        self._hosts = None
-        self._summarized_events = None
         self._updater_id = None
-        self._updated_at = None
+        self._summarized_events = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._running_state = None
         self._can_delete = None
         self._can_close = None
         self._creator_type = None
+        self._running_state = None
         self.discriminator = None
 
         self.start_time = start_time
+        if table is not None:
+            self.table = table
         if end_time is not None:
             self.end_time = end_time
         self.name = name
         self.annotations = annotations
         if id is not None:
             self.id = id
-        if table is not None:
-            self.table = table
         if tags is not None:
             self.tags = tags
         if created_at is not None:
             self.created_at = created_at
         if is_user_event is not None:
             self.is_user_event = is_user_event
+        if updated_at is not None:
+            self.updated_at = updated_at
+        if hosts is not None:
+            self.hosts = hosts
         if is_ephemeral is not None:
             self.is_ephemeral = is_ephemeral
         if creator_id is not None:
             self.creator_id = creator_id
-        if hosts is not None:
-            self.hosts = hosts
-        if summarized_events is not None:
-            self.summarized_events = summarized_events
         if updater_id is not None:
             self.updater_id = updater_id
-        if updated_at is not None:
-            self.updated_at = updated_at
+        if summarized_events is not None:
+            self.summarized_events = summarized_events
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if running_state is not None:
-            self.running_state = running_state
         if can_delete is not None:
             self.can_delete = can_delete
         if can_close is not None:
             self.can_close = can_close
         if creator_type is not None:
             self.creator_type = creator_type
+        if running_state is not None:
+            self.running_state = running_state
 
     @property
     def start_time(self):
@@ -169,6 +169,29 @@ def start_time(self, start_time):
 
         self._start_time = start_time
 
+    @property
+    def table(self):
+        """Gets the table of this Event.  # noqa: E501
+
+        The customer to which the event belongs  # noqa: E501
+
+        :return: The table of this Event.  # noqa: E501
+        :rtype: str
+        """
+        return self._table
+
+    @table.setter
+    def table(self, table):
+        """Sets the table of this Event.
+
+        The customer to which the event belongs  # noqa: E501
+
+        :param table: The table of this Event.  # noqa: E501
+        :type: str
+        """
+
+        self._table = table
+
     @property
     def end_time(self):
         """Gets the end_time of this Event.  # noqa: E501
@@ -263,29 +286,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def table(self):
-        """Gets the table of this Event.  # noqa: E501
-
-        The customer to which the event belongs  # noqa: E501
-
-        :return: The table of this Event.  # noqa: E501
-        :rtype: str
-        """
-        return self._table
-
-    @table.setter
-    def table(self, table):
-        """Sets the table of this Event.
-
-        The customer to which the event belongs  # noqa: E501
-
-        :param table: The table of this Event.  # noqa: E501
-        :type: str
-        """
-
-        self._table = table
-
     @property
     def tags(self):
         """Gets the tags of this Event.  # noqa: E501
@@ -353,6 +353,50 @@ def is_user_event(self, is_user_event):
 
         self._is_user_event = is_user_event
 
+    @property
+    def updated_at(self):
+        """Gets the updated_at of this Event.  # noqa: E501
+
+
+        :return: The updated_at of this Event.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_at
+
+    @updated_at.setter
+    def updated_at(self, updated_at):
+        """Sets the updated_at of this Event.
+
+
+        :param updated_at: The updated_at of this Event.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_at = updated_at
+
+    @property
+    def hosts(self):
+        """Gets the hosts of this Event.  # noqa: E501
+
+        A list of sources/hosts affected by the event  # noqa: E501
+
+        :return: The hosts of this Event.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._hosts
+
+    @hosts.setter
+    def hosts(self, hosts):
+        """Sets the hosts of this Event.
+
+        A list of sources/hosts affected by the event  # noqa: E501
+
+        :param hosts: The hosts of this Event.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._hosts = hosts
+
     @property
     def is_ephemeral(self):
         """Gets the is_ephemeral of this Event.  # noqa: E501
@@ -397,52 +441,6 @@ def creator_id(self, creator_id):
 
         self._creator_id = creator_id
 
-    @property
-    def hosts(self):
-        """Gets the hosts of this Event.  # noqa: E501
-
-        A list of sources/hosts affected by the event  # noqa: E501
-
-        :return: The hosts of this Event.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._hosts
-
-    @hosts.setter
-    def hosts(self, hosts):
-        """Sets the hosts of this Event.
-
-        A list of sources/hosts affected by the event  # noqa: E501
-
-        :param hosts: The hosts of this Event.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._hosts = hosts
-
-    @property
-    def summarized_events(self):
-        """Gets the summarized_events of this Event.  # noqa: E501
-
-        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
-
-        :return: The summarized_events of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._summarized_events
-
-    @summarized_events.setter
-    def summarized_events(self, summarized_events):
-        """Sets the summarized_events of this Event.
-
-        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
-
-        :param summarized_events: The summarized_events of this Event.  # noqa: E501
-        :type: int
-        """
-
-        self._summarized_events = summarized_events
-
     @property
     def updater_id(self):
         """Gets the updater_id of this Event.  # noqa: E501
@@ -465,25 +463,27 @@ def updater_id(self, updater_id):
         self._updater_id = updater_id
 
     @property
-    def updated_at(self):
-        """Gets the updated_at of this Event.  # noqa: E501
+    def summarized_events(self):
+        """Gets the summarized_events of this Event.  # noqa: E501
 
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
-        :return: The updated_at of this Event.  # noqa: E501
+        :return: The summarized_events of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._updated_at
+        return self._summarized_events
 
-    @updated_at.setter
-    def updated_at(self, updated_at):
-        """Sets the updated_at of this Event.
+    @summarized_events.setter
+    def summarized_events(self, summarized_events):
+        """Sets the summarized_events of this Event.
 
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
-        :param updated_at: The updated_at of this Event.  # noqa: E501
+        :param summarized_events: The summarized_events of this Event.  # noqa: E501
         :type: int
         """
 
-        self._updated_at = updated_at
+        self._summarized_events = summarized_events
 
     @property
     def created_epoch_millis(self):
@@ -527,33 +527,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def running_state(self):
-        """Gets the running_state of this Event.  # noqa: E501
-
-
-        :return: The running_state of this Event.  # noqa: E501
-        :rtype: str
-        """
-        return self._running_state
-
-    @running_state.setter
-    def running_state(self, running_state):
-        """Sets the running_state of this Event.
-
-
-        :param running_state: The running_state of this Event.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
-            raise ValueError(
-                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
-                .format(running_state, allowed_values)
-            )
-
-        self._running_state = running_state
-
     @property
     def can_delete(self):
         """Gets the can_delete of this Event.  # noqa: E501
@@ -624,6 +597,33 @@ def creator_type(self, creator_type):
 
         self._creator_type = creator_type
 
+    @property
+    def running_state(self):
+        """Gets the running_state of this Event.  # noqa: E501
+
+
+        :return: The running_state of this Event.  # noqa: E501
+        :rtype: str
+        """
+        return self._running_state
+
+    @running_state.setter
+    def running_state(self, running_state):
+        """Sets the running_state of this Event.
+
+
+        :param running_state: The running_state of this Event.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
+        if running_state not in allowed_values:
+            raise ValueError(
+                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
+                .format(running_state, allowed_values)
+            )
+
+        self._running_state = running_state
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -645,6 +645,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Event, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index da7827f..30c28ca 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -204,6 +204,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(EventSearchRequest, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/event_time_range.py b/wavefront_api_client/models/event_time_range.py
index 820e424..24363b9 100644
--- a/wavefront_api_client/models/event_time_range.py
+++ b/wavefront_api_client/models/event_time_range.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(EventTimeRange, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index f5f8cef..023cace 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,61 +31,57 @@ class ExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'description': 'str',
         'name': 'str',
         'id': 'str',
-        'description': 'str',
         'creator_id': 'str',
         'updater_id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
         'template': 'str',
         'metric_filter_regex': 'str',
         'source_filter_regex': 'str',
-        'point_tag_filter_regexes': 'dict(str, str)'
+        'point_tag_filter_regexes': 'dict(str, str)',
+        'created_epoch_millis': 'int',
+        'updated_epoch_millis': 'int'
     }
 
     attribute_map = {
+        'description': 'description',
         'name': 'name',
         'id': 'id',
-        'description': 'description',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
         'template': 'template',
         'metric_filter_regex': 'metricFilterRegex',
         'source_filter_regex': 'sourceFilterRegex',
-        'point_tag_filter_regexes': 'pointTagFilterRegexes'
+        'point_tag_filter_regexes': 'pointTagFilterRegexes',
+        'created_epoch_millis': 'createdEpochMillis',
+        'updated_epoch_millis': 'updatedEpochMillis'
     }
 
-    def __init__(self, name=None, id=None, description=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None):  # noqa: E501
+    def __init__(self, description=None, name=None, id=None, creator_id=None, updater_id=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None, created_epoch_millis=None, updated_epoch_millis=None):  # noqa: E501
         """ExternalLink - a model defined in Swagger"""  # noqa: E501
 
+        self._description = None
         self._name = None
         self._id = None
-        self._description = None
         self._creator_id = None
         self._updater_id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
         self._template = None
         self._metric_filter_regex = None
         self._source_filter_regex = None
         self._point_tag_filter_regexes = None
+        self._created_epoch_millis = None
+        self._updated_epoch_millis = None
         self.discriminator = None
 
+        self.description = description
         self.name = name
         if id is not None:
             self.id = id
-        self.description = description
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
         self.template = template
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
@@ -93,6 +89,35 @@ def __init__(self, name=None, id=None, description=None, creator_id=None, update
             self.source_filter_regex = source_filter_regex
         if point_tag_filter_regexes is not None:
             self.point_tag_filter_regexes = point_tag_filter_regexes
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def description(self):
+        """Gets the description of this ExternalLink.  # noqa: E501
+
+        Human-readable description for this external link  # noqa: E501
+
+        :return: The description of this ExternalLink.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ExternalLink.
+
+        Human-readable description for this external link  # noqa: E501
+
+        :param description: The description of this ExternalLink.  # noqa: E501
+        :type: str
+        """
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
+
+        self._description = description
 
     @property
     def name(self):
@@ -140,31 +165,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def description(self):
-        """Gets the description of this ExternalLink.  # noqa: E501
-
-        Human-readable description for this external link  # noqa: E501
-
-        :return: The description of this ExternalLink.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this ExternalLink.
-
-        Human-readable description for this external link  # noqa: E501
-
-        :param description: The description of this ExternalLink.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
     @property
     def creator_id(self):
         """Gets the creator_id of this ExternalLink.  # noqa: E501
@@ -207,48 +207,6 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this ExternalLink.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this ExternalLink.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this ExternalLink.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this ExternalLink.  # noqa: E501
-
-
-        :return: The updated_epoch_millis of this ExternalLink.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated_epoch_millis
-
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this ExternalLink.
-
-
-        :param updated_epoch_millis: The updated_epoch_millis of this ExternalLink.  # noqa: E501
-        :type: int
-        """
-
-        self._updated_epoch_millis = updated_epoch_millis
-
     @property
     def template(self):
         """Gets the template of this ExternalLink.  # noqa: E501
@@ -343,6 +301,48 @@ def point_tag_filter_regexes(self, point_tag_filter_regexes):
 
         self._point_tag_filter_regexes = point_tag_filter_regexes
 
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this ExternalLink.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this ExternalLink.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this ExternalLink.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this ExternalLink.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this ExternalLink.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this ExternalLink.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this ExternalLink.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -364,6 +364,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ExternalLink, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index 77f0023..8214b49 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -255,6 +255,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(FacetResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 2e05656..6997297 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -211,6 +211,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(FacetSearchRequestContainer, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index 0b77d07..cc50719 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(FacetsResponseContainer, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index 563f236..96c6cae 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -212,6 +212,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(FacetsSearchRequestContainer, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index d343e5e..40b028a 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,53 +31,53 @@ class GCPBillingConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'project_id': 'str',
+        'gcp_api_key': 'str',
         'gcp_json_key': 'str',
-        'gcp_api_key': 'str'
+        'project_id': 'str'
     }
 
     attribute_map = {
-        'project_id': 'projectId',
+        'gcp_api_key': 'gcpApiKey',
         'gcp_json_key': 'gcpJsonKey',
-        'gcp_api_key': 'gcpApiKey'
+        'project_id': 'projectId'
     }
 
-    def __init__(self, project_id=None, gcp_json_key=None, gcp_api_key=None):  # noqa: E501
+    def __init__(self, gcp_api_key=None, gcp_json_key=None, project_id=None):  # noqa: E501
         """GCPBillingConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._project_id = None
-        self._gcp_json_key = None
         self._gcp_api_key = None
+        self._gcp_json_key = None
+        self._project_id = None
         self.discriminator = None
 
-        self.project_id = project_id
-        self.gcp_json_key = gcp_json_key
         self.gcp_api_key = gcp_api_key
+        self.gcp_json_key = gcp_json_key
+        self.project_id = project_id
 
     @property
-    def project_id(self):
-        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
+    def gcp_api_key(self):
+        """Gets the gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
 
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
+        API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating  # noqa: E501
 
-        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :return: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._project_id
+        return self._gcp_api_key
 
-    @project_id.setter
-    def project_id(self, project_id):
-        """Sets the project_id of this GCPBillingConfiguration.
+    @gcp_api_key.setter
+    def gcp_api_key(self, gcp_api_key):
+        """Sets the gcp_api_key of this GCPBillingConfiguration.
 
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
+        API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating  # noqa: E501
 
-        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :param gcp_api_key: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
         :type: str
         """
-        if project_id is None:
-            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
+        if gcp_api_key is None:
+            raise ValueError("Invalid value for `gcp_api_key`, must not be `None`")  # noqa: E501
 
-        self._project_id = project_id
+        self._gcp_api_key = gcp_api_key
 
     @property
     def gcp_json_key(self):
@@ -105,29 +105,29 @@ def gcp_json_key(self, gcp_json_key):
         self._gcp_json_key = gcp_json_key
 
     @property
-    def gcp_api_key(self):
-        """Gets the gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
+    def project_id(self):
+        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
 
-        API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :return: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
+        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._gcp_api_key
+        return self._project_id
 
-    @gcp_api_key.setter
-    def gcp_api_key(self, gcp_api_key):
-        """Sets the gcp_api_key of this GCPBillingConfiguration.
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPBillingConfiguration.
 
-        API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :param gcp_api_key: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
+        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
         :type: str
         """
-        if gcp_api_key is None:
-            raise ValueError("Invalid value for `gcp_api_key`, must not be `None`")  # noqa: E501
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
 
-        self._gcp_api_key = gcp_api_key
+        self._project_id = project_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
@@ -150,6 +150,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(GCPBillingConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 39c2209..ebb500b 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,34 +31,64 @@ class GCPConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'categories_to_fetch': 'list[str]',
         'metric_filter_regex': 'str',
-        'project_id': 'str',
         'gcp_json_key': 'str',
-        'categories_to_fetch': 'list[str]'
+        'project_id': 'str'
     }
 
     attribute_map = {
+        'categories_to_fetch': 'categoriesToFetch',
         'metric_filter_regex': 'metricFilterRegex',
-        'project_id': 'projectId',
         'gcp_json_key': 'gcpJsonKey',
-        'categories_to_fetch': 'categoriesToFetch'
+        'project_id': 'projectId'
     }
 
-    def __init__(self, metric_filter_regex=None, project_id=None, gcp_json_key=None, categories_to_fetch=None):  # noqa: E501
+    def __init__(self, categories_to_fetch=None, metric_filter_regex=None, gcp_json_key=None, project_id=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
 
+        self._categories_to_fetch = None
         self._metric_filter_regex = None
-        self._project_id = None
         self._gcp_json_key = None
-        self._categories_to_fetch = None
+        self._project_id = None
         self.discriminator = None
 
+        if categories_to_fetch is not None:
+            self.categories_to_fetch = categories_to_fetch
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
-        self.project_id = project_id
         self.gcp_json_key = gcp_json_key
-        if categories_to_fetch is not None:
-            self.categories_to_fetch = categories_to_fetch
+        self.project_id = project_id
+
+    @property
+    def categories_to_fetch(self):
+        """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
+
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+
+        :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._categories_to_fetch
+
+    @categories_to_fetch.setter
+    def categories_to_fetch(self, categories_to_fetch):
+        """Sets the categories_to_fetch of this GCPConfiguration.
+
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+
+        :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
+        if not set(categories_to_fetch).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._categories_to_fetch = categories_to_fetch
 
     @property
     def metric_filter_regex(self):
@@ -83,31 +113,6 @@ def metric_filter_regex(self, metric_filter_regex):
 
         self._metric_filter_regex = metric_filter_regex
 
-    @property
-    def project_id(self):
-        """Gets the project_id of this GCPConfiguration.  # noqa: E501
-
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
-
-        :return: The project_id of this GCPConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._project_id
-
-    @project_id.setter
-    def project_id(self, project_id):
-        """Sets the project_id of this GCPConfiguration.
-
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
-
-        :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
-        :type: str
-        """
-        if project_id is None:
-            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
-
-        self._project_id = project_id
-
     @property
     def gcp_json_key(self):
         """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
@@ -134,34 +139,29 @@ def gcp_json_key(self, gcp_json_key):
         self._gcp_json_key = gcp_json_key
 
     @property
-    def categories_to_fetch(self):
-        """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
+    def project_id(self):
+        """Gets the project_id of this GCPConfiguration.  # noqa: E501
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
-        :rtype: list[str]
+        :return: The project_id of this GCPConfiguration.  # noqa: E501
+        :rtype: str
         """
-        return self._categories_to_fetch
+        return self._project_id
 
-    @categories_to_fetch.setter
-    def categories_to_fetch(self, categories_to_fetch):
-        """Sets the categories_to_fetch of this GCPConfiguration.
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPConfiguration.
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
-        :type: list[str]
+        :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
+        :type: str
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
-        if not set(categories_to_fetch).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
 
-        self._categories_to_fetch = categories_to_fetch
+        self._project_id = project_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
@@ -184,6 +184,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(GCPConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index 4462dfb..bc80a5f 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -219,6 +219,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(HistoryEntry, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index 424afbe..ea413c7 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(HistoryResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/install_alerts.py b/wavefront_api_client/models/install_alerts.py
new file mode 100644
index 0000000..0b581ee
--- /dev/null
+++ b/wavefront_api_client/models/install_alerts.py
@@ -0,0 +1,115 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class InstallAlerts(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'target': 'str'
+    }
+
+    attribute_map = {
+        'target': 'target'
+    }
+
+    def __init__(self, target=None):  # noqa: E501
+        """InstallAlerts - a model defined in Swagger"""  # noqa: E501
+
+        self._target = None
+        self.discriminator = None
+
+        if target is not None:
+            self.target = target
+
+    @property
+    def target(self):
+        """Gets the target of this InstallAlerts.  # noqa: E501
+
+
+        :return: The target of this InstallAlerts.  # noqa: E501
+        :rtype: str
+        """
+        return self._target
+
+    @target.setter
+    def target(self, target):
+        """Sets the target of this InstallAlerts.
+
+
+        :param target: The target of this InstallAlerts.  # noqa: E501
+        :type: str
+        """
+
+        self._target = target
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(InstallAlerts, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, InstallAlerts):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 005dc16..4c6f8e9 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -16,6 +16,7 @@
 
 import six
 
+from wavefront_api_client.models.integration_alert import IntegrationAlert  # noqa: F401,E501
 from wavefront_api_client.models.integration_alias import IntegrationAlias  # noqa: F401,E501
 from wavefront_api_client.models.integration_dashboard import IntegrationDashboard  # noqa: F401,E501
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics  # noqa: F401,E501
@@ -36,82 +37,87 @@ class Integration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'icon': 'str',
         'version': 'str',
-        'name': 'str',
-        'id': 'str',
         'metrics': 'IntegrationMetrics',
+        'icon': 'str',
         'description': 'str',
+        'name': 'str',
+        'id': 'str',
         'base_url': 'str',
         'status': 'IntegrationStatus',
+        'alerts': 'list[IntegrationAlert]',
         'creator_id': 'str',
         'updater_id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'dashboards': 'list[IntegrationDashboard]',
         'alias_of': 'str',
         'alias_integrations': 'list[IntegrationAlias]',
+        'dashboards': 'list[IntegrationDashboard]',
         'deleted': 'bool',
         'overview': 'str',
         'setup': 'str'
     }
 
     attribute_map = {
-        'icon': 'icon',
         'version': 'version',
-        'name': 'name',
-        'id': 'id',
         'metrics': 'metrics',
+        'icon': 'icon',
         'description': 'description',
+        'name': 'name',
+        'id': 'id',
         'base_url': 'baseUrl',
         'status': 'status',
+        'alerts': 'alerts',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'dashboards': 'dashboards',
         'alias_of': 'aliasOf',
         'alias_integrations': 'aliasIntegrations',
+        'dashboards': 'dashboards',
         'deleted': 'deleted',
         'overview': 'overview',
         'setup': 'setup'
     }
 
-    def __init__(self, icon=None, version=None, name=None, id=None, metrics=None, description=None, base_url=None, status=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, dashboards=None, alias_of=None, alias_integrations=None, deleted=None, overview=None, setup=None):  # noqa: E501
+    def __init__(self, version=None, metrics=None, icon=None, description=None, name=None, id=None, base_url=None, status=None, alerts=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, alias_of=None, alias_integrations=None, dashboards=None, deleted=None, overview=None, setup=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
 
-        self._icon = None
         self._version = None
-        self._name = None
-        self._id = None
         self._metrics = None
+        self._icon = None
         self._description = None
+        self._name = None
+        self._id = None
         self._base_url = None
         self._status = None
+        self._alerts = None
         self._creator_id = None
         self._updater_id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._dashboards = None
         self._alias_of = None
         self._alias_integrations = None
+        self._dashboards = None
         self._deleted = None
         self._overview = None
         self._setup = None
         self.discriminator = None
 
-        self.icon = icon
         self.version = version
-        self.name = name
-        if id is not None:
-            self.id = id
         if metrics is not None:
             self.metrics = metrics
+        self.icon = icon
         self.description = description
+        self.name = name
+        if id is not None:
+            self.id = id
         if base_url is not None:
             self.base_url = base_url
         if status is not None:
             self.status = status
+        if alerts is not None:
+            self.alerts = alerts
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
@@ -120,12 +126,12 @@ def __init__(self, icon=None, version=None, name=None, id=None, metrics=None, de
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if dashboards is not None:
-            self.dashboards = dashboards
         if alias_of is not None:
             self.alias_of = alias_of
         if alias_integrations is not None:
             self.alias_integrations = alias_integrations
+        if dashboards is not None:
+            self.dashboards = dashboards
         if deleted is not None:
             self.deleted = deleted
         if overview is not None:
@@ -133,6 +139,52 @@ def __init__(self, icon=None, version=None, name=None, id=None, metrics=None, de
         if setup is not None:
             self.setup = setup
 
+    @property
+    def version(self):
+        """Gets the version of this Integration.  # noqa: E501
+
+        Integration version string  # noqa: E501
+
+        :return: The version of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._version
+
+    @version.setter
+    def version(self, version):
+        """Sets the version of this Integration.
+
+        Integration version string  # noqa: E501
+
+        :param version: The version of this Integration.  # noqa: E501
+        :type: str
+        """
+        if version is None:
+            raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
+
+        self._version = version
+
+    @property
+    def metrics(self):
+        """Gets the metrics of this Integration.  # noqa: E501
+
+
+        :return: The metrics of this Integration.  # noqa: E501
+        :rtype: IntegrationMetrics
+        """
+        return self._metrics
+
+    @metrics.setter
+    def metrics(self, metrics):
+        """Sets the metrics of this Integration.
+
+
+        :param metrics: The metrics of this Integration.  # noqa: E501
+        :type: IntegrationMetrics
+        """
+
+        self._metrics = metrics
+
     @property
     def icon(self):
         """Gets the icon of this Integration.  # noqa: E501
@@ -159,29 +211,29 @@ def icon(self, icon):
         self._icon = icon
 
     @property
-    def version(self):
-        """Gets the version of this Integration.  # noqa: E501
+    def description(self):
+        """Gets the description of this Integration.  # noqa: E501
 
-        Integration version string  # noqa: E501
+        Integration description  # noqa: E501
 
-        :return: The version of this Integration.  # noqa: E501
+        :return: The description of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._version
+        return self._description
 
-    @version.setter
-    def version(self, version):
-        """Sets the version of this Integration.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Integration.
 
-        Integration version string  # noqa: E501
+        Integration description  # noqa: E501
 
-        :param version: The version of this Integration.  # noqa: E501
+        :param description: The description of this Integration.  # noqa: E501
         :type: str
         """
-        if version is None:
-            raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._version = version
+        self._description = description
 
     @property
     def name(self):
@@ -229,52 +281,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def metrics(self):
-        """Gets the metrics of this Integration.  # noqa: E501
-
-
-        :return: The metrics of this Integration.  # noqa: E501
-        :rtype: IntegrationMetrics
-        """
-        return self._metrics
-
-    @metrics.setter
-    def metrics(self, metrics):
-        """Sets the metrics of this Integration.
-
-
-        :param metrics: The metrics of this Integration.  # noqa: E501
-        :type: IntegrationMetrics
-        """
-
-        self._metrics = metrics
-
-    @property
-    def description(self):
-        """Gets the description of this Integration.  # noqa: E501
-
-        Integration description  # noqa: E501
-
-        :return: The description of this Integration.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Integration.
-
-        Integration description  # noqa: E501
-
-        :param description: The description of this Integration.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
     @property
     def base_url(self):
         """Gets the base_url of this Integration.  # noqa: E501
@@ -319,6 +325,29 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def alerts(self):
+        """Gets the alerts of this Integration.  # noqa: E501
+
+        A list of alerts belonging to this integration  # noqa: E501
+
+        :return: The alerts of this Integration.  # noqa: E501
+        :rtype: list[IntegrationAlert]
+        """
+        return self._alerts
+
+    @alerts.setter
+    def alerts(self, alerts):
+        """Sets the alerts of this Integration.
+
+        A list of alerts belonging to this integration  # noqa: E501
+
+        :param alerts: The alerts of this Integration.  # noqa: E501
+        :type: list[IntegrationAlert]
+        """
+
+        self._alerts = alerts
+
     @property
     def creator_id(self):
         """Gets the creator_id of this Integration.  # noqa: E501
@@ -403,29 +432,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def dashboards(self):
-        """Gets the dashboards of this Integration.  # noqa: E501
-
-        A list of dashboards belonging to this integration  # noqa: E501
-
-        :return: The dashboards of this Integration.  # noqa: E501
-        :rtype: list[IntegrationDashboard]
-        """
-        return self._dashboards
-
-    @dashboards.setter
-    def dashboards(self, dashboards):
-        """Sets the dashboards of this Integration.
-
-        A list of dashboards belonging to this integration  # noqa: E501
-
-        :param dashboards: The dashboards of this Integration.  # noqa: E501
-        :type: list[IntegrationDashboard]
-        """
-
-        self._dashboards = dashboards
-
     @property
     def alias_of(self):
         """Gets the alias_of of this Integration.  # noqa: E501
@@ -472,6 +478,29 @@ def alias_integrations(self, alias_integrations):
 
         self._alias_integrations = alias_integrations
 
+    @property
+    def dashboards(self):
+        """Gets the dashboards of this Integration.  # noqa: E501
+
+        A list of dashboards belonging to this integration  # noqa: E501
+
+        :return: The dashboards of this Integration.  # noqa: E501
+        :rtype: list[IntegrationDashboard]
+        """
+        return self._dashboards
+
+    @dashboards.setter
+    def dashboards(self, dashboards):
+        """Sets the dashboards of this Integration.
+
+        A list of dashboards belonging to this integration  # noqa: E501
+
+        :param dashboards: The dashboards of this Integration.  # noqa: E501
+        :type: list[IntegrationDashboard]
+        """
+
+        self._dashboards = dashboards
+
     @property
     def deleted(self):
         """Gets the deleted of this Integration.  # noqa: E501
@@ -560,6 +589,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Integration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
new file mode 100644
index 0000000..f2aeaf0
--- /dev/null
+++ b/wavefront_api_client/models/integration_alert.py
@@ -0,0 +1,204 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.alert import Alert  # noqa: F401,E501
+
+
+class IntegrationAlert(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'name': 'str',
+        'url': 'str',
+        'alert_obj': 'Alert'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'name': 'name',
+        'url': 'url',
+        'alert_obj': 'alertObj'
+    }
+
+    def __init__(self, description=None, name=None, url=None, alert_obj=None):  # noqa: E501
+        """IntegrationAlert - a model defined in Swagger"""  # noqa: E501
+
+        self._description = None
+        self._name = None
+        self._url = None
+        self._alert_obj = None
+        self.discriminator = None
+
+        self.description = description
+        self.name = name
+        self.url = url
+        if alert_obj is not None:
+            self.alert_obj = alert_obj
+
+    @property
+    def description(self):
+        """Gets the description of this IntegrationAlert.  # noqa: E501
+
+        Alert description  # noqa: E501
+
+        :return: The description of this IntegrationAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this IntegrationAlert.
+
+        Alert description  # noqa: E501
+
+        :param description: The description of this IntegrationAlert.  # noqa: E501
+        :type: str
+        """
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
+
+        self._description = description
+
+    @property
+    def name(self):
+        """Gets the name of this IntegrationAlert.  # noqa: E501
+
+        Alert name  # noqa: E501
+
+        :return: The name of this IntegrationAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IntegrationAlert.
+
+        Alert name  # noqa: E501
+
+        :param name: The name of this IntegrationAlert.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def url(self):
+        """Gets the url of this IntegrationAlert.  # noqa: E501
+
+        URL path to the JSON definition of this alert  # noqa: E501
+
+        :return: The url of this IntegrationAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._url
+
+    @url.setter
+    def url(self, url):
+        """Sets the url of this IntegrationAlert.
+
+        URL path to the JSON definition of this alert  # noqa: E501
+
+        :param url: The url of this IntegrationAlert.  # noqa: E501
+        :type: str
+        """
+        if url is None:
+            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
+
+        self._url = url
+
+    @property
+    def alert_obj(self):
+        """Gets the alert_obj of this IntegrationAlert.  # noqa: E501
+
+
+        :return: The alert_obj of this IntegrationAlert.  # noqa: E501
+        :rtype: Alert
+        """
+        return self._alert_obj
+
+    @alert_obj.setter
+    def alert_obj(self, alert_obj):
+        """Sets the alert_obj of this IntegrationAlert.
+
+
+        :param alert_obj: The alert_obj of this IntegrationAlert.  # noqa: E501
+        :type: Alert
+        """
+
+        self._alert_obj = alert_obj
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IntegrationAlert, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IntegrationAlert):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index 97da426..eeeb1b7 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,38 +32,38 @@ class IntegrationAlias(object):
     """
     swagger_types = {
         'icon': 'str',
+        'description': 'str',
         'name': 'str',
         'id': 'str',
-        'description': 'str',
         'base_url': 'str'
     }
 
     attribute_map = {
         'icon': 'icon',
+        'description': 'description',
         'name': 'name',
         'id': 'id',
-        'description': 'description',
         'base_url': 'baseUrl'
     }
 
-    def __init__(self, icon=None, name=None, id=None, description=None, base_url=None):  # noqa: E501
+    def __init__(self, icon=None, description=None, name=None, id=None, base_url=None):  # noqa: E501
         """IntegrationAlias - a model defined in Swagger"""  # noqa: E501
 
         self._icon = None
+        self._description = None
         self._name = None
         self._id = None
-        self._description = None
         self._base_url = None
         self.discriminator = None
 
         if icon is not None:
             self.icon = icon
+        if description is not None:
+            self.description = description
         if name is not None:
             self.name = name
         if id is not None:
             self.id = id
-        if description is not None:
-            self.description = description
         if base_url is not None:
             self.base_url = base_url
 
@@ -90,6 +90,29 @@ def icon(self, icon):
 
         self._icon = icon
 
+    @property
+    def description(self):
+        """Gets the description of this IntegrationAlias.  # noqa: E501
+
+        Description of the alias Integration  # noqa: E501
+
+        :return: The description of this IntegrationAlias.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this IntegrationAlias.
+
+        Description of the alias Integration  # noqa: E501
+
+        :param description: The description of this IntegrationAlias.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def name(self):
         """Gets the name of this IntegrationAlias.  # noqa: E501
@@ -136,29 +159,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def description(self):
-        """Gets the description of this IntegrationAlias.  # noqa: E501
-
-        Description of the alias Integration  # noqa: E501
-
-        :return: The description of this IntegrationAlias.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this IntegrationAlias.
-
-        Description of the alias Integration  # noqa: E501
-
-        :param description: The description of this IntegrationAlias.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
     @property
     def base_url(self):
         """Gets the base_url of this IntegrationAlias.  # noqa: E501
@@ -203,6 +203,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IntegrationAlias, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 4ebd75c..6a1778b 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -33,59 +33,34 @@ class IntegrationDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'name': 'str',
         'description': 'str',
+        'name': 'str',
         'url': 'str',
         'dashboard_obj': 'Dashboard'
     }
 
     attribute_map = {
-        'name': 'name',
         'description': 'description',
+        'name': 'name',
         'url': 'url',
         'dashboard_obj': 'dashboardObj'
     }
 
-    def __init__(self, name=None, description=None, url=None, dashboard_obj=None):  # noqa: E501
+    def __init__(self, description=None, name=None, url=None, dashboard_obj=None):  # noqa: E501
         """IntegrationDashboard - a model defined in Swagger"""  # noqa: E501
 
-        self._name = None
         self._description = None
+        self._name = None
         self._url = None
         self._dashboard_obj = None
         self.discriminator = None
 
-        self.name = name
         self.description = description
+        self.name = name
         self.url = url
         if dashboard_obj is not None:
             self.dashboard_obj = dashboard_obj
 
-    @property
-    def name(self):
-        """Gets the name of this IntegrationDashboard.  # noqa: E501
-
-        Dashboard name  # noqa: E501
-
-        :return: The name of this IntegrationDashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this IntegrationDashboard.
-
-        Dashboard name  # noqa: E501
-
-        :param name: The name of this IntegrationDashboard.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
     @property
     def description(self):
         """Gets the description of this IntegrationDashboard.  # noqa: E501
@@ -111,6 +86,31 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def name(self):
+        """Gets the name of this IntegrationDashboard.  # noqa: E501
+
+        Dashboard name  # noqa: E501
+
+        :return: The name of this IntegrationDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IntegrationDashboard.
+
+        Dashboard name  # noqa: E501
+
+        :param name: The name of this IntegrationDashboard.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     @property
     def url(self):
         """Gets the url of this IntegrationDashboard.  # noqa: E501
@@ -178,6 +178,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IntegrationDashboard, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 1d7639a..1704fbf 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -180,6 +180,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IntegrationManifestGroup, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index 2ba449a..e5522b6 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -34,41 +34,41 @@ class IntegrationMetrics(object):
     """
     swagger_types = {
         'prefixes': 'list[str]',
-        'display': 'list[str]',
-        'charts': 'list[str]',
-        'chart_objs': 'list[Chart]',
         'required': 'list[str]',
-        'pps_dimensions': 'list[str]'
+        'charts': 'list[str]',
+        'pps_dimensions': 'list[str]',
+        'display': 'list[str]',
+        'chart_objs': 'list[Chart]'
     }
 
     attribute_map = {
         'prefixes': 'prefixes',
-        'display': 'display',
-        'charts': 'charts',
-        'chart_objs': 'chartObjs',
         'required': 'required',
-        'pps_dimensions': 'ppsDimensions'
+        'charts': 'charts',
+        'pps_dimensions': 'ppsDimensions',
+        'display': 'display',
+        'chart_objs': 'chartObjs'
     }
 
-    def __init__(self, prefixes=None, display=None, charts=None, chart_objs=None, required=None, pps_dimensions=None):  # noqa: E501
+    def __init__(self, prefixes=None, required=None, charts=None, pps_dimensions=None, display=None, chart_objs=None):  # noqa: E501
         """IntegrationMetrics - a model defined in Swagger"""  # noqa: E501
 
         self._prefixes = None
-        self._display = None
-        self._charts = None
-        self._chart_objs = None
         self._required = None
+        self._charts = None
         self._pps_dimensions = None
+        self._display = None
+        self._chart_objs = None
         self.discriminator = None
 
         self.prefixes = prefixes
-        self.display = display
-        self.charts = charts
-        if chart_objs is not None:
-            self.chart_objs = chart_objs
         self.required = required
+        self.charts = charts
         if pps_dimensions is not None:
             self.pps_dimensions = pps_dimensions
+        self.display = display
+        if chart_objs is not None:
+            self.chart_objs = chart_objs
 
     @property
     def prefixes(self):
@@ -96,29 +96,29 @@ def prefixes(self, prefixes):
         self._prefixes = prefixes
 
     @property
-    def display(self):
-        """Gets the display of this IntegrationMetrics.  # noqa: E501
+    def required(self):
+        """Gets the required of this IntegrationMetrics.  # noqa: E501
 
-        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
+        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
 
-        :return: The display of this IntegrationMetrics.  # noqa: E501
+        :return: The required of this IntegrationMetrics.  # noqa: E501
         :rtype: list[str]
         """
-        return self._display
+        return self._required
 
-    @display.setter
-    def display(self, display):
-        """Sets the display of this IntegrationMetrics.
+    @required.setter
+    def required(self, required):
+        """Sets the required of this IntegrationMetrics.
 
-        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
+        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
 
-        :param display: The display of this IntegrationMetrics.  # noqa: E501
+        :param required: The required of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if display is None:
-            raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
+        if required is None:
+            raise ValueError("Invalid value for `required`, must not be `None`")  # noqa: E501
 
-        self._display = display
+        self._required = required
 
     @property
     def charts(self):
@@ -146,75 +146,75 @@ def charts(self, charts):
         self._charts = charts
 
     @property
-    def chart_objs(self):
-        """Gets the chart_objs of this IntegrationMetrics.  # noqa: E501
+    def pps_dimensions(self):
+        """Gets the pps_dimensions of this IntegrationMetrics.  # noqa: E501
 
-        Chart JSONs materialized from the links in `charts`  # noqa: E501
+        For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions  # noqa: E501
 
-        :return: The chart_objs of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[Chart]
+        :return: The pps_dimensions of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._chart_objs
+        return self._pps_dimensions
 
-    @chart_objs.setter
-    def chart_objs(self, chart_objs):
-        """Sets the chart_objs of this IntegrationMetrics.
+    @pps_dimensions.setter
+    def pps_dimensions(self, pps_dimensions):
+        """Sets the pps_dimensions of this IntegrationMetrics.
 
-        Chart JSONs materialized from the links in `charts`  # noqa: E501
+        For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions  # noqa: E501
 
-        :param chart_objs: The chart_objs of this IntegrationMetrics.  # noqa: E501
-        :type: list[Chart]
+        :param pps_dimensions: The pps_dimensions of this IntegrationMetrics.  # noqa: E501
+        :type: list[str]
         """
 
-        self._chart_objs = chart_objs
+        self._pps_dimensions = pps_dimensions
 
     @property
-    def required(self):
-        """Gets the required of this IntegrationMetrics.  # noqa: E501
+    def display(self):
+        """Gets the display of this IntegrationMetrics.  # noqa: E501
 
-        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
+        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
 
-        :return: The required of this IntegrationMetrics.  # noqa: E501
+        :return: The display of this IntegrationMetrics.  # noqa: E501
         :rtype: list[str]
         """
-        return self._required
+        return self._display
 
-    @required.setter
-    def required(self, required):
-        """Sets the required of this IntegrationMetrics.
+    @display.setter
+    def display(self, display):
+        """Sets the display of this IntegrationMetrics.
 
-        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
+        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
 
-        :param required: The required of this IntegrationMetrics.  # noqa: E501
+        :param display: The display of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if required is None:
-            raise ValueError("Invalid value for `required`, must not be `None`")  # noqa: E501
+        if display is None:
+            raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
 
-        self._required = required
+        self._display = display
 
     @property
-    def pps_dimensions(self):
-        """Gets the pps_dimensions of this IntegrationMetrics.  # noqa: E501
+    def chart_objs(self):
+        """Gets the chart_objs of this IntegrationMetrics.  # noqa: E501
 
-        For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions  # noqa: E501
+        Chart JSONs materialized from the links in `charts`  # noqa: E501
 
-        :return: The pps_dimensions of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[str]
+        :return: The chart_objs of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[Chart]
         """
-        return self._pps_dimensions
+        return self._chart_objs
 
-    @pps_dimensions.setter
-    def pps_dimensions(self, pps_dimensions):
-        """Sets the pps_dimensions of this IntegrationMetrics.
+    @chart_objs.setter
+    def chart_objs(self, chart_objs):
+        """Sets the chart_objs of this IntegrationMetrics.
 
-        For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions  # noqa: E501
+        Chart JSONs materialized from the links in `charts`  # noqa: E501
 
-        :param pps_dimensions: The pps_dimensions of this IntegrationMetrics.  # noqa: E501
-        :type: list[str]
+        :param chart_objs: The chart_objs of this IntegrationMetrics.  # noqa: E501
+        :type: list[Chart]
         """
 
-        self._pps_dimensions = pps_dimensions
+        self._chart_objs = chart_objs
 
     def to_dict(self):
         """Returns the model properties as a dict"""
@@ -237,6 +237,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IntegrationMetrics, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index 873e31d..ca178aa 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -35,26 +35,30 @@ class IntegrationStatus(object):
     swagger_types = {
         'content_status': 'str',
         'install_status': 'str',
-        'metric_statuses': 'dict(str, MetricStatus)'
+        'metric_statuses': 'dict(str, MetricStatus)',
+        'alert_statuses': 'dict(str, str)'
     }
 
     attribute_map = {
         'content_status': 'contentStatus',
         'install_status': 'installStatus',
-        'metric_statuses': 'metricStatuses'
+        'metric_statuses': 'metricStatuses',
+        'alert_statuses': 'alertStatuses'
     }
 
-    def __init__(self, content_status=None, install_status=None, metric_statuses=None):  # noqa: E501
+    def __init__(self, content_status=None, install_status=None, metric_statuses=None, alert_statuses=None):  # noqa: E501
         """IntegrationStatus - a model defined in Swagger"""  # noqa: E501
 
         self._content_status = None
         self._install_status = None
         self._metric_statuses = None
+        self._alert_statuses = None
         self.discriminator = None
 
         self.content_status = content_status
         self.install_status = install_status
         self.metric_statuses = metric_statuses
+        self.alert_statuses = alert_statuses
 
     @property
     def content_status(self):
@@ -91,7 +95,7 @@ def content_status(self, content_status):
     def install_status(self):
         """Gets the install_status of this IntegrationStatus.  # noqa: E501
 
-        Whether the customer or an automated process has chosen to install this integration  # noqa: E501
+        Whether the customer or an automated process has installed the dashboards for this integration  # noqa: E501
 
         :return: The install_status of this IntegrationStatus.  # noqa: E501
         :rtype: str
@@ -102,7 +106,7 @@ def install_status(self):
     def install_status(self, install_status):
         """Sets the install_status of this IntegrationStatus.
 
-        Whether the customer or an automated process has chosen to install this integration  # noqa: E501
+        Whether the customer or an automated process has installed the dashboards for this integration  # noqa: E501
 
         :param install_status: The install_status of this IntegrationStatus.  # noqa: E501
         :type: str
@@ -143,6 +147,38 @@ def metric_statuses(self, metric_statuses):
 
         self._metric_statuses = metric_statuses
 
+    @property
+    def alert_statuses(self):
+        """Gets the alert_statuses of this IntegrationStatus.  # noqa: E501
+
+        A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`  # noqa: E501
+
+        :return: The alert_statuses of this IntegrationStatus.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._alert_statuses
+
+    @alert_statuses.setter
+    def alert_statuses(self, alert_statuses):
+        """Sets the alert_statuses of this IntegrationStatus.
+
+        A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`  # noqa: E501
+
+        :param alert_statuses: The alert_statuses of this IntegrationStatus.  # noqa: E501
+        :type: dict(str, str)
+        """
+        if alert_statuses is None:
+            raise ValueError("Invalid value for `alert_statuses`, must not be `None`")  # noqa: E501
+        allowed_values = ["VISIBLE", "HIDDEN", "NOT_LOADED"]  # noqa: E501
+        if not set(alert_statuses.keys()).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid keys in `alert_statuses` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(alert_statuses.keys()) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._alert_statuses = alert_statuses
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -164,6 +200,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IntegrationStatus, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/iterator_entry_string_json_node.py b/wavefront_api_client/models/iterator_entry_string_json_node.py
index 1c22cde..c840c45 100644
--- a/wavefront_api_client/models/iterator_entry_string_json_node.py
+++ b/wavefront_api_client/models/iterator_entry_string_json_node.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -61,6 +61,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IteratorEntryStringJsonNode, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/iterator_json_node.py b/wavefront_api_client/models/iterator_json_node.py
index 5d9f434..c243c60 100644
--- a/wavefront_api_client/models/iterator_json_node.py
+++ b/wavefront_api_client/models/iterator_json_node.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -61,6 +61,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IteratorJsonNode, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/iterator_string.py b/wavefront_api_client/models/iterator_string.py
index 6810500..b9b8aa4 100644
--- a/wavefront_api_client/models/iterator_string.py
+++ b/wavefront_api_client/models/iterator_string.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -61,6 +61,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(IteratorString, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/json_node.py b/wavefront_api_client/models/json_node.py
index a11b0c5..cdeed31 100644
--- a/wavefront_api_client/models/json_node.py
+++ b/wavefront_api_client/models/json_node.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -61,6 +61,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(JsonNode, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
index 16c0f94..975cdca 100644
--- a/wavefront_api_client/models/logical_type.py
+++ b/wavefront_api_client/models/logical_type.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -89,6 +89,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(LogicalType, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index 7e841ae..dcf9f4a 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -34,10 +34,10 @@ class MaintenanceWindow(object):
         'reason': 'str',
         'id': 'str',
         'customer_id': 'str',
-        'relevant_customer_tags': 'list[str]',
         'title': 'str',
         'start_time_in_seconds': 'int',
         'end_time_in_seconds': 'int',
+        'relevant_customer_tags': 'list[str]',
         'relevant_host_tags': 'list[str]',
         'relevant_host_names': 'list[str]',
         'creator_id': 'str',
@@ -47,18 +47,18 @@ class MaintenanceWindow(object):
         'relevant_host_tags_anded': 'bool',
         'host_tag_group_host_names_group_anded': 'bool',
         'event_name': 'str',
-        'sort_attr': 'int',
-        'running_state': 'str'
+        'running_state': 'str',
+        'sort_attr': 'int'
     }
 
     attribute_map = {
         'reason': 'reason',
         'id': 'id',
         'customer_id': 'customerId',
-        'relevant_customer_tags': 'relevantCustomerTags',
         'title': 'title',
         'start_time_in_seconds': 'startTimeInSeconds',
         'end_time_in_seconds': 'endTimeInSeconds',
+        'relevant_customer_tags': 'relevantCustomerTags',
         'relevant_host_tags': 'relevantHostTags',
         'relevant_host_names': 'relevantHostNames',
         'creator_id': 'creatorId',
@@ -68,20 +68,20 @@ class MaintenanceWindow(object):
         'relevant_host_tags_anded': 'relevantHostTagsAnded',
         'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
         'event_name': 'eventName',
-        'sort_attr': 'sortAttr',
-        'running_state': 'runningState'
+        'running_state': 'runningState',
+        'sort_attr': 'sortAttr'
     }
 
-    def __init__(self, reason=None, id=None, customer_id=None, relevant_customer_tags=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, relevant_host_tags=None, relevant_host_names=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, event_name=None, sort_attr=None, running_state=None):  # noqa: E501
+    def __init__(self, reason=None, id=None, customer_id=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, relevant_customer_tags=None, relevant_host_tags=None, relevant_host_names=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, event_name=None, running_state=None, sort_attr=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
         self._reason = None
         self._id = None
         self._customer_id = None
-        self._relevant_customer_tags = None
         self._title = None
         self._start_time_in_seconds = None
         self._end_time_in_seconds = None
+        self._relevant_customer_tags = None
         self._relevant_host_tags = None
         self._relevant_host_names = None
         self._creator_id = None
@@ -91,8 +91,8 @@ def __init__(self, reason=None, id=None, customer_id=None, relevant_customer_tag
         self._relevant_host_tags_anded = None
         self._host_tag_group_host_names_group_anded = None
         self._event_name = None
-        self._sort_attr = None
         self._running_state = None
+        self._sort_attr = None
         self.discriminator = None
 
         self.reason = reason
@@ -100,10 +100,10 @@ def __init__(self, reason=None, id=None, customer_id=None, relevant_customer_tag
             self.id = id
         if customer_id is not None:
             self.customer_id = customer_id
-        self.relevant_customer_tags = relevant_customer_tags
         self.title = title
         self.start_time_in_seconds = start_time_in_seconds
         self.end_time_in_seconds = end_time_in_seconds
+        self.relevant_customer_tags = relevant_customer_tags
         if relevant_host_tags is not None:
             self.relevant_host_tags = relevant_host_tags
         if relevant_host_names is not None:
@@ -122,10 +122,10 @@ def __init__(self, reason=None, id=None, customer_id=None, relevant_customer_tag
             self.host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
         if event_name is not None:
             self.event_name = event_name
-        if sort_attr is not None:
-            self.sort_attr = sort_attr
         if running_state is not None:
             self.running_state = running_state
+        if sort_attr is not None:
+            self.sort_attr = sort_attr
 
     @property
     def reason(self):
@@ -194,31 +194,6 @@ def customer_id(self, customer_id):
 
         self._customer_id = customer_id
 
-    @property
-    def relevant_customer_tags(self):
-        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
-
-        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._relevant_customer_tags
-
-    @relevant_customer_tags.setter
-    def relevant_customer_tags(self, relevant_customer_tags):
-        """Sets the relevant_customer_tags of this MaintenanceWindow.
-
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
-
-        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :type: list[str]
-        """
-        if relevant_customer_tags is None:
-            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
-
-        self._relevant_customer_tags = relevant_customer_tags
-
     @property
     def title(self):
         """Gets the title of this MaintenanceWindow.  # noqa: E501
@@ -294,6 +269,31 @@ def end_time_in_seconds(self, end_time_in_seconds):
 
         self._end_time_in_seconds = end_time_in_seconds
 
+    @property
+    def relevant_customer_tags(self):
+        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
+
+        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._relevant_customer_tags
+
+    @relevant_customer_tags.setter
+    def relevant_customer_tags(self, relevant_customer_tags):
+        """Sets the relevant_customer_tags of this MaintenanceWindow.
+
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
+
+        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+        :type: list[str]
+        """
+        if relevant_customer_tags is None:
+            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
+
+        self._relevant_customer_tags = relevant_customer_tags
+
     @property
     def relevant_host_tags(self):
         """Gets the relevant_host_tags of this MaintenanceWindow.  # noqa: E501
@@ -493,29 +493,6 @@ def event_name(self, event_name):
 
         self._event_name = event_name
 
-    @property
-    def sort_attr(self):
-        """Gets the sort_attr of this MaintenanceWindow.  # noqa: E501
-
-        Numeric value used in default sorting  # noqa: E501
-
-        :return: The sort_attr of this MaintenanceWindow.  # noqa: E501
-        :rtype: int
-        """
-        return self._sort_attr
-
-    @sort_attr.setter
-    def sort_attr(self, sort_attr):
-        """Sets the sort_attr of this MaintenanceWindow.
-
-        Numeric value used in default sorting  # noqa: E501
-
-        :param sort_attr: The sort_attr of this MaintenanceWindow.  # noqa: E501
-        :type: int
-        """
-
-        self._sort_attr = sort_attr
-
     @property
     def running_state(self):
         """Gets the running_state of this MaintenanceWindow.  # noqa: E501
@@ -543,6 +520,29 @@ def running_state(self, running_state):
 
         self._running_state = running_state
 
+    @property
+    def sort_attr(self):
+        """Gets the sort_attr of this MaintenanceWindow.  # noqa: E501
+
+        Numeric value used in default sorting  # noqa: E501
+
+        :return: The sort_attr of this MaintenanceWindow.  # noqa: E501
+        :rtype: int
+        """
+        return self._sort_attr
+
+    @sort_attr.setter
+    def sort_attr(self, sort_attr):
+        """Sets the sort_attr of this MaintenanceWindow.
+
+        Numeric value used in default sorting  # noqa: E501
+
+        :param sort_attr: The sort_attr of this MaintenanceWindow.  # noqa: E501
+        :type: int
+        """
+
+        self._sort_attr = sort_attr
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -564,6 +564,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(MaintenanceWindow, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 53e3903..758aa5a 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,14 +31,14 @@ class Message(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'source': 'str',
+        'scope': 'str',
         'attributes': 'dict(str, str)',
+        'source': 'str',
+        'severity': 'str',
         'id': 'str',
         'target': 'str',
         'content': 'str',
-        'scope': 'str',
         'title': 'str',
-        'severity': 'str',
         'start_epoch_millis': 'int',
         'end_epoch_millis': 'int',
         'display': 'str',
@@ -46,48 +46,48 @@ class Message(object):
     }
 
     attribute_map = {
-        'source': 'source',
+        'scope': 'scope',
         'attributes': 'attributes',
+        'source': 'source',
+        'severity': 'severity',
         'id': 'id',
         'target': 'target',
         'content': 'content',
-        'scope': 'scope',
         'title': 'title',
-        'severity': 'severity',
         'start_epoch_millis': 'startEpochMillis',
         'end_epoch_millis': 'endEpochMillis',
         'display': 'display',
         'read': 'read'
     }
 
-    def __init__(self, source=None, attributes=None, id=None, target=None, content=None, scope=None, title=None, severity=None, start_epoch_millis=None, end_epoch_millis=None, display=None, read=None):  # noqa: E501
+    def __init__(self, scope=None, attributes=None, source=None, severity=None, id=None, target=None, content=None, title=None, start_epoch_millis=None, end_epoch_millis=None, display=None, read=None):  # noqa: E501
         """Message - a model defined in Swagger"""  # noqa: E501
 
-        self._source = None
+        self._scope = None
         self._attributes = None
+        self._source = None
+        self._severity = None
         self._id = None
         self._target = None
         self._content = None
-        self._scope = None
         self._title = None
-        self._severity = None
         self._start_epoch_millis = None
         self._end_epoch_millis = None
         self._display = None
         self._read = None
         self.discriminator = None
 
-        self.source = source
+        self.scope = scope
         if attributes is not None:
             self.attributes = attributes
+        self.source = source
+        self.severity = severity
         if id is not None:
             self.id = id
         if target is not None:
             self.target = target
         self.content = content
-        self.scope = scope
         self.title = title
-        self.severity = severity
         self.start_epoch_millis = start_epoch_millis
         self.end_epoch_millis = end_epoch_millis
         self.display = display
@@ -95,29 +95,35 @@ def __init__(self, source=None, attributes=None, id=None, target=None, content=N
             self.read = read
 
     @property
-    def source(self):
-        """Gets the source of this Message.  # noqa: E501
+    def scope(self):
+        """Gets the scope of this Message.  # noqa: E501
 
-        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+        The audience scope that this message should reach  # noqa: E501
 
-        :return: The source of this Message.  # noqa: E501
+        :return: The scope of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._source
+        return self._scope
 
-    @source.setter
-    def source(self, source):
-        """Sets the source of this Message.
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this Message.
 
-        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+        The audience scope that this message should reach  # noqa: E501
 
-        :param source: The source of this Message.  # noqa: E501
+        :param scope: The scope of this Message.  # noqa: E501
         :type: str
         """
-        if source is None:
-            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
+        if scope is None:
+            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
+        allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
+        if scope not in allowed_values:
+            raise ValueError(
+                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
+                .format(scope, allowed_values)
+            )
 
-        self._source = source
+        self._scope = scope
 
     @property
     def attributes(self):
@@ -142,6 +148,62 @@ def attributes(self, attributes):
 
         self._attributes = attributes
 
+    @property
+    def source(self):
+        """Gets the source of this Message.  # noqa: E501
+
+        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+
+        :return: The source of this Message.  # noqa: E501
+        :rtype: str
+        """
+        return self._source
+
+    @source.setter
+    def source(self, source):
+        """Sets the source of this Message.
+
+        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+
+        :param source: The source of this Message.  # noqa: E501
+        :type: str
+        """
+        if source is None:
+            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
+
+        self._source = source
+
+    @property
+    def severity(self):
+        """Gets the severity of this Message.  # noqa: E501
+
+        Message severity  # noqa: E501
+
+        :return: The severity of this Message.  # noqa: E501
+        :rtype: str
+        """
+        return self._severity
+
+    @severity.setter
+    def severity(self, severity):
+        """Sets the severity of this Message.
+
+        Message severity  # noqa: E501
+
+        :param severity: The severity of this Message.  # noqa: E501
+        :type: str
+        """
+        if severity is None:
+            raise ValueError("Invalid value for `severity`, must not be `None`")  # noqa: E501
+        allowed_values = ["MARKETING", "INFO", "WARN", "SEVERE"]  # noqa: E501
+        if severity not in allowed_values:
+            raise ValueError(
+                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(severity, allowed_values)
+            )
+
+        self._severity = severity
+
     @property
     def id(self):
         """Gets the id of this Message.  # noqa: E501
@@ -211,37 +273,6 @@ def content(self, content):
 
         self._content = content
 
-    @property
-    def scope(self):
-        """Gets the scope of this Message.  # noqa: E501
-
-        The audience scope that this message should reach  # noqa: E501
-
-        :return: The scope of this Message.  # noqa: E501
-        :rtype: str
-        """
-        return self._scope
-
-    @scope.setter
-    def scope(self, scope):
-        """Sets the scope of this Message.
-
-        The audience scope that this message should reach  # noqa: E501
-
-        :param scope: The scope of this Message.  # noqa: E501
-        :type: str
-        """
-        if scope is None:
-            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
-        if scope not in allowed_values:
-            raise ValueError(
-                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
-                .format(scope, allowed_values)
-            )
-
-        self._scope = scope
-
     @property
     def title(self):
         """Gets the title of this Message.  # noqa: E501
@@ -267,37 +298,6 @@ def title(self, title):
 
         self._title = title
 
-    @property
-    def severity(self):
-        """Gets the severity of this Message.  # noqa: E501
-
-        Message severity  # noqa: E501
-
-        :return: The severity of this Message.  # noqa: E501
-        :rtype: str
-        """
-        return self._severity
-
-    @severity.setter
-    def severity(self, severity):
-        """Sets the severity of this Message.
-
-        Message severity  # noqa: E501
-
-        :param severity: The severity of this Message.  # noqa: E501
-        :type: str
-        """
-        if severity is None:
-            raise ValueError("Invalid value for `severity`, must not be `None`")  # noqa: E501
-        allowed_values = ["MARKETING", "INFO", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
-            raise ValueError(
-                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
-                .format(severity, allowed_values)
-            )
-
-        self._severity = severity
-
     @property
     def start_epoch_millis(self):
         """Gets the start_epoch_millis of this Message.  # noqa: E501
@@ -423,6 +423,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Message, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/metric_details.py b/wavefront_api_client/models/metric_details.py
index 07b880f..f6bfe44 100644
--- a/wavefront_api_client/models/metric_details.py
+++ b/wavefront_api_client/models/metric_details.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -147,6 +147,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(MetricDetails, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index 870c67c..d6bd5f9 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -93,6 +93,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(MetricDetailsResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index 82e0c4a..b665442 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -173,6 +173,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(MetricStatus, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
new file mode 100644
index 0000000..7523905
--- /dev/null
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -0,0 +1,204 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters  # noqa: F401,E501
+
+
+class NewRelicConfiguration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'app_filter_regex': 'str',
+        'host_filter_regex': 'str',
+        'new_relic_metric_filters': 'list[NewRelicMetricFilters]',
+        'api_key': 'str'
+    }
+
+    attribute_map = {
+        'app_filter_regex': 'appFilterRegex',
+        'host_filter_regex': 'hostFilterRegex',
+        'new_relic_metric_filters': 'newRelicMetricFilters',
+        'api_key': 'apiKey'
+    }
+
+    def __init__(self, app_filter_regex=None, host_filter_regex=None, new_relic_metric_filters=None, api_key=None):  # noqa: E501
+        """NewRelicConfiguration - a model defined in Swagger"""  # noqa: E501
+
+        self._app_filter_regex = None
+        self._host_filter_regex = None
+        self._new_relic_metric_filters = None
+        self._api_key = None
+        self.discriminator = None
+
+        if app_filter_regex is not None:
+            self.app_filter_regex = app_filter_regex
+        if host_filter_regex is not None:
+            self.host_filter_regex = host_filter_regex
+        if new_relic_metric_filters is not None:
+            self.new_relic_metric_filters = new_relic_metric_filters
+        self.api_key = api_key
+
+    @property
+    def app_filter_regex(self):
+        """Gets the app_filter_regex of this NewRelicConfiguration.  # noqa: E501
+
+        A regular expression that a application name must match (case-insensitively) in order to collect metrics.  # noqa: E501
+
+        :return: The app_filter_regex of this NewRelicConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._app_filter_regex
+
+    @app_filter_regex.setter
+    def app_filter_regex(self, app_filter_regex):
+        """Sets the app_filter_regex of this NewRelicConfiguration.
+
+        A regular expression that a application name must match (case-insensitively) in order to collect metrics.  # noqa: E501
+
+        :param app_filter_regex: The app_filter_regex of this NewRelicConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._app_filter_regex = app_filter_regex
+
+    @property
+    def host_filter_regex(self):
+        """Gets the host_filter_regex of this NewRelicConfiguration.  # noqa: E501
+
+        A regular expression that a host name must match (case-insensitively) in order to collect metrics.  # noqa: E501
+
+        :return: The host_filter_regex of this NewRelicConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._host_filter_regex
+
+    @host_filter_regex.setter
+    def host_filter_regex(self, host_filter_regex):
+        """Sets the host_filter_regex of this NewRelicConfiguration.
+
+        A regular expression that a host name must match (case-insensitively) in order to collect metrics.  # noqa: E501
+
+        :param host_filter_regex: The host_filter_regex of this NewRelicConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._host_filter_regex = host_filter_regex
+
+    @property
+    def new_relic_metric_filters(self):
+        """Gets the new_relic_metric_filters of this NewRelicConfiguration.  # noqa: E501
+
+        Application specific metric filter  # noqa: E501
+
+        :return: The new_relic_metric_filters of this NewRelicConfiguration.  # noqa: E501
+        :rtype: list[NewRelicMetricFilters]
+        """
+        return self._new_relic_metric_filters
+
+    @new_relic_metric_filters.setter
+    def new_relic_metric_filters(self, new_relic_metric_filters):
+        """Sets the new_relic_metric_filters of this NewRelicConfiguration.
+
+        Application specific metric filter  # noqa: E501
+
+        :param new_relic_metric_filters: The new_relic_metric_filters of this NewRelicConfiguration.  # noqa: E501
+        :type: list[NewRelicMetricFilters]
+        """
+
+        self._new_relic_metric_filters = new_relic_metric_filters
+
+    @property
+    def api_key(self):
+        """Gets the api_key of this NewRelicConfiguration.  # noqa: E501
+
+        New Relic REST API Key.  # noqa: E501
+
+        :return: The api_key of this NewRelicConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._api_key
+
+    @api_key.setter
+    def api_key(self, api_key):
+        """Sets the api_key of this NewRelicConfiguration.
+
+        New Relic REST API Key.  # noqa: E501
+
+        :param api_key: The api_key of this NewRelicConfiguration.  # noqa: E501
+        :type: str
+        """
+        if api_key is None:
+            raise ValueError("Invalid value for `api_key`, must not be `None`")  # noqa: E501
+
+        self._api_key = api_key
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(NewRelicConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, NewRelicConfiguration):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/new_relic_metric_filters.py b/wavefront_api_client/models/new_relic_metric_filters.py
new file mode 100644
index 0000000..e41fa49
--- /dev/null
+++ b/wavefront_api_client/models/new_relic_metric_filters.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class NewRelicMetricFilters(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'app_name': 'str',
+        'metric_filter_regex': 'str'
+    }
+
+    attribute_map = {
+        'app_name': 'appName',
+        'metric_filter_regex': 'metricFilterRegex'
+    }
+
+    def __init__(self, app_name=None, metric_filter_regex=None):  # noqa: E501
+        """NewRelicMetricFilters - a model defined in Swagger"""  # noqa: E501
+
+        self._app_name = None
+        self._metric_filter_regex = None
+        self.discriminator = None
+
+        if app_name is not None:
+            self.app_name = app_name
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
+
+    @property
+    def app_name(self):
+        """Gets the app_name of this NewRelicMetricFilters.  # noqa: E501
+
+
+        :return: The app_name of this NewRelicMetricFilters.  # noqa: E501
+        :rtype: str
+        """
+        return self._app_name
+
+    @app_name.setter
+    def app_name(self, app_name):
+        """Sets the app_name of this NewRelicMetricFilters.
+
+
+        :param app_name: The app_name of this NewRelicMetricFilters.  # noqa: E501
+        :type: str
+        """
+
+        self._app_name = app_name
+
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this NewRelicMetricFilters.  # noqa: E501
+
+
+        :return: The metric_filter_regex of this NewRelicMetricFilters.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this NewRelicMetricFilters.
+
+
+        :param metric_filter_regex: The metric_filter_regex of this NewRelicMetricFilters.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(NewRelicMetricFilters, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, NewRelicMetricFilters):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index cba9b4a..13d9f0e 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -31,17 +31,17 @@ class Notificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'method': 'str',
-        'id': 'str',
         'content_type': 'str',
+        'method': 'str',
         'description': 'str',
+        'id': 'str',
         'customer_id': 'str',
         'title': 'str',
         'creator_id': 'str',
         'updater_id': 'str',
+        'template': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'template': 'str',
         'triggers': 'list[str]',
         'recipient': 'str',
         'custom_http_headers': 'dict(str, str)',
@@ -50,17 +50,17 @@ class Notificant(object):
     }
 
     attribute_map = {
-        'method': 'method',
-        'id': 'id',
         'content_type': 'contentType',
+        'method': 'method',
         'description': 'description',
+        'id': 'id',
         'customer_id': 'customerId',
         'title': 'title',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'template': 'template',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'template': 'template',
         'triggers': 'triggers',
         'recipient': 'recipient',
         'custom_http_headers': 'customHttpHeaders',
@@ -68,20 +68,20 @@ class Notificant(object):
         'is_html_content': 'isHtmlContent'
     }
 
-    def __init__(self, method=None, id=None, content_type=None, description=None, customer_id=None, title=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, is_html_content=None):  # noqa: E501
+    def __init__(self, content_type=None, method=None, description=None, id=None, customer_id=None, title=None, creator_id=None, updater_id=None, template=None, created_epoch_millis=None, updated_epoch_millis=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, is_html_content=None):  # noqa: E501
         """Notificant - a model defined in Swagger"""  # noqa: E501
 
-        self._method = None
-        self._id = None
         self._content_type = None
+        self._method = None
         self._description = None
+        self._id = None
         self._customer_id = None
         self._title = None
         self._creator_id = None
         self._updater_id = None
+        self._template = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._template = None
         self._triggers = None
         self._recipient = None
         self._custom_http_headers = None
@@ -89,12 +89,12 @@ def __init__(self, method=None, id=None, content_type=None, description=None, cu
         self._is_html_content = None
         self.discriminator = None
 
-        self.method = method
-        if id is not None:
-            self.id = id
         if content_type is not None:
             self.content_type = content_type
+        self.method = method
         self.description = description
+        if id is not None:
+            self.id = id
         if customer_id is not None:
             self.customer_id = customer_id
         self.title = title
@@ -102,11 +102,11 @@ def __init__(self, method=None, id=None, content_type=None, description=None, cu
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        self.template = template
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        self.template = template
         self.triggers = triggers
         self.recipient = recipient
         if custom_http_headers is not None:
@@ -116,6 +116,35 @@ def __init__(self, method=None, id=None, content_type=None, description=None, cu
         if is_html_content is not None:
             self.is_html_content = is_html_content
 
+    @property
+    def content_type(self):
+        """Gets the content_type of this Notificant.  # noqa: E501
+
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
+
+        :return: The content_type of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._content_type
+
+    @content_type.setter
+    def content_type(self, content_type):
+        """Sets the content_type of this Notificant.
+
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
+
+        :param content_type: The content_type of this Notificant.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
+        if content_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(content_type, allowed_values)
+            )
+
+        self._content_type = content_type
+
     @property
     def method(self):
         """Gets the method of this Notificant.  # noqa: E501
@@ -147,56 +176,6 @@ def method(self, method):
 
         self._method = method
 
-    @property
-    def id(self):
-        """Gets the id of this Notificant.  # noqa: E501
-
-
-        :return: The id of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Notificant.
-
-
-        :param id: The id of this Notificant.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
-    @property
-    def content_type(self):
-        """Gets the content_type of this Notificant.  # noqa: E501
-
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
-
-        :return: The content_type of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._content_type
-
-    @content_type.setter
-    def content_type(self, content_type):
-        """Sets the content_type of this Notificant.
-
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
-
-        :param content_type: The content_type of this Notificant.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
-        if content_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(content_type, allowed_values)
-            )
-
-        self._content_type = content_type
-
     @property
     def description(self):
         """Gets the description of this Notificant.  # noqa: E501
@@ -222,6 +201,27 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def id(self):
+        """Gets the id of this Notificant.  # noqa: E501
+
+
+        :return: The id of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Notificant.
+
+
+        :param id: The id of this Notificant.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def customer_id(self):
         """Gets the customer_id of this Notificant.  # noqa: E501
@@ -310,6 +310,31 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def template(self):
+        """Gets the template of this Notificant.  # noqa: E501
+
+        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
+
+        :return: The template of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._template
+
+    @template.setter
+    def template(self, template):
+        """Sets the template of this Notificant.
+
+        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
+
+        :param template: The template of this Notificant.  # noqa: E501
+        :type: str
+        """
+        if template is None:
+            raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
+
+        self._template = template
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this Notificant.  # noqa: E501
@@ -352,31 +377,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def template(self):
-        """Gets the template of this Notificant.  # noqa: E501
-
-        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
-
-        :return: The template of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._template
-
-    @template.setter
-    def template(self, template):
-        """Sets the template of this Notificant.
-
-        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
-
-        :param template: The template of this Notificant.  # noqa: E501
-        :type: str
-        """
-        if template is None:
-            raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
-
-        self._template = template
-
     @property
     def triggers(self):
         """Gets the triggers of this Notificant.  # noqa: E501
@@ -399,7 +399,7 @@ def triggers(self, triggers):
         """
         if triggers is None:
             raise ValueError("Invalid value for `triggers`, must not be `None`")  # noqa: E501
-        allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE"]  # noqa: E501
+        allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE", "ALERT_SERIES_SEVERITY_UPDATE", "ALERT_SEVERITY_UPDATE"]  # noqa: E501
         if not set(triggers).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `triggers` [{0}], must be a subset of [{1}]"  # noqa: E501
@@ -524,6 +524,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Notificant, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/number.py b/wavefront_api_client/models/number.py
index c8f1027..9521e38 100644
--- a/wavefront_api_client/models/number.py
+++ b/wavefront_api_client/models/number.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -61,6 +61,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Number, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index 5307780..2c8e7bb 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedAlert, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index 6d44dcf..ca3fa78 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -284,6 +284,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedAlertWithStats, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index 16ce51e..14c1210 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedCloudIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index dc4a856..e0301e1 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedCustomerFacingUserObject, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index f95c946..5cae16e 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedDashboard, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index 1435115..ab19513 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedDerivedMetricDefinition, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index ae735e6..68d0d76 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -284,6 +284,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedDerivedMetricDefinitionWithStats, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index f097626..f3d1db8 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedEvent, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index 6273ba1..c5dd274 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedExternalLink, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index 0ce3ab1..554968c 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index 28f2d66..939c22e 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedMaintenanceWindow, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index 02794bd..8779485 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedMessage, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 7a2b295..620c6e4 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedNotificant, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index a9cecf6..c9ade15 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedProxy, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index 7d48a2c..a9f5295 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedSavedSearch, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index a67e7f8..9904d26 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -256,6 +256,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(PagedSource, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/paged_user_group.py b/wavefront_api_client/models/paged_user_group.py
new file mode 100644
index 0000000..52bebf1
--- /dev/null
+++ b/wavefront_api_client/models/paged_user_group.py
@@ -0,0 +1,282 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
+
+class PagedUserGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'items': 'list[UserGroup]',
+        'offset': 'int',
+        'limit': 'int',
+        'cursor': 'str',
+        'total_items': 'int',
+        'more_items': 'bool',
+        'sort': 'Sorting'
+    }
+
+    attribute_map = {
+        'items': 'items',
+        'offset': 'offset',
+        'limit': 'limit',
+        'cursor': 'cursor',
+        'total_items': 'totalItems',
+        'more_items': 'moreItems',
+        'sort': 'sort'
+    }
+
+    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+        """PagedUserGroup - a model defined in Swagger"""  # noqa: E501
+
+        self._items = None
+        self._offset = None
+        self._limit = None
+        self._cursor = None
+        self._total_items = None
+        self._more_items = None
+        self._sort = None
+        self.discriminator = None
+
+        if items is not None:
+            self.items = items
+        if offset is not None:
+            self.offset = offset
+        if limit is not None:
+            self.limit = limit
+        if cursor is not None:
+            self.cursor = cursor
+        if total_items is not None:
+            self.total_items = total_items
+        if more_items is not None:
+            self.more_items = more_items
+        if sort is not None:
+            self.sort = sort
+
+    @property
+    def items(self):
+        """Gets the items of this PagedUserGroup.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedUserGroup.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedUserGroup.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedUserGroup.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._items = items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedUserGroup.  # noqa: E501
+
+
+        :return: The offset of this PagedUserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedUserGroup.
+
+
+        :param offset: The offset of this PagedUserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedUserGroup.  # noqa: E501
+
+
+        :return: The limit of this PagedUserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedUserGroup.
+
+
+        :param limit: The limit of this PagedUserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedUserGroup.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedUserGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedUserGroup.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedUserGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedUserGroup.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedUserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedUserGroup.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedUserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedUserGroup.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedUserGroup.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedUserGroup.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedUserGroup.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedUserGroup.  # noqa: E501
+
+
+        :return: The sort of this PagedUserGroup.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedUserGroup.
+
+
+        :param sort: The sort of this PagedUserGroup.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedUserGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedUserGroup):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index 6039498..ec3025b 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Point, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 3b08eb8..39a7278 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -40,6 +40,7 @@ class Proxy(object):
         'customer_id': 'str',
         'in_trash': 'bool',
         'hostname': 'str',
+        'last_check_in_time': 'int',
         'last_known_error': 'str',
         'last_error_time': 'int',
         'last_error_event': 'Event',
@@ -49,7 +50,6 @@ class Proxy(object):
         'local_queue_size': 'int',
         'ssh_agent': 'bool',
         'ephemeral': 'bool',
-        'last_check_in_time': 'int',
         'deleted': 'bool',
         'status_cause': 'str'
     }
@@ -62,6 +62,7 @@ class Proxy(object):
         'customer_id': 'customerId',
         'in_trash': 'inTrash',
         'hostname': 'hostname',
+        'last_check_in_time': 'lastCheckInTime',
         'last_known_error': 'lastKnownError',
         'last_error_time': 'lastErrorTime',
         'last_error_event': 'lastErrorEvent',
@@ -71,12 +72,11 @@ class Proxy(object):
         'local_queue_size': 'localQueueSize',
         'ssh_agent': 'sshAgent',
         'ephemeral': 'ephemeral',
-        'last_check_in_time': 'lastCheckInTime',
         'deleted': 'deleted',
         'status_cause': 'statusCause'
     }
 
-    def __init__(self, version=None, name=None, id=None, status=None, customer_id=None, in_trash=None, hostname=None, last_known_error=None, last_error_time=None, last_error_event=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, ssh_agent=None, ephemeral=None, last_check_in_time=None, deleted=None, status_cause=None):  # noqa: E501
+    def __init__(self, version=None, name=None, id=None, status=None, customer_id=None, in_trash=None, hostname=None, last_check_in_time=None, last_known_error=None, last_error_time=None, last_error_event=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, ssh_agent=None, ephemeral=None, deleted=None, status_cause=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
         self._version = None
@@ -86,6 +86,7 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
         self._customer_id = None
         self._in_trash = None
         self._hostname = None
+        self._last_check_in_time = None
         self._last_known_error = None
         self._last_error_time = None
         self._last_error_event = None
@@ -95,7 +96,6 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
         self._local_queue_size = None
         self._ssh_agent = None
         self._ephemeral = None
-        self._last_check_in_time = None
         self._deleted = None
         self._status_cause = None
         self.discriminator = None
@@ -113,6 +113,8 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
             self.in_trash = in_trash
         if hostname is not None:
             self.hostname = hostname
+        if last_check_in_time is not None:
+            self.last_check_in_time = last_check_in_time
         if last_known_error is not None:
             self.last_known_error = last_known_error
         if last_error_time is not None:
@@ -131,8 +133,6 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
             self.ssh_agent = ssh_agent
         if ephemeral is not None:
             self.ephemeral = ephemeral
-        if last_check_in_time is not None:
-            self.last_check_in_time = last_check_in_time
         if deleted is not None:
             self.deleted = deleted
         if status_cause is not None:
@@ -299,6 +299,29 @@ def hostname(self, hostname):
 
         self._hostname = hostname
 
+    @property
+    def last_check_in_time(self):
+        """Gets the last_check_in_time of this Proxy.  # noqa: E501
+
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+
+        :return: The last_check_in_time of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_check_in_time
+
+    @last_check_in_time.setter
+    def last_check_in_time(self, last_check_in_time):
+        """Sets the last_check_in_time of this Proxy.
+
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+
+        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._last_check_in_time = last_check_in_time
+
     @property
     def last_known_error(self):
         """Gets the last_known_error of this Proxy.  # noqa: E501
@@ -504,29 +527,6 @@ def ephemeral(self, ephemeral):
 
         self._ephemeral = ephemeral
 
-    @property
-    def last_check_in_time(self):
-        """Gets the last_check_in_time of this Proxy.  # noqa: E501
-
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
-
-        :return: The last_check_in_time of this Proxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_check_in_time
-
-    @last_check_in_time.setter
-    def last_check_in_time(self, last_check_in_time):
-        """Sets the last_check_in_time of this Proxy.
-
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
-
-        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
-        :type: int
-        """
-
-        self._last_check_in_time = last_check_in_time
-
     @property
     def deleted(self):
         """Gets the deleted of this Proxy.  # noqa: E501
@@ -592,6 +592,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Proxy, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index f4a40bb..6840d58 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -259,6 +259,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(QueryEvent, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index f7b7eb6..b1330e6 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -35,75 +35,52 @@ class QueryResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'warnings': 'str',
         'name': 'str',
         'query': 'str',
+        'warnings': 'str',
+        'timeseries': 'list[Timeseries]',
         'stats': 'StatsModel',
         'events': 'list[QueryEvent]',
-        'timeseries': 'list[Timeseries]',
         'granularity': 'int'
     }
 
     attribute_map = {
-        'warnings': 'warnings',
         'name': 'name',
         'query': 'query',
+        'warnings': 'warnings',
+        'timeseries': 'timeseries',
         'stats': 'stats',
         'events': 'events',
-        'timeseries': 'timeseries',
         'granularity': 'granularity'
     }
 
-    def __init__(self, warnings=None, name=None, query=None, stats=None, events=None, timeseries=None, granularity=None):  # noqa: E501
+    def __init__(self, name=None, query=None, warnings=None, timeseries=None, stats=None, events=None, granularity=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
 
-        self._warnings = None
         self._name = None
         self._query = None
+        self._warnings = None
+        self._timeseries = None
         self._stats = None
         self._events = None
-        self._timeseries = None
         self._granularity = None
         self.discriminator = None
 
-        if warnings is not None:
-            self.warnings = warnings
         if name is not None:
             self.name = name
         if query is not None:
             self.query = query
+        if warnings is not None:
+            self.warnings = warnings
+        if timeseries is not None:
+            self.timeseries = timeseries
         if stats is not None:
             self.stats = stats
         if events is not None:
             self.events = events
-        if timeseries is not None:
-            self.timeseries = timeseries
         if granularity is not None:
             self.granularity = granularity
 
-    @property
-    def warnings(self):
-        """Gets the warnings of this QueryResult.  # noqa: E501
-
-        The warnings incurred by this query  # noqa: E501
-
-        :return: The warnings of this QueryResult.  # noqa: E501
-        :rtype: str
-        """
-        return self._warnings
-
-    @warnings.setter
-    def warnings(self, warnings):
-        """Sets the warnings of this QueryResult.
-
-        The warnings incurred by this query  # noqa: E501
-
-        :param warnings: The warnings of this QueryResult.  # noqa: E501
-        :type: str
-        """
-
-        self._warnings = warnings
-
     @property
     def name(self):
         """Gets the name of this QueryResult.  # noqa: E501
@@ -150,6 +127,50 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def warnings(self):
+        """Gets the warnings of this QueryResult.  # noqa: E501
+
+        The warnings incurred by this query  # noqa: E501
+
+        :return: The warnings of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._warnings
+
+    @warnings.setter
+    def warnings(self, warnings):
+        """Sets the warnings of this QueryResult.
+
+        The warnings incurred by this query  # noqa: E501
+
+        :param warnings: The warnings of this QueryResult.  # noqa: E501
+        :type: str
+        """
+
+        self._warnings = warnings
+
+    @property
+    def timeseries(self):
+        """Gets the timeseries of this QueryResult.  # noqa: E501
+
+
+        :return: The timeseries of this QueryResult.  # noqa: E501
+        :rtype: list[Timeseries]
+        """
+        return self._timeseries
+
+    @timeseries.setter
+    def timeseries(self, timeseries):
+        """Sets the timeseries of this QueryResult.
+
+
+        :param timeseries: The timeseries of this QueryResult.  # noqa: E501
+        :type: list[Timeseries]
+        """
+
+        self._timeseries = timeseries
+
     @property
     def stats(self):
         """Gets the stats of this QueryResult.  # noqa: E501
@@ -192,27 +213,6 @@ def events(self, events):
 
         self._events = events
 
-    @property
-    def timeseries(self):
-        """Gets the timeseries of this QueryResult.  # noqa: E501
-
-
-        :return: The timeseries of this QueryResult.  # noqa: E501
-        :rtype: list[Timeseries]
-        """
-        return self._timeseries
-
-    @timeseries.setter
-    def timeseries(self, timeseries):
-        """Sets the timeseries of this QueryResult.
-
-
-        :param timeseries: The timeseries of this QueryResult.  # noqa: E501
-        :type: list[Timeseries]
-        """
-
-        self._timeseries = timeseries
-
     @property
     def granularity(self):
         """Gets the granularity of this QueryResult.  # noqa: E501
@@ -257,6 +257,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(QueryResult, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index ff1234a..261ed96 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -120,6 +120,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(RawTimeseries, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index 5e29cff..f383661 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -118,6 +118,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainer, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index 8e5cc4d..8701d0d 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerAlert, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 1f88ca5..b111cfa 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerCloudIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index 9cb9a89..94a9bab 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerDashboard, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 66abe5f..efdc4ae 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerDerivedMetricDefinition, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index bb29993..1deb38e 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerEvent, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index 0fbb806..52c67ce 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerExternalLink, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 2ed8b7d..e4b5238 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerFacetResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 1b0c1d7..2e17d82 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerFacetsResponseContainer, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 4b9fc02..454c98d 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerHistoryResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index a0fb838..fdf0eb6 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 1d2a0df..b6c203e 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerIntegrationStatus, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_list_acl.py b/wavefront_api_client/models/response_container_list_acl.py
new file mode 100644
index 0000000..7b3e752
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_acl.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.acl import ACL  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerListACL(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'status': 'ResponseStatus',
+        'response': 'list[ACL]'
+    }
+
+    attribute_map = {
+        'status': 'status',
+        'response': 'response'
+    }
+
+    def __init__(self, status=None, response=None):  # noqa: E501
+        """ResponseContainerListACL - a model defined in Swagger"""  # noqa: E501
+
+        self._status = None
+        self._response = None
+        self.discriminator = None
+
+        self.status = status
+        if response is not None:
+            self.response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListACL.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListACL.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListACL.
+
+
+        :param status: The status of this ResponseContainerListACL.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListACL.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListACL.  # noqa: E501
+        :rtype: list[ACL]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListACL.
+
+
+        :param response: The response of this ResponseContainerListACL.  # noqa: E501
+        :type: list[ACL]
+        """
+
+        self._response = response
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListACL, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListACL):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
new file mode 100644
index 0000000..f794d22
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.integration import Integration  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerListIntegration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'status': 'ResponseStatus',
+        'response': 'list[Integration]'
+    }
+
+    attribute_map = {
+        'status': 'status',
+        'response': 'response'
+    }
+
+    def __init__(self, status=None, response=None):  # noqa: E501
+        """ResponseContainerListIntegration - a model defined in Swagger"""  # noqa: E501
+
+        self._status = None
+        self._response = None
+        self.discriminator = None
+
+        self.status = status
+        if response is not None:
+            self.response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListIntegration.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListIntegration.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListIntegration.
+
+
+        :param status: The status of this ResponseContainerListIntegration.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListIntegration.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListIntegration.  # noqa: E501
+        :rtype: list[Integration]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListIntegration.
+
+
+        :param response: The response of this ResponseContainerListIntegration.  # noqa: E501
+        :type: list[Integration]
+        """
+
+        self._response = response
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListIntegration):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index ef71263..324feb3 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerListIntegrationManifestGroup, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
new file mode 100644
index 0000000..0989f67
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -0,0 +1,144 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerListString(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'status': 'ResponseStatus',
+        'response': 'list[str]'
+    }
+
+    attribute_map = {
+        'status': 'status',
+        'response': 'response'
+    }
+
+    def __init__(self, status=None, response=None):  # noqa: E501
+        """ResponseContainerListString - a model defined in Swagger"""  # noqa: E501
+
+        self._status = None
+        self._response = None
+        self.discriminator = None
+
+        self.status = status
+        if response is not None:
+            self.response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListString.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListString.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListString.
+
+
+        :param status: The status of this ResponseContainerListString.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListString.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListString.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListString.
+
+
+        :param response: The response of this ResponseContainerListString.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._response = response
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListString, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListString):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_user_group.py b/wavefront_api_client/models/response_container_list_user_group.py
new file mode 100644
index 0000000..7aac359
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_user_group.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
+
+class ResponseContainerListUserGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'status': 'ResponseStatus',
+        'response': 'list[UserGroup]'
+    }
+
+    attribute_map = {
+        'status': 'status',
+        'response': 'response'
+    }
+
+    def __init__(self, status=None, response=None):  # noqa: E501
+        """ResponseContainerListUserGroup - a model defined in Swagger"""  # noqa: E501
+
+        self._status = None
+        self._response = None
+        self.discriminator = None
+
+        self.status = status
+        if response is not None:
+            self.response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListUserGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListUserGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListUserGroup.
+
+
+        :param status: The status of this ResponseContainerListUserGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListUserGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListUserGroup.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListUserGroup.
+
+
+        :param response: The response of this ResponseContainerListUserGroup.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._response = response
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListUserGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListUserGroup):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index c14bbb9..9f363b4 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerMaintenanceWindow, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 67aae78..1bbd2f7 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -118,6 +118,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerMapStringInteger, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index 61c8eeb..bd6eeee 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerMapStringIntegrationStatus, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index a3291f2..109ba03 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerMessage, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index a69c5a9..0b3df14 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerNotificant, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index 9e42ccb..7c7589a 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedAlert, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index 2f044dd..eff57e7 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedAlertWithStats, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index 10ac8f4..d969f9a 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedCloudIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 5072ae2..5f4319e 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedCustomerFacingUserObject, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index b4a4bdc..3f31910 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedDashboard, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index d7ead43..d02d754 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedDerivedMetricDefinition, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 4638ab8..d11469f 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedDerivedMetricDefinitionWithStats, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index 95e8b57..be8882b 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedEvent, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index 61a9492..a8c1ccb 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedExternalLink, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 20b9eaf..9baeb45 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedIntegration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index b5afdcf..40e3771 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedMaintenanceWindow, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index 3196a9e..a5d379d 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedMessage, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index 7951376..7f7e29e 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedNotificant, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index c5612b6..dad48ef 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedProxy, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index ea81c3b..94db44c 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedSavedSearch, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index f1520c9..285ffe1 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerPagedSource, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_paged_user_group.py b/wavefront_api_client/models/response_container_paged_user_group.py
new file mode 100644
index 0000000..e2264c0
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_user_group.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.paged_user_group import PagedUserGroup  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerPagedUserGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'status': 'ResponseStatus',
+        'response': 'PagedUserGroup'
+    }
+
+    attribute_map = {
+        'status': 'status',
+        'response': 'response'
+    }
+
+    def __init__(self, status=None, response=None):  # noqa: E501
+        """ResponseContainerPagedUserGroup - a model defined in Swagger"""  # noqa: E501
+
+        self._status = None
+        self._response = None
+        self.discriminator = None
+
+        self.status = status
+        if response is not None:
+            self.response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedUserGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedUserGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedUserGroup.
+
+
+        :param status: The status of this ResponseContainerPagedUserGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedUserGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
+        :rtype: PagedUserGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedUserGroup.
+
+
+        :param response: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
+        :type: PagedUserGroup
+        """
+
+        self._response = response
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedUserGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedUserGroup):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index 3ab5635..eaa70bd 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerProxy, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index 5e44251..b128247 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerSavedSearch, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 3d95fa8..2aa4804 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerSource, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index bb3019f..c888346 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -119,6 +119,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseContainerTagsResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/response_container_user_group.py b/wavefront_api_client/models/response_container_user_group.py
new file mode 100644
index 0000000..160978e
--- /dev/null
+++ b/wavefront_api_client/models/response_container_user_group.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
+
+class ResponseContainerUserGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'status': 'ResponseStatus',
+        'response': 'UserGroup'
+    }
+
+    attribute_map = {
+        'status': 'status',
+        'response': 'response'
+    }
+
+    def __init__(self, status=None, response=None):  # noqa: E501
+        """ResponseContainerUserGroup - a model defined in Swagger"""  # noqa: E501
+
+        self._status = None
+        self._response = None
+        self.discriminator = None
+
+        self.status = status
+        if response is not None:
+            self.response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerUserGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerUserGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerUserGroup.
+
+
+        :param status: The status of this ResponseContainerUserGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerUserGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerUserGroup.  # noqa: E501
+        :rtype: UserGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerUserGroup.
+
+
+        :param response: The response of this ResponseContainerUserGroup.  # noqa: E501
+        :type: UserGroup
+        """
+
+        self._response = response
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerUserGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerUserGroup):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index a1629e2..ce8ddc9 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -153,6 +153,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(ResponseStatus, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 542cf66..17455da 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -148,7 +148,7 @@ def entity_type(self, entity_type):
         """
         if entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP"]  # noqa: E501
         if entity_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
@@ -285,6 +285,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(SavedSearch, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index fcc6f4f..6b93697 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -155,6 +155,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(SearchQuery, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index e09a0d1..662c1d1 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -176,6 +176,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(SortableSearchRequest, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index 60f1db3..624e6c1 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -149,6 +149,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Sorting, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index fe96e24..16b5ebb 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,8 +32,8 @@ class Source(object):
     """
     swagger_types = {
         'hidden': 'bool',
-        'id': 'str',
         'description': 'str',
+        'id': 'str',
         'tags': 'dict(str, bool)',
         'creator_id': 'str',
         'updater_id': 'str',
@@ -45,8 +45,8 @@ class Source(object):
 
     attribute_map = {
         'hidden': 'hidden',
-        'id': 'id',
         'description': 'description',
+        'id': 'id',
         'tags': 'tags',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
@@ -56,12 +56,12 @@ class Source(object):
         'source_name': 'sourceName'
     }
 
-    def __init__(self, hidden=None, id=None, description=None, tags=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, marked_new_epoch_millis=None, source_name=None):  # noqa: E501
+    def __init__(self, hidden=None, description=None, id=None, tags=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, marked_new_epoch_millis=None, source_name=None):  # noqa: E501
         """Source - a model defined in Swagger"""  # noqa: E501
 
         self._hidden = None
-        self._id = None
         self._description = None
+        self._id = None
         self._tags = None
         self._creator_id = None
         self._updater_id = None
@@ -73,9 +73,9 @@ def __init__(self, hidden=None, id=None, description=None, tags=None, creator_id
 
         if hidden is not None:
             self.hidden = hidden
-        self.id = id
         if description is not None:
             self.description = description
+        self.id = id
         if tags is not None:
             self.tags = tags
         if creator_id is not None:
@@ -113,6 +113,29 @@ def hidden(self, hidden):
 
         self._hidden = hidden
 
+    @property
+    def description(self):
+        """Gets the description of this Source.  # noqa: E501
+
+        Description of this source  # noqa: E501
+
+        :return: The description of this Source.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Source.
+
+        Description of this source  # noqa: E501
+
+        :param description: The description of this Source.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def id(self):
         """Gets the id of this Source.  # noqa: E501
@@ -138,29 +161,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def description(self):
-        """Gets the description of this Source.  # noqa: E501
-
-        Description of this source  # noqa: E501
-
-        :return: The description of this Source.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Source.
-
-        Description of this source  # noqa: E501
-
-        :param description: The description of this Source.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
     @property
     def tags(self):
         """Gets the tags of this Source.  # noqa: E501
@@ -337,6 +337,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Source, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 7de5de0..96dbb21 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,6 +32,7 @@ class SourceLabelPair(object):
     """
     swagger_types = {
         'label': 'str',
+        'severity': 'str',
         'host': 'str',
         'tags': 'dict(str, str)',
         'firing': 'int',
@@ -40,16 +41,18 @@ class SourceLabelPair(object):
 
     attribute_map = {
         'label': 'label',
+        'severity': 'severity',
         'host': 'host',
         'tags': 'tags',
         'firing': 'firing',
         'observed': 'observed'
     }
 
-    def __init__(self, label=None, host=None, tags=None, firing=None, observed=None):  # noqa: E501
+    def __init__(self, label=None, severity=None, host=None, tags=None, firing=None, observed=None):  # noqa: E501
         """SourceLabelPair - a model defined in Swagger"""  # noqa: E501
 
         self._label = None
+        self._severity = None
         self._host = None
         self._tags = None
         self._firing = None
@@ -58,6 +61,8 @@ def __init__(self, label=None, host=None, tags=None, firing=None, observed=None)
 
         if label is not None:
             self.label = label
+        if severity is not None:
+            self.severity = severity
         if host is not None:
             self.host = host
         if tags is not None:
@@ -88,6 +93,33 @@ def label(self, label):
 
         self._label = label
 
+    @property
+    def severity(self):
+        """Gets the severity of this SourceLabelPair.  # noqa: E501
+
+
+        :return: The severity of this SourceLabelPair.  # noqa: E501
+        :rtype: str
+        """
+        return self._severity
+
+    @severity.setter
+    def severity(self, severity):
+        """Sets the severity of this SourceLabelPair.
+
+
+        :param severity: The severity of this SourceLabelPair.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if severity not in allowed_values:
+            raise ValueError(
+                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(severity, allowed_values)
+            )
+
+        self._severity = severity
+
     @property
     def host(self):
         """Gets the host of this SourceLabelPair.  # noqa: E501
@@ -195,6 +227,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(SourceLabelPair, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index 121ea08..0f2f651 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -177,6 +177,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(SourceSearchRequestContainer, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/stats_model.py b/wavefront_api_client/models/stats_model.py
index 26bea62..f5acbf6 100644
--- a/wavefront_api_client/models/stats_model.py
+++ b/wavefront_api_client/models/stats_model.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -453,6 +453,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(StatsModel, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 13359d9..5698174 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -255,6 +255,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(TagsResponse, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index 57d1b6c..e4314f4 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -153,6 +153,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(TargetInfo, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/tesla_configuration.py b/wavefront_api_client/models/tesla_configuration.py
index 0a7562b..11dee4d 100644
--- a/wavefront_api_client/models/tesla_configuration.py
+++ b/wavefront_api_client/models/tesla_configuration.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -92,6 +92,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(TeslaConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index 987fe9f..88e9f56 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -175,6 +175,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(Timeseries, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
new file mode 100644
index 0000000..54908e8
--- /dev/null
+++ b/wavefront_api_client/models/user.py
@@ -0,0 +1,533 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_settings import UserSettings  # noqa: F401,E501
+
+
+class User(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'identifier': 'str',
+        'customer': 'str',
+        'credential': 'str',
+        'provider': 'str',
+        'groups': 'list[str]',
+        'user_groups': 'list[str]',
+        'reset_token': 'str',
+        'api_token': 'str',
+        'api_token2': 'str',
+        'reset_token_creation_millis': 'int',
+        'invalid_password_attempts': 'int',
+        'last_successful_login': 'int',
+        'settings': 'UserSettings',
+        'onboarding_state': 'str',
+        'last_logout': 'int',
+        'sso_id': 'str',
+        'super_admin': 'bool'
+    }
+
+    attribute_map = {
+        'identifier': 'identifier',
+        'customer': 'customer',
+        'credential': 'credential',
+        'provider': 'provider',
+        'groups': 'groups',
+        'user_groups': 'userGroups',
+        'reset_token': 'resetToken',
+        'api_token': 'apiToken',
+        'api_token2': 'apiToken2',
+        'reset_token_creation_millis': 'resetTokenCreationMillis',
+        'invalid_password_attempts': 'invalidPasswordAttempts',
+        'last_successful_login': 'lastSuccessfulLogin',
+        'settings': 'settings',
+        'onboarding_state': 'onboardingState',
+        'last_logout': 'lastLogout',
+        'sso_id': 'ssoId',
+        'super_admin': 'superAdmin'
+    }
+
+    def __init__(self, identifier=None, customer=None, credential=None, provider=None, groups=None, user_groups=None, reset_token=None, api_token=None, api_token2=None, reset_token_creation_millis=None, invalid_password_attempts=None, last_successful_login=None, settings=None, onboarding_state=None, last_logout=None, sso_id=None, super_admin=None):  # noqa: E501
+        """User - a model defined in Swagger"""  # noqa: E501
+
+        self._identifier = None
+        self._customer = None
+        self._credential = None
+        self._provider = None
+        self._groups = None
+        self._user_groups = None
+        self._reset_token = None
+        self._api_token = None
+        self._api_token2 = None
+        self._reset_token_creation_millis = None
+        self._invalid_password_attempts = None
+        self._last_successful_login = None
+        self._settings = None
+        self._onboarding_state = None
+        self._last_logout = None
+        self._sso_id = None
+        self._super_admin = None
+        self.discriminator = None
+
+        if identifier is not None:
+            self.identifier = identifier
+        if customer is not None:
+            self.customer = customer
+        if credential is not None:
+            self.credential = credential
+        if provider is not None:
+            self.provider = provider
+        if groups is not None:
+            self.groups = groups
+        if user_groups is not None:
+            self.user_groups = user_groups
+        if reset_token is not None:
+            self.reset_token = reset_token
+        if api_token is not None:
+            self.api_token = api_token
+        if api_token2 is not None:
+            self.api_token2 = api_token2
+        if reset_token_creation_millis is not None:
+            self.reset_token_creation_millis = reset_token_creation_millis
+        if invalid_password_attempts is not None:
+            self.invalid_password_attempts = invalid_password_attempts
+        if last_successful_login is not None:
+            self.last_successful_login = last_successful_login
+        if settings is not None:
+            self.settings = settings
+        if onboarding_state is not None:
+            self.onboarding_state = onboarding_state
+        if last_logout is not None:
+            self.last_logout = last_logout
+        if sso_id is not None:
+            self.sso_id = sso_id
+        if super_admin is not None:
+            self.super_admin = super_admin
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this User.  # noqa: E501
+
+
+        :return: The identifier of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._identifier
+
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this User.
+
+
+        :param identifier: The identifier of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._identifier = identifier
+
+    @property
+    def customer(self):
+        """Gets the customer of this User.  # noqa: E501
+
+
+        :return: The customer of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this User.
+
+
+        :param customer: The customer of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def credential(self):
+        """Gets the credential of this User.  # noqa: E501
+
+
+        :return: The credential of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._credential
+
+    @credential.setter
+    def credential(self, credential):
+        """Sets the credential of this User.
+
+
+        :param credential: The credential of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._credential = credential
+
+    @property
+    def provider(self):
+        """Gets the provider of this User.  # noqa: E501
+
+
+        :return: The provider of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._provider
+
+    @provider.setter
+    def provider(self, provider):
+        """Sets the provider of this User.
+
+
+        :param provider: The provider of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._provider = provider
+
+    @property
+    def groups(self):
+        """Gets the groups of this User.  # noqa: E501
+
+
+        :return: The groups of this User.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this User.
+
+
+        :param groups: The groups of this User.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this User.  # noqa: E501
+
+
+        :return: The user_groups of this User.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this User.
+
+
+        :param user_groups: The user_groups of this User.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
+
+    @property
+    def reset_token(self):
+        """Gets the reset_token of this User.  # noqa: E501
+
+
+        :return: The reset_token of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._reset_token
+
+    @reset_token.setter
+    def reset_token(self, reset_token):
+        """Sets the reset_token of this User.
+
+
+        :param reset_token: The reset_token of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._reset_token = reset_token
+
+    @property
+    def api_token(self):
+        """Gets the api_token of this User.  # noqa: E501
+
+
+        :return: The api_token of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._api_token
+
+    @api_token.setter
+    def api_token(self, api_token):
+        """Sets the api_token of this User.
+
+
+        :param api_token: The api_token of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._api_token = api_token
+
+    @property
+    def api_token2(self):
+        """Gets the api_token2 of this User.  # noqa: E501
+
+
+        :return: The api_token2 of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._api_token2
+
+    @api_token2.setter
+    def api_token2(self, api_token2):
+        """Sets the api_token2 of this User.
+
+
+        :param api_token2: The api_token2 of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._api_token2 = api_token2
+
+    @property
+    def reset_token_creation_millis(self):
+        """Gets the reset_token_creation_millis of this User.  # noqa: E501
+
+
+        :return: The reset_token_creation_millis of this User.  # noqa: E501
+        :rtype: int
+        """
+        return self._reset_token_creation_millis
+
+    @reset_token_creation_millis.setter
+    def reset_token_creation_millis(self, reset_token_creation_millis):
+        """Sets the reset_token_creation_millis of this User.
+
+
+        :param reset_token_creation_millis: The reset_token_creation_millis of this User.  # noqa: E501
+        :type: int
+        """
+
+        self._reset_token_creation_millis = reset_token_creation_millis
+
+    @property
+    def invalid_password_attempts(self):
+        """Gets the invalid_password_attempts of this User.  # noqa: E501
+
+
+        :return: The invalid_password_attempts of this User.  # noqa: E501
+        :rtype: int
+        """
+        return self._invalid_password_attempts
+
+    @invalid_password_attempts.setter
+    def invalid_password_attempts(self, invalid_password_attempts):
+        """Sets the invalid_password_attempts of this User.
+
+
+        :param invalid_password_attempts: The invalid_password_attempts of this User.  # noqa: E501
+        :type: int
+        """
+
+        self._invalid_password_attempts = invalid_password_attempts
+
+    @property
+    def last_successful_login(self):
+        """Gets the last_successful_login of this User.  # noqa: E501
+
+
+        :return: The last_successful_login of this User.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_successful_login
+
+    @last_successful_login.setter
+    def last_successful_login(self, last_successful_login):
+        """Sets the last_successful_login of this User.
+
+
+        :param last_successful_login: The last_successful_login of this User.  # noqa: E501
+        :type: int
+        """
+
+        self._last_successful_login = last_successful_login
+
+    @property
+    def settings(self):
+        """Gets the settings of this User.  # noqa: E501
+
+
+        :return: The settings of this User.  # noqa: E501
+        :rtype: UserSettings
+        """
+        return self._settings
+
+    @settings.setter
+    def settings(self, settings):
+        """Sets the settings of this User.
+
+
+        :param settings: The settings of this User.  # noqa: E501
+        :type: UserSettings
+        """
+
+        self._settings = settings
+
+    @property
+    def onboarding_state(self):
+        """Gets the onboarding_state of this User.  # noqa: E501
+
+
+        :return: The onboarding_state of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._onboarding_state
+
+    @onboarding_state.setter
+    def onboarding_state(self, onboarding_state):
+        """Sets the onboarding_state of this User.
+
+
+        :param onboarding_state: The onboarding_state of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._onboarding_state = onboarding_state
+
+    @property
+    def last_logout(self):
+        """Gets the last_logout of this User.  # noqa: E501
+
+
+        :return: The last_logout of this User.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_logout
+
+    @last_logout.setter
+    def last_logout(self, last_logout):
+        """Sets the last_logout of this User.
+
+
+        :param last_logout: The last_logout of this User.  # noqa: E501
+        :type: int
+        """
+
+        self._last_logout = last_logout
+
+    @property
+    def sso_id(self):
+        """Gets the sso_id of this User.  # noqa: E501
+
+
+        :return: The sso_id of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._sso_id
+
+    @sso_id.setter
+    def sso_id(self, sso_id):
+        """Sets the sso_id of this User.
+
+
+        :param sso_id: The sso_id of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._sso_id = sso_id
+
+    @property
+    def super_admin(self):
+        """Gets the super_admin of this User.  # noqa: E501
+
+
+        :return: The super_admin of this User.  # noqa: E501
+        :rtype: bool
+        """
+        return self._super_admin
+
+    @super_admin.setter
+    def super_admin(self, super_admin):
+        """Sets the super_admin of this User.
+
+
+        :param super_admin: The super_admin of this User.  # noqa: E501
+        :type: bool
+        """
+
+        self._super_admin = super_admin
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(User, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, User):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
new file mode 100644
index 0000000..fbf61b7
--- /dev/null
+++ b/wavefront_api_client/models/user_group.py
@@ -0,0 +1,289 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO  # noqa: F401,E501
+
+
+class UserGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'id': 'str',
+        'name': 'str',
+        'permissions': 'list[str]',
+        'customer': 'str',
+        'users': 'list[str]',
+        'user_count': 'int',
+        'properties': 'UserGroupPropertiesDTO'
+    }
+
+    attribute_map = {
+        'id': 'id',
+        'name': 'name',
+        'permissions': 'permissions',
+        'customer': 'customer',
+        'users': 'users',
+        'user_count': 'userCount',
+        'properties': 'properties'
+    }
+
+    def __init__(self, id=None, name=None, permissions=None, customer=None, users=None, user_count=None, properties=None):  # noqa: E501
+        """UserGroup - a model defined in Swagger"""  # noqa: E501
+
+        self._id = None
+        self._name = None
+        self._permissions = None
+        self._customer = None
+        self._users = None
+        self._user_count = None
+        self._properties = None
+        self.discriminator = None
+
+        if id is not None:
+            self.id = id
+        self.name = name
+        self.permissions = permissions
+        if customer is not None:
+            self.customer = customer
+        if users is not None:
+            self.users = users
+        if user_count is not None:
+            self.user_count = user_count
+        if properties is not None:
+            self.properties = properties
+
+    @property
+    def id(self):
+        """Gets the id of this UserGroup.  # noqa: E501
+
+        Unique ID for the user group  # noqa: E501
+
+        :return: The id of this UserGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this UserGroup.
+
+        Unique ID for the user group  # noqa: E501
+
+        :param id: The id of this UserGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this UserGroup.  # noqa: E501
+
+        Name of the user group  # noqa: E501
+
+        :return: The name of this UserGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this UserGroup.
+
+        Name of the user group  # noqa: E501
+
+        :param name: The name of this UserGroup.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def permissions(self):
+        """Gets the permissions of this UserGroup.  # noqa: E501
+
+        Permission assigned to the user group  # noqa: E501
+
+        :return: The permissions of this UserGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this UserGroup.
+
+        Permission assigned to the user group  # noqa: E501
+
+        :param permissions: The permissions of this UserGroup.  # noqa: E501
+        :type: list[str]
+        """
+        if permissions is None:
+            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
+
+        self._permissions = permissions
+
+    @property
+    def customer(self):
+        """Gets the customer of this UserGroup.  # noqa: E501
+
+        ID of the customer to which the user group belongs  # noqa: E501
+
+        :return: The customer of this UserGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserGroup.
+
+        ID of the customer to which the user group belongs  # noqa: E501
+
+        :param customer: The customer of this UserGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def users(self):
+        """Gets the users of this UserGroup.  # noqa: E501
+
+        List of Users that are members of the user group. Maybe incomplete.  # noqa: E501
+
+        :return: The users of this UserGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._users
+
+    @users.setter
+    def users(self, users):
+        """Sets the users of this UserGroup.
+
+        List of Users that are members of the user group. Maybe incomplete.  # noqa: E501
+
+        :param users: The users of this UserGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._users = users
+
+    @property
+    def user_count(self):
+        """Gets the user_count of this UserGroup.  # noqa: E501
+
+        Total number of users that are members of the user group  # noqa: E501
+
+        :return: The user_count of this UserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._user_count
+
+    @user_count.setter
+    def user_count(self, user_count):
+        """Sets the user_count of this UserGroup.
+
+        Total number of users that are members of the user group  # noqa: E501
+
+        :param user_count: The user_count of this UserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._user_count = user_count
+
+    @property
+    def properties(self):
+        """Gets the properties of this UserGroup.  # noqa: E501
+
+        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
+
+        :return: The properties of this UserGroup.  # noqa: E501
+        :rtype: UserGroupPropertiesDTO
+        """
+        return self._properties
+
+    @properties.setter
+    def properties(self, properties):
+        """Sets the properties of this UserGroup.
+
+        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
+
+        :param properties: The properties of this UserGroup.  # noqa: E501
+        :type: UserGroupPropertiesDTO
+        """
+
+        self._properties = properties
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserGroup):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
new file mode 100644
index 0000000..005f263
--- /dev/null
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class UserGroupPropertiesDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'name_editable': 'bool',
+        'permissions_editable': 'bool',
+        'users_editable': 'bool'
+    }
+
+    attribute_map = {
+        'name_editable': 'nameEditable',
+        'permissions_editable': 'permissionsEditable',
+        'users_editable': 'usersEditable'
+    }
+
+    def __init__(self, name_editable=None, permissions_editable=None, users_editable=None):  # noqa: E501
+        """UserGroupPropertiesDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._name_editable = None
+        self._permissions_editable = None
+        self._users_editable = None
+        self.discriminator = None
+
+        if name_editable is not None:
+            self.name_editable = name_editable
+        if permissions_editable is not None:
+            self.permissions_editable = permissions_editable
+        if users_editable is not None:
+            self.users_editable = users_editable
+
+    @property
+    def name_editable(self):
+        """Gets the name_editable of this UserGroupPropertiesDTO.  # noqa: E501
+
+
+        :return: The name_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._name_editable
+
+    @name_editable.setter
+    def name_editable(self, name_editable):
+        """Sets the name_editable of this UserGroupPropertiesDTO.
+
+
+        :param name_editable: The name_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._name_editable = name_editable
+
+    @property
+    def permissions_editable(self):
+        """Gets the permissions_editable of this UserGroupPropertiesDTO.  # noqa: E501
+
+
+        :return: The permissions_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._permissions_editable
+
+    @permissions_editable.setter
+    def permissions_editable(self, permissions_editable):
+        """Sets the permissions_editable of this UserGroupPropertiesDTO.
+
+
+        :param permissions_editable: The permissions_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._permissions_editable = permissions_editable
+
+    @property
+    def users_editable(self):
+        """Gets the users_editable of this UserGroupPropertiesDTO.  # noqa: E501
+
+
+        :return: The users_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._users_editable
+
+    @users_editable.setter
+    def users_editable(self, users_editable):
+        """Sets the users_editable of this UserGroupPropertiesDTO.
+
+
+        :param users_editable: The users_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._users_editable = users_editable
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserGroupPropertiesDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserGroupPropertiesDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
new file mode 100644
index 0000000..9edaad9
--- /dev/null
+++ b/wavefront_api_client/models/user_group_write.py
@@ -0,0 +1,229 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class UserGroupWrite(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'permissions': 'list[str]',
+        'name': 'str',
+        'id': 'str',
+        'customer': 'str',
+        'created_epoch_millis': 'int'
+    }
+
+    attribute_map = {
+        'permissions': 'permissions',
+        'name': 'name',
+        'id': 'id',
+        'customer': 'customer',
+        'created_epoch_millis': 'createdEpochMillis'
+    }
+
+    def __init__(self, permissions=None, name=None, id=None, customer=None, created_epoch_millis=None):  # noqa: E501
+        """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
+
+        self._permissions = None
+        self._name = None
+        self._id = None
+        self._customer = None
+        self._created_epoch_millis = None
+        self.discriminator = None
+
+        self.permissions = permissions
+        self.name = name
+        if id is not None:
+            self.id = id
+        if customer is not None:
+            self.customer = customer
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+
+    @property
+    def permissions(self):
+        """Gets the permissions of this UserGroupWrite.  # noqa: E501
+
+        List of permissions the user group has been granted access to  # noqa: E501
+
+        :return: The permissions of this UserGroupWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this UserGroupWrite.
+
+        List of permissions the user group has been granted access to  # noqa: E501
+
+        :param permissions: The permissions of this UserGroupWrite.  # noqa: E501
+        :type: list[str]
+        """
+        if permissions is None:
+            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
+
+        self._permissions = permissions
+
+    @property
+    def name(self):
+        """Gets the name of this UserGroupWrite.  # noqa: E501
+
+        The name of the user group  # noqa: E501
+
+        :return: The name of this UserGroupWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this UserGroupWrite.
+
+        The name of the user group  # noqa: E501
+
+        :param name: The name of this UserGroupWrite.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def id(self):
+        """Gets the id of this UserGroupWrite.  # noqa: E501
+
+        The unique identifier of the user group  # noqa: E501
+
+        :return: The id of this UserGroupWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this UserGroupWrite.
+
+        The unique identifier of the user group  # noqa: E501
+
+        :param id: The id of this UserGroupWrite.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def customer(self):
+        """Gets the customer of this UserGroupWrite.  # noqa: E501
+
+        The id of the customer to which the user group belongs  # noqa: E501
+
+        :return: The customer of this UserGroupWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserGroupWrite.
+
+        The id of the customer to which the user group belongs  # noqa: E501
+
+        :param customer: The customer of this UserGroupWrite.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this UserGroupWrite.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this UserGroupWrite.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this UserGroupWrite.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this UserGroupWrite.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserGroupWrite, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserGroupWrite):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index ece0366..37ebf89 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
 
 class UserModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -33,26 +35,40 @@ class UserModel(object):
     swagger_types = {
         'identifier': 'str',
         'customer': 'str',
-        'groups': 'list[str]'
+        'sso_id': 'str',
+        'last_successful_login': 'int',
+        'groups': 'list[str]',
+        'user_groups': 'list[UserGroup]'
     }
 
     attribute_map = {
         'identifier': 'identifier',
         'customer': 'customer',
-        'groups': 'groups'
+        'sso_id': 'ssoId',
+        'last_successful_login': 'lastSuccessfulLogin',
+        'groups': 'groups',
+        'user_groups': 'userGroups'
     }
 
-    def __init__(self, identifier=None, customer=None, groups=None):  # noqa: E501
+    def __init__(self, identifier=None, customer=None, sso_id=None, last_successful_login=None, groups=None, user_groups=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
 
         self._identifier = None
         self._customer = None
+        self._sso_id = None
+        self._last_successful_login = None
         self._groups = None
+        self._user_groups = None
         self.discriminator = None
 
         self.identifier = identifier
         self.customer = customer
+        if sso_id is not None:
+            self.sso_id = sso_id
+        if last_successful_login is not None:
+            self.last_successful_login = last_successful_login
         self.groups = groups
+        self.user_groups = user_groups
 
     @property
     def identifier(self):
@@ -104,6 +120,48 @@ def customer(self, customer):
 
         self._customer = customer
 
+    @property
+    def sso_id(self):
+        """Gets the sso_id of this UserModel.  # noqa: E501
+
+
+        :return: The sso_id of this UserModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._sso_id
+
+    @sso_id.setter
+    def sso_id(self, sso_id):
+        """Sets the sso_id of this UserModel.
+
+
+        :param sso_id: The sso_id of this UserModel.  # noqa: E501
+        :type: str
+        """
+
+        self._sso_id = sso_id
+
+    @property
+    def last_successful_login(self):
+        """Gets the last_successful_login of this UserModel.  # noqa: E501
+
+
+        :return: The last_successful_login of this UserModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_successful_login
+
+    @last_successful_login.setter
+    def last_successful_login(self, last_successful_login):
+        """Sets the last_successful_login of this UserModel.
+
+
+        :param last_successful_login: The last_successful_login of this UserModel.  # noqa: E501
+        :type: int
+        """
+
+        self._last_successful_login = last_successful_login
+
     @property
     def groups(self):
         """Gets the groups of this UserModel.  # noqa: E501
@@ -129,6 +187,31 @@ def groups(self, groups):
 
         self._groups = groups
 
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this UserModel.  # noqa: E501
+
+        The list of user groups the user belongs to  # noqa: E501
+
+        :return: The user_groups of this UserModel.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this UserModel.
+
+        The list of user groups the user belongs to  # noqa: E501
+
+        :param user_groups: The user_groups of this UserModel.  # noqa: E501
+        :type: list[UserGroup]
+        """
+        if user_groups is None:
+            raise ValueError("Invalid value for `user_groups`, must not be `None`")  # noqa: E501
+
+        self._user_groups = user_groups
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -150,6 +233,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(UserModel, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
new file mode 100644
index 0000000..0c8de28
--- /dev/null
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -0,0 +1,219 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class UserRequestDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'identifier': 'str',
+        'sso_id': 'str',
+        'customer': 'str',
+        'groups': 'list[str]',
+        'user_groups': 'list[str]'
+    }
+
+    attribute_map = {
+        'identifier': 'identifier',
+        'sso_id': 'ssoId',
+        'customer': 'customer',
+        'groups': 'groups',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, identifier=None, sso_id=None, customer=None, groups=None, user_groups=None):  # noqa: E501
+        """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._identifier = None
+        self._sso_id = None
+        self._customer = None
+        self._groups = None
+        self._user_groups = None
+        self.discriminator = None
+
+        if identifier is not None:
+            self.identifier = identifier
+        if sso_id is not None:
+            self.sso_id = sso_id
+        if customer is not None:
+            self.customer = customer
+        if groups is not None:
+            self.groups = groups
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The identifier of this UserRequestDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._identifier
+
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this UserRequestDTO.
+
+
+        :param identifier: The identifier of this UserRequestDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._identifier = identifier
+
+    @property
+    def sso_id(self):
+        """Gets the sso_id of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The sso_id of this UserRequestDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._sso_id
+
+    @sso_id.setter
+    def sso_id(self, sso_id):
+        """Sets the sso_id of this UserRequestDTO.
+
+
+        :param sso_id: The sso_id of this UserRequestDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._sso_id = sso_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The customer of this UserRequestDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserRequestDTO.
+
+
+        :param customer: The customer of this UserRequestDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def groups(self):
+        """Gets the groups of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The groups of this UserRequestDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this UserRequestDTO.
+
+
+        :param groups: The groups of this UserRequestDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The user_groups of this UserRequestDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this UserRequestDTO.
+
+
+        :param user_groups: The user_groups of this UserRequestDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserRequestDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserRequestDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
new file mode 100644
index 0000000..5ceeff7
--- /dev/null
+++ b/wavefront_api_client/models/user_settings.py
@@ -0,0 +1,323 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class UserSettings(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'preferred_time_zone': 'str',
+        'chart_title_scalar': 'int',
+        'show_querybuilder_by_default': 'bool',
+        'hide_ts_when_querybuilder_shown': 'bool',
+        'always_hide_querybuilder': 'bool',
+        'use24_hour_time': 'bool',
+        'use_dark_theme': 'bool',
+        'landing_dashboard_slug': 'str',
+        'show_onboarding': 'bool'
+    }
+
+    attribute_map = {
+        'preferred_time_zone': 'preferredTimeZone',
+        'chart_title_scalar': 'chartTitleScalar',
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
+        'always_hide_querybuilder': 'alwaysHideQuerybuilder',
+        'use24_hour_time': 'use24HourTime',
+        'use_dark_theme': 'useDarkTheme',
+        'landing_dashboard_slug': 'landingDashboardSlug',
+        'show_onboarding': 'showOnboarding'
+    }
+
+    def __init__(self, preferred_time_zone=None, chart_title_scalar=None, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, always_hide_querybuilder=None, use24_hour_time=None, use_dark_theme=None, landing_dashboard_slug=None, show_onboarding=None):  # noqa: E501
+        """UserSettings - a model defined in Swagger"""  # noqa: E501
+
+        self._preferred_time_zone = None
+        self._chart_title_scalar = None
+        self._show_querybuilder_by_default = None
+        self._hide_ts_when_querybuilder_shown = None
+        self._always_hide_querybuilder = None
+        self._use24_hour_time = None
+        self._use_dark_theme = None
+        self._landing_dashboard_slug = None
+        self._show_onboarding = None
+        self.discriminator = None
+
+        if preferred_time_zone is not None:
+            self.preferred_time_zone = preferred_time_zone
+        if chart_title_scalar is not None:
+            self.chart_title_scalar = chart_title_scalar
+        if show_querybuilder_by_default is not None:
+            self.show_querybuilder_by_default = show_querybuilder_by_default
+        if hide_ts_when_querybuilder_shown is not None:
+            self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+        if always_hide_querybuilder is not None:
+            self.always_hide_querybuilder = always_hide_querybuilder
+        if use24_hour_time is not None:
+            self.use24_hour_time = use24_hour_time
+        if use_dark_theme is not None:
+            self.use_dark_theme = use_dark_theme
+        if landing_dashboard_slug is not None:
+            self.landing_dashboard_slug = landing_dashboard_slug
+        if show_onboarding is not None:
+            self.show_onboarding = show_onboarding
+
+    @property
+    def preferred_time_zone(self):
+        """Gets the preferred_time_zone of this UserSettings.  # noqa: E501
+
+
+        :return: The preferred_time_zone of this UserSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._preferred_time_zone
+
+    @preferred_time_zone.setter
+    def preferred_time_zone(self, preferred_time_zone):
+        """Sets the preferred_time_zone of this UserSettings.
+
+
+        :param preferred_time_zone: The preferred_time_zone of this UserSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._preferred_time_zone = preferred_time_zone
+
+    @property
+    def chart_title_scalar(self):
+        """Gets the chart_title_scalar of this UserSettings.  # noqa: E501
+
+
+        :return: The chart_title_scalar of this UserSettings.  # noqa: E501
+        :rtype: int
+        """
+        return self._chart_title_scalar
+
+    @chart_title_scalar.setter
+    def chart_title_scalar(self, chart_title_scalar):
+        """Sets the chart_title_scalar of this UserSettings.
+
+
+        :param chart_title_scalar: The chart_title_scalar of this UserSettings.  # noqa: E501
+        :type: int
+        """
+
+        self._chart_title_scalar = chart_title_scalar
+
+    @property
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this UserSettings.  # noqa: E501
+
+
+        :return: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_querybuilder_by_default
+
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this UserSettings.
+
+
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._show_querybuilder_by_default = show_querybuilder_by_default
+
+    @property
+    def hide_ts_when_querybuilder_shown(self):
+        """Gets the hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
+
+
+        :return: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hide_ts_when_querybuilder_shown
+
+    @hide_ts_when_querybuilder_shown.setter
+    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
+        """Sets the hide_ts_when_querybuilder_shown of this UserSettings.
+
+
+        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+
+    @property
+    def always_hide_querybuilder(self):
+        """Gets the always_hide_querybuilder of this UserSettings.  # noqa: E501
+
+
+        :return: The always_hide_querybuilder of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._always_hide_querybuilder
+
+    @always_hide_querybuilder.setter
+    def always_hide_querybuilder(self, always_hide_querybuilder):
+        """Sets the always_hide_querybuilder of this UserSettings.
+
+
+        :param always_hide_querybuilder: The always_hide_querybuilder of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._always_hide_querybuilder = always_hide_querybuilder
+
+    @property
+    def use24_hour_time(self):
+        """Gets the use24_hour_time of this UserSettings.  # noqa: E501
+
+
+        :return: The use24_hour_time of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._use24_hour_time
+
+    @use24_hour_time.setter
+    def use24_hour_time(self, use24_hour_time):
+        """Sets the use24_hour_time of this UserSettings.
+
+
+        :param use24_hour_time: The use24_hour_time of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._use24_hour_time = use24_hour_time
+
+    @property
+    def use_dark_theme(self):
+        """Gets the use_dark_theme of this UserSettings.  # noqa: E501
+
+
+        :return: The use_dark_theme of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._use_dark_theme
+
+    @use_dark_theme.setter
+    def use_dark_theme(self, use_dark_theme):
+        """Sets the use_dark_theme of this UserSettings.
+
+
+        :param use_dark_theme: The use_dark_theme of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._use_dark_theme = use_dark_theme
+
+    @property
+    def landing_dashboard_slug(self):
+        """Gets the landing_dashboard_slug of this UserSettings.  # noqa: E501
+
+
+        :return: The landing_dashboard_slug of this UserSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._landing_dashboard_slug
+
+    @landing_dashboard_slug.setter
+    def landing_dashboard_slug(self, landing_dashboard_slug):
+        """Sets the landing_dashboard_slug of this UserSettings.
+
+
+        :param landing_dashboard_slug: The landing_dashboard_slug of this UserSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._landing_dashboard_slug = landing_dashboard_slug
+
+    @property
+    def show_onboarding(self):
+        """Gets the show_onboarding of this UserSettings.  # noqa: E501
+
+
+        :return: The show_onboarding of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_onboarding
+
+    @show_onboarding.setter
+    def show_onboarding(self, show_onboarding):
+        """Sets the show_onboarding of this UserSettings.
+
+
+        :param show_onboarding: The show_onboarding of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._show_onboarding = show_onboarding
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserSettings, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserSettings):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index d6cad2e..da25433 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -32,29 +32,33 @@ class UserToCreate(object):
     """
     swagger_types = {
         'email_address': 'str',
-        'groups': 'list[str]'
+        'groups': 'list[str]',
+        'user_groups': 'list[str]'
     }
 
     attribute_map = {
         'email_address': 'emailAddress',
-        'groups': 'groups'
+        'groups': 'groups',
+        'user_groups': 'userGroups'
     }
 
-    def __init__(self, email_address=None, groups=None):  # noqa: E501
+    def __init__(self, email_address=None, groups=None, user_groups=None):  # noqa: E501
         """UserToCreate - a model defined in Swagger"""  # noqa: E501
 
         self._email_address = None
         self._groups = None
+        self._user_groups = None
         self.discriminator = None
 
         self.email_address = email_address
         self.groups = groups
+        self.user_groups = user_groups
 
     @property
     def email_address(self):
         """Gets the email_address of this UserToCreate.  # noqa: E501
 
-        The (unique) identifier of the user to create.  Must be a valid email address  # noqa: E501
+        The (unique) identifier of the user to create. Must be a valid email address  # noqa: E501
 
         :return: The email_address of this UserToCreate.  # noqa: E501
         :rtype: str
@@ -65,7 +69,7 @@ def email_address(self):
     def email_address(self, email_address):
         """Sets the email_address of this UserToCreate.
 
-        The (unique) identifier of the user to create.  Must be a valid email address  # noqa: E501
+        The (unique) identifier of the user to create. Must be a valid email address  # noqa: E501
 
         :param email_address: The email_address of this UserToCreate.  # noqa: E501
         :type: str
@@ -79,7 +83,7 @@ def email_address(self, email_address):
     def groups(self):
         """Gets the groups of this UserToCreate.  # noqa: E501
 
-        List of permission groups to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are browse, agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management  # noqa: E501
+        List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management  # noqa: E501
 
         :return: The groups of this UserToCreate.  # noqa: E501
         :rtype: list[str]
@@ -90,7 +94,7 @@ def groups(self):
     def groups(self, groups):
         """Sets the groups of this UserToCreate.
 
-        List of permission groups to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are browse, agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management  # noqa: E501
+        List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management  # noqa: E501
 
         :param groups: The groups of this UserToCreate.  # noqa: E501
         :type: list[str]
@@ -100,6 +104,31 @@ def groups(self, groups):
 
         self._groups = groups
 
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this UserToCreate.  # noqa: E501
+
+        List of user groups to this user.   # noqa: E501
+
+        :return: The user_groups of this UserToCreate.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this UserToCreate.
+
+        List of user groups to this user.   # noqa: E501
+
+        :param user_groups: The user_groups of this UserToCreate.  # noqa: E501
+        :type: list[str]
+        """
+        if user_groups is None:
+            raise ValueError("Invalid value for `user_groups`, must not be `None`")  # noqa: E501
+
+        self._user_groups = user_groups
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
@@ -121,6 +150,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(UserToCreate, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/models/wf_tags.py b/wavefront_api_client/models/wf_tags.py
index ea2cb9b..e70f994 100644
--- a/wavefront_api_client/models/wf_tags.py
+++ b/wavefront_api_client/models/wf_tags.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -91,6 +91,9 @@ def to_dict(self):
                 ))
             else:
                 result[attr] = value
+        if issubclass(WFTags, dict):
+            for key, value in self.items():
+                result[key] = value
 
         return result
 
diff --git a/wavefront_api_client/rest.py b/wavefront_api_client/rest.py
index 5ea57e8..e42c675 100644
--- a/wavefront_api_client/rest.py
+++ b/wavefront_api_client/rest.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 
 """
-    Wavefront Public API
+    Wavefront REST API
 
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: support@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 

From d8f845ccdc1652dbf8f1880582b82e4e564f2f92 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Mon, 18 Mar 2019 15:25:03 -0700
Subject: [PATCH 020/161] Update Based on 29.38 Spec.

```
java -jar ~/Applications/swagger-codegen-cli.jar generate -l python \
-i <( curl https://mon.wavefront.com/api/v2/swagger.json | python3 -m json.tool ) \
-c .swagger-codegen/config.json \
--additional-properties basePath=https://YOUR_INSTANCE.wavefront.com,infoEmail=support@wavefront.com
```
---
 .swagger-codegen/config.json                  |    2 +-
 README.md                                     |    2 +-
 docs/AccessControlElement.md                  |    2 +-
 docs/Alert.md                                 |   20 +-
 docs/AvroBackedStandardizedDTO.md             |    2 +-
 docs/AzureConfiguration.md                    |    2 +-
 docs/Chart.md                                 |    8 +-
 docs/ChartSettings.md                         |   38 +-
 docs/ChartSourceQuery.md                      |    4 +-
 docs/CloudIntegration.md                      |    6 +-
 docs/CloudTrailConfiguration.md               |    2 +-
 docs/CloudWatchConfiguration.md               |    8 +-
 docs/CustomerFacingUserObject.md              |    2 +-
 docs/CustomerPreferences.md                   |   14 +-
 docs/Dashboard.md                             |    6 +-
 docs/DashboardParameterValue.md               |   16 +-
 docs/DashboardSection.md                      |    2 +-
 docs/DashboardSectionRow.md                   |    2 +-
 docs/DerivedMetricDefinition.md               |    8 +-
 docs/EC2Configuration.md                      |    2 +-
 docs/Event.md                                 |   18 +-
 docs/ExternalLink.md                          |    8 +-
 docs/GCPBillingConfiguration.md               |    2 +-
 docs/GCPConfiguration.md                      |    4 +-
 docs/Integration.md                           |    8 +-
 docs/IntegrationAlert.md                      |    2 +-
 docs/IntegrationAlias.md                      |    6 +-
 docs/IntegrationDashboard.md                  |    2 +-
 docs/IntegrationManifestGroup.md              |    2 +-
 docs/MaintenanceWindow.md                     |    6 +-
 docs/Message.md                               |    8 +-
 docs/Notificant.md                            |    8 +-
 docs/Proxy.md                                 |   10 +-
 docs/QueryResult.md                           |    4 +-
 docs/SavedSearch.md                           |    4 +-
 docs/Source.md                                |    6 +-
 docs/UserGroupWrite.md                        |    4 +-
 setup.py                                      |    9 +-
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |    2 +-
 .../models/access_control_element.py          |   52 +-
 wavefront_api_client/models/alert.py          |  564 +++---
 .../models/avro_backed_standardized_dto.py    |   54 +-
 .../models/azure_configuration.py             |   62 +-
 wavefront_api_client/models/chart.py          |  172 +-
 wavefront_api_client/models/chart_settings.py | 1664 ++++++++---------
 .../models/chart_source_query.py              |  122 +-
 .../models/cloud_integration.py               |  172 +-
 .../models/cloud_trail_configuration.py       |   60 +-
 .../models/cloud_watch_configuration.py       |  146 +-
 .../models/customer_facing_user_object.py     |   60 +-
 .../models/customer_preferences.py            |  368 ++--
 wavefront_api_client/models/dashboard.py      |  154 +-
 .../models/dashboard_parameter_value.py       |  322 ++--
 .../models/dashboard_section.py               |   64 +-
 .../models/dashboard_section_row.py           |   60 +-
 .../models/derived_metric_definition.py       |  226 +--
 .../models/ec2_configuration.py               |   58 +-
 wavefront_api_client/models/event.py          |  400 ++--
 wavefront_api_client/models/external_link.py  |  174 +-
 .../models/gcp_billing_configuration.py       |   64 +-
 .../models/gcp_configuration.py               |   90 +-
 wavefront_api_client/models/integration.py    |  204 +-
 .../models/integration_alert.py               |   64 +-
 .../models/integration_alias.py               |  120 +-
 .../models/integration_dashboard.py           |   64 +-
 .../models/integration_manifest_group.py      |   60 +-
 .../models/maintenance_window.py              |  170 +-
 wavefront_api_client/models/message.py        |  216 +--
 wavefront_api_client/models/notificant.py     |  164 +-
 wavefront_api_client/models/proxy.py          |  260 +--
 wavefront_api_client/models/query_result.py   |  118 +-
 wavefront_api_client/models/saved_search.py   |  100 +-
 wavefront_api_client/models/source.py         |  154 +-
 .../models/user_group_write.py                |   96 +-
 75 files changed, 3578 insertions(+), 3583 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index cea429b..b35d449 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.9.37"
+    "packageVersion": "2.9.38"
 }
diff --git a/README.md b/README.md
index 3d9bd5d..088e909 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.9.37
+- Package version: 2.9.38
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/AccessControlElement.md b/docs/AccessControlElement.md
index bc29e72..ea8b673 100644
--- a/docs/AccessControlElement.md
+++ b/docs/AccessControlElement.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **str** |  | [optional] 
 **id** | **str** |  | [optional] 
+**name** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Alert.md b/docs/Alert.md
index b173c9a..77907c3 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -4,17 +4,18 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
+**created** | **int** | When this alert was created, in epoch millis | [optional] 
 **hidden** | **bool** |  | [optional] 
 **severity** | **str** | Severity of the alert | [optional] 
-**created** | **int** | When this alert was created, in epoch millis | [optional] 
-**name** | **str** |  | 
-**id** | **str** |  | [optional] 
-**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
 **minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
 **event** | [**Event**](Event.md) |  | [optional] 
 **updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
+**targets** | **dict(str, str)** | Targets for severity. | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
+**update_user_id** | **str** | The user that last updated this alert | [optional] 
 **condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **alert_type** | **str** | Alert type. | [optional] 
 **display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
@@ -26,10 +27,6 @@ Name | Type | Description | Notes
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
 **include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
-**targets** | **dict(str, str)** | Targets for severity. | [optional] 
-**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
-**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
-**update_user_id** | **str** | The user that last updated this alert | [optional] 
 **prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
 **no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
 **snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
@@ -53,14 +50,17 @@ Name | Type | Description | Notes
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
-**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
+**id** | **str** |  | [optional] 
 **notification_resend_frequency_minutes** | **int** | How often to re-trigger a continually failing alert. If absent or &lt;&#x3D; 0, no retriggering occurs | [optional] 
+**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
-**target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
 **severity_list** | **list[str]** | Alert severity list for multi-threshold type. | [optional] 
+**target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
+**name** | **str** |  | 
+**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AvroBackedStandardizedDTO.md b/docs/AvroBackedStandardizedDTO.md
index 1131618..8d362b0 100644
--- a/docs/AvroBackedStandardizedDTO.md
+++ b/docs/AvroBackedStandardizedDTO.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
diff --git a/docs/AzureConfiguration.md b/docs/AzureConfiguration.md
index 867dc72..51b7fdf 100644
--- a/docs/AzureConfiguration.md
+++ b/docs/AzureConfiguration.md
@@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AzureBaseCredentials**](AzureBaseCredentials.md) |  | [optional] 
-**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **category_filter** | **list[str]** | A list of Azure services (such as Microsoft.Compute/virtualMachines, Microsoft.Cache/redis etc) from which to pull metrics. | [optional] 
 **resource_group_filter** | **list[str]** | A list of Azure resource groups from which to pull metrics. | [optional] 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Chart.md b/docs/Chart.md
index 906a37c..95351a1 100644
--- a/docs/Chart.md
+++ b/docs/Chart.md
@@ -4,16 +4,16 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
-**units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
 **description** | **str** | Description of the chart | [optional] 
-**name** | **str** | Name of the source | 
+**units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
+**interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
 **sources** | [**list[ChartSourceQuery]**](ChartSourceQuery.md) | Query expression to plot on the chart | 
 **include_obsolete_metrics** | **bool** | Whether to show obsolete metrics.  Default: false | [optional] 
 **no_default_events** | **bool** | Whether to hide events related to the sources in the charts produced. Default false (i.e. shows events) | [optional] 
 **chart_attributes** | [**JsonNode**](JsonNode.md) | Experimental field for chart attributes | [optional] 
-**interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
-**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
 **summarization** | **str** | Summarization strategy for the chart.  MEAN is default | [optional] 
+**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
+**name** | **str** | Name of the source | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index bf035ac..2823cd1 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -3,9 +3,27 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
 **min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
+**type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
 **max** | **float** | Max value of Y-axis.  Set to null or leave blank for auto | [optional] 
+**time_based_coloring** | **bool** | Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false | [optional] 
+**sparkline_display_value_type** | **str** | For the single stat view, whether to display the name of the query or the value of query | [optional] 
+**sparkline_display_color** | **str** | For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_display_vertical_position** | **str** | deprecated | [optional] 
+**sparkline_display_horizontal_position** | **str** | For the single stat view, the horizontal position of the displayed text | [optional] 
+**sparkline_display_font_size** | **str** | For the single stat view, the font size of the displayed text, in percent | [optional] 
+**sparkline_display_prefix** | **str** | For the single stat view, a string to add before the displayed text | [optional] 
+**sparkline_display_postfix** | **str** | For the single stat view, a string to append to the displayed text | [optional] 
+**sparkline_size** | **str** | For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE | [optional] 
+**sparkline_line_color** | **str** | For the single stat view, the color of the line. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_fill_color** | **str** | For the single stat view, the color of the background fill. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_value_color_map_colors** | **list[str]** | For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_value_color_map_values_v2** | **list[float]** | For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors | [optional] 
+**sparkline_value_color_map_values** | **list[int]** | deprecated | [optional] 
+**sparkline_value_color_map_apply_to** | **str** | For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND | [optional] 
+**sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
+**sparkline_value_text_map_text** | **list[str]** | For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds | [optional] 
+**sparkline_value_text_map_thresholds** | **list[float]** | For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText | [optional] 
 **line_type** | **str** | Plot interpolation type.  linear is default | [optional] 
 **stack_type** | **str** | Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y&#x3D;0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream | [optional] 
 **windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
@@ -40,24 +58,6 @@ Name | Type | Description | Notes
 **xmin** | **float** | For x-y scatterplots, min value for X-axis.  Set null for auto | [optional] 
 **ymax** | **float** | For x-y scatterplots, max value for Y-axis.  Set null for auto | [optional] 
 **ymin** | **float** | For x-y scatterplots, min value for Y-axis.  Set null for auto | [optional] 
-**time_based_coloring** | **bool** | Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false | [optional] 
-**sparkline_display_value_type** | **str** | For the single stat view, whether to display the name of the query or the value of query | [optional] 
-**sparkline_display_color** | **str** | For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_display_vertical_position** | **str** | deprecated | [optional] 
-**sparkline_display_horizontal_position** | **str** | For the single stat view, the horizontal position of the displayed text | [optional] 
-**sparkline_display_font_size** | **str** | For the single stat view, the font size of the displayed text, in percent | [optional] 
-**sparkline_display_prefix** | **str** | For the single stat view, a string to add before the displayed text | [optional] 
-**sparkline_display_postfix** | **str** | For the single stat view, a string to append to the displayed text | [optional] 
-**sparkline_size** | **str** | For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE | [optional] 
-**sparkline_line_color** | **str** | For the single stat view, the color of the line. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_fill_color** | **str** | For the single stat view, the color of the background fill. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_value_color_map_colors** | **list[str]** | For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_value_color_map_values_v2** | **list[float]** | For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors | [optional] 
-**sparkline_value_color_map_values** | **list[int]** | deprecated | [optional] 
-**sparkline_value_color_map_apply_to** | **str** | For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND | [optional] 
-**sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
-**sparkline_value_text_map_text** | **list[str]** | For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds | [optional] 
-**sparkline_value_text_map_thresholds** | **list[float]** | For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText | [optional] 
 **expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
 **plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
 
diff --git a/docs/ChartSourceQuery.md b/docs/ChartSourceQuery.md
index 3678150..22c3a0c 100644
--- a/docs/ChartSourceQuery.md
+++ b/docs/ChartSourceQuery.md
@@ -3,15 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **str** | Name of the source | 
-**query** | **str** | Query expression to plot on the chart | 
 **scatter_plot_source** | **str** | For scatter plots, does this query source the X-axis or the Y-axis | [optional] 
 **querybuilder_serialization** | **str** | Opaque representation of the querybuilder | [optional] 
 **querybuilder_enabled** | **bool** | Whether or not this source line should have the query builder enabled | [optional] 
 **secondary_axis** | **bool** | Determines if this source relates to the right hand Y-axis or not | [optional] 
 **source_description** | **str** | A description for the purpose of this source | [optional] 
 **source_color** | **str** | The color used to draw all results from this source (auto if unset) | [optional] 
+**query** | **str** | Query expression to plot on the chart | 
 **disabled** | **bool** | Whether the source is disabled | [optional] 
+**name** | **str** | Name of the source | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 30c7941..7f5ab7c 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -4,14 +4,12 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **force_save** | **bool** |  | [optional] 
-**name** | **str** | The human-readable name of this integration | 
-**id** | **str** |  | [optional] 
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
 **in_trash** | **bool** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
-**service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **additional_tags** | **dict(str, str)** | A list of point tag key-values to add to every point ingested using this integration | [optional] 
 **last_received_data_point_ms** | **int** | Time that this integration last received a data point, in epoch millis | [optional] 
 **last_metric_count** | **int** | Number of metrics / events ingested by this integration the last time it ran | [optional] 
@@ -31,7 +29,9 @@ Name | Type | Description | Notes
 **last_processing_timestamp** | **int** | Time, in epoch millis, that this integration was last processed | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
+**service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **deleted** | **bool** |  | [optional] 
+**name** | **str** | The human-readable name of this integration | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudTrailConfiguration.md b/docs/CloudTrailConfiguration.md
index 766806f..2a62d35 100644
--- a/docs/CloudTrailConfiguration.md
+++ b/docs/CloudTrailConfiguration.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
 **prefix** | **str** | The common prefix, if any, appended to all CloudTrail log files | [optional] 
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
+**region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
 **filter_rule** | **str** | Rule to filter cloud trail log event. | [optional] 
 **bucket_name** | **str** | Name of the S3 bucket where CloudTrail logs are stored | 
 
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index fbb267a..adfa627 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -4,11 +4,11 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
-**instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
-**volume_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
-**point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
-**namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
+**namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
+**point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
+**volume_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index dd8d402..31f750e 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -5,10 +5,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **user_groups** | **list[str]** | List of user group identifiers this user belongs to | [optional] 
 **identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
-**id** | **str** | The unique identifier of this user, which should be their valid email address | 
 **_self** | **bool** | Whether this user is the one calling the API | 
 **groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
 **customer** | **str** | The id of the customer to which the user belongs | 
+**id** | **str** | The unique identifier of this user, which should be their valid email address | 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
 **gravatar_url** | **str** | URL id For User&#39;s gravatar (see gravatar.com), if one exists. | [optional] 
 **escaped_identifier** | **str** | URL Escaped Identifier | [optional] 
diff --git a/docs/CustomerPreferences.md b/docs/CustomerPreferences.md
index bfeb54f..6c1bb92 100644
--- a/docs/CustomerPreferences.md
+++ b/docs/CustomerPreferences.md
@@ -4,20 +4,20 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **default_user_groups** | [**list[UserGroup]**](UserGroup.md) | List of default user groups of the customer | [optional] 
-**id** | **str** |  | [optional] 
+**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
+**hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
+**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
 **customer_id** | **str** | The id of the customer preferences are attached to | 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
 **invite_permissions** | **list[str]** | List of permissions that are assigned to newly invited users | [optional] 
+**blacklisted_emails** | **dict(str, int)** | List of blacklisted emails of the customer | [optional] 
 **hidden_metric_prefixes** | **dict(str, int)** | Metric prefixes which should be hidden from user | [optional] 
 **landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
-**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
 **grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
-**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
-**hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
-**blacklisted_emails** | **dict(str, int)** | List of blacklisted emails of the customer | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index cd8d9b7..9feee0b 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -4,10 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **can_user_modify** | **bool** |  | [optional] 
-**hidden** | **bool** |  | [optional] 
 **description** | **str** | Human-readable description of the dashboard | [optional] 
-**name** | **str** | Name of the dashboard | 
-**id** | **str** | Unique identifier, also URL slug, of the dashboard | 
+**hidden** | **bool** |  | [optional] 
 **parameters** | **dict(str, str)** | Deprecated.  An obsolete representation of dashboard parameters | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **customer** | **str** | id of the customer to which this dashboard belongs | [optional] 
@@ -15,6 +13,7 @@ Name | Type | Description | Notes
 **system_owned** | **bool** | Whether this dashboard is system-owned and not writeable | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** | Unique identifier, also URL slug, of the dashboard | 
 **event_filter_type** | **str** | How charts belonging to this dashboard should display events.  BYCHART is default if unspecified | [optional] 
 **sections** | [**list[DashboardSection]**](DashboardSection.md) | Dashboard chart sections | 
 **parameter_details** | [**dict(str, DashboardParameterValue)**](DashboardParameterValue.md) | The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation | [optional] 
@@ -39,6 +38,7 @@ Name | Type | Description | Notes
 **favorite** | **bool** |  | [optional] 
 **num_favorites** | **int** |  | [optional] 
 **orphan** | **bool** |  | [optional] 
+**name** | **str** | Name of the dashboard | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DashboardParameterValue.md b/docs/DashboardParameterValue.md
index 904a25c..057098c 100644
--- a/docs/DashboardParameterValue.md
+++ b/docs/DashboardParameterValue.md
@@ -3,18 +3,18 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**label** | **str** |  | [optional] 
 **description** | **str** |  | [optional] 
-**default_value** | **str** |  | [optional] 
-**parameter_type** | **str** |  | [optional] 
-**values_to_readable_strings** | **dict(str, str)** |  | [optional] 
-**dynamic_field_type** | **str** |  | [optional] 
-**query_value** | **str** |  | [optional] 
+**label** | **str** |  | [optional] 
+**multivalue** | **bool** |  | [optional] 
 **hide_from_view** | **bool** |  | [optional] 
+**allow_all** | **bool** |  | [optional] 
+**dynamic_field_type** | **str** |  | [optional] 
 **tag_key** | **str** |  | [optional] 
-**multivalue** | **bool** |  | [optional] 
+**query_value** | **str** |  | [optional] 
 **reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
-**allow_all** | **bool** |  | [optional] 
+**parameter_type** | **str** |  | [optional] 
+**default_value** | **str** |  | [optional] 
+**values_to_readable_strings** | **dict(str, str)** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DashboardSection.md b/docs/DashboardSection.md
index 3fe84cc..1034466 100644
--- a/docs/DashboardSection.md
+++ b/docs/DashboardSection.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **str** | Name of this section | 
 **rows** | [**list[DashboardSectionRow]**](DashboardSectionRow.md) | Rows of this section | 
+**name** | **str** | Name of this section | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DashboardSectionRow.md b/docs/DashboardSectionRow.md
index d9ff11c..2dcbd76 100644
--- a/docs/DashboardSectionRow.md
+++ b/docs/DashboardSectionRow.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**height_factor** | **int** | Scalar for the height of this row. 100 is normal and default. 50 is half height | [optional] 
 **charts** | [**list[Chart]**](Chart.md) | Charts in this section row | 
+**height_factor** | **int** | Scalar for the height of this row. 100 is normal and default. 50 is half height | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index e785cef..086a52d 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -4,17 +4,15 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **created** | **int** | When this derived metric was created, in epoch millis | [optional] 
-**name** | **str** |  | 
-**id** | **str** |  | [optional] 
-**query** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m). | 
 **minutes** | **int** | How frequently the query generating the derived metric is run | 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **status** | **list[str]** | Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA | [optional] 
 **updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
-**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
 **process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
 **last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
 **update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
+**query** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m). | 
+**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
 **additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
 **last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
 **in_trash** | **bool** |  | [optional] 
@@ -26,12 +24,14 @@ Name | Type | Description | Notes
 **hosts_used** | **list[str]** | Number of hosts checked by the query | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
 **query_qb_enabled** | **bool** | Whether the query was created using the Query Builder. Default false | [optional] 
 **query_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true | [optional] 
 **last_error_message** | **str** | The last error encountered when running the query | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
+**name** | **str** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EC2Configuration.md b/docs/EC2Configuration.md
index bfe95c1..73f8e6f 100644
--- a/docs/EC2Configuration.md
+++ b/docs/EC2Configuration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**host_name_tags** | **list[str]** | A list of AWS instance tags that, when found, will be used as the \&quot;source\&quot; name in a series.  Default: [\&quot;hostname\&quot;, \&quot;host\&quot;, \&quot;name\&quot;].  If no tag in this list is found, the series source is set to the instance id. | [optional] 
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
+**host_name_tags** | **list[str]** | A list of AWS instance tags that, when found, will be used as the \&quot;source\&quot; name in a series.  Default: [\&quot;hostname\&quot;, \&quot;host\&quot;, \&quot;name\&quot;].  If no tag in this list is found, the series source is set to the instance id. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Event.md b/docs/Event.md
index 4ea01b2..1f7a5db 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -3,27 +3,27 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
 **start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
 **table** | **str** | The customer to which the event belongs | [optional] 
-**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
-**name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
-**annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
-**id** | **str** |  | [optional] 
+**can_delete** | **bool** |  | [optional] 
+**can_close** | **bool** |  | [optional] 
+**creator_type** | **list[str]** |  | [optional] 
 **tags** | **list[str]** | A list of event tags | [optional] 
+**annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **created_at** | **int** |  | [optional] 
 **is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
-**updated_at** | **int** |  | [optional] 
+**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
 **hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
 **is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
-**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
+**updated_at** | **int** |  | [optional] 
+**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**can_delete** | **bool** |  | [optional] 
-**can_close** | **bool** |  | [optional] 
-**creator_type** | **list[str]** |  | [optional] 
 **running_state** | **str** |  | [optional] 
+**name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ExternalLink.md b/docs/ExternalLink.md
index ed82e7d..bac2880 100644
--- a/docs/ExternalLink.md
+++ b/docs/ExternalLink.md
@@ -4,16 +4,16 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **description** | **str** | Human-readable description for this external link | 
-**name** | **str** | Name of the external link.  Will be displayed in context (right-click) menus on charts | 
-**id** | **str** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
 **template** | **str** | The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc | 
 **metric_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **source_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **point_tag_filter_regexes** | **dict(str, str)** | Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
+**name** | **str** | Name of the external link.  Will be displayed in context (right-click) menus on charts | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GCPBillingConfiguration.md b/docs/GCPBillingConfiguration.md
index cd6d0e1..57783ef 100644
--- a/docs/GCPBillingConfiguration.md
+++ b/docs/GCPBillingConfiguration.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 **gcp_api_key** | **str** | API key for Google Cloud Platform (GCP). Use &#39;saved_api_key&#39; to retain existing API key when updating | 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index 02eee12..af9d0e2 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
+**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Integration.md b/docs/Integration.md
index f65fa44..9d9bc97 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -3,17 +3,16 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**description** | **str** | Integration description | 
 **version** | **str** | Integration version string | 
-**metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
 **icon** | **str** | URI path to the integration icon | 
-**description** | **str** | Integration description | 
-**name** | **str** | Integration name | 
-**id** | **str** |  | [optional] 
+**metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
 **base_url** | **str** | Base URL for this integration&#39;s assets | [optional] 
 **status** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
 **alerts** | [**list[IntegrationAlert]**](IntegrationAlert.md) | A list of alerts belonging to this integration | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **alias_of** | **str** | If set, designates this integration as an alias integration, of the integration whose id is specified. | [optional] 
@@ -22,6 +21,7 @@ Name | Type | Description | Notes
 **deleted** | **bool** |  | [optional] 
 **overview** | **str** | Descriptive text giving an overview of integration functionality | [optional] 
 **setup** | **str** | How the integration will be set-up | [optional] 
+**name** | **str** | Integration name | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationAlert.md b/docs/IntegrationAlert.md
index 8171907..6b3985c 100644
--- a/docs/IntegrationAlert.md
+++ b/docs/IntegrationAlert.md
@@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **description** | **str** | Alert description | 
-**name** | **str** | Alert name | 
 **url** | **str** | URL path to the JSON definition of this alert | 
 **alert_obj** | [**Alert**](Alert.md) |  | [optional] 
+**name** | **str** | Alert name | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationAlias.md b/docs/IntegrationAlias.md
index 025a152..6d5b419 100644
--- a/docs/IntegrationAlias.md
+++ b/docs/IntegrationAlias.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**icon** | **str** | Icon path of the alias Integration | [optional] 
 **description** | **str** | Description of the alias Integration | [optional] 
-**name** | **str** | Name of the alias Integration | [optional] 
-**id** | **str** | ID of the alias Integration | [optional] 
+**icon** | **str** | Icon path of the alias Integration | [optional] 
 **base_url** | **str** | Base URL of this alias Integration | [optional] 
+**id** | **str** | ID of the alias Integration | [optional] 
+**name** | **str** | Name of the alias Integration | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationDashboard.md b/docs/IntegrationDashboard.md
index ed16f69..f6f4326 100644
--- a/docs/IntegrationDashboard.md
+++ b/docs/IntegrationDashboard.md
@@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **description** | **str** | Dashboard description | 
-**name** | **str** | Dashboard name | 
 **url** | **str** | URL path to the JSON definition of this dashboard | 
 **dashboard_obj** | [**Dashboard**](Dashboard.md) |  | [optional] 
+**name** | **str** | Dashboard name | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationManifestGroup.md b/docs/IntegrationManifestGroup.md
index 23954e8..89894ee 100644
--- a/docs/IntegrationManifestGroup.md
+++ b/docs/IntegrationManifestGroup.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**title** | **str** | Title of this integration group | 
 **integrations** | **list[str]** | A list of paths to JSON definitions for integrations in this group | 
 **integration_objs** | [**list[Integration]**](Integration.md) | Materialized JSONs for integrations belonging to this group, as referenced by &#x60;integrations&#x60; | [optional] 
+**title** | **str** | Title of this integration group | 
 **subtitle** | **str** | Subtitle of this integration group | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index 2bfe861..cad2b16 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -4,23 +4,23 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **reason** | **str** | The purpose of this maintenance window | 
-**id** | **str** |  | [optional] 
 **customer_id** | **str** |  | [optional] 
+**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
 **title** | **str** | Title of this maintenance window | 
 **start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
 **end_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will end | 
-**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
 **relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
 **relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **relevant_host_tags_anded** | **bool** | Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a source/host must contain one of the tags. Default: false | [optional] 
 **host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
 **event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
-**running_state** | **str** |  | [optional] 
 **sort_attr** | **int** | Numeric value used in default sorting | [optional] 
+**running_state** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Message.md b/docs/Message.md
index 396f34d..25a55c0 100644
--- a/docs/Message.md
+++ b/docs/Message.md
@@ -3,18 +3,18 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**scope** | **str** | The audience scope that this message should reach | 
 **attributes** | **dict(str, str)** | A string-&gt;string map of additional properties associated with this message | [optional] 
 **source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
+**scope** | **str** | The audience scope that this message should reach | 
 **severity** | **str** | Message severity | 
+**read** | **bool** | A derived field for whether the current user has read this message | [optional] 
+**title** | **str** | Title of this message | 
 **id** | **str** |  | [optional] 
-**target** | **str** | For scope&#x3D;CUSTOMER or scope&#x3D;USER, the individual customer or user id | [optional] 
 **content** | **str** | Message content | 
-**title** | **str** | Title of this message | 
 **start_epoch_millis** | **int** | When this message will begin to be displayed, in epoch millis | 
 **end_epoch_millis** | **int** | When this message will stop being displayed, in epoch millis | 
 **display** | **str** | The form of display for this message | 
-**read** | **bool** | A derived field for whether the current user has read this message | [optional] 
+**target** | **str** | For scope&#x3D;CUSTOMER or scope&#x3D;USER, the individual customer or user id | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Notificant.md b/docs/Notificant.md
index c753738..c065863 100644
--- a/docs/Notificant.md
+++ b/docs/Notificant.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**content_type** | **str** | The value of the Content-Type header of the webhook POST request. | [optional] 
-**method** | **str** | The notification method used for notification target. | 
 **description** | **str** | Description | 
-**id** | **str** |  | [optional] 
+**method** | **str** | The notification method used for notification target. | 
+**content_type** | **str** | The value of the Content-Type header of the webhook POST request. | [optional] 
 **customer_id** | **str** |  | [optional] 
 **title** | **str** | Title | 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
-**template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
+**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
+**template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
 **triggers** | **list[str]** | A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED | 
 **recipient** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
 **custom_http_headers** | **dict(str, str)** | A string-&gt;string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook | [optional] 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 1fb3c23..9dfee00 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -4,24 +4,24 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **version** | **str** |  | [optional] 
-**name** | **str** | Proxy name (modifiable) | 
-**id** | **str** |  | [optional] 
 **status** | **str** | the proxy&#39;s status | [optional] 
 **customer_id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
-**last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
-**last_known_error** | **str** | deprecated | [optional] 
-**last_error_time** | **int** | deprecated | [optional] 
+**id** | **str** |  | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
 **bytes_left_for_buffer** | **int** | Number of bytes of space remaining in the persistent disk queue of this proxy | [optional] 
 **bytes_per_minute_for_buffer** | **int** | Bytes used per minute by the persistent disk queue of this proxy | [optional] 
 **local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
+**last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
+**last_known_error** | **str** | deprecated | [optional] 
+**last_error_time** | **int** | deprecated | [optional] 
 **ssh_agent** | **bool** | deprecated | [optional] 
 **ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
 **deleted** | **bool** |  | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
+**name** | **str** | Proxy name (modifiable) | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/QueryResult.md b/docs/QueryResult.md
index a5b0500..93b4462 100644
--- a/docs/QueryResult.md
+++ b/docs/QueryResult.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **str** | The name of this query | [optional] 
-**query** | **str** | The query used to obtain this result | [optional] 
 **warnings** | **str** | The warnings incurred by this query | [optional] 
 **timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
 **stats** | [**StatsModel**](StatsModel.md) |  | [optional] 
 **events** | [**list[QueryEvent]**](QueryEvent.md) |  | [optional] 
 **granularity** | **int** | The granularity of the returned results, in seconds | [optional] 
+**name** | **str** | The name of this query | [optional] 
+**query** | **str** | The query used to obtain this result | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SavedSearch.md b/docs/SavedSearch.md
index 56e86d6..d4adf58 100644
--- a/docs/SavedSearch.md
+++ b/docs/SavedSearch.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** |  | [optional] 
-**query** | **dict(str, str)** | The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query | 
 **entity_type** | **str** | The Wavefront entity type over which to search | 
+**query** | **dict(str, str)** | The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query | 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **user_id** | **str** | The user for whom this search is saved | [optional] 
diff --git a/docs/Source.md b/docs/Source.md
index 58e4000..fd86ae0 100644
--- a/docs/Source.md
+++ b/docs/Source.md
@@ -3,16 +3,16 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**hidden** | **bool** | A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things) | [optional] 
 **description** | **str** | Description of this source | [optional] 
-**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
+**hidden** | **bool** | A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things) | [optional] 
+**source_name** | **str** | The name of the source, usually set by ingested telemetry | 
 **tags** | **dict(str, bool)** | A Map (String -&gt; boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true | [optional] 
 **creator_id** | **str** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
 **created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **marked_new_epoch_millis** | **int** | Epoch Millis when this source was marked as ~status.new | [optional] 
-**source_name** | **str** | The name of the source, usually set by ingested telemetry | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
index 5e23d3e..c80da0c 100644
--- a/docs/UserGroupWrite.md
+++ b/docs/UserGroupWrite.md
@@ -4,10 +4,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **permissions** | **list[str]** | List of permissions the user group has been granted access to | 
-**name** | **str** | The name of the user group | 
-**id** | **str** | The unique identifier of the user group | [optional] 
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
+**id** | **str** | The unique identifier of the user group | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
+**name** | **str** | The name of the user group | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index e105680..f398796 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.9.37"
+VERSION = "2.9.38"
 # To install the library, run the following
 #
 # python setup.py install
@@ -22,12 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = [
-    "certifi>=2017.4.17",
-    "python-dateutil>=2.1",
-    "six>=1.10",
-    "urllib3>=1.23"
-]
+REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
 
 setup(
     name=NAME,
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 30d8d6c..3cf2e53 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -73,7 +73,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.9.37/python'
+        self.user_agent = 'Swagger-Codegen/2.9.38/python'
 
     def __del__(self):
         self.pool.close()
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 85c51d7..af62b27 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.9.37".\
+               "SDK Package Version: 2.9.38".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index 332b9f0..d90039e 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -31,68 +31,68 @@ class AccessControlElement(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'name': 'str',
-        'id': 'str'
+        'id': 'str',
+        'name': 'str'
     }
 
     attribute_map = {
-        'name': 'name',
-        'id': 'id'
+        'id': 'id',
+        'name': 'name'
     }
 
-    def __init__(self, name=None, id=None):  # noqa: E501
+    def __init__(self, id=None, name=None):  # noqa: E501
         """AccessControlElement - a model defined in Swagger"""  # noqa: E501
 
-        self._name = None
         self._id = None
+        self._name = None
         self.discriminator = None
 
-        if name is not None:
-            self.name = name
         if id is not None:
             self.id = id
+        if name is not None:
+            self.name = name
 
     @property
-    def name(self):
-        """Gets the name of this AccessControlElement.  # noqa: E501
+    def id(self):
+        """Gets the id of this AccessControlElement.  # noqa: E501
 
 
-        :return: The name of this AccessControlElement.  # noqa: E501
+        :return: The id of this AccessControlElement.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this AccessControlElement.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this AccessControlElement.
 
 
-        :param name: The name of this AccessControlElement.  # noqa: E501
+        :param id: The id of this AccessControlElement.  # noqa: E501
         :type: str
         """
 
-        self._name = name
+        self._id = id
 
     @property
-    def id(self):
-        """Gets the id of this AccessControlElement.  # noqa: E501
+    def name(self):
+        """Gets the name of this AccessControlElement.  # noqa: E501
 
 
-        :return: The id of this AccessControlElement.  # noqa: E501
+        :return: The name of this AccessControlElement.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._name
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this AccessControlElement.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this AccessControlElement.
 
 
-        :param id: The id of this AccessControlElement.  # noqa: E501
+        :param name: The name of this AccessControlElement.  # noqa: E501
         :type: str
         """
 
-        self._id = id
+        self._name = name
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 37738ae..8271b92 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -37,17 +37,18 @@ class Alert(object):
     """
     swagger_types = {
         'last_event_time': 'int',
+        'created': 'int',
         'hidden': 'bool',
         'severity': 'str',
-        'created': 'int',
-        'name': 'str',
-        'id': 'str',
-        'target': 'str',
         'minutes': 'int',
         'tags': 'WFTags',
         'status': 'list[str]',
         'event': 'Event',
         'updated': 'int',
+        'targets': 'dict(str, str)',
+        'process_rate_minutes': 'int',
+        'last_processed_millis': 'int',
+        'update_user_id': 'str',
         'condition': 'str',
         'alert_type': 'str',
         'display_expression': 'str',
@@ -59,10 +60,6 @@ class Alert(object):
         'condition_qb_serialization': 'str',
         'display_expression_qb_serialization': 'str',
         'include_obsolete_metrics': 'bool',
-        'targets': 'dict(str, str)',
-        'process_rate_minutes': 'int',
-        'last_processed_millis': 'int',
-        'update_user_id': 'str',
         'prefiring_host_label_pairs': 'list[SourceLabelPair]',
         'no_data_event': 'Event',
         'snoozed': 'int',
@@ -86,29 +83,33 @@ class Alert(object):
         'resolve_after_minutes': 'int',
         'creator_id': 'str',
         'updater_id': 'str',
-        'last_error_message': 'str',
+        'id': 'str',
         'notification_resend_frequency_minutes': 'int',
+        'last_error_message': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'deleted': 'bool',
-        'target_info': 'list[TargetInfo]',
         'sort_attr': 'int',
-        'severity_list': 'list[str]'
+        'severity_list': 'list[str]',
+        'target_info': 'list[TargetInfo]',
+        'name': 'str',
+        'target': 'str'
     }
 
     attribute_map = {
         'last_event_time': 'lastEventTime',
+        'created': 'created',
         'hidden': 'hidden',
         'severity': 'severity',
-        'created': 'created',
-        'name': 'name',
-        'id': 'id',
-        'target': 'target',
         'minutes': 'minutes',
         'tags': 'tags',
         'status': 'status',
         'event': 'event',
         'updated': 'updated',
+        'targets': 'targets',
+        'process_rate_minutes': 'processRateMinutes',
+        'last_processed_millis': 'lastProcessedMillis',
+        'update_user_id': 'updateUserId',
         'condition': 'condition',
         'alert_type': 'alertType',
         'display_expression': 'displayExpression',
@@ -120,10 +121,6 @@ class Alert(object):
         'condition_qb_serialization': 'conditionQBSerialization',
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
-        'targets': 'targets',
-        'process_rate_minutes': 'processRateMinutes',
-        'last_processed_millis': 'lastProcessedMillis',
-        'update_user_id': 'updateUserId',
         'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
         'no_data_event': 'noDataEvent',
         'snoozed': 'snoozed',
@@ -147,31 +144,35 @@ class Alert(object):
         'resolve_after_minutes': 'resolveAfterMinutes',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
-        'last_error_message': 'lastErrorMessage',
+        'id': 'id',
         'notification_resend_frequency_minutes': 'notificationResendFrequencyMinutes',
+        'last_error_message': 'lastErrorMessage',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted',
-        'target_info': 'targetInfo',
         'sort_attr': 'sortAttr',
-        'severity_list': 'severityList'
+        'severity_list': 'severityList',
+        'target_info': 'targetInfo',
+        'name': 'name',
+        'target': 'target'
     }
 
-    def __init__(self, last_event_time=None, hidden=None, severity=None, created=None, name=None, id=None, target=None, minutes=None, tags=None, status=None, event=None, updated=None, condition=None, alert_type=None, display_expression=None, failing_host_label_pairs=None, in_maintenance_host_label_pairs=None, active_maintenance_windows=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, targets=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, prefiring_host_label_pairs=None, no_data_event=None, snoozed=None, conditions=None, notificants=None, additional_information=None, last_query_time=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, last_notification_millis=None, points_scanned_at_last_query=None, num_points_in_failure_frame=None, metrics_used=None, hosts_used=None, system_owned=None, resolve_after_minutes=None, creator_id=None, updater_id=None, last_error_message=None, notification_resend_frequency_minutes=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, target_info=None, sort_attr=None, severity_list=None):  # noqa: E501
+    def __init__(self, last_event_time=None, created=None, hidden=None, severity=None, minutes=None, tags=None, status=None, event=None, updated=None, targets=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, condition=None, alert_type=None, display_expression=None, failing_host_label_pairs=None, in_maintenance_host_label_pairs=None, active_maintenance_windows=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, prefiring_host_label_pairs=None, no_data_event=None, snoozed=None, conditions=None, notificants=None, additional_information=None, last_query_time=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, last_notification_millis=None, points_scanned_at_last_query=None, num_points_in_failure_frame=None, metrics_used=None, hosts_used=None, system_owned=None, resolve_after_minutes=None, creator_id=None, updater_id=None, id=None, notification_resend_frequency_minutes=None, last_error_message=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, sort_attr=None, severity_list=None, target_info=None, name=None, target=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._last_event_time = None
+        self._created = None
         self._hidden = None
         self._severity = None
-        self._created = None
-        self._name = None
-        self._id = None
-        self._target = None
         self._minutes = None
         self._tags = None
         self._status = None
         self._event = None
         self._updated = None
+        self._targets = None
+        self._process_rate_minutes = None
+        self._last_processed_millis = None
+        self._update_user_id = None
         self._condition = None
         self._alert_type = None
         self._display_expression = None
@@ -183,10 +184,6 @@ def __init__(self, last_event_time=None, hidden=None, severity=None, created=Non
         self._condition_qb_serialization = None
         self._display_expression_qb_serialization = None
         self._include_obsolete_metrics = None
-        self._targets = None
-        self._process_rate_minutes = None
-        self._last_processed_millis = None
-        self._update_user_id = None
         self._prefiring_host_label_pairs = None
         self._no_data_event = None
         self._snoozed = None
@@ -210,29 +207,27 @@ def __init__(self, last_event_time=None, hidden=None, severity=None, created=Non
         self._resolve_after_minutes = None
         self._creator_id = None
         self._updater_id = None
-        self._last_error_message = None
+        self._id = None
         self._notification_resend_frequency_minutes = None
+        self._last_error_message = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._deleted = None
-        self._target_info = None
         self._sort_attr = None
         self._severity_list = None
+        self._target_info = None
+        self._name = None
+        self._target = None
         self.discriminator = None
 
         if last_event_time is not None:
             self.last_event_time = last_event_time
+        if created is not None:
+            self.created = created
         if hidden is not None:
             self.hidden = hidden
         if severity is not None:
             self.severity = severity
-        if created is not None:
-            self.created = created
-        self.name = name
-        if id is not None:
-            self.id = id
-        if target is not None:
-            self.target = target
         self.minutes = minutes
         if tags is not None:
             self.tags = tags
@@ -242,6 +237,14 @@ def __init__(self, last_event_time=None, hidden=None, severity=None, created=Non
             self.event = event
         if updated is not None:
             self.updated = updated
+        if targets is not None:
+            self.targets = targets
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
         self.condition = condition
         if alert_type is not None:
             self.alert_type = alert_type
@@ -263,14 +266,6 @@ def __init__(self, last_event_time=None, hidden=None, severity=None, created=Non
             self.display_expression_qb_serialization = display_expression_qb_serialization
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
-        if targets is not None:
-            self.targets = targets
-        if process_rate_minutes is not None:
-            self.process_rate_minutes = process_rate_minutes
-        if last_processed_millis is not None:
-            self.last_processed_millis = last_processed_millis
-        if update_user_id is not None:
-            self.update_user_id = update_user_id
         if prefiring_host_label_pairs is not None:
             self.prefiring_host_label_pairs = prefiring_host_label_pairs
         if no_data_event is not None:
@@ -317,22 +312,27 @@ def __init__(self, last_event_time=None, hidden=None, severity=None, created=Non
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
-        if last_error_message is not None:
-            self.last_error_message = last_error_message
+        if id is not None:
+            self.id = id
         if notification_resend_frequency_minutes is not None:
             self.notification_resend_frequency_minutes = notification_resend_frequency_minutes
+        if last_error_message is not None:
+            self.last_error_message = last_error_message
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if deleted is not None:
             self.deleted = deleted
-        if target_info is not None:
-            self.target_info = target_info
         if sort_attr is not None:
             self.sort_attr = sort_attr
         if severity_list is not None:
             self.severity_list = severity_list
+        if target_info is not None:
+            self.target_info = target_info
+        self.name = name
+        if target is not None:
+            self.target = target
 
     @property
     def last_event_time(self):
@@ -357,6 +357,29 @@ def last_event_time(self, last_event_time):
 
         self._last_event_time = last_event_time
 
+    @property
+    def created(self):
+        """Gets the created of this Alert.  # noqa: E501
+
+        When this alert was created, in epoch millis  # noqa: E501
+
+        :return: The created of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._created
+
+    @created.setter
+    def created(self, created):
+        """Sets the created of this Alert.
+
+        When this alert was created, in epoch millis  # noqa: E501
+
+        :param created: The created of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._created = created
+
     @property
     def hidden(self):
         """Gets the hidden of this Alert.  # noqa: E501
@@ -407,96 +430,6 @@ def severity(self, severity):
 
         self._severity = severity
 
-    @property
-    def created(self):
-        """Gets the created of this Alert.  # noqa: E501
-
-        When this alert was created, in epoch millis  # noqa: E501
-
-        :return: The created of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this Alert.
-
-        When this alert was created, in epoch millis  # noqa: E501
-
-        :param created: The created of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._created = created
-
-    @property
-    def name(self):
-        """Gets the name of this Alert.  # noqa: E501
-
-
-        :return: The name of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Alert.
-
-
-        :param name: The name of this Alert.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def id(self):
-        """Gets the id of this Alert.  # noqa: E501
-
-
-        :return: The id of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Alert.
-
-
-        :param id: The id of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
-    @property
-    def target(self):
-        """Gets the target of this Alert.  # noqa: E501
-
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
-
-        :return: The target of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._target
-
-    @target.setter
-    def target(self, target):
-        """Sets the target of this Alert.
-
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
-
-        :param target: The target of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._target = target
-
     @property
     def minutes(self):
         """Gets the minutes of this Alert.  # noqa: E501
@@ -585,30 +518,122 @@ def event(self, event):
         :type: Event
         """
 
-        self._event = event
+        self._event = event
+
+    @property
+    def updated(self):
+        """Gets the updated of this Alert.  # noqa: E501
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :return: The updated of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated
+
+    @updated.setter
+    def updated(self, updated):
+        """Sets the updated of this Alert.
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :param updated: The updated of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._updated = updated
+
+    @property
+    def targets(self):
+        """Gets the targets of this Alert.  # noqa: E501
+
+        Targets for severity.  # noqa: E501
+
+        :return: The targets of this Alert.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._targets
+
+    @targets.setter
+    def targets(self, targets):
+        """Sets the targets of this Alert.
+
+        Targets for severity.  # noqa: E501
+
+        :param targets: The targets of this Alert.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._targets = targets
+
+    @property
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this Alert.  # noqa: E501
+
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :return: The process_rate_minutes of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._process_rate_minutes
+
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this Alert.
+
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._process_rate_minutes = process_rate_minutes
+
+    @property
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this Alert.  # noqa: E501
+
+        The time when this alert was last checked, in epoch millis  # noqa: E501
+
+        :return: The last_processed_millis of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_processed_millis
+
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this Alert.
+
+        The time when this alert was last checked, in epoch millis  # noqa: E501
+
+        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_processed_millis = last_processed_millis
 
     @property
-    def updated(self):
-        """Gets the updated of this Alert.  # noqa: E501
+    def update_user_id(self):
+        """Gets the update_user_id of this Alert.  # noqa: E501
 
-        When the alert was last updated, in epoch millis  # noqa: E501
+        The user that last updated this alert  # noqa: E501
 
-        :return: The updated of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The update_user_id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._updated
+        return self._update_user_id
 
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this Alert.
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this Alert.
 
-        When the alert was last updated, in epoch millis  # noqa: E501
+        The user that last updated this alert  # noqa: E501
 
-        :param updated: The updated of this Alert.  # noqa: E501
-        :type: int
+        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._updated = updated
+        self._update_user_id = update_user_id
 
     @property
     def condition(self):
@@ -871,98 +896,6 @@ def include_obsolete_metrics(self, include_obsolete_metrics):
 
         self._include_obsolete_metrics = include_obsolete_metrics
 
-    @property
-    def targets(self):
-        """Gets the targets of this Alert.  # noqa: E501
-
-        Targets for severity.  # noqa: E501
-
-        :return: The targets of this Alert.  # noqa: E501
-        :rtype: dict(str, str)
-        """
-        return self._targets
-
-    @targets.setter
-    def targets(self, targets):
-        """Sets the targets of this Alert.
-
-        Targets for severity.  # noqa: E501
-
-        :param targets: The targets of this Alert.  # noqa: E501
-        :type: dict(str, str)
-        """
-
-        self._targets = targets
-
-    @property
-    def process_rate_minutes(self):
-        """Gets the process_rate_minutes of this Alert.  # noqa: E501
-
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
-
-        :return: The process_rate_minutes of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._process_rate_minutes
-
-    @process_rate_minutes.setter
-    def process_rate_minutes(self, process_rate_minutes):
-        """Sets the process_rate_minutes of this Alert.
-
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
-
-        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._process_rate_minutes = process_rate_minutes
-
-    @property
-    def last_processed_millis(self):
-        """Gets the last_processed_millis of this Alert.  # noqa: E501
-
-        The time when this alert was last checked, in epoch millis  # noqa: E501
-
-        :return: The last_processed_millis of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_processed_millis
-
-    @last_processed_millis.setter
-    def last_processed_millis(self, last_processed_millis):
-        """Sets the last_processed_millis of this Alert.
-
-        The time when this alert was last checked, in epoch millis  # noqa: E501
-
-        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._last_processed_millis = last_processed_millis
-
-    @property
-    def update_user_id(self):
-        """Gets the update_user_id of this Alert.  # noqa: E501
-
-        The user that last updated this alert  # noqa: E501
-
-        :return: The update_user_id of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._update_user_id
-
-    @update_user_id.setter
-    def update_user_id(self, update_user_id):
-        """Sets the update_user_id of this Alert.
-
-        The user that last updated this alert  # noqa: E501
-
-        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._update_user_id = update_user_id
-
     @property
     def prefiring_host_label_pairs(self):
         """Gets the prefiring_host_label_pairs of this Alert.  # noqa: E501
@@ -1479,27 +1412,25 @@ def updater_id(self, updater_id):
         self._updater_id = updater_id
 
     @property
-    def last_error_message(self):
-        """Gets the last_error_message of this Alert.  # noqa: E501
+    def id(self):
+        """Gets the id of this Alert.  # noqa: E501
 
-        The last error encountered when running this alert's condition query  # noqa: E501
 
-        :return: The last_error_message of this Alert.  # noqa: E501
+        :return: The id of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._last_error_message
+        return self._id
 
-    @last_error_message.setter
-    def last_error_message(self, last_error_message):
-        """Sets the last_error_message of this Alert.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Alert.
 
-        The last error encountered when running this alert's condition query  # noqa: E501
 
-        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
+        :param id: The id of this Alert.  # noqa: E501
         :type: str
         """
 
-        self._last_error_message = last_error_message
+        self._id = id
 
     @property
     def notification_resend_frequency_minutes(self):
@@ -1524,6 +1455,29 @@ def notification_resend_frequency_minutes(self, notification_resend_frequency_mi
 
         self._notification_resend_frequency_minutes = notification_resend_frequency_minutes
 
+    @property
+    def last_error_message(self):
+        """Gets the last_error_message of this Alert.  # noqa: E501
+
+        The last error encountered when running this alert's condition query  # noqa: E501
+
+        :return: The last_error_message of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_error_message
+
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this Alert.
+
+        The last error encountered when running this alert's condition query  # noqa: E501
+
+        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._last_error_message = last_error_message
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this Alert.  # noqa: E501
@@ -1587,29 +1541,6 @@ def deleted(self, deleted):
 
         self._deleted = deleted
 
-    @property
-    def target_info(self):
-        """Gets the target_info of this Alert.  # noqa: E501
-
-        List of alert targets display information that includes name, id and type.  # noqa: E501
-
-        :return: The target_info of this Alert.  # noqa: E501
-        :rtype: list[TargetInfo]
-        """
-        return self._target_info
-
-    @target_info.setter
-    def target_info(self, target_info):
-        """Sets the target_info of this Alert.
-
-        List of alert targets display information that includes name, id and type.  # noqa: E501
-
-        :param target_info: The target_info of this Alert.  # noqa: E501
-        :type: list[TargetInfo]
-        """
-
-        self._target_info = target_info
-
     @property
     def sort_attr(self):
         """Gets the sort_attr of this Alert.  # noqa: E501
@@ -1663,6 +1594,75 @@ def severity_list(self, severity_list):
 
         self._severity_list = severity_list
 
+    @property
+    def target_info(self):
+        """Gets the target_info of this Alert.  # noqa: E501
+
+        List of alert targets display information that includes name, id and type.  # noqa: E501
+
+        :return: The target_info of this Alert.  # noqa: E501
+        :rtype: list[TargetInfo]
+        """
+        return self._target_info
+
+    @target_info.setter
+    def target_info(self, target_info):
+        """Sets the target_info of this Alert.
+
+        List of alert targets display information that includes name, id and type.  # noqa: E501
+
+        :param target_info: The target_info of this Alert.  # noqa: E501
+        :type: list[TargetInfo]
+        """
+
+        self._target_info = target_info
+
+    @property
+    def name(self):
+        """Gets the name of this Alert.  # noqa: E501
+
+
+        :return: The name of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Alert.
+
+
+        :param name: The name of this Alert.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def target(self):
+        """Gets the target of this Alert.  # noqa: E501
+
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
+
+        :return: The target of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._target
+
+    @target.setter
+    def target(self, target):
+        """Sets the target of this Alert.
+
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
+
+        :param target: The target of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._target = target
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/avro_backed_standardized_dto.py b/wavefront_api_client/models/avro_backed_standardized_dto.py
index 194021c..f8e31e3 100644
--- a/wavefront_api_client/models/avro_backed_standardized_dto.py
+++ b/wavefront_api_client/models/avro_backed_standardized_dto.py
@@ -31,40 +31,40 @@ class AvroBackedStandardizedDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'str',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'deleted': 'bool'
     }
 
     attribute_map = {
-        'id': 'id',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted'
     }
 
-    def __init__(self, id=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+    def __init__(self, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
         """AvroBackedStandardizedDTO - a model defined in Swagger"""  # noqa: E501
 
-        self._id = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._deleted = None
         self.discriminator = None
 
-        if id is not None:
-            self.id = id
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
@@ -72,27 +72,6 @@ def __init__(self, id=None, creator_id=None, updater_id=None, created_epoch_mill
         if deleted is not None:
             self.deleted = deleted
 
-    @property
-    def id(self):
-        """Gets the id of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this AvroBackedStandardizedDTO.
-
-
-        :param id: The id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
     @property
     def creator_id(self):
         """Gets the creator_id of this AvroBackedStandardizedDTO.  # noqa: E501
@@ -135,6 +114,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this AvroBackedStandardizedDTO.  # noqa: E501
+
+
+        :return: The id of this AvroBackedStandardizedDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this AvroBackedStandardizedDTO.
+
+
+        :param id: The id of this AvroBackedStandardizedDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index 3b6b9fc..761119a 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -34,35 +34,35 @@ class AzureConfiguration(object):
     """
     swagger_types = {
         'base_credentials': 'AzureBaseCredentials',
-        'metric_filter_regex': 'str',
         'category_filter': 'list[str]',
-        'resource_group_filter': 'list[str]'
+        'resource_group_filter': 'list[str]',
+        'metric_filter_regex': 'str'
     }
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
-        'metric_filter_regex': 'metricFilterRegex',
         'category_filter': 'categoryFilter',
-        'resource_group_filter': 'resourceGroupFilter'
+        'resource_group_filter': 'resourceGroupFilter',
+        'metric_filter_regex': 'metricFilterRegex'
     }
 
-    def __init__(self, base_credentials=None, metric_filter_regex=None, category_filter=None, resource_group_filter=None):  # noqa: E501
+    def __init__(self, base_credentials=None, category_filter=None, resource_group_filter=None, metric_filter_regex=None):  # noqa: E501
         """AzureConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._base_credentials = None
-        self._metric_filter_regex = None
         self._category_filter = None
         self._resource_group_filter = None
+        self._metric_filter_regex = None
         self.discriminator = None
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
-        if metric_filter_regex is not None:
-            self.metric_filter_regex = metric_filter_regex
         if category_filter is not None:
             self.category_filter = category_filter
         if resource_group_filter is not None:
             self.resource_group_filter = resource_group_filter
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
 
     @property
     def base_credentials(self):
@@ -85,29 +85,6 @@ def base_credentials(self, base_credentials):
 
         self._base_credentials = base_credentials
 
-    @property
-    def metric_filter_regex(self):
-        """Gets the metric_filter_regex of this AzureConfiguration.  # noqa: E501
-
-        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
-
-        :return: The metric_filter_regex of this AzureConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._metric_filter_regex
-
-    @metric_filter_regex.setter
-    def metric_filter_regex(self, metric_filter_regex):
-        """Sets the metric_filter_regex of this AzureConfiguration.
-
-        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
-
-        :param metric_filter_regex: The metric_filter_regex of this AzureConfiguration.  # noqa: E501
-        :type: str
-        """
-
-        self._metric_filter_regex = metric_filter_regex
-
     @property
     def category_filter(self):
         """Gets the category_filter of this AzureConfiguration.  # noqa: E501
@@ -154,6 +131,29 @@ def resource_group_filter(self, resource_group_filter):
 
         self._resource_group_filter = resource_group_filter
 
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this AzureConfiguration.  # noqa: E501
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The metric_filter_regex of this AzureConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this AzureConfiguration.
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param metric_filter_regex: The metric_filter_regex of this AzureConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 5712c68..c9d83ff 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -36,55 +36,56 @@ class Chart(object):
     """
     swagger_types = {
         'base': 'int',
-        'units': 'str',
         'description': 'str',
-        'name': 'str',
+        'units': 'str',
+        'interpolate_points': 'bool',
         'sources': 'list[ChartSourceQuery]',
         'include_obsolete_metrics': 'bool',
         'no_default_events': 'bool',
         'chart_attributes': 'JsonNode',
-        'interpolate_points': 'bool',
+        'summarization': 'str',
         'chart_settings': 'ChartSettings',
-        'summarization': 'str'
+        'name': 'str'
     }
 
     attribute_map = {
         'base': 'base',
-        'units': 'units',
         'description': 'description',
-        'name': 'name',
+        'units': 'units',
+        'interpolate_points': 'interpolatePoints',
         'sources': 'sources',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
         'no_default_events': 'noDefaultEvents',
         'chart_attributes': 'chartAttributes',
-        'interpolate_points': 'interpolatePoints',
+        'summarization': 'summarization',
         'chart_settings': 'chartSettings',
-        'summarization': 'summarization'
+        'name': 'name'
     }
 
-    def __init__(self, base=None, units=None, description=None, name=None, sources=None, include_obsolete_metrics=None, no_default_events=None, chart_attributes=None, interpolate_points=None, chart_settings=None, summarization=None):  # noqa: E501
+    def __init__(self, base=None, description=None, units=None, interpolate_points=None, sources=None, include_obsolete_metrics=None, no_default_events=None, chart_attributes=None, summarization=None, chart_settings=None, name=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
 
         self._base = None
-        self._units = None
         self._description = None
-        self._name = None
+        self._units = None
+        self._interpolate_points = None
         self._sources = None
         self._include_obsolete_metrics = None
         self._no_default_events = None
         self._chart_attributes = None
-        self._interpolate_points = None
-        self._chart_settings = None
         self._summarization = None
+        self._chart_settings = None
+        self._name = None
         self.discriminator = None
 
         if base is not None:
             self.base = base
-        if units is not None:
-            self.units = units
         if description is not None:
             self.description = description
-        self.name = name
+        if units is not None:
+            self.units = units
+        if interpolate_points is not None:
+            self.interpolate_points = interpolate_points
         self.sources = sources
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
@@ -92,12 +93,11 @@ def __init__(self, base=None, units=None, description=None, name=None, sources=N
             self.no_default_events = no_default_events
         if chart_attributes is not None:
             self.chart_attributes = chart_attributes
-        if interpolate_points is not None:
-            self.interpolate_points = interpolate_points
-        if chart_settings is not None:
-            self.chart_settings = chart_settings
         if summarization is not None:
             self.summarization = summarization
+        if chart_settings is not None:
+            self.chart_settings = chart_settings
+        self.name = name
 
     @property
     def base(self):
@@ -122,29 +122,6 @@ def base(self, base):
 
         self._base = base
 
-    @property
-    def units(self):
-        """Gets the units of this Chart.  # noqa: E501
-
-        String to label the units of the chart on the Y-axis  # noqa: E501
-
-        :return: The units of this Chart.  # noqa: E501
-        :rtype: str
-        """
-        return self._units
-
-    @units.setter
-    def units(self, units):
-        """Sets the units of this Chart.
-
-        String to label the units of the chart on the Y-axis  # noqa: E501
-
-        :param units: The units of this Chart.  # noqa: E501
-        :type: str
-        """
-
-        self._units = units
-
     @property
     def description(self):
         """Gets the description of this Chart.  # noqa: E501
@@ -169,29 +146,50 @@ def description(self, description):
         self._description = description
 
     @property
-    def name(self):
-        """Gets the name of this Chart.  # noqa: E501
+    def units(self):
+        """Gets the units of this Chart.  # noqa: E501
 
-        Name of the source  # noqa: E501
+        String to label the units of the chart on the Y-axis  # noqa: E501
 
-        :return: The name of this Chart.  # noqa: E501
+        :return: The units of this Chart.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._units
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Chart.
+    @units.setter
+    def units(self, units):
+        """Sets the units of this Chart.
 
-        Name of the source  # noqa: E501
+        String to label the units of the chart on the Y-axis  # noqa: E501
 
-        :param name: The name of this Chart.  # noqa: E501
+        :param units: The units of this Chart.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._units = units
+
+    @property
+    def interpolate_points(self):
+        """Gets the interpolate_points of this Chart.  # noqa: E501
+
+        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+
+        :return: The interpolate_points of this Chart.  # noqa: E501
+        :rtype: bool
+        """
+        return self._interpolate_points
+
+    @interpolate_points.setter
+    def interpolate_points(self, interpolate_points):
+        """Sets the interpolate_points of this Chart.
+
+        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+
+        :param interpolate_points: The interpolate_points of this Chart.  # noqa: E501
+        :type: bool
+        """
+
+        self._interpolate_points = interpolate_points
 
     @property
     def sources(self):
@@ -288,27 +286,33 @@ def chart_attributes(self, chart_attributes):
         self._chart_attributes = chart_attributes
 
     @property
-    def interpolate_points(self):
-        """Gets the interpolate_points of this Chart.  # noqa: E501
+    def summarization(self):
+        """Gets the summarization of this Chart.  # noqa: E501
 
-        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+        Summarization strategy for the chart.  MEAN is default  # noqa: E501
 
-        :return: The interpolate_points of this Chart.  # noqa: E501
-        :rtype: bool
+        :return: The summarization of this Chart.  # noqa: E501
+        :rtype: str
         """
-        return self._interpolate_points
+        return self._summarization
 
-    @interpolate_points.setter
-    def interpolate_points(self, interpolate_points):
-        """Sets the interpolate_points of this Chart.
+    @summarization.setter
+    def summarization(self, summarization):
+        """Sets the summarization of this Chart.
 
-        Whether to interpolate points in the charts produced. Default: true  # noqa: E501
+        Summarization strategy for the chart.  MEAN is default  # noqa: E501
 
-        :param interpolate_points: The interpolate_points of this Chart.  # noqa: E501
-        :type: bool
+        :param summarization: The summarization of this Chart.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
+        if summarization not in allowed_values:
+            raise ValueError(
+                "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
+                .format(summarization, allowed_values)
+            )
 
-        self._interpolate_points = interpolate_points
+        self._summarization = summarization
 
     @property
     def chart_settings(self):
@@ -332,33 +336,29 @@ def chart_settings(self, chart_settings):
         self._chart_settings = chart_settings
 
     @property
-    def summarization(self):
-        """Gets the summarization of this Chart.  # noqa: E501
+    def name(self):
+        """Gets the name of this Chart.  # noqa: E501
 
-        Summarization strategy for the chart.  MEAN is default  # noqa: E501
+        Name of the source  # noqa: E501
 
-        :return: The summarization of this Chart.  # noqa: E501
+        :return: The name of this Chart.  # noqa: E501
         :rtype: str
         """
-        return self._summarization
+        return self._name
 
-    @summarization.setter
-    def summarization(self, summarization):
-        """Sets the summarization of this Chart.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Chart.
 
-        Summarization strategy for the chart.  MEAN is default  # noqa: E501
+        Name of the source  # noqa: E501
 
-        :param summarization: The summarization of this Chart.  # noqa: E501
+        :param name: The name of this Chart.  # noqa: E501
         :type: str
         """
-        allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
-        if summarization not in allowed_values:
-            raise ValueError(
-                "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
-                .format(summarization, allowed_values)
-            )
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._summarization = summarization
+        self._name = name
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 2dad384..321ca4f 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -31,9 +31,27 @@ class ChartSettings(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'type': 'str',
         'min': 'float',
+        'type': 'str',
         'max': 'float',
+        'time_based_coloring': 'bool',
+        'sparkline_display_value_type': 'str',
+        'sparkline_display_color': 'str',
+        'sparkline_display_vertical_position': 'str',
+        'sparkline_display_horizontal_position': 'str',
+        'sparkline_display_font_size': 'str',
+        'sparkline_display_prefix': 'str',
+        'sparkline_display_postfix': 'str',
+        'sparkline_size': 'str',
+        'sparkline_line_color': 'str',
+        'sparkline_fill_color': 'str',
+        'sparkline_value_color_map_colors': 'list[str]',
+        'sparkline_value_color_map_values_v2': 'list[float]',
+        'sparkline_value_color_map_values': 'list[int]',
+        'sparkline_value_color_map_apply_to': 'str',
+        'sparkline_decimal_precision': 'int',
+        'sparkline_value_text_map_text': 'list[str]',
+        'sparkline_value_text_map_thresholds': 'list[float]',
         'line_type': 'str',
         'stack_type': 'str',
         'windowing': 'str',
@@ -68,32 +86,32 @@ class ChartSettings(object):
         'xmin': 'float',
         'ymax': 'float',
         'ymin': 'float',
-        'time_based_coloring': 'bool',
-        'sparkline_display_value_type': 'str',
-        'sparkline_display_color': 'str',
-        'sparkline_display_vertical_position': 'str',
-        'sparkline_display_horizontal_position': 'str',
-        'sparkline_display_font_size': 'str',
-        'sparkline_display_prefix': 'str',
-        'sparkline_display_postfix': 'str',
-        'sparkline_size': 'str',
-        'sparkline_line_color': 'str',
-        'sparkline_fill_color': 'str',
-        'sparkline_value_color_map_colors': 'list[str]',
-        'sparkline_value_color_map_values_v2': 'list[float]',
-        'sparkline_value_color_map_values': 'list[int]',
-        'sparkline_value_color_map_apply_to': 'str',
-        'sparkline_decimal_precision': 'int',
-        'sparkline_value_text_map_text': 'list[str]',
-        'sparkline_value_text_map_thresholds': 'list[float]',
         'expected_data_spacing': 'int',
         'plain_markdown_content': 'str'
     }
 
     attribute_map = {
-        'type': 'type',
         'min': 'min',
+        'type': 'type',
         'max': 'max',
+        'time_based_coloring': 'timeBasedColoring',
+        'sparkline_display_value_type': 'sparklineDisplayValueType',
+        'sparkline_display_color': 'sparklineDisplayColor',
+        'sparkline_display_vertical_position': 'sparklineDisplayVerticalPosition',
+        'sparkline_display_horizontal_position': 'sparklineDisplayHorizontalPosition',
+        'sparkline_display_font_size': 'sparklineDisplayFontSize',
+        'sparkline_display_prefix': 'sparklineDisplayPrefix',
+        'sparkline_display_postfix': 'sparklineDisplayPostfix',
+        'sparkline_size': 'sparklineSize',
+        'sparkline_line_color': 'sparklineLineColor',
+        'sparkline_fill_color': 'sparklineFillColor',
+        'sparkline_value_color_map_colors': 'sparklineValueColorMapColors',
+        'sparkline_value_color_map_values_v2': 'sparklineValueColorMapValuesV2',
+        'sparkline_value_color_map_values': 'sparklineValueColorMapValues',
+        'sparkline_value_color_map_apply_to': 'sparklineValueColorMapApplyTo',
+        'sparkline_decimal_precision': 'sparklineDecimalPrecision',
+        'sparkline_value_text_map_text': 'sparklineValueTextMapText',
+        'sparkline_value_text_map_thresholds': 'sparklineValueTextMapThresholds',
         'line_type': 'lineType',
         'stack_type': 'stackType',
         'windowing': 'windowing',
@@ -128,34 +146,34 @@ class ChartSettings(object):
         'xmin': 'xmin',
         'ymax': 'ymax',
         'ymin': 'ymin',
-        'time_based_coloring': 'timeBasedColoring',
-        'sparkline_display_value_type': 'sparklineDisplayValueType',
-        'sparkline_display_color': 'sparklineDisplayColor',
-        'sparkline_display_vertical_position': 'sparklineDisplayVerticalPosition',
-        'sparkline_display_horizontal_position': 'sparklineDisplayHorizontalPosition',
-        'sparkline_display_font_size': 'sparklineDisplayFontSize',
-        'sparkline_display_prefix': 'sparklineDisplayPrefix',
-        'sparkline_display_postfix': 'sparklineDisplayPostfix',
-        'sparkline_size': 'sparklineSize',
-        'sparkline_line_color': 'sparklineLineColor',
-        'sparkline_fill_color': 'sparklineFillColor',
-        'sparkline_value_color_map_colors': 'sparklineValueColorMapColors',
-        'sparkline_value_color_map_values_v2': 'sparklineValueColorMapValuesV2',
-        'sparkline_value_color_map_values': 'sparklineValueColorMapValues',
-        'sparkline_value_color_map_apply_to': 'sparklineValueColorMapApplyTo',
-        'sparkline_decimal_precision': 'sparklineDecimalPrecision',
-        'sparkline_value_text_map_text': 'sparklineValueTextMapText',
-        'sparkline_value_text_map_thresholds': 'sparklineValueTextMapThresholds',
         'expected_data_spacing': 'expectedDataSpacing',
         'plain_markdown_content': 'plainMarkdownContent'
     }
 
-    def __init__(self, type=None, min=None, max=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, expected_data_spacing=None, plain_markdown_content=None):  # noqa: E501
+    def __init__(self, min=None, type=None, max=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, expected_data_spacing=None, plain_markdown_content=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
-        self._type = None
         self._min = None
+        self._type = None
         self._max = None
+        self._time_based_coloring = None
+        self._sparkline_display_value_type = None
+        self._sparkline_display_color = None
+        self._sparkline_display_vertical_position = None
+        self._sparkline_display_horizontal_position = None
+        self._sparkline_display_font_size = None
+        self._sparkline_display_prefix = None
+        self._sparkline_display_postfix = None
+        self._sparkline_size = None
+        self._sparkline_line_color = None
+        self._sparkline_fill_color = None
+        self._sparkline_value_color_map_colors = None
+        self._sparkline_value_color_map_values_v2 = None
+        self._sparkline_value_color_map_values = None
+        self._sparkline_value_color_map_apply_to = None
+        self._sparkline_decimal_precision = None
+        self._sparkline_value_text_map_text = None
+        self._sparkline_value_text_map_thresholds = None
         self._line_type = None
         self._stack_type = None
         self._windowing = None
@@ -190,33 +208,51 @@ def __init__(self, type=None, min=None, max=None, line_type=None, stack_type=Non
         self._xmin = None
         self._ymax = None
         self._ymin = None
-        self._time_based_coloring = None
-        self._sparkline_display_value_type = None
-        self._sparkline_display_color = None
-        self._sparkline_display_vertical_position = None
-        self._sparkline_display_horizontal_position = None
-        self._sparkline_display_font_size = None
-        self._sparkline_display_prefix = None
-        self._sparkline_display_postfix = None
-        self._sparkline_size = None
-        self._sparkline_line_color = None
-        self._sparkline_fill_color = None
-        self._sparkline_value_color_map_colors = None
-        self._sparkline_value_color_map_values_v2 = None
-        self._sparkline_value_color_map_values = None
-        self._sparkline_value_color_map_apply_to = None
-        self._sparkline_decimal_precision = None
-        self._sparkline_value_text_map_text = None
-        self._sparkline_value_text_map_thresholds = None
         self._expected_data_spacing = None
         self._plain_markdown_content = None
         self.discriminator = None
 
-        self.type = type
         if min is not None:
             self.min = min
+        self.type = type
         if max is not None:
             self.max = max
+        if time_based_coloring is not None:
+            self.time_based_coloring = time_based_coloring
+        if sparkline_display_value_type is not None:
+            self.sparkline_display_value_type = sparkline_display_value_type
+        if sparkline_display_color is not None:
+            self.sparkline_display_color = sparkline_display_color
+        if sparkline_display_vertical_position is not None:
+            self.sparkline_display_vertical_position = sparkline_display_vertical_position
+        if sparkline_display_horizontal_position is not None:
+            self.sparkline_display_horizontal_position = sparkline_display_horizontal_position
+        if sparkline_display_font_size is not None:
+            self.sparkline_display_font_size = sparkline_display_font_size
+        if sparkline_display_prefix is not None:
+            self.sparkline_display_prefix = sparkline_display_prefix
+        if sparkline_display_postfix is not None:
+            self.sparkline_display_postfix = sparkline_display_postfix
+        if sparkline_size is not None:
+            self.sparkline_size = sparkline_size
+        if sparkline_line_color is not None:
+            self.sparkline_line_color = sparkline_line_color
+        if sparkline_fill_color is not None:
+            self.sparkline_fill_color = sparkline_fill_color
+        if sparkline_value_color_map_colors is not None:
+            self.sparkline_value_color_map_colors = sparkline_value_color_map_colors
+        if sparkline_value_color_map_values_v2 is not None:
+            self.sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
+        if sparkline_value_color_map_values is not None:
+            self.sparkline_value_color_map_values = sparkline_value_color_map_values
+        if sparkline_value_color_map_apply_to is not None:
+            self.sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
+        if sparkline_decimal_precision is not None:
+            self.sparkline_decimal_precision = sparkline_decimal_precision
+        if sparkline_value_text_map_text is not None:
+            self.sparkline_value_text_map_text = sparkline_value_text_map_text
+        if sparkline_value_text_map_thresholds is not None:
+            self.sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
         if line_type is not None:
             self.line_type = line_type
         if stack_type is not None:
@@ -285,47 +321,34 @@ def __init__(self, type=None, min=None, max=None, line_type=None, stack_type=Non
             self.ymax = ymax
         if ymin is not None:
             self.ymin = ymin
-        if time_based_coloring is not None:
-            self.time_based_coloring = time_based_coloring
-        if sparkline_display_value_type is not None:
-            self.sparkline_display_value_type = sparkline_display_value_type
-        if sparkline_display_color is not None:
-            self.sparkline_display_color = sparkline_display_color
-        if sparkline_display_vertical_position is not None:
-            self.sparkline_display_vertical_position = sparkline_display_vertical_position
-        if sparkline_display_horizontal_position is not None:
-            self.sparkline_display_horizontal_position = sparkline_display_horizontal_position
-        if sparkline_display_font_size is not None:
-            self.sparkline_display_font_size = sparkline_display_font_size
-        if sparkline_display_prefix is not None:
-            self.sparkline_display_prefix = sparkline_display_prefix
-        if sparkline_display_postfix is not None:
-            self.sparkline_display_postfix = sparkline_display_postfix
-        if sparkline_size is not None:
-            self.sparkline_size = sparkline_size
-        if sparkline_line_color is not None:
-            self.sparkline_line_color = sparkline_line_color
-        if sparkline_fill_color is not None:
-            self.sparkline_fill_color = sparkline_fill_color
-        if sparkline_value_color_map_colors is not None:
-            self.sparkline_value_color_map_colors = sparkline_value_color_map_colors
-        if sparkline_value_color_map_values_v2 is not None:
-            self.sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
-        if sparkline_value_color_map_values is not None:
-            self.sparkline_value_color_map_values = sparkline_value_color_map_values
-        if sparkline_value_color_map_apply_to is not None:
-            self.sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
-        if sparkline_decimal_precision is not None:
-            self.sparkline_decimal_precision = sparkline_decimal_precision
-        if sparkline_value_text_map_text is not None:
-            self.sparkline_value_text_map_text = sparkline_value_text_map_text
-        if sparkline_value_text_map_thresholds is not None:
-            self.sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
         if expected_data_spacing is not None:
             self.expected_data_spacing = expected_data_spacing
         if plain_markdown_content is not None:
             self.plain_markdown_content = plain_markdown_content
 
+    @property
+    def min(self):
+        """Gets the min of this ChartSettings.  # noqa: E501
+
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+
+        :return: The min of this ChartSettings.  # noqa: E501
+        :rtype: float
+        """
+        return self._min
+
+    @min.setter
+    def min(self, min):
+        """Sets the min of this ChartSettings.
+
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+
+        :param min: The min of this ChartSettings.  # noqa: E501
+        :type: float
+        """
+
+        self._min = min
+
     @property
     def type(self):
         """Gets the type of this ChartSettings.  # noqa: E501
@@ -357,29 +380,6 @@ def type(self, type):
 
         self._type = type
 
-    @property
-    def min(self):
-        """Gets the min of this ChartSettings.  # noqa: E501
-
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
-
-        :return: The min of this ChartSettings.  # noqa: E501
-        :rtype: float
-        """
-        return self._min
-
-    @min.setter
-    def min(self, min):
-        """Sets the min of this ChartSettings.
-
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
-
-        :param min: The min of this ChartSettings.  # noqa: E501
-        :type: float
-        """
-
-        self._min = min
-
     @property
     def max(self):
         """Gets the max of this ChartSettings.  # noqa: E501
@@ -404,1266 +404,1266 @@ def max(self, max):
         self._max = max
 
     @property
-    def line_type(self):
-        """Gets the line_type of this ChartSettings.  # noqa: E501
+    def time_based_coloring(self):
+        """Gets the time_based_coloring of this ChartSettings.  # noqa: E501
 
-        Plot interpolation type.  linear is default  # noqa: E501
+        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
 
-        :return: The line_type of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The time_based_coloring of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._line_type
+        return self._time_based_coloring
 
-    @line_type.setter
-    def line_type(self, line_type):
-        """Sets the line_type of this ChartSettings.
+    @time_based_coloring.setter
+    def time_based_coloring(self, time_based_coloring):
+        """Sets the time_based_coloring of this ChartSettings.
 
-        Plot interpolation type.  linear is default  # noqa: E501
+        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
 
-        :param line_type: The line_type of this ChartSettings.  # noqa: E501
-        :type: str
+        :param time_based_coloring: The time_based_coloring of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["linear", "step-before", "step-after", "basis", "cardinal", "monotone"]  # noqa: E501
-        if line_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `line_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(line_type, allowed_values)
-            )
 
-        self._line_type = line_type
+        self._time_based_coloring = time_based_coloring
 
     @property
-    def stack_type(self):
-        """Gets the stack_type of this ChartSettings.  # noqa: E501
+    def sparkline_display_value_type(self):
+        """Gets the sparkline_display_value_type of this ChartSettings.  # noqa: E501
 
-        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
+        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
 
-        :return: The stack_type of this ChartSettings.  # noqa: E501
+        :return: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._stack_type
+        return self._sparkline_display_value_type
 
-    @stack_type.setter
-    def stack_type(self, stack_type):
-        """Sets the stack_type of this ChartSettings.
+    @sparkline_display_value_type.setter
+    def sparkline_display_value_type(self, sparkline_display_value_type):
+        """Sets the sparkline_display_value_type of this ChartSettings.
 
-        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
+        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
 
-        :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
+        :param sparkline_display_value_type: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
-        if stack_type not in allowed_values:
+        allowed_values = ["VALUE", "LABEL"]  # noqa: E501
+        if sparkline_display_value_type not in allowed_values:
             raise ValueError(
-                "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(stack_type, allowed_values)
+                "Invalid value for `sparkline_display_value_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_display_value_type, allowed_values)
             )
 
-        self._stack_type = stack_type
+        self._sparkline_display_value_type = sparkline_display_value_type
 
     @property
-    def windowing(self):
-        """Gets the windowing of this ChartSettings.  # noqa: E501
+    def sparkline_display_color(self):
+        """Gets the sparkline_display_color of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
+        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The windowing of this ChartSettings.  # noqa: E501
+        :return: The sparkline_display_color of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._windowing
+        return self._sparkline_display_color
 
-    @windowing.setter
-    def windowing(self, windowing):
-        """Sets the windowing of this ChartSettings.
+    @sparkline_display_color.setter
+    def sparkline_display_color(self, sparkline_display_color):
+        """Sets the sparkline_display_color of this ChartSettings.
 
-        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
+        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param windowing: The windowing of this ChartSettings.  # noqa: E501
+        :param sparkline_display_color: The sparkline_display_color of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["full", "last"]  # noqa: E501
-        if windowing not in allowed_values:
-            raise ValueError(
-                "Invalid value for `windowing` ({0}), must be one of {1}"  # noqa: E501
-                .format(windowing, allowed_values)
-            )
 
-        self._windowing = windowing
+        self._sparkline_display_color = sparkline_display_color
 
     @property
-    def window_size(self):
-        """Gets the window_size of this ChartSettings.  # noqa: E501
+    def sparkline_display_vertical_position(self):
+        """Gets the sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
 
-        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
+        deprecated  # noqa: E501
 
-        :return: The window_size of this ChartSettings.  # noqa: E501
-        :rtype: int
+        :return: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._window_size
+        return self._sparkline_display_vertical_position
 
-    @window_size.setter
-    def window_size(self, window_size):
-        """Sets the window_size of this ChartSettings.
+    @sparkline_display_vertical_position.setter
+    def sparkline_display_vertical_position(self, sparkline_display_vertical_position):
+        """Sets the sparkline_display_vertical_position of this ChartSettings.
 
-        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
+        deprecated  # noqa: E501
 
-        :param window_size: The window_size of this ChartSettings.  # noqa: E501
-        :type: int
+        :param sparkline_display_vertical_position: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._window_size = window_size
+        self._sparkline_display_vertical_position = sparkline_display_vertical_position
 
     @property
-    def show_hosts(self):
-        """Gets the show_hosts of this ChartSettings.  # noqa: E501
+    def sparkline_display_horizontal_position(self):
+        """Gets the sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display sources.  Default: true  # noqa: E501
+        For the single stat view, the horizontal position of the displayed text  # noqa: E501
 
-        :return: The show_hosts of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._show_hosts
+        return self._sparkline_display_horizontal_position
 
-    @show_hosts.setter
-    def show_hosts(self, show_hosts):
-        """Sets the show_hosts of this ChartSettings.
+    @sparkline_display_horizontal_position.setter
+    def sparkline_display_horizontal_position(self, sparkline_display_horizontal_position):
+        """Sets the sparkline_display_horizontal_position of this ChartSettings.
 
-        For the tabular view, whether to display sources.  Default: true  # noqa: E501
+        For the single stat view, the horizontal position of the displayed text  # noqa: E501
 
-        :param show_hosts: The show_hosts of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_horizontal_position: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["MIDDLE", "LEFT", "RIGHT"]  # noqa: E501
+        if sparkline_display_horizontal_position not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sparkline_display_horizontal_position` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_display_horizontal_position, allowed_values)
+            )
 
-        self._show_hosts = show_hosts
+        self._sparkline_display_horizontal_position = sparkline_display_horizontal_position
 
     @property
-    def show_labels(self):
-        """Gets the show_labels of this ChartSettings.  # noqa: E501
+    def sparkline_display_font_size(self):
+        """Gets the sparkline_display_font_size of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display labels.  Default: true  # noqa: E501
+        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
 
-        :return: The show_labels of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._show_labels
+        return self._sparkline_display_font_size
 
-    @show_labels.setter
-    def show_labels(self, show_labels):
-        """Sets the show_labels of this ChartSettings.
+    @sparkline_display_font_size.setter
+    def sparkline_display_font_size(self, sparkline_display_font_size):
+        """Sets the sparkline_display_font_size of this ChartSettings.
 
-        For the tabular view, whether to display labels.  Default: true  # noqa: E501
+        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
 
-        :param show_labels: The show_labels of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_font_size: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._show_labels = show_labels
+        self._sparkline_display_font_size = sparkline_display_font_size
 
     @property
-    def show_raw_values(self):
-        """Gets the show_raw_values of this ChartSettings.  # noqa: E501
+    def sparkline_display_prefix(self):
+        """Gets the sparkline_display_prefix of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
+        For the single stat view, a string to add before the displayed text  # noqa: E501
 
-        :return: The show_raw_values of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._show_raw_values
+        return self._sparkline_display_prefix
 
-    @show_raw_values.setter
-    def show_raw_values(self, show_raw_values):
-        """Sets the show_raw_values of this ChartSettings.
+    @sparkline_display_prefix.setter
+    def sparkline_display_prefix(self, sparkline_display_prefix):
+        """Sets the sparkline_display_prefix of this ChartSettings.
 
-        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
+        For the single stat view, a string to add before the displayed text  # noqa: E501
 
-        :param show_raw_values: The show_raw_values of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_prefix: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._show_raw_values = show_raw_values
+        self._sparkline_display_prefix = sparkline_display_prefix
 
     @property
-    def auto_column_tags(self):
-        """Gets the auto_column_tags of this ChartSettings.  # noqa: E501
+    def sparkline_display_postfix(self):
+        """Gets the sparkline_display_postfix of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        For the single stat view, a string to append to the displayed text  # noqa: E501
 
-        :return: The auto_column_tags of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._auto_column_tags
+        return self._sparkline_display_postfix
 
-    @auto_column_tags.setter
-    def auto_column_tags(self, auto_column_tags):
-        """Sets the auto_column_tags of this ChartSettings.
+    @sparkline_display_postfix.setter
+    def sparkline_display_postfix(self, sparkline_display_postfix):
+        """Sets the sparkline_display_postfix of this ChartSettings.
 
-        deprecated  # noqa: E501
+        For the single stat view, a string to append to the displayed text  # noqa: E501
 
-        :param auto_column_tags: The auto_column_tags of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_postfix: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._auto_column_tags = auto_column_tags
+        self._sparkline_display_postfix = sparkline_display_postfix
 
     @property
-    def column_tags(self):
-        """Gets the column_tags of this ChartSettings.  # noqa: E501
+    def sparkline_size(self):
+        """Gets the sparkline_size of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
 
-        :return: The column_tags of this ChartSettings.  # noqa: E501
+        :return: The sparkline_size of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._column_tags
+        return self._sparkline_size
 
-    @column_tags.setter
-    def column_tags(self, column_tags):
-        """Sets the column_tags of this ChartSettings.
+    @sparkline_size.setter
+    def sparkline_size(self, sparkline_size):
+        """Sets the sparkline_size of this ChartSettings.
 
-        deprecated  # noqa: E501
+        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
 
-        :param column_tags: The column_tags of this ChartSettings.  # noqa: E501
+        :param sparkline_size: The sparkline_size of this ChartSettings.  # noqa: E501
         :type: str
         """
+        allowed_values = ["BACKGROUND", "BOTTOM", "NONE"]  # noqa: E501
+        if sparkline_size not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sparkline_size` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_size, allowed_values)
+            )
 
-        self._column_tags = column_tags
+        self._sparkline_size = sparkline_size
 
     @property
-    def tag_mode(self):
-        """Gets the tag_mode of this ChartSettings.  # noqa: E501
+    def sparkline_line_color(self):
+        """Gets the sparkline_line_color of this ChartSettings.  # noqa: E501
 
-        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
+        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The tag_mode of this ChartSettings.  # noqa: E501
+        :return: The sparkline_line_color of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._tag_mode
+        return self._sparkline_line_color
 
-    @tag_mode.setter
-    def tag_mode(self, tag_mode):
-        """Sets the tag_mode of this ChartSettings.
+    @sparkline_line_color.setter
+    def sparkline_line_color(self, sparkline_line_color):
+        """Sets the sparkline_line_color of this ChartSettings.
 
-        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
+        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param tag_mode: The tag_mode of this ChartSettings.  # noqa: E501
+        :param sparkline_line_color: The sparkline_line_color of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["all", "top", "custom"]  # noqa: E501
-        if tag_mode not in allowed_values:
-            raise ValueError(
-                "Invalid value for `tag_mode` ({0}), must be one of {1}"  # noqa: E501
-                .format(tag_mode, allowed_values)
-            )
 
-        self._tag_mode = tag_mode
+        self._sparkline_line_color = sparkline_line_color
 
     @property
-    def num_tags(self):
-        """Gets the num_tags of this ChartSettings.  # noqa: E501
+    def sparkline_fill_color(self):
+        """Gets the sparkline_fill_color of this ChartSettings.  # noqa: E501
 
-        For the tabular view, how many point tags to display  # noqa: E501
+        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The num_tags of this ChartSettings.  # noqa: E501
-        :rtype: int
+        :return: The sparkline_fill_color of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._num_tags
+        return self._sparkline_fill_color
 
-    @num_tags.setter
-    def num_tags(self, num_tags):
-        """Sets the num_tags of this ChartSettings.
+    @sparkline_fill_color.setter
+    def sparkline_fill_color(self, sparkline_fill_color):
+        """Sets the sparkline_fill_color of this ChartSettings.
 
-        For the tabular view, how many point tags to display  # noqa: E501
+        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param num_tags: The num_tags of this ChartSettings.  # noqa: E501
-        :type: int
+        :param sparkline_fill_color: The sparkline_fill_color of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._num_tags = num_tags
+        self._sparkline_fill_color = sparkline_fill_color
 
     @property
-    def custom_tags(self):
-        """Gets the custom_tags of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_colors(self):
+        """Gets the sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
 
-        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
+        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The custom_tags of this ChartSettings.  # noqa: E501
+        :return: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
         :rtype: list[str]
         """
-        return self._custom_tags
+        return self._sparkline_value_color_map_colors
 
-    @custom_tags.setter
-    def custom_tags(self, custom_tags):
-        """Sets the custom_tags of this ChartSettings.
+    @sparkline_value_color_map_colors.setter
+    def sparkline_value_color_map_colors(self, sparkline_value_color_map_colors):
+        """Sets the sparkline_value_color_map_colors of this ChartSettings.
 
-        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
+        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param custom_tags: The custom_tags of this ChartSettings.  # noqa: E501
+        :param sparkline_value_color_map_colors: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
         :type: list[str]
         """
 
-        self._custom_tags = custom_tags
+        self._sparkline_value_color_map_colors = sparkline_value_color_map_colors
 
     @property
-    def group_by_source(self):
-        """Gets the group_by_source of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_values_v2(self):
+        """Gets the sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
+        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
 
-        :return: The group_by_source of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
+        :rtype: list[float]
         """
-        return self._group_by_source
+        return self._sparkline_value_color_map_values_v2
 
-    @group_by_source.setter
-    def group_by_source(self, group_by_source):
-        """Sets the group_by_source of this ChartSettings.
+    @sparkline_value_color_map_values_v2.setter
+    def sparkline_value_color_map_values_v2(self, sparkline_value_color_map_values_v2):
+        """Sets the sparkline_value_color_map_values_v2 of this ChartSettings.
 
-        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
+        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
 
-        :param group_by_source: The group_by_source of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_value_color_map_values_v2: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
+        :type: list[float]
         """
 
-        self._group_by_source = group_by_source
+        self._sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
 
     @property
-    def sort_values_descending(self):
-        """Gets the sort_values_descending of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_values(self):
+        """Gets the sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
+        deprecated  # noqa: E501
 
-        :return: The sort_values_descending of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
+        :rtype: list[int]
         """
-        return self._sort_values_descending
+        return self._sparkline_value_color_map_values
 
-    @sort_values_descending.setter
-    def sort_values_descending(self, sort_values_descending):
-        """Sets the sort_values_descending of this ChartSettings.
+    @sparkline_value_color_map_values.setter
+    def sparkline_value_color_map_values(self, sparkline_value_color_map_values):
+        """Sets the sparkline_value_color_map_values of this ChartSettings.
 
-        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
+        deprecated  # noqa: E501
 
-        :param sort_values_descending: The sort_values_descending of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_value_color_map_values: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
+        :type: list[int]
         """
 
-        self._sort_values_descending = sort_values_descending
+        self._sparkline_value_color_map_values = sparkline_value_color_map_values
 
     @property
-    def y1_max(self):
-        """Gets the y1_max of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_apply_to(self):
+        """Gets the sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
 
-        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
 
-        :return: The y1_max of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y1_max
+        return self._sparkline_value_color_map_apply_to
 
-    @y1_max.setter
-    def y1_max(self, y1_max):
-        """Sets the y1_max of this ChartSettings.
+    @sparkline_value_color_map_apply_to.setter
+    def sparkline_value_color_map_apply_to(self, sparkline_value_color_map_apply_to):
+        """Sets the sparkline_value_color_map_apply_to of this ChartSettings.
 
-        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
 
-        :param y1_max: The y1_max of this ChartSettings.  # noqa: E501
-        :type: float
+        :param sparkline_value_color_map_apply_to: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["TEXT", "BACKGROUND"]  # noqa: E501
+        if sparkline_value_color_map_apply_to not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sparkline_value_color_map_apply_to` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_value_color_map_apply_to, allowed_values)
+            )
 
-        self._y1_max = y1_max
+        self._sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
 
     @property
-    def y1_min(self):
-        """Gets the y1_min of this ChartSettings.  # noqa: E501
+    def sparkline_decimal_precision(self):
+        """Gets the sparkline_decimal_precision of this ChartSettings.  # noqa: E501
 
-        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, the decimal precision of the displayed number  # noqa: E501
 
-        :return: The y1_min of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The sparkline_decimal_precision of this ChartSettings.  # noqa: E501
+        :rtype: int
         """
-        return self._y1_min
+        return self._sparkline_decimal_precision
 
-    @y1_min.setter
-    def y1_min(self, y1_min):
-        """Sets the y1_min of this ChartSettings.
+    @sparkline_decimal_precision.setter
+    def sparkline_decimal_precision(self, sparkline_decimal_precision):
+        """Sets the sparkline_decimal_precision of this ChartSettings.
 
-        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, the decimal precision of the displayed number  # noqa: E501
 
-        :param y1_min: The y1_min of this ChartSettings.  # noqa: E501
-        :type: float
+        :param sparkline_decimal_precision: The sparkline_decimal_precision of this ChartSettings.  # noqa: E501
+        :type: int
         """
 
-        self._y1_min = y1_min
+        self._sparkline_decimal_precision = sparkline_decimal_precision
 
     @property
-    def y1_units(self):
-        """Gets the y1_units of this ChartSettings.  # noqa: E501
+    def sparkline_value_text_map_text(self):
+        """Gets the sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
 
-        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
+        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
 
-        :return: The y1_units of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._y1_units
+        return self._sparkline_value_text_map_text
 
-    @y1_units.setter
-    def y1_units(self, y1_units):
-        """Sets the y1_units of this ChartSettings.
+    @sparkline_value_text_map_text.setter
+    def sparkline_value_text_map_text(self, sparkline_value_text_map_text):
+        """Sets the sparkline_value_text_map_text of this ChartSettings.
 
-        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
+        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
 
-        :param y1_units: The y1_units of this ChartSettings.  # noqa: E501
-        :type: str
+        :param sparkline_value_text_map_text: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
 
-        self._y1_units = y1_units
+        self._sparkline_value_text_map_text = sparkline_value_text_map_text
 
     @property
-    def y0_scale_si_by1024(self):
-        """Gets the y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+    def sparkline_value_text_map_thresholds(self):
+        """Gets the sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
 
-        :return: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
+        :rtype: list[float]
         """
-        return self._y0_scale_si_by1024
+        return self._sparkline_value_text_map_thresholds
 
-    @y0_scale_si_by1024.setter
-    def y0_scale_si_by1024(self, y0_scale_si_by1024):
-        """Sets the y0_scale_si_by1024 of this ChartSettings.
+    @sparkline_value_text_map_thresholds.setter
+    def sparkline_value_text_map_thresholds(self, sparkline_value_text_map_thresholds):
+        """Sets the sparkline_value_text_map_thresholds of this ChartSettings.
 
-        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
 
-        :param y0_scale_si_by1024: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_value_text_map_thresholds: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
+        :type: list[float]
         """
 
-        self._y0_scale_si_by1024 = y0_scale_si_by1024
+        self._sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
 
     @property
-    def y1_scale_si_by1024(self):
-        """Gets the y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+    def line_type(self):
+        """Gets the line_type of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        Plot interpolation type.  linear is default  # noqa: E501
 
-        :return: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The line_type of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y1_scale_si_by1024
+        return self._line_type
 
-    @y1_scale_si_by1024.setter
-    def y1_scale_si_by1024(self, y1_scale_si_by1024):
-        """Sets the y1_scale_si_by1024 of this ChartSettings.
+    @line_type.setter
+    def line_type(self, line_type):
+        """Sets the line_type of this ChartSettings.
 
-        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        Plot interpolation type.  linear is default  # noqa: E501
 
-        :param y1_scale_si_by1024: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param line_type: The line_type of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["linear", "step-before", "step-after", "basis", "cardinal", "monotone"]  # noqa: E501
+        if line_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `line_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(line_type, allowed_values)
+            )
 
-        self._y1_scale_si_by1024 = y1_scale_si_by1024
+        self._line_type = line_type
 
     @property
-    def y0_unit_autoscaling(self):
-        """Gets the y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+    def stack_type(self):
+        """Gets the stack_type of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
 
-        :return: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The stack_type of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y0_unit_autoscaling
+        return self._stack_type
 
-    @y0_unit_autoscaling.setter
-    def y0_unit_autoscaling(self, y0_unit_autoscaling):
-        """Sets the y0_unit_autoscaling of this ChartSettings.
+    @stack_type.setter
+    def stack_type(self, stack_type):
+        """Sets the stack_type of this ChartSettings.
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
 
-        :param y0_unit_autoscaling: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
+        if stack_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(stack_type, allowed_values)
+            )
 
-        self._y0_unit_autoscaling = y0_unit_autoscaling
+        self._stack_type = stack_type
 
     @property
-    def y1_unit_autoscaling(self):
-        """Gets the y1_unit_autoscaling of this ChartSettings.  # noqa: E501
+    def windowing(self):
+        """Gets the windowing of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
 
-        :return: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The windowing of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y1_unit_autoscaling
+        return self._windowing
 
-    @y1_unit_autoscaling.setter
-    def y1_unit_autoscaling(self, y1_unit_autoscaling):
-        """Sets the y1_unit_autoscaling of this ChartSettings.
+    @windowing.setter
+    def windowing(self, windowing):
+        """Sets the windowing of this ChartSettings.
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
 
-        :param y1_unit_autoscaling: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param windowing: The windowing of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["full", "last"]  # noqa: E501
+        if windowing not in allowed_values:
+            raise ValueError(
+                "Invalid value for `windowing` ({0}), must be one of {1}"  # noqa: E501
+                .format(windowing, allowed_values)
+            )
 
-        self._y1_unit_autoscaling = y1_unit_autoscaling
+        self._windowing = windowing
 
     @property
-    def invert_dynamic_legend_hover_control(self):
-        """Gets the invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+    def window_size(self):
+        """Gets the window_size of this ChartSettings.  # noqa: E501
 
-        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
+        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
 
-        :return: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+        :return: The window_size of this ChartSettings.  # noqa: E501
+        :rtype: int
+        """
+        return self._window_size
+
+    @window_size.setter
+    def window_size(self, window_size):
+        """Sets the window_size of this ChartSettings.
+
+        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
+
+        :param window_size: The window_size of this ChartSettings.  # noqa: E501
+        :type: int
+        """
+
+        self._window_size = window_size
+
+    @property
+    def show_hosts(self):
+        """Gets the show_hosts of this ChartSettings.  # noqa: E501
+
+        For the tabular view, whether to display sources.  Default: true  # noqa: E501
+
+        :return: The show_hosts of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._invert_dynamic_legend_hover_control
+        return self._show_hosts
 
-    @invert_dynamic_legend_hover_control.setter
-    def invert_dynamic_legend_hover_control(self, invert_dynamic_legend_hover_control):
-        """Sets the invert_dynamic_legend_hover_control of this ChartSettings.
+    @show_hosts.setter
+    def show_hosts(self, show_hosts):
+        """Sets the show_hosts of this ChartSettings.
 
-        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
+        For the tabular view, whether to display sources.  Default: true  # noqa: E501
 
-        :param invert_dynamic_legend_hover_control: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+        :param show_hosts: The show_hosts of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
+        self._show_hosts = show_hosts
 
     @property
-    def fixed_legend_enabled(self):
-        """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
+    def show_labels(self):
+        """Gets the show_labels of this ChartSettings.  # noqa: E501
 
-        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
+        For the tabular view, whether to display labels.  Default: true  # noqa: E501
 
-        :return: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
+        :return: The show_labels of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._fixed_legend_enabled
+        return self._show_labels
 
-    @fixed_legend_enabled.setter
-    def fixed_legend_enabled(self, fixed_legend_enabled):
-        """Sets the fixed_legend_enabled of this ChartSettings.
+    @show_labels.setter
+    def show_labels(self, show_labels):
+        """Sets the show_labels of this ChartSettings.
 
-        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
+        For the tabular view, whether to display labels.  Default: true  # noqa: E501
 
-        :param fixed_legend_enabled: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
+        :param show_labels: The show_labels of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._fixed_legend_enabled = fixed_legend_enabled
+        self._show_labels = show_labels
 
     @property
-    def fixed_legend_use_raw_stats(self):
-        """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+    def show_raw_values(self):
+        """Gets the show_raw_values of this ChartSettings.  # noqa: E501
 
-        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
 
-        :return: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :return: The show_raw_values of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._fixed_legend_use_raw_stats
+        return self._show_raw_values
 
-    @fixed_legend_use_raw_stats.setter
-    def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
-        """Sets the fixed_legend_use_raw_stats of this ChartSettings.
+    @show_raw_values.setter
+    def show_raw_values(self, show_raw_values):
+        """Sets the show_raw_values of this ChartSettings.
 
-        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
 
-        :param fixed_legend_use_raw_stats: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :param show_raw_values: The show_raw_values of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
+        self._show_raw_values = show_raw_values
 
     @property
-    def fixed_legend_position(self):
-        """Gets the fixed_legend_position of this ChartSettings.  # noqa: E501
+    def auto_column_tags(self):
+        """Gets the auto_column_tags of this ChartSettings.  # noqa: E501
 
-        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
+        deprecated  # noqa: E501
 
-        :return: The fixed_legend_position of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The auto_column_tags of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._fixed_legend_position
+        return self._auto_column_tags
 
-    @fixed_legend_position.setter
-    def fixed_legend_position(self, fixed_legend_position):
-        """Sets the fixed_legend_position of this ChartSettings.
+    @auto_column_tags.setter
+    def auto_column_tags(self, auto_column_tags):
+        """Sets the auto_column_tags of this ChartSettings.
 
-        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
+        deprecated  # noqa: E501
 
-        :param fixed_legend_position: The fixed_legend_position of this ChartSettings.  # noqa: E501
-        :type: str
+        :param auto_column_tags: The auto_column_tags of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["RIGHT", "TOP", "LEFT", "BOTTOM"]  # noqa: E501
-        if fixed_legend_position not in allowed_values:
-            raise ValueError(
-                "Invalid value for `fixed_legend_position` ({0}), must be one of {1}"  # noqa: E501
-                .format(fixed_legend_position, allowed_values)
-            )
 
-        self._fixed_legend_position = fixed_legend_position
+        self._auto_column_tags = auto_column_tags
 
     @property
-    def fixed_legend_display_stats(self):
-        """Gets the fixed_legend_display_stats of this ChartSettings.  # noqa: E501
+    def column_tags(self):
+        """Gets the column_tags of this ChartSettings.  # noqa: E501
 
-        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
+        deprecated  # noqa: E501
 
-        :return: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
+        :return: The column_tags of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._fixed_legend_display_stats
+        return self._column_tags
 
-    @fixed_legend_display_stats.setter
-    def fixed_legend_display_stats(self, fixed_legend_display_stats):
-        """Sets the fixed_legend_display_stats of this ChartSettings.
+    @column_tags.setter
+    def column_tags(self, column_tags):
+        """Sets the column_tags of this ChartSettings.
 
-        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
+        deprecated  # noqa: E501
 
-        :param fixed_legend_display_stats: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
-        :type: list[str]
+        :param column_tags: The column_tags of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._fixed_legend_display_stats = fixed_legend_display_stats
+        self._column_tags = column_tags
 
     @property
-    def fixed_legend_filter_sort(self):
-        """Gets the fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
+    def tag_mode(self):
+        """Gets the tag_mode of this ChartSettings.  # noqa: E501
 
-        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
+        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
 
-        :return: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
+        :return: The tag_mode of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._fixed_legend_filter_sort
+        return self._tag_mode
 
-    @fixed_legend_filter_sort.setter
-    def fixed_legend_filter_sort(self, fixed_legend_filter_sort):
-        """Sets the fixed_legend_filter_sort of this ChartSettings.
+    @tag_mode.setter
+    def tag_mode(self, tag_mode):
+        """Sets the tag_mode of this ChartSettings.
 
-        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
+        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
 
-        :param fixed_legend_filter_sort: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
+        :param tag_mode: The tag_mode of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["TOP", "BOTTOM"]  # noqa: E501
-        if fixed_legend_filter_sort not in allowed_values:
+        allowed_values = ["all", "top", "custom"]  # noqa: E501
+        if tag_mode not in allowed_values:
             raise ValueError(
-                "Invalid value for `fixed_legend_filter_sort` ({0}), must be one of {1}"  # noqa: E501
-                .format(fixed_legend_filter_sort, allowed_values)
+                "Invalid value for `tag_mode` ({0}), must be one of {1}"  # noqa: E501
+                .format(tag_mode, allowed_values)
             )
 
-        self._fixed_legend_filter_sort = fixed_legend_filter_sort
+        self._tag_mode = tag_mode
 
     @property
-    def fixed_legend_filter_limit(self):
-        """Gets the fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+    def num_tags(self):
+        """Gets the num_tags of this ChartSettings.  # noqa: E501
 
-        Number of series to include in the fixed legend  # noqa: E501
+        For the tabular view, how many point tags to display  # noqa: E501
 
-        :return: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+        :return: The num_tags of this ChartSettings.  # noqa: E501
         :rtype: int
         """
-        return self._fixed_legend_filter_limit
+        return self._num_tags
 
-    @fixed_legend_filter_limit.setter
-    def fixed_legend_filter_limit(self, fixed_legend_filter_limit):
-        """Sets the fixed_legend_filter_limit of this ChartSettings.
+    @num_tags.setter
+    def num_tags(self, num_tags):
+        """Sets the num_tags of this ChartSettings.
 
-        Number of series to include in the fixed legend  # noqa: E501
+        For the tabular view, how many point tags to display  # noqa: E501
 
-        :param fixed_legend_filter_limit: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+        :param num_tags: The num_tags of this ChartSettings.  # noqa: E501
         :type: int
         """
 
-        self._fixed_legend_filter_limit = fixed_legend_filter_limit
+        self._num_tags = num_tags
 
     @property
-    def fixed_legend_filter_field(self):
-        """Gets the fixed_legend_filter_field of this ChartSettings.  # noqa: E501
+    def custom_tags(self):
+        """Gets the custom_tags of this ChartSettings.  # noqa: E501
 
-        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
+        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
 
-        :return: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The custom_tags of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._fixed_legend_filter_field
+        return self._custom_tags
 
-    @fixed_legend_filter_field.setter
-    def fixed_legend_filter_field(self, fixed_legend_filter_field):
-        """Sets the fixed_legend_filter_field of this ChartSettings.
+    @custom_tags.setter
+    def custom_tags(self, custom_tags):
+        """Sets the custom_tags of this ChartSettings.
 
-        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
+        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
 
-        :param fixed_legend_filter_field: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
-        :type: str
+        :param custom_tags: The custom_tags of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
-        allowed_values = ["CURRENT", "MEAN", "MEDIAN", "SUM", "MIN", "MAX", "COUNT"]  # noqa: E501
-        if fixed_legend_filter_field not in allowed_values:
-            raise ValueError(
-                "Invalid value for `fixed_legend_filter_field` ({0}), must be one of {1}"  # noqa: E501
-                .format(fixed_legend_filter_field, allowed_values)
-            )
 
-        self._fixed_legend_filter_field = fixed_legend_filter_field
+        self._custom_tags = custom_tags
 
     @property
-    def fixed_legend_hide_label(self):
-        """Gets the fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+    def group_by_source(self):
+        """Gets the group_by_source of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
 
-        :return: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :return: The group_by_source of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._fixed_legend_hide_label
+        return self._group_by_source
 
-    @fixed_legend_hide_label.setter
-    def fixed_legend_hide_label(self, fixed_legend_hide_label):
-        """Sets the fixed_legend_hide_label of this ChartSettings.
+    @group_by_source.setter
+    def group_by_source(self, group_by_source):
+        """Sets the group_by_source of this ChartSettings.
 
-        deprecated  # noqa: E501
+        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
 
-        :param fixed_legend_hide_label: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :param group_by_source: The group_by_source of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._fixed_legend_hide_label = fixed_legend_hide_label
-
-    @property
-    def xmax(self):
-        """Gets the xmax of this ChartSettings.  # noqa: E501
-
-        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
-
-        :return: The xmax of this ChartSettings.  # noqa: E501
-        :rtype: float
-        """
-        return self._xmax
-
-    @xmax.setter
-    def xmax(self, xmax):
-        """Sets the xmax of this ChartSettings.
-
-        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
-
-        :param xmax: The xmax of this ChartSettings.  # noqa: E501
-        :type: float
-        """
-
-        self._xmax = xmax
+        self._group_by_source = group_by_source
 
     @property
-    def xmin(self):
-        """Gets the xmin of this ChartSettings.  # noqa: E501
+    def sort_values_descending(self):
+        """Gets the sort_values_descending of this ChartSettings.  # noqa: E501
 
-        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
+        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
 
-        :return: The xmin of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The sort_values_descending of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._xmin
+        return self._sort_values_descending
 
-    @xmin.setter
-    def xmin(self, xmin):
-        """Sets the xmin of this ChartSettings.
+    @sort_values_descending.setter
+    def sort_values_descending(self, sort_values_descending):
+        """Sets the sort_values_descending of this ChartSettings.
 
-        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
+        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
 
-        :param xmin: The xmin of this ChartSettings.  # noqa: E501
-        :type: float
+        :param sort_values_descending: The sort_values_descending of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._xmin = xmin
+        self._sort_values_descending = sort_values_descending
 
     @property
-    def ymax(self):
-        """Gets the ymax of this ChartSettings.  # noqa: E501
+    def y1_max(self):
+        """Gets the y1_max of this ChartSettings.  # noqa: E501
 
-        For x-y scatterplots, max value for Y-axis.  Set null for auto  # noqa: E501
+        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :return: The ymax of this ChartSettings.  # noqa: E501
+        :return: The y1_max of this ChartSettings.  # noqa: E501
         :rtype: float
         """
-        return self._ymax
+        return self._y1_max
 
-    @ymax.setter
-    def ymax(self, ymax):
-        """Sets the ymax of this ChartSettings.
+    @y1_max.setter
+    def y1_max(self, y1_max):
+        """Sets the y1_max of this ChartSettings.
 
-        For x-y scatterplots, max value for Y-axis.  Set null for auto  # noqa: E501
+        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :param ymax: The ymax of this ChartSettings.  # noqa: E501
+        :param y1_max: The y1_max of this ChartSettings.  # noqa: E501
         :type: float
         """
 
-        self._ymax = ymax
+        self._y1_max = y1_max
 
     @property
-    def ymin(self):
-        """Gets the ymin of this ChartSettings.  # noqa: E501
+    def y1_min(self):
+        """Gets the y1_min of this ChartSettings.  # noqa: E501
 
-        For x-y scatterplots, min value for Y-axis.  Set null for auto  # noqa: E501
+        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :return: The ymin of this ChartSettings.  # noqa: E501
+        :return: The y1_min of this ChartSettings.  # noqa: E501
         :rtype: float
         """
-        return self._ymin
+        return self._y1_min
 
-    @ymin.setter
-    def ymin(self, ymin):
-        """Sets the ymin of this ChartSettings.
+    @y1_min.setter
+    def y1_min(self, y1_min):
+        """Sets the y1_min of this ChartSettings.
 
-        For x-y scatterplots, min value for Y-axis.  Set null for auto  # noqa: E501
+        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :param ymin: The ymin of this ChartSettings.  # noqa: E501
+        :param y1_min: The y1_min of this ChartSettings.  # noqa: E501
         :type: float
         """
 
-        self._ymin = ymin
+        self._y1_min = y1_min
 
     @property
-    def time_based_coloring(self):
-        """Gets the time_based_coloring of this ChartSettings.  # noqa: E501
+    def y1_units(self):
+        """Gets the y1_units of this ChartSettings.  # noqa: E501
 
-        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
+        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
 
-        :return: The time_based_coloring of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The y1_units of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._time_based_coloring
+        return self._y1_units
 
-    @time_based_coloring.setter
-    def time_based_coloring(self, time_based_coloring):
-        """Sets the time_based_coloring of this ChartSettings.
+    @y1_units.setter
+    def y1_units(self, y1_units):
+        """Sets the y1_units of this ChartSettings.
 
-        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
+        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
 
-        :param time_based_coloring: The time_based_coloring of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param y1_units: The y1_units of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._time_based_coloring = time_based_coloring
+        self._y1_units = y1_units
 
     @property
-    def sparkline_display_value_type(self):
-        """Gets the sparkline_display_value_type of this ChartSettings.  # noqa: E501
+    def y0_scale_si_by1024(self):
+        """Gets the y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
 
-        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :return: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_value_type
+        return self._y0_scale_si_by1024
 
-    @sparkline_display_value_type.setter
-    def sparkline_display_value_type(self, sparkline_display_value_type):
-        """Sets the sparkline_display_value_type of this ChartSettings.
+    @y0_scale_si_by1024.setter
+    def y0_scale_si_by1024(self, y0_scale_si_by1024):
+        """Sets the y0_scale_si_by1024 of this ChartSettings.
 
-        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :param sparkline_display_value_type: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
-        :type: str
+        :param y0_scale_si_by1024: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["VALUE", "LABEL"]  # noqa: E501
-        if sparkline_display_value_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `sparkline_display_value_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_display_value_type, allowed_values)
-            )
 
-        self._sparkline_display_value_type = sparkline_display_value_type
+        self._y0_scale_si_by1024 = y0_scale_si_by1024
 
     @property
-    def sparkline_display_color(self):
-        """Gets the sparkline_display_color of this ChartSettings.  # noqa: E501
+    def y1_scale_si_by1024(self):
+        """Gets the y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :return: The sparkline_display_color of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_color
+        return self._y1_scale_si_by1024
 
-    @sparkline_display_color.setter
-    def sparkline_display_color(self, sparkline_display_color):
-        """Sets the sparkline_display_color of this ChartSettings.
+    @y1_scale_si_by1024.setter
+    def y1_scale_si_by1024(self, y1_scale_si_by1024):
+        """Sets the y1_scale_si_by1024 of this ChartSettings.
 
-        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :param sparkline_display_color: The sparkline_display_color of this ChartSettings.  # noqa: E501
-        :type: str
+        :param y1_scale_si_by1024: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_display_color = sparkline_display_color
+        self._y1_scale_si_by1024 = y1_scale_si_by1024
 
     @property
-    def sparkline_display_vertical_position(self):
-        """Gets the sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+    def y0_unit_autoscaling(self):
+        """Gets the y0_unit_autoscaling of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :return: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_vertical_position
+        return self._y0_unit_autoscaling
 
-    @sparkline_display_vertical_position.setter
-    def sparkline_display_vertical_position(self, sparkline_display_vertical_position):
-        """Sets the sparkline_display_vertical_position of this ChartSettings.
+    @y0_unit_autoscaling.setter
+    def y0_unit_autoscaling(self, y0_unit_autoscaling):
+        """Sets the y0_unit_autoscaling of this ChartSettings.
 
-        deprecated  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :param sparkline_display_vertical_position: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
-        :type: str
+        :param y0_unit_autoscaling: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_display_vertical_position = sparkline_display_vertical_position
+        self._y0_unit_autoscaling = y0_unit_autoscaling
 
     @property
-    def sparkline_display_horizontal_position(self):
-        """Gets the sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
+    def y1_unit_autoscaling(self):
+        """Gets the y1_unit_autoscaling of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the horizontal position of the displayed text  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :return: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_horizontal_position
+        return self._y1_unit_autoscaling
 
-    @sparkline_display_horizontal_position.setter
-    def sparkline_display_horizontal_position(self, sparkline_display_horizontal_position):
-        """Sets the sparkline_display_horizontal_position of this ChartSettings.
+    @y1_unit_autoscaling.setter
+    def y1_unit_autoscaling(self, y1_unit_autoscaling):
+        """Sets the y1_unit_autoscaling of this ChartSettings.
 
-        For the single stat view, the horizontal position of the displayed text  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :param sparkline_display_horizontal_position: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
-        :type: str
+        :param y1_unit_autoscaling: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["MIDDLE", "LEFT", "RIGHT"]  # noqa: E501
-        if sparkline_display_horizontal_position not in allowed_values:
-            raise ValueError(
-                "Invalid value for `sparkline_display_horizontal_position` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_display_horizontal_position, allowed_values)
-            )
 
-        self._sparkline_display_horizontal_position = sparkline_display_horizontal_position
+        self._y1_unit_autoscaling = y1_unit_autoscaling
 
     @property
-    def sparkline_display_font_size(self):
-        """Gets the sparkline_display_font_size of this ChartSettings.  # noqa: E501
+    def invert_dynamic_legend_hover_control(self):
+        """Gets the invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
+        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
 
-        :return: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_font_size
+        return self._invert_dynamic_legend_hover_control
 
-    @sparkline_display_font_size.setter
-    def sparkline_display_font_size(self, sparkline_display_font_size):
-        """Sets the sparkline_display_font_size of this ChartSettings.
+    @invert_dynamic_legend_hover_control.setter
+    def invert_dynamic_legend_hover_control(self, invert_dynamic_legend_hover_control):
+        """Sets the invert_dynamic_legend_hover_control of this ChartSettings.
 
-        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
+        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
 
-        :param sparkline_display_font_size: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
-        :type: str
+        :param invert_dynamic_legend_hover_control: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_display_font_size = sparkline_display_font_size
+        self._invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
 
     @property
-    def sparkline_display_prefix(self):
-        """Gets the sparkline_display_prefix of this ChartSettings.  # noqa: E501
+    def fixed_legend_enabled(self):
+        """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a string to add before the displayed text  # noqa: E501
+        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
 
-        :return: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_prefix
+        return self._fixed_legend_enabled
 
-    @sparkline_display_prefix.setter
-    def sparkline_display_prefix(self, sparkline_display_prefix):
-        """Sets the sparkline_display_prefix of this ChartSettings.
+    @fixed_legend_enabled.setter
+    def fixed_legend_enabled(self, fixed_legend_enabled):
+        """Sets the fixed_legend_enabled of this ChartSettings.
 
-        For the single stat view, a string to add before the displayed text  # noqa: E501
+        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
 
-        :param sparkline_display_prefix: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
-        :type: str
+        :param fixed_legend_enabled: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_display_prefix = sparkline_display_prefix
+        self._fixed_legend_enabled = fixed_legend_enabled
 
     @property
-    def sparkline_display_postfix(self):
-        """Gets the sparkline_display_postfix of this ChartSettings.  # noqa: E501
+    def fixed_legend_use_raw_stats(self):
+        """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a string to append to the displayed text  # noqa: E501
+        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
 
-        :return: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_postfix
+        return self._fixed_legend_use_raw_stats
 
-    @sparkline_display_postfix.setter
-    def sparkline_display_postfix(self, sparkline_display_postfix):
-        """Sets the sparkline_display_postfix of this ChartSettings.
+    @fixed_legend_use_raw_stats.setter
+    def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
+        """Sets the fixed_legend_use_raw_stats of this ChartSettings.
 
-        For the single stat view, a string to append to the displayed text  # noqa: E501
+        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
 
-        :param sparkline_display_postfix: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
-        :type: str
+        :param fixed_legend_use_raw_stats: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_display_postfix = sparkline_display_postfix
+        self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
 
     @property
-    def sparkline_size(self):
-        """Gets the sparkline_size of this ChartSettings.  # noqa: E501
+    def fixed_legend_position(self):
+        """Gets the fixed_legend_position of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
+        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
 
-        :return: The sparkline_size of this ChartSettings.  # noqa: E501
+        :return: The fixed_legend_position of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._sparkline_size
+        return self._fixed_legend_position
 
-    @sparkline_size.setter
-    def sparkline_size(self, sparkline_size):
-        """Sets the sparkline_size of this ChartSettings.
+    @fixed_legend_position.setter
+    def fixed_legend_position(self, fixed_legend_position):
+        """Sets the fixed_legend_position of this ChartSettings.
 
-        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
+        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
 
-        :param sparkline_size: The sparkline_size of this ChartSettings.  # noqa: E501
+        :param fixed_legend_position: The fixed_legend_position of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["BACKGROUND", "BOTTOM", "NONE"]  # noqa: E501
-        if sparkline_size not in allowed_values:
+        allowed_values = ["RIGHT", "TOP", "LEFT", "BOTTOM"]  # noqa: E501
+        if fixed_legend_position not in allowed_values:
             raise ValueError(
-                "Invalid value for `sparkline_size` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_size, allowed_values)
+                "Invalid value for `fixed_legend_position` ({0}), must be one of {1}"  # noqa: E501
+                .format(fixed_legend_position, allowed_values)
             )
 
-        self._sparkline_size = sparkline_size
+        self._fixed_legend_position = fixed_legend_position
 
     @property
-    def sparkline_line_color(self):
-        """Gets the sparkline_line_color of this ChartSettings.  # noqa: E501
+    def fixed_legend_display_stats(self):
+        """Gets the fixed_legend_display_stats of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
 
-        :return: The sparkline_line_color of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._sparkline_line_color
+        return self._fixed_legend_display_stats
 
-    @sparkline_line_color.setter
-    def sparkline_line_color(self, sparkline_line_color):
-        """Sets the sparkline_line_color of this ChartSettings.
+    @fixed_legend_display_stats.setter
+    def fixed_legend_display_stats(self, fixed_legend_display_stats):
+        """Sets the fixed_legend_display_stats of this ChartSettings.
 
-        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
 
-        :param sparkline_line_color: The sparkline_line_color of this ChartSettings.  # noqa: E501
-        :type: str
+        :param fixed_legend_display_stats: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
 
-        self._sparkline_line_color = sparkline_line_color
+        self._fixed_legend_display_stats = fixed_legend_display_stats
 
     @property
-    def sparkline_fill_color(self):
-        """Gets the sparkline_fill_color of this ChartSettings.  # noqa: E501
+    def fixed_legend_filter_sort(self):
+        """Gets the fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
 
-        :return: The sparkline_fill_color of this ChartSettings.  # noqa: E501
+        :return: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._sparkline_fill_color
+        return self._fixed_legend_filter_sort
 
-    @sparkline_fill_color.setter
-    def sparkline_fill_color(self, sparkline_fill_color):
-        """Sets the sparkline_fill_color of this ChartSettings.
+    @fixed_legend_filter_sort.setter
+    def fixed_legend_filter_sort(self, fixed_legend_filter_sort):
+        """Sets the fixed_legend_filter_sort of this ChartSettings.
 
-        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
 
-        :param sparkline_fill_color: The sparkline_fill_color of this ChartSettings.  # noqa: E501
+        :param fixed_legend_filter_sort: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
         :type: str
         """
+        allowed_values = ["TOP", "BOTTOM"]  # noqa: E501
+        if fixed_legend_filter_sort not in allowed_values:
+            raise ValueError(
+                "Invalid value for `fixed_legend_filter_sort` ({0}), must be one of {1}"  # noqa: E501
+                .format(fixed_legend_filter_sort, allowed_values)
+            )
 
-        self._sparkline_fill_color = sparkline_fill_color
+        self._fixed_legend_filter_sort = fixed_legend_filter_sort
 
     @property
-    def sparkline_value_color_map_colors(self):
-        """Gets the sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
+    def fixed_legend_filter_limit(self):
+        """Gets the fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Number of series to include in the fixed legend  # noqa: E501
 
-        :return: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
+        :return: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+        :rtype: int
         """
-        return self._sparkline_value_color_map_colors
+        return self._fixed_legend_filter_limit
 
-    @sparkline_value_color_map_colors.setter
-    def sparkline_value_color_map_colors(self, sparkline_value_color_map_colors):
-        """Sets the sparkline_value_color_map_colors of this ChartSettings.
+    @fixed_legend_filter_limit.setter
+    def fixed_legend_filter_limit(self, fixed_legend_filter_limit):
+        """Sets the fixed_legend_filter_limit of this ChartSettings.
 
-        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Number of series to include in the fixed legend  # noqa: E501
 
-        :param sparkline_value_color_map_colors: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
-        :type: list[str]
+        :param fixed_legend_filter_limit: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+        :type: int
         """
 
-        self._sparkline_value_color_map_colors = sparkline_value_color_map_colors
+        self._fixed_legend_filter_limit = fixed_legend_filter_limit
 
     @property
-    def sparkline_value_color_map_values_v2(self):
-        """Gets the sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
+    def fixed_legend_filter_field(self):
+        """Gets the fixed_legend_filter_field of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
+        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
 
-        :return: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
-        :rtype: list[float]
+        :return: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._sparkline_value_color_map_values_v2
+        return self._fixed_legend_filter_field
 
-    @sparkline_value_color_map_values_v2.setter
-    def sparkline_value_color_map_values_v2(self, sparkline_value_color_map_values_v2):
-        """Sets the sparkline_value_color_map_values_v2 of this ChartSettings.
+    @fixed_legend_filter_field.setter
+    def fixed_legend_filter_field(self, fixed_legend_filter_field):
+        """Sets the fixed_legend_filter_field of this ChartSettings.
 
-        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
+        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
 
-        :param sparkline_value_color_map_values_v2: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
-        :type: list[float]
+        :param fixed_legend_filter_field: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["CURRENT", "MEAN", "MEDIAN", "SUM", "MIN", "MAX", "COUNT"]  # noqa: E501
+        if fixed_legend_filter_field not in allowed_values:
+            raise ValueError(
+                "Invalid value for `fixed_legend_filter_field` ({0}), must be one of {1}"  # noqa: E501
+                .format(fixed_legend_filter_field, allowed_values)
+            )
 
-        self._sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
+        self._fixed_legend_filter_field = fixed_legend_filter_field
 
     @property
-    def sparkline_value_color_map_values(self):
-        """Gets the sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
+    def fixed_legend_hide_label(self):
+        """Gets the fixed_legend_hide_label of this ChartSettings.  # noqa: E501
 
         deprecated  # noqa: E501
 
-        :return: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
-        :rtype: list[int]
+        :return: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_value_color_map_values
+        return self._fixed_legend_hide_label
 
-    @sparkline_value_color_map_values.setter
-    def sparkline_value_color_map_values(self, sparkline_value_color_map_values):
-        """Sets the sparkline_value_color_map_values of this ChartSettings.
+    @fixed_legend_hide_label.setter
+    def fixed_legend_hide_label(self, fixed_legend_hide_label):
+        """Sets the fixed_legend_hide_label of this ChartSettings.
 
         deprecated  # noqa: E501
 
-        :param sparkline_value_color_map_values: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
-        :type: list[int]
+        :param fixed_legend_hide_label: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_value_color_map_values = sparkline_value_color_map_values
+        self._fixed_legend_hide_label = fixed_legend_hide_label
 
     @property
-    def sparkline_value_color_map_apply_to(self):
-        """Gets the sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
+    def xmax(self):
+        """Gets the xmax of this ChartSettings.  # noqa: E501
 
-        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
+        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
 
-        :return: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The xmax of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._sparkline_value_color_map_apply_to
+        return self._xmax
 
-    @sparkline_value_color_map_apply_to.setter
-    def sparkline_value_color_map_apply_to(self, sparkline_value_color_map_apply_to):
-        """Sets the sparkline_value_color_map_apply_to of this ChartSettings.
+    @xmax.setter
+    def xmax(self, xmax):
+        """Sets the xmax of this ChartSettings.
 
-        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
+        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
 
-        :param sparkline_value_color_map_apply_to: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
-        :type: str
+        :param xmax: The xmax of this ChartSettings.  # noqa: E501
+        :type: float
         """
-        allowed_values = ["TEXT", "BACKGROUND"]  # noqa: E501
-        if sparkline_value_color_map_apply_to not in allowed_values:
-            raise ValueError(
-                "Invalid value for `sparkline_value_color_map_apply_to` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_value_color_map_apply_to, allowed_values)
-            )
 
-        self._sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
+        self._xmax = xmax
 
     @property
-    def sparkline_decimal_precision(self):
-        """Gets the sparkline_decimal_precision of this ChartSettings.  # noqa: E501
+    def xmin(self):
+        """Gets the xmin of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the decimal precision of the displayed number  # noqa: E501
+        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
 
-        :return: The sparkline_decimal_precision of this ChartSettings.  # noqa: E501
-        :rtype: int
+        :return: The xmin of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._sparkline_decimal_precision
+        return self._xmin
 
-    @sparkline_decimal_precision.setter
-    def sparkline_decimal_precision(self, sparkline_decimal_precision):
-        """Sets the sparkline_decimal_precision of this ChartSettings.
+    @xmin.setter
+    def xmin(self, xmin):
+        """Sets the xmin of this ChartSettings.
 
-        For the single stat view, the decimal precision of the displayed number  # noqa: E501
+        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
 
-        :param sparkline_decimal_precision: The sparkline_decimal_precision of this ChartSettings.  # noqa: E501
-        :type: int
+        :param xmin: The xmin of this ChartSettings.  # noqa: E501
+        :type: float
         """
 
-        self._sparkline_decimal_precision = sparkline_decimal_precision
+        self._xmin = xmin
 
     @property
-    def sparkline_value_text_map_text(self):
-        """Gets the sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
+    def ymax(self):
+        """Gets the ymax of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
+        For x-y scatterplots, max value for Y-axis.  Set null for auto  # noqa: E501
 
-        :return: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
+        :return: The ymax of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._sparkline_value_text_map_text
+        return self._ymax
 
-    @sparkline_value_text_map_text.setter
-    def sparkline_value_text_map_text(self, sparkline_value_text_map_text):
-        """Sets the sparkline_value_text_map_text of this ChartSettings.
+    @ymax.setter
+    def ymax(self, ymax):
+        """Sets the ymax of this ChartSettings.
 
-        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
+        For x-y scatterplots, max value for Y-axis.  Set null for auto  # noqa: E501
 
-        :param sparkline_value_text_map_text: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
-        :type: list[str]
+        :param ymax: The ymax of this ChartSettings.  # noqa: E501
+        :type: float
         """
 
-        self._sparkline_value_text_map_text = sparkline_value_text_map_text
+        self._ymax = ymax
 
     @property
-    def sparkline_value_text_map_thresholds(self):
-        """Gets the sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
+    def ymin(self):
+        """Gets the ymin of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
+        For x-y scatterplots, min value for Y-axis.  Set null for auto  # noqa: E501
 
-        :return: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
-        :rtype: list[float]
+        :return: The ymin of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._sparkline_value_text_map_thresholds
+        return self._ymin
 
-    @sparkline_value_text_map_thresholds.setter
-    def sparkline_value_text_map_thresholds(self, sparkline_value_text_map_thresholds):
-        """Sets the sparkline_value_text_map_thresholds of this ChartSettings.
+    @ymin.setter
+    def ymin(self, ymin):
+        """Sets the ymin of this ChartSettings.
 
-        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
+        For x-y scatterplots, min value for Y-axis.  Set null for auto  # noqa: E501
 
-        :param sparkline_value_text_map_thresholds: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
-        :type: list[float]
+        :param ymin: The ymin of this ChartSettings.  # noqa: E501
+        :type: float
         """
 
-        self._sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
+        self._ymin = ymin
 
     @property
     def expected_data_spacing(self):
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index 51e0565..b7246bc 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -31,45 +31,43 @@ class ChartSourceQuery(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'name': 'str',
-        'query': 'str',
         'scatter_plot_source': 'str',
         'querybuilder_serialization': 'str',
         'querybuilder_enabled': 'bool',
         'secondary_axis': 'bool',
         'source_description': 'str',
         'source_color': 'str',
-        'disabled': 'bool'
+        'query': 'str',
+        'disabled': 'bool',
+        'name': 'str'
     }
 
     attribute_map = {
-        'name': 'name',
-        'query': 'query',
         'scatter_plot_source': 'scatterPlotSource',
         'querybuilder_serialization': 'querybuilderSerialization',
         'querybuilder_enabled': 'querybuilderEnabled',
         'secondary_axis': 'secondaryAxis',
         'source_description': 'sourceDescription',
         'source_color': 'sourceColor',
-        'disabled': 'disabled'
+        'query': 'query',
+        'disabled': 'disabled',
+        'name': 'name'
     }
 
-    def __init__(self, name=None, query=None, scatter_plot_source=None, querybuilder_serialization=None, querybuilder_enabled=None, secondary_axis=None, source_description=None, source_color=None, disabled=None):  # noqa: E501
+    def __init__(self, scatter_plot_source=None, querybuilder_serialization=None, querybuilder_enabled=None, secondary_axis=None, source_description=None, source_color=None, query=None, disabled=None, name=None):  # noqa: E501
         """ChartSourceQuery - a model defined in Swagger"""  # noqa: E501
 
-        self._name = None
-        self._query = None
         self._scatter_plot_source = None
         self._querybuilder_serialization = None
         self._querybuilder_enabled = None
         self._secondary_axis = None
         self._source_description = None
         self._source_color = None
+        self._query = None
         self._disabled = None
+        self._name = None
         self.discriminator = None
 
-        self.name = name
-        self.query = query
         if scatter_plot_source is not None:
             self.scatter_plot_source = scatter_plot_source
         if querybuilder_serialization is not None:
@@ -82,58 +80,10 @@ def __init__(self, name=None, query=None, scatter_plot_source=None, querybuilder
             self.source_description = source_description
         if source_color is not None:
             self.source_color = source_color
+        self.query = query
         if disabled is not None:
             self.disabled = disabled
-
-    @property
-    def name(self):
-        """Gets the name of this ChartSourceQuery.  # noqa: E501
-
-        Name of the source  # noqa: E501
-
-        :return: The name of this ChartSourceQuery.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ChartSourceQuery.
-
-        Name of the source  # noqa: E501
-
-        :param name: The name of this ChartSourceQuery.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def query(self):
-        """Gets the query of this ChartSourceQuery.  # noqa: E501
-
-        Query expression to plot on the chart  # noqa: E501
-
-        :return: The query of this ChartSourceQuery.  # noqa: E501
-        :rtype: str
-        """
-        return self._query
-
-    @query.setter
-    def query(self, query):
-        """Sets the query of this ChartSourceQuery.
-
-        Query expression to plot on the chart  # noqa: E501
-
-        :param query: The query of this ChartSourceQuery.  # noqa: E501
-        :type: str
-        """
-        if query is None:
-            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
-
-        self._query = query
+        self.name = name
 
     @property
     def scatter_plot_source(self):
@@ -279,6 +229,31 @@ def source_color(self, source_color):
 
         self._source_color = source_color
 
+    @property
+    def query(self):
+        """Gets the query of this ChartSourceQuery.  # noqa: E501
+
+        Query expression to plot on the chart  # noqa: E501
+
+        :return: The query of this ChartSourceQuery.  # noqa: E501
+        :rtype: str
+        """
+        return self._query
+
+    @query.setter
+    def query(self, query):
+        """Sets the query of this ChartSourceQuery.
+
+        Query expression to plot on the chart  # noqa: E501
+
+        :param query: The query of this ChartSourceQuery.  # noqa: E501
+        :type: str
+        """
+        if query is None:
+            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
+
+        self._query = query
+
     @property
     def disabled(self):
         """Gets the disabled of this ChartSourceQuery.  # noqa: E501
@@ -302,6 +277,31 @@ def disabled(self, disabled):
 
         self._disabled = disabled
 
+    @property
+    def name(self):
+        """Gets the name of this ChartSourceQuery.  # noqa: E501
+
+        Name of the source  # noqa: E501
+
+        :return: The name of this ChartSourceQuery.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ChartSourceQuery.
+
+        Name of the source  # noqa: E501
+
+        :param name: The name of this ChartSourceQuery.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index c94eb54..54c6832 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -43,14 +43,12 @@ class CloudIntegration(object):
     """
     swagger_types = {
         'force_save': 'bool',
-        'name': 'str',
-        'id': 'str',
         'service': 'str',
         'in_trash': 'bool',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'last_error_event': 'Event',
-        'service_refresh_rate_in_mins': 'int',
         'additional_tags': 'dict(str, str)',
         'last_received_data_point_ms': 'int',
         'last_metric_count': 'int',
@@ -70,19 +68,19 @@ class CloudIntegration(object):
         'last_processing_timestamp': 'int',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'deleted': 'bool'
+        'service_refresh_rate_in_mins': 'int',
+        'deleted': 'bool',
+        'name': 'str'
     }
 
     attribute_map = {
         'force_save': 'forceSave',
-        'name': 'name',
-        'id': 'id',
         'service': 'service',
         'in_trash': 'inTrash',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'last_error_event': 'lastErrorEvent',
-        'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'additional_tags': 'additionalTags',
         'last_received_data_point_ms': 'lastReceivedDataPointMs',
         'last_metric_count': 'lastMetricCount',
@@ -102,21 +100,21 @@ class CloudIntegration(object):
         'last_processing_timestamp': 'lastProcessingTimestamp',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'deleted': 'deleted'
+        'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
+        'deleted': 'deleted',
+        'name': 'name'
     }
 
-    def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=None, creator_id=None, updater_id=None, last_error_event=None, service_refresh_rate_in_mins=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, gcp_billing=None, new_relic=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+    def __init__(self, force_save=None, service=None, in_trash=None, creator_id=None, updater_id=None, id=None, last_error_event=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, gcp_billing=None, new_relic=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, service_refresh_rate_in_mins=None, deleted=None, name=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
 
         self._force_save = None
-        self._name = None
-        self._id = None
         self._service = None
         self._in_trash = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._last_error_event = None
-        self._service_refresh_rate_in_mins = None
         self._additional_tags = None
         self._last_received_data_point_ms = None
         self._last_metric_count = None
@@ -136,14 +134,13 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
         self._last_processing_timestamp = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
+        self._service_refresh_rate_in_mins = None
         self._deleted = None
+        self._name = None
         self.discriminator = None
 
         if force_save is not None:
             self.force_save = force_save
-        self.name = name
-        if id is not None:
-            self.id = id
         self.service = service
         if in_trash is not None:
             self.in_trash = in_trash
@@ -151,10 +148,10 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
         if last_error_event is not None:
             self.last_error_event = last_error_event
-        if service_refresh_rate_in_mins is not None:
-            self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if additional_tags is not None:
             self.additional_tags = additional_tags
         if last_received_data_point_ms is not None:
@@ -193,8 +190,11 @@ def __init__(self, force_save=None, name=None, id=None, service=None, in_trash=N
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
+        if service_refresh_rate_in_mins is not None:
+            self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if deleted is not None:
             self.deleted = deleted
+        self.name = name
 
     @property
     def force_save(self):
@@ -217,52 +217,6 @@ def force_save(self, force_save):
 
         self._force_save = force_save
 
-    @property
-    def name(self):
-        """Gets the name of this CloudIntegration.  # noqa: E501
-
-        The human-readable name of this integration  # noqa: E501
-
-        :return: The name of this CloudIntegration.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this CloudIntegration.
-
-        The human-readable name of this integration  # noqa: E501
-
-        :param name: The name of this CloudIntegration.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def id(self):
-        """Gets the id of this CloudIntegration.  # noqa: E501
-
-
-        :return: The id of this CloudIntegration.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CloudIntegration.
-
-
-        :param id: The id of this CloudIntegration.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
     @property
     def service(self):
         """Gets the service of this CloudIntegration.  # noqa: E501
@@ -357,6 +311,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this CloudIntegration.  # noqa: E501
+
+
+        :return: The id of this CloudIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CloudIntegration.
+
+
+        :param id: The id of this CloudIntegration.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def last_error_event(self):
         """Gets the last_error_event of this CloudIntegration.  # noqa: E501
@@ -378,29 +353,6 @@ def last_error_event(self, last_error_event):
 
         self._last_error_event = last_error_event
 
-    @property
-    def service_refresh_rate_in_mins(self):
-        """Gets the service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
-
-        Service refresh rate in minutes.  # noqa: E501
-
-        :return: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
-        :rtype: int
-        """
-        return self._service_refresh_rate_in_mins
-
-    @service_refresh_rate_in_mins.setter
-    def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
-        """Sets the service_refresh_rate_in_mins of this CloudIntegration.
-
-        Service refresh rate in minutes.  # noqa: E501
-
-        :param service_refresh_rate_in_mins: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
-        :type: int
-        """
-
-        self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
-
     @property
     def additional_tags(self):
         """Gets the additional_tags of this CloudIntegration.  # noqa: E501
@@ -816,6 +768,29 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
+    @property
+    def service_refresh_rate_in_mins(self):
+        """Gets the service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
+
+        Service refresh rate in minutes.  # noqa: E501
+
+        :return: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._service_refresh_rate_in_mins
+
+    @service_refresh_rate_in_mins.setter
+    def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
+        """Sets the service_refresh_rate_in_mins of this CloudIntegration.
+
+        Service refresh rate in minutes.  # noqa: E501
+
+        :param service_refresh_rate_in_mins: The service_refresh_rate_in_mins of this CloudIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
+
     @property
     def deleted(self):
         """Gets the deleted of this CloudIntegration.  # noqa: E501
@@ -837,6 +812,31 @@ def deleted(self, deleted):
 
         self._deleted = deleted
 
+    @property
+    def name(self):
+        """Gets the name of this CloudIntegration.  # noqa: E501
+
+        The human-readable name of this integration  # noqa: E501
+
+        :return: The name of this CloudIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this CloudIntegration.
+
+        The human-readable name of this integration  # noqa: E501
+
+        :param name: The name of this CloudIntegration.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index 22912ad..480e730 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -33,65 +33,40 @@ class CloudTrailConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'region': 'str',
         'prefix': 'str',
         'base_credentials': 'AWSBaseCredentials',
+        'region': 'str',
         'filter_rule': 'str',
         'bucket_name': 'str'
     }
 
     attribute_map = {
-        'region': 'region',
         'prefix': 'prefix',
         'base_credentials': 'baseCredentials',
+        'region': 'region',
         'filter_rule': 'filterRule',
         'bucket_name': 'bucketName'
     }
 
-    def __init__(self, region=None, prefix=None, base_credentials=None, filter_rule=None, bucket_name=None):  # noqa: E501
+    def __init__(self, prefix=None, base_credentials=None, region=None, filter_rule=None, bucket_name=None):  # noqa: E501
         """CloudTrailConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._region = None
         self._prefix = None
         self._base_credentials = None
+        self._region = None
         self._filter_rule = None
         self._bucket_name = None
         self.discriminator = None
 
-        self.region = region
         if prefix is not None:
             self.prefix = prefix
         if base_credentials is not None:
             self.base_credentials = base_credentials
+        self.region = region
         if filter_rule is not None:
             self.filter_rule = filter_rule
         self.bucket_name = bucket_name
 
-    @property
-    def region(self):
-        """Gets the region of this CloudTrailConfiguration.  # noqa: E501
-
-        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
-
-        :return: The region of this CloudTrailConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._region
-
-    @region.setter
-    def region(self, region):
-        """Sets the region of this CloudTrailConfiguration.
-
-        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
-
-        :param region: The region of this CloudTrailConfiguration.  # noqa: E501
-        :type: str
-        """
-        if region is None:
-            raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
-
-        self._region = region
-
     @property
     def prefix(self):
         """Gets the prefix of this CloudTrailConfiguration.  # noqa: E501
@@ -136,6 +111,31 @@ def base_credentials(self, base_credentials):
 
         self._base_credentials = base_credentials
 
+    @property
+    def region(self):
+        """Gets the region of this CloudTrailConfiguration.  # noqa: E501
+
+        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+
+        :return: The region of this CloudTrailConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._region
+
+    @region.setter
+    def region(self, region):
+        """Sets the region of this CloudTrailConfiguration.
+
+        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+
+        :param region: The region of this CloudTrailConfiguration.  # noqa: E501
+        :type: str
+        """
+        if region is None:
+            raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
+
+        self._region = region
+
     @property
     def filter_rule(self):
         """Gets the filter_rule of this CloudTrailConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index c999e7c..a6c6039 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -34,45 +34,45 @@ class CloudWatchConfiguration(object):
     """
     swagger_types = {
         'base_credentials': 'AWSBaseCredentials',
-        'instance_selection_tags': 'dict(str, str)',
-        'volume_selection_tags': 'dict(str, str)',
-        'point_tag_filter_regex': 'str',
+        'metric_filter_regex': 'str',
         'namespaces': 'list[str]',
-        'metric_filter_regex': 'str'
+        'point_tag_filter_regex': 'str',
+        'volume_selection_tags': 'dict(str, str)',
+        'instance_selection_tags': 'dict(str, str)'
     }
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
-        'instance_selection_tags': 'instanceSelectionTags',
-        'volume_selection_tags': 'volumeSelectionTags',
-        'point_tag_filter_regex': 'pointTagFilterRegex',
+        'metric_filter_regex': 'metricFilterRegex',
         'namespaces': 'namespaces',
-        'metric_filter_regex': 'metricFilterRegex'
+        'point_tag_filter_regex': 'pointTagFilterRegex',
+        'volume_selection_tags': 'volumeSelectionTags',
+        'instance_selection_tags': 'instanceSelectionTags'
     }
 
-    def __init__(self, base_credentials=None, instance_selection_tags=None, volume_selection_tags=None, point_tag_filter_regex=None, namespaces=None, metric_filter_regex=None):  # noqa: E501
+    def __init__(self, base_credentials=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None, instance_selection_tags=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._base_credentials = None
-        self._instance_selection_tags = None
-        self._volume_selection_tags = None
-        self._point_tag_filter_regex = None
-        self._namespaces = None
         self._metric_filter_regex = None
+        self._namespaces = None
+        self._point_tag_filter_regex = None
+        self._volume_selection_tags = None
+        self._instance_selection_tags = None
         self.discriminator = None
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
-        if instance_selection_tags is not None:
-            self.instance_selection_tags = instance_selection_tags
-        if volume_selection_tags is not None:
-            self.volume_selection_tags = volume_selection_tags
-        if point_tag_filter_regex is not None:
-            self.point_tag_filter_regex = point_tag_filter_regex
-        if namespaces is not None:
-            self.namespaces = namespaces
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
+        if namespaces is not None:
+            self.namespaces = namespaces
+        if point_tag_filter_regex is not None:
+            self.point_tag_filter_regex = point_tag_filter_regex
+        if volume_selection_tags is not None:
+            self.volume_selection_tags = volume_selection_tags
+        if instance_selection_tags is not None:
+            self.instance_selection_tags = instance_selection_tags
 
     @property
     def base_credentials(self):
@@ -96,50 +96,50 @@ def base_credentials(self, base_credentials):
         self._base_credentials = base_credentials
 
     @property
-    def instance_selection_tags(self):
-        """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
 
-        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
 
-        :return: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: str
         """
-        return self._instance_selection_tags
+        return self._metric_filter_regex
 
-    @instance_selection_tags.setter
-    def instance_selection_tags(self, instance_selection_tags):
-        """Sets the instance_selection_tags of this CloudWatchConfiguration.
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this CloudWatchConfiguration.
 
-        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
 
-        :param instance_selection_tags: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-        :type: dict(str, str)
+        :param metric_filter_regex: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+        :type: str
         """
 
-        self._instance_selection_tags = instance_selection_tags
+        self._metric_filter_regex = metric_filter_regex
 
     @property
-    def volume_selection_tags(self):
-        """Gets the volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+    def namespaces(self):
+        """Gets the namespaces of this CloudWatchConfiguration.  # noqa: E501
 
-        A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
 
-        :return: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The namespaces of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._volume_selection_tags
+        return self._namespaces
 
-    @volume_selection_tags.setter
-    def volume_selection_tags(self, volume_selection_tags):
-        """Sets the volume_selection_tags of this CloudWatchConfiguration.
+    @namespaces.setter
+    def namespaces(self, namespaces):
+        """Sets the namespaces of this CloudWatchConfiguration.
 
-        A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
 
-        :param volume_selection_tags: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-        :type: dict(str, str)
+        :param namespaces: The namespaces of this CloudWatchConfiguration.  # noqa: E501
+        :type: list[str]
         """
 
-        self._volume_selection_tags = volume_selection_tags
+        self._namespaces = namespaces
 
     @property
     def point_tag_filter_regex(self):
@@ -165,50 +165,50 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
         self._point_tag_filter_regex = point_tag_filter_regex
 
     @property
-    def namespaces(self):
-        """Gets the namespaces of this CloudWatchConfiguration.  # noqa: E501
+    def volume_selection_tags(self):
+        """Gets the volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
 
-        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
+        A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
 
-        :return: The namespaces of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: list[str]
+        :return: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._namespaces
+        return self._volume_selection_tags
 
-    @namespaces.setter
-    def namespaces(self, namespaces):
-        """Sets the namespaces of this CloudWatchConfiguration.
+    @volume_selection_tags.setter
+    def volume_selection_tags(self, volume_selection_tags):
+        """Sets the volume_selection_tags of this CloudWatchConfiguration.
 
-        A list of namespace that limit what we query from CloudWatch.  # noqa: E501
+        A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
 
-        :param namespaces: The namespaces of this CloudWatchConfiguration.  # noqa: E501
-        :type: list[str]
+        :param volume_selection_tags: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._namespaces = namespaces
+        self._volume_selection_tags = volume_selection_tags
 
     @property
-    def metric_filter_regex(self):
-        """Gets the metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+    def instance_selection_tags(self):
+        """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
 
-        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
 
-        :return: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: str
+        :return: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._metric_filter_regex
+        return self._instance_selection_tags
 
-    @metric_filter_regex.setter
-    def metric_filter_regex(self, metric_filter_regex):
-        """Sets the metric_filter_regex of this CloudWatchConfiguration.
+    @instance_selection_tags.setter
+    def instance_selection_tags(self, instance_selection_tags):
+        """Sets the instance_selection_tags of this CloudWatchConfiguration.
 
-        A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
 
-        :param metric_filter_regex: The metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
-        :type: str
+        :param instance_selection_tags: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._metric_filter_regex = metric_filter_regex
+        self._instance_selection_tags = instance_selection_tags
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index e1a3bb5..a2046e1 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -33,10 +33,10 @@ class CustomerFacingUserObject(object):
     swagger_types = {
         'user_groups': 'list[str]',
         'identifier': 'str',
-        'id': 'str',
         '_self': 'bool',
         'groups': 'list[str]',
         'customer': 'str',
+        'id': 'str',
         'last_successful_login': 'int',
         'gravatar_url': 'str',
         'escaped_identifier': 'str'
@@ -45,24 +45,24 @@ class CustomerFacingUserObject(object):
     attribute_map = {
         'user_groups': 'userGroups',
         'identifier': 'identifier',
-        'id': 'id',
         '_self': 'self',
         'groups': 'groups',
         'customer': 'customer',
+        'id': 'id',
         'last_successful_login': 'lastSuccessfulLogin',
         'gravatar_url': 'gravatarUrl',
         'escaped_identifier': 'escapedIdentifier'
     }
 
-    def __init__(self, user_groups=None, identifier=None, id=None, _self=None, groups=None, customer=None, last_successful_login=None, gravatar_url=None, escaped_identifier=None):  # noqa: E501
+    def __init__(self, user_groups=None, identifier=None, _self=None, groups=None, customer=None, id=None, last_successful_login=None, gravatar_url=None, escaped_identifier=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
         self._user_groups = None
         self._identifier = None
-        self._id = None
         self.__self = None
         self._groups = None
         self._customer = None
+        self._id = None
         self._last_successful_login = None
         self._gravatar_url = None
         self._escaped_identifier = None
@@ -71,11 +71,11 @@ def __init__(self, user_groups=None, identifier=None, id=None, _self=None, group
         if user_groups is not None:
             self.user_groups = user_groups
         self.identifier = identifier
-        self.id = id
         self._self = _self
         if groups is not None:
             self.groups = groups
         self.customer = customer
+        self.id = id
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         if gravatar_url is not None:
@@ -131,31 +131,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def id(self):
-        """Gets the id of this CustomerFacingUserObject.  # noqa: E501
-
-        The unique identifier of this user, which should be their valid email address  # noqa: E501
-
-        :return: The id of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CustomerFacingUserObject.
-
-        The unique identifier of this user, which should be their valid email address  # noqa: E501
-
-        :param id: The id of this CustomerFacingUserObject.  # noqa: E501
-        :type: str
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
     @property
     def _self(self):
         """Gets the _self of this CustomerFacingUserObject.  # noqa: E501
@@ -229,6 +204,31 @@ def customer(self, customer):
 
         self._customer = customer
 
+    @property
+    def id(self):
+        """Gets the id of this CustomerFacingUserObject.  # noqa: E501
+
+        The unique identifier of this user, which should be their valid email address  # noqa: E501
+
+        :return: The id of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CustomerFacingUserObject.
+
+        The unique identifier of this user, which should be their valid email address  # noqa: E501
+
+        :param id: The id of this CustomerFacingUserObject.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this CustomerFacingUserObject.  # noqa: E501
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
index cea741f..fdb80c6 100644
--- a/wavefront_api_client/models/customer_preferences.py
+++ b/wavefront_api_client/models/customer_preferences.py
@@ -34,88 +34,88 @@ class CustomerPreferences(object):
     """
     swagger_types = {
         'default_user_groups': 'list[UserGroup]',
-        'id': 'str',
+        'show_querybuilder_by_default': 'bool',
+        'hide_ts_when_querybuilder_shown': 'bool',
+        'show_onboarding': 'bool',
         'customer_id': 'str',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
+        'created_epoch_millis': 'int',
+        'updated_epoch_millis': 'int',
         'invite_permissions': 'list[str]',
+        'blacklisted_emails': 'dict(str, int)',
         'hidden_metric_prefixes': 'dict(str, int)',
         'landing_dashboard_slug': 'str',
-        'show_onboarding': 'bool',
         'grant_modify_access_to_everyone': 'bool',
-        'show_querybuilder_by_default': 'bool',
-        'hide_ts_when_querybuilder_shown': 'bool',
-        'blacklisted_emails': 'dict(str, int)',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
         'deleted': 'bool'
     }
 
     attribute_map = {
         'default_user_groups': 'defaultUserGroups',
-        'id': 'id',
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
+        'show_onboarding': 'showOnboarding',
         'customer_id': 'customerId',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
+        'created_epoch_millis': 'createdEpochMillis',
+        'updated_epoch_millis': 'updatedEpochMillis',
         'invite_permissions': 'invitePermissions',
+        'blacklisted_emails': 'blacklistedEmails',
         'hidden_metric_prefixes': 'hiddenMetricPrefixes',
         'landing_dashboard_slug': 'landingDashboardSlug',
-        'show_onboarding': 'showOnboarding',
         'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
-        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
-        'blacklisted_emails': 'blacklistedEmails',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
         'deleted': 'deleted'
     }
 
-    def __init__(self, default_user_groups=None, id=None, customer_id=None, creator_id=None, updater_id=None, invite_permissions=None, hidden_metric_prefixes=None, landing_dashboard_slug=None, show_onboarding=None, grant_modify_access_to_everyone=None, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, blacklisted_emails=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+    def __init__(self, default_user_groups=None, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, show_onboarding=None, customer_id=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, invite_permissions=None, blacklisted_emails=None, hidden_metric_prefixes=None, landing_dashboard_slug=None, grant_modify_access_to_everyone=None, deleted=None):  # noqa: E501
         """CustomerPreferences - a model defined in Swagger"""  # noqa: E501
 
         self._default_user_groups = None
-        self._id = None
+        self._show_querybuilder_by_default = None
+        self._hide_ts_when_querybuilder_shown = None
+        self._show_onboarding = None
         self._customer_id = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
+        self._created_epoch_millis = None
+        self._updated_epoch_millis = None
         self._invite_permissions = None
+        self._blacklisted_emails = None
         self._hidden_metric_prefixes = None
         self._landing_dashboard_slug = None
-        self._show_onboarding = None
         self._grant_modify_access_to_everyone = None
-        self._show_querybuilder_by_default = None
-        self._hide_ts_when_querybuilder_shown = None
-        self._blacklisted_emails = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
         self._deleted = None
         self.discriminator = None
 
         if default_user_groups is not None:
             self.default_user_groups = default_user_groups
-        if id is not None:
-            self.id = id
+        self.show_querybuilder_by_default = show_querybuilder_by_default
+        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+        self.show_onboarding = show_onboarding
         self.customer_id = customer_id
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
         if invite_permissions is not None:
             self.invite_permissions = invite_permissions
+        if blacklisted_emails is not None:
+            self.blacklisted_emails = blacklisted_emails
         if hidden_metric_prefixes is not None:
             self.hidden_metric_prefixes = hidden_metric_prefixes
         if landing_dashboard_slug is not None:
             self.landing_dashboard_slug = landing_dashboard_slug
-        self.show_onboarding = show_onboarding
         self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
-        self.show_querybuilder_by_default = show_querybuilder_by_default
-        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        if blacklisted_emails is not None:
-            self.blacklisted_emails = blacklisted_emails
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
         if deleted is not None:
             self.deleted = deleted
 
@@ -143,25 +143,79 @@ def default_user_groups(self, default_user_groups):
         self._default_user_groups = default_user_groups
 
     @property
-    def id(self):
-        """Gets the id of this CustomerPreferences.  # noqa: E501
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
 
+        Whether the Querybuilder is shown by default  # noqa: E501
 
-        :return: The id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
+        :return: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
         """
-        return self._id
+        return self._show_querybuilder_by_default
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CustomerPreferences.
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this CustomerPreferences.
 
+        Whether the Querybuilder is shown by default  # noqa: E501
 
-        :param id: The id of this CustomerPreferences.  # noqa: E501
-        :type: str
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+        :type: bool
         """
+        if show_querybuilder_by_default is None:
+            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._show_querybuilder_by_default = show_querybuilder_by_default
+
+    @property
+    def hide_ts_when_querybuilder_shown(self):
+        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
+
+        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hide_ts_when_querybuilder_shown
+
+    @hide_ts_when_querybuilder_shown.setter
+    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
+        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferences.
+
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
+
+        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+        if hide_ts_when_querybuilder_shown is None:
+            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
+
+        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+
+    @property
+    def show_onboarding(self):
+        """Gets the show_onboarding of this CustomerPreferences.  # noqa: E501
+
+        Whether to show onboarding for any new user without an override  # noqa: E501
+
+        :return: The show_onboarding of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_onboarding
+
+    @show_onboarding.setter
+    def show_onboarding(self, show_onboarding):
+        """Sets the show_onboarding of this CustomerPreferences.
+
+        Whether to show onboarding for any new user without an override  # noqa: E501
+
+        :param show_onboarding: The show_onboarding of this CustomerPreferences.  # noqa: E501
+        :type: bool
+        """
+        if show_onboarding is None:
+            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
+
+        self._show_onboarding = show_onboarding
 
     @property
     def customer_id(self):
@@ -230,6 +284,69 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CustomerPreferences.
+
+
+        :param id: The id of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this CustomerPreferences.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this CustomerPreferences.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
     @property
     def invite_permissions(self):
         """Gets the invite_permissions of this CustomerPreferences.  # noqa: E501
@@ -253,6 +370,29 @@ def invite_permissions(self, invite_permissions):
 
         self._invite_permissions = invite_permissions
 
+    @property
+    def blacklisted_emails(self):
+        """Gets the blacklisted_emails of this CustomerPreferences.  # noqa: E501
+
+        List of blacklisted emails of the customer  # noqa: E501
+
+        :return: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
+        :rtype: dict(str, int)
+        """
+        return self._blacklisted_emails
+
+    @blacklisted_emails.setter
+    def blacklisted_emails(self, blacklisted_emails):
+        """Sets the blacklisted_emails of this CustomerPreferences.
+
+        List of blacklisted emails of the customer  # noqa: E501
+
+        :param blacklisted_emails: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
+        :type: dict(str, int)
+        """
+
+        self._blacklisted_emails = blacklisted_emails
+
     @property
     def hidden_metric_prefixes(self):
         """Gets the hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
@@ -299,31 +439,6 @@ def landing_dashboard_slug(self, landing_dashboard_slug):
 
         self._landing_dashboard_slug = landing_dashboard_slug
 
-    @property
-    def show_onboarding(self):
-        """Gets the show_onboarding of this CustomerPreferences.  # noqa: E501
-
-        Whether to show onboarding for any new user without an override  # noqa: E501
-
-        :return: The show_onboarding of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_onboarding
-
-    @show_onboarding.setter
-    def show_onboarding(self, show_onboarding):
-        """Sets the show_onboarding of this CustomerPreferences.
-
-        Whether to show onboarding for any new user without an override  # noqa: E501
-
-        :param show_onboarding: The show_onboarding of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if show_onboarding is None:
-            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
-
-        self._show_onboarding = show_onboarding
-
     @property
     def grant_modify_access_to_everyone(self):
         """Gets the grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
@@ -349,121 +464,6 @@ def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
 
         self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
 
-    @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-
-        Whether the Querybuilder is shown by default  # noqa: E501
-
-        :return: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_querybuilder_by_default
-
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this CustomerPreferences.
-
-        Whether the Querybuilder is shown by default  # noqa: E501
-
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if show_querybuilder_by_default is None:
-            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
-
-        self._show_querybuilder_by_default = show_querybuilder_by_default
-
-    @property
-    def hide_ts_when_querybuilder_shown(self):
-        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
-
-        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._hide_ts_when_querybuilder_shown
-
-    @hide_ts_when_querybuilder_shown.setter
-    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
-        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferences.
-
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
-
-        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if hide_ts_when_querybuilder_shown is None:
-            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
-
-        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-
-    @property
-    def blacklisted_emails(self):
-        """Gets the blacklisted_emails of this CustomerPreferences.  # noqa: E501
-
-        List of blacklisted emails of the customer  # noqa: E501
-
-        :return: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
-        :rtype: dict(str, int)
-        """
-        return self._blacklisted_emails
-
-    @blacklisted_emails.setter
-    def blacklisted_emails(self, blacklisted_emails):
-        """Sets the blacklisted_emails of this CustomerPreferences.
-
-        List of blacklisted emails of the customer  # noqa: E501
-
-        :param blacklisted_emails: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
-        :type: dict(str, int)
-        """
-
-        self._blacklisted_emails = blacklisted_emails
-
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this CustomerPreferences.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated_epoch_millis
-
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this CustomerPreferences.
-
-
-        :param updated_epoch_millis: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :type: int
-        """
-
-        self._updated_epoch_millis = updated_epoch_millis
-
     @property
     def deleted(self):
         """Gets the deleted of this CustomerPreferences.  # noqa: E501
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 8dcb380..1cf3c86 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -37,10 +37,8 @@ class Dashboard(object):
     """
     swagger_types = {
         'can_user_modify': 'bool',
-        'hidden': 'bool',
         'description': 'str',
-        'name': 'str',
-        'id': 'str',
+        'hidden': 'bool',
         'parameters': 'dict(str, str)',
         'tags': 'WFTags',
         'customer': 'str',
@@ -48,6 +46,7 @@ class Dashboard(object):
         'system_owned': 'bool',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'event_filter_type': 'str',
         'sections': 'list[DashboardSection]',
         'parameter_details': 'dict(str, DashboardParameterValue)',
@@ -71,15 +70,14 @@ class Dashboard(object):
         'num_charts': 'int',
         'favorite': 'bool',
         'num_favorites': 'int',
-        'orphan': 'bool'
+        'orphan': 'bool',
+        'name': 'str'
     }
 
     attribute_map = {
         'can_user_modify': 'canUserModify',
-        'hidden': 'hidden',
         'description': 'description',
-        'name': 'name',
-        'id': 'id',
+        'hidden': 'hidden',
         'parameters': 'parameters',
         'tags': 'tags',
         'customer': 'customer',
@@ -87,6 +85,7 @@ class Dashboard(object):
         'system_owned': 'systemOwned',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'event_filter_type': 'eventFilterType',
         'sections': 'sections',
         'parameter_details': 'parameterDetails',
@@ -110,17 +109,16 @@ class Dashboard(object):
         'num_charts': 'numCharts',
         'favorite': 'favorite',
         'num_favorites': 'numFavorites',
-        'orphan': 'orphan'
+        'orphan': 'orphan',
+        'name': 'name'
     }
 
-    def __init__(self, can_user_modify=None, hidden=None, description=None, name=None, id=None, parameters=None, tags=None, customer=None, url=None, system_owned=None, creator_id=None, updater_id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, acl=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, num_charts=None, favorite=None, num_favorites=None, orphan=None):  # noqa: E501
+    def __init__(self, can_user_modify=None, description=None, hidden=None, parameters=None, tags=None, customer=None, url=None, system_owned=None, creator_id=None, updater_id=None, id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, acl=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, num_charts=None, favorite=None, num_favorites=None, orphan=None, name=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
 
         self._can_user_modify = None
-        self._hidden = None
         self._description = None
-        self._name = None
-        self._id = None
+        self._hidden = None
         self._parameters = None
         self._tags = None
         self._customer = None
@@ -128,6 +126,7 @@ def __init__(self, can_user_modify=None, hidden=None, description=None, name=Non
         self._system_owned = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._event_filter_type = None
         self._sections = None
         self._parameter_details = None
@@ -152,16 +151,15 @@ def __init__(self, can_user_modify=None, hidden=None, description=None, name=Non
         self._favorite = None
         self._num_favorites = None
         self._orphan = None
+        self._name = None
         self.discriminator = None
 
         if can_user_modify is not None:
             self.can_user_modify = can_user_modify
-        if hidden is not None:
-            self.hidden = hidden
         if description is not None:
             self.description = description
-        self.name = name
-        self.id = id
+        if hidden is not None:
+            self.hidden = hidden
         if parameters is not None:
             self.parameters = parameters
         if tags is not None:
@@ -175,6 +173,7 @@ def __init__(self, can_user_modify=None, hidden=None, description=None, name=Non
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        self.id = id
         if event_filter_type is not None:
             self.event_filter_type = event_filter_type
         self.sections = sections
@@ -222,6 +221,7 @@ def __init__(self, can_user_modify=None, hidden=None, description=None, name=Non
             self.num_favorites = num_favorites
         if orphan is not None:
             self.orphan = orphan
+        self.name = name
 
     @property
     def can_user_modify(self):
@@ -244,27 +244,6 @@ def can_user_modify(self, can_user_modify):
 
         self._can_user_modify = can_user_modify
 
-    @property
-    def hidden(self):
-        """Gets the hidden of this Dashboard.  # noqa: E501
-
-
-        :return: The hidden of this Dashboard.  # noqa: E501
-        :rtype: bool
-        """
-        return self._hidden
-
-    @hidden.setter
-    def hidden(self, hidden):
-        """Sets the hidden of this Dashboard.
-
-
-        :param hidden: The hidden of this Dashboard.  # noqa: E501
-        :type: bool
-        """
-
-        self._hidden = hidden
-
     @property
     def description(self):
         """Gets the description of this Dashboard.  # noqa: E501
@@ -289,54 +268,25 @@ def description(self, description):
         self._description = description
 
     @property
-    def name(self):
-        """Gets the name of this Dashboard.  # noqa: E501
-
-        Name of the dashboard  # noqa: E501
-
-        :return: The name of this Dashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Dashboard.
-
-        Name of the dashboard  # noqa: E501
-
-        :param name: The name of this Dashboard.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def id(self):
-        """Gets the id of this Dashboard.  # noqa: E501
+    def hidden(self):
+        """Gets the hidden of this Dashboard.  # noqa: E501
 
-        Unique identifier, also URL slug, of the dashboard  # noqa: E501
 
-        :return: The id of this Dashboard.  # noqa: E501
-        :rtype: str
+        :return: The hidden of this Dashboard.  # noqa: E501
+        :rtype: bool
         """
-        return self._id
+        return self._hidden
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Dashboard.
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Dashboard.
 
-        Unique identifier, also URL slug, of the dashboard  # noqa: E501
 
-        :param id: The id of this Dashboard.  # noqa: E501
-        :type: str
+        :param hidden: The hidden of this Dashboard.  # noqa: E501
+        :type: bool
         """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._hidden = hidden
 
     @property
     def parameters(self):
@@ -495,6 +445,31 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this Dashboard.  # noqa: E501
+
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+
+        :return: The id of this Dashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Dashboard.
+
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+
+        :param id: The id of this Dashboard.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
     @property
     def event_filter_type(self):
         """Gets the event_filter_type of this Dashboard.  # noqa: E501
@@ -1033,6 +1008,31 @@ def orphan(self, orphan):
 
         self._orphan = orphan
 
+    @property
+    def name(self):
+        """Gets the name of this Dashboard.  # noqa: E501
+
+        Name of the dashboard  # noqa: E501
+
+        :return: The name of this Dashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Dashboard.
+
+        Name of the dashboard  # noqa: E501
+
+        :param name: The name of this Dashboard.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index d3f65cd..b6cafb8 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -31,187 +31,181 @@ class DashboardParameterValue(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'label': 'str',
         'description': 'str',
-        'default_value': 'str',
-        'parameter_type': 'str',
-        'values_to_readable_strings': 'dict(str, str)',
-        'dynamic_field_type': 'str',
-        'query_value': 'str',
+        'label': 'str',
+        'multivalue': 'bool',
         'hide_from_view': 'bool',
+        'allow_all': 'bool',
+        'dynamic_field_type': 'str',
         'tag_key': 'str',
-        'multivalue': 'bool',
+        'query_value': 'str',
         'reverse_dyn_sort': 'bool',
-        'allow_all': 'bool'
+        'parameter_type': 'str',
+        'default_value': 'str',
+        'values_to_readable_strings': 'dict(str, str)'
     }
 
     attribute_map = {
-        'label': 'label',
         'description': 'description',
-        'default_value': 'defaultValue',
-        'parameter_type': 'parameterType',
-        'values_to_readable_strings': 'valuesToReadableStrings',
-        'dynamic_field_type': 'dynamicFieldType',
-        'query_value': 'queryValue',
+        'label': 'label',
+        'multivalue': 'multivalue',
         'hide_from_view': 'hideFromView',
+        'allow_all': 'allowAll',
+        'dynamic_field_type': 'dynamicFieldType',
         'tag_key': 'tagKey',
-        'multivalue': 'multivalue',
+        'query_value': 'queryValue',
         'reverse_dyn_sort': 'reverseDynSort',
-        'allow_all': 'allowAll'
+        'parameter_type': 'parameterType',
+        'default_value': 'defaultValue',
+        'values_to_readable_strings': 'valuesToReadableStrings'
     }
 
-    def __init__(self, label=None, description=None, default_value=None, parameter_type=None, values_to_readable_strings=None, dynamic_field_type=None, query_value=None, hide_from_view=None, tag_key=None, multivalue=None, reverse_dyn_sort=None, allow_all=None):  # noqa: E501
+    def __init__(self, description=None, label=None, multivalue=None, hide_from_view=None, allow_all=None, dynamic_field_type=None, tag_key=None, query_value=None, reverse_dyn_sort=None, parameter_type=None, default_value=None, values_to_readable_strings=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
 
-        self._label = None
         self._description = None
-        self._default_value = None
-        self._parameter_type = None
-        self._values_to_readable_strings = None
-        self._dynamic_field_type = None
-        self._query_value = None
+        self._label = None
+        self._multivalue = None
         self._hide_from_view = None
+        self._allow_all = None
+        self._dynamic_field_type = None
         self._tag_key = None
-        self._multivalue = None
+        self._query_value = None
         self._reverse_dyn_sort = None
-        self._allow_all = None
+        self._parameter_type = None
+        self._default_value = None
+        self._values_to_readable_strings = None
         self.discriminator = None
 
-        if label is not None:
-            self.label = label
         if description is not None:
             self.description = description
-        if default_value is not None:
-            self.default_value = default_value
-        if parameter_type is not None:
-            self.parameter_type = parameter_type
-        if values_to_readable_strings is not None:
-            self.values_to_readable_strings = values_to_readable_strings
-        if dynamic_field_type is not None:
-            self.dynamic_field_type = dynamic_field_type
-        if query_value is not None:
-            self.query_value = query_value
+        if label is not None:
+            self.label = label
+        if multivalue is not None:
+            self.multivalue = multivalue
         if hide_from_view is not None:
             self.hide_from_view = hide_from_view
+        if allow_all is not None:
+            self.allow_all = allow_all
+        if dynamic_field_type is not None:
+            self.dynamic_field_type = dynamic_field_type
         if tag_key is not None:
             self.tag_key = tag_key
-        if multivalue is not None:
-            self.multivalue = multivalue
+        if query_value is not None:
+            self.query_value = query_value
         if reverse_dyn_sort is not None:
             self.reverse_dyn_sort = reverse_dyn_sort
-        if allow_all is not None:
-            self.allow_all = allow_all
+        if parameter_type is not None:
+            self.parameter_type = parameter_type
+        if default_value is not None:
+            self.default_value = default_value
+        if values_to_readable_strings is not None:
+            self.values_to_readable_strings = values_to_readable_strings
 
     @property
-    def label(self):
-        """Gets the label of this DashboardParameterValue.  # noqa: E501
+    def description(self):
+        """Gets the description of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The label of this DashboardParameterValue.  # noqa: E501
+        :return: The description of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._label
+        return self._description
 
-    @label.setter
-    def label(self, label):
-        """Sets the label of this DashboardParameterValue.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DashboardParameterValue.
 
 
-        :param label: The label of this DashboardParameterValue.  # noqa: E501
+        :param description: The description of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._label = label
+        self._description = description
 
     @property
-    def description(self):
-        """Gets the description of this DashboardParameterValue.  # noqa: E501
+    def label(self):
+        """Gets the label of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The description of this DashboardParameterValue.  # noqa: E501
+        :return: The label of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._label
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this DashboardParameterValue.
+    @label.setter
+    def label(self, label):
+        """Sets the label of this DashboardParameterValue.
 
 
-        :param description: The description of this DashboardParameterValue.  # noqa: E501
+        :param label: The label of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._description = description
+        self._label = label
 
     @property
-    def default_value(self):
-        """Gets the default_value of this DashboardParameterValue.  # noqa: E501
+    def multivalue(self):
+        """Gets the multivalue of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The default_value of this DashboardParameterValue.  # noqa: E501
-        :rtype: str
+        :return: The multivalue of this DashboardParameterValue.  # noqa: E501
+        :rtype: bool
         """
-        return self._default_value
+        return self._multivalue
 
-    @default_value.setter
-    def default_value(self, default_value):
-        """Sets the default_value of this DashboardParameterValue.
+    @multivalue.setter
+    def multivalue(self, multivalue):
+        """Sets the multivalue of this DashboardParameterValue.
 
 
-        :param default_value: The default_value of this DashboardParameterValue.  # noqa: E501
-        :type: str
+        :param multivalue: The multivalue of this DashboardParameterValue.  # noqa: E501
+        :type: bool
         """
 
-        self._default_value = default_value
+        self._multivalue = multivalue
 
     @property
-    def parameter_type(self):
-        """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
+    def hide_from_view(self):
+        """Gets the hide_from_view of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The parameter_type of this DashboardParameterValue.  # noqa: E501
-        :rtype: str
+        :return: The hide_from_view of this DashboardParameterValue.  # noqa: E501
+        :rtype: bool
         """
-        return self._parameter_type
+        return self._hide_from_view
 
-    @parameter_type.setter
-    def parameter_type(self, parameter_type):
-        """Sets the parameter_type of this DashboardParameterValue.
+    @hide_from_view.setter
+    def hide_from_view(self, hide_from_view):
+        """Sets the hide_from_view of this DashboardParameterValue.
 
 
-        :param parameter_type: The parameter_type of this DashboardParameterValue.  # noqa: E501
-        :type: str
+        :param hide_from_view: The hide_from_view of this DashboardParameterValue.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
-        if parameter_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(parameter_type, allowed_values)
-            )
 
-        self._parameter_type = parameter_type
+        self._hide_from_view = hide_from_view
 
     @property
-    def values_to_readable_strings(self):
-        """Gets the values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
+    def allow_all(self):
+        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :rtype: bool
         """
-        return self._values_to_readable_strings
+        return self._allow_all
 
-    @values_to_readable_strings.setter
-    def values_to_readable_strings(self, values_to_readable_strings):
-        """Sets the values_to_readable_strings of this DashboardParameterValue.
+    @allow_all.setter
+    def allow_all(self, allow_all):
+        """Sets the allow_all of this DashboardParameterValue.
 
 
-        :param values_to_readable_strings: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
-        :type: dict(str, str)
+        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :type: bool
         """
 
-        self._values_to_readable_strings = values_to_readable_strings
+        self._allow_all = allow_all
 
     @property
     def dynamic_field_type(self):
@@ -240,6 +234,27 @@ def dynamic_field_type(self, dynamic_field_type):
 
         self._dynamic_field_type = dynamic_field_type
 
+    @property
+    def tag_key(self):
+        """Gets the tag_key of this DashboardParameterValue.  # noqa: E501
+
+
+        :return: The tag_key of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
+        """
+        return self._tag_key
+
+    @tag_key.setter
+    def tag_key(self, tag_key):
+        """Sets the tag_key of this DashboardParameterValue.
+
+
+        :param tag_key: The tag_key of this DashboardParameterValue.  # noqa: E501
+        :type: str
+        """
+
+        self._tag_key = tag_key
+
     @property
     def query_value(self):
         """Gets the query_value of this DashboardParameterValue.  # noqa: E501
@@ -262,111 +277,96 @@ def query_value(self, query_value):
         self._query_value = query_value
 
     @property
-    def hide_from_view(self):
-        """Gets the hide_from_view of this DashboardParameterValue.  # noqa: E501
+    def reverse_dyn_sort(self):
+        """Gets the reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
 
+        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :return: The hide_from_view of this DashboardParameterValue.  # noqa: E501
+        :return: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
         :rtype: bool
         """
-        return self._hide_from_view
+        return self._reverse_dyn_sort
 
-    @hide_from_view.setter
-    def hide_from_view(self, hide_from_view):
-        """Sets the hide_from_view of this DashboardParameterValue.
+    @reverse_dyn_sort.setter
+    def reverse_dyn_sort(self, reverse_dyn_sort):
+        """Sets the reverse_dyn_sort of this DashboardParameterValue.
 
+        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :param hide_from_view: The hide_from_view of this DashboardParameterValue.  # noqa: E501
+        :param reverse_dyn_sort: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
         :type: bool
         """
 
-        self._hide_from_view = hide_from_view
+        self._reverse_dyn_sort = reverse_dyn_sort
 
     @property
-    def tag_key(self):
-        """Gets the tag_key of this DashboardParameterValue.  # noqa: E501
+    def parameter_type(self):
+        """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The tag_key of this DashboardParameterValue.  # noqa: E501
+        :return: The parameter_type of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._tag_key
+        return self._parameter_type
 
-    @tag_key.setter
-    def tag_key(self, tag_key):
-        """Sets the tag_key of this DashboardParameterValue.
+    @parameter_type.setter
+    def parameter_type(self, parameter_type):
+        """Sets the parameter_type of this DashboardParameterValue.
 
 
-        :param tag_key: The tag_key of this DashboardParameterValue.  # noqa: E501
+        :param parameter_type: The parameter_type of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
+        allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
+        if parameter_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(parameter_type, allowed_values)
+            )
 
-        self._tag_key = tag_key
-
-    @property
-    def multivalue(self):
-        """Gets the multivalue of this DashboardParameterValue.  # noqa: E501
-
-
-        :return: The multivalue of this DashboardParameterValue.  # noqa: E501
-        :rtype: bool
-        """
-        return self._multivalue
-
-    @multivalue.setter
-    def multivalue(self, multivalue):
-        """Sets the multivalue of this DashboardParameterValue.
-
-
-        :param multivalue: The multivalue of this DashboardParameterValue.  # noqa: E501
-        :type: bool
-        """
-
-        self._multivalue = multivalue
+        self._parameter_type = parameter_type
 
     @property
-    def reverse_dyn_sort(self):
-        """Gets the reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
+    def default_value(self):
+        """Gets the default_value of this DashboardParameterValue.  # noqa: E501
 
-        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :return: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
-        :rtype: bool
+        :return: The default_value of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
         """
-        return self._reverse_dyn_sort
+        return self._default_value
 
-    @reverse_dyn_sort.setter
-    def reverse_dyn_sort(self, reverse_dyn_sort):
-        """Sets the reverse_dyn_sort of this DashboardParameterValue.
+    @default_value.setter
+    def default_value(self, default_value):
+        """Sets the default_value of this DashboardParameterValue.
 
-        Whether to reverse alphabetically sort the returned result.  # noqa: E501
 
-        :param reverse_dyn_sort: The reverse_dyn_sort of this DashboardParameterValue.  # noqa: E501
-        :type: bool
+        :param default_value: The default_value of this DashboardParameterValue.  # noqa: E501
+        :type: str
         """
 
-        self._reverse_dyn_sort = reverse_dyn_sort
+        self._default_value = default_value
 
     @property
-    def allow_all(self):
-        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
+    def values_to_readable_strings(self):
+        """Gets the values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
-        :rtype: bool
+        :return: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._allow_all
+        return self._values_to_readable_strings
 
-    @allow_all.setter
-    def allow_all(self, allow_all):
-        """Sets the allow_all of this DashboardParameterValue.
+    @values_to_readable_strings.setter
+    def values_to_readable_strings(self, values_to_readable_strings):
+        """Sets the values_to_readable_strings of this DashboardParameterValue.
 
 
-        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
-        :type: bool
+        :param values_to_readable_strings: The values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._allow_all = allow_all
+        self._values_to_readable_strings = values_to_readable_strings
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index f3fe571..6ced669 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -33,49 +33,24 @@ class DashboardSection(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'name': 'str',
-        'rows': 'list[DashboardSectionRow]'
+        'rows': 'list[DashboardSectionRow]',
+        'name': 'str'
     }
 
     attribute_map = {
-        'name': 'name',
-        'rows': 'rows'
+        'rows': 'rows',
+        'name': 'name'
     }
 
-    def __init__(self, name=None, rows=None):  # noqa: E501
+    def __init__(self, rows=None, name=None):  # noqa: E501
         """DashboardSection - a model defined in Swagger"""  # noqa: E501
 
-        self._name = None
         self._rows = None
+        self._name = None
         self.discriminator = None
 
-        self.name = name
         self.rows = rows
-
-    @property
-    def name(self):
-        """Gets the name of this DashboardSection.  # noqa: E501
-
-        Name of this section  # noqa: E501
-
-        :return: The name of this DashboardSection.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this DashboardSection.
-
-        Name of this section  # noqa: E501
-
-        :param name: The name of this DashboardSection.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
+        self.name = name
 
     @property
     def rows(self):
@@ -102,6 +77,31 @@ def rows(self, rows):
 
         self._rows = rows
 
+    @property
+    def name(self):
+        """Gets the name of this DashboardSection.  # noqa: E501
+
+        Name of this section  # noqa: E501
+
+        :return: The name of this DashboardSection.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DashboardSection.
+
+        Name of this section  # noqa: E501
+
+        :param name: The name of this DashboardSection.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index ae5d0aa..2eb3e9d 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -33,48 +33,25 @@ class DashboardSectionRow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'height_factor': 'int',
-        'charts': 'list[Chart]'
+        'charts': 'list[Chart]',
+        'height_factor': 'int'
     }
 
     attribute_map = {
-        'height_factor': 'heightFactor',
-        'charts': 'charts'
+        'charts': 'charts',
+        'height_factor': 'heightFactor'
     }
 
-    def __init__(self, height_factor=None, charts=None):  # noqa: E501
+    def __init__(self, charts=None, height_factor=None):  # noqa: E501
         """DashboardSectionRow - a model defined in Swagger"""  # noqa: E501
 
-        self._height_factor = None
         self._charts = None
+        self._height_factor = None
         self.discriminator = None
 
+        self.charts = charts
         if height_factor is not None:
             self.height_factor = height_factor
-        self.charts = charts
-
-    @property
-    def height_factor(self):
-        """Gets the height_factor of this DashboardSectionRow.  # noqa: E501
-
-        Scalar for the height of this row. 100 is normal and default. 50 is half height  # noqa: E501
-
-        :return: The height_factor of this DashboardSectionRow.  # noqa: E501
-        :rtype: int
-        """
-        return self._height_factor
-
-    @height_factor.setter
-    def height_factor(self, height_factor):
-        """Sets the height_factor of this DashboardSectionRow.
-
-        Scalar for the height of this row. 100 is normal and default. 50 is half height  # noqa: E501
-
-        :param height_factor: The height_factor of this DashboardSectionRow.  # noqa: E501
-        :type: int
-        """
-
-        self._height_factor = height_factor
 
     @property
     def charts(self):
@@ -101,6 +78,29 @@ def charts(self, charts):
 
         self._charts = charts
 
+    @property
+    def height_factor(self):
+        """Gets the height_factor of this DashboardSectionRow.  # noqa: E501
+
+        Scalar for the height of this row. 100 is normal and default. 50 is half height  # noqa: E501
+
+        :return: The height_factor of this DashboardSectionRow.  # noqa: E501
+        :rtype: int
+        """
+        return self._height_factor
+
+    @height_factor.setter
+    def height_factor(self, height_factor):
+        """Sets the height_factor of this DashboardSectionRow.
+
+        Scalar for the height of this row. 100 is normal and default. 50 is half height  # noqa: E501
+
+        :param height_factor: The height_factor of this DashboardSectionRow.  # noqa: E501
+        :type: int
+        """
+
+        self._height_factor = height_factor
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 0079d03..70657ca 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -34,17 +34,15 @@ class DerivedMetricDefinition(object):
     """
     swagger_types = {
         'created': 'int',
-        'name': 'str',
-        'id': 'str',
-        'query': 'str',
         'minutes': 'int',
         'tags': 'WFTags',
         'status': 'list[str]',
         'updated': 'int',
-        'include_obsolete_metrics': 'bool',
         'process_rate_minutes': 'int',
         'last_processed_millis': 'int',
         'update_user_id': 'str',
+        'query': 'str',
+        'include_obsolete_metrics': 'bool',
         'additional_information': 'str',
         'last_query_time': 'int',
         'in_trash': 'bool',
@@ -56,27 +54,27 @@ class DerivedMetricDefinition(object):
         'hosts_used': 'list[str]',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'query_qb_enabled': 'bool',
         'query_qb_serialization': 'str',
         'last_error_message': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'deleted': 'bool'
+        'deleted': 'bool',
+        'name': 'str'
     }
 
     attribute_map = {
         'created': 'created',
-        'name': 'name',
-        'id': 'id',
-        'query': 'query',
         'minutes': 'minutes',
         'tags': 'tags',
         'status': 'status',
         'updated': 'updated',
-        'include_obsolete_metrics': 'includeObsoleteMetrics',
         'process_rate_minutes': 'processRateMinutes',
         'last_processed_millis': 'lastProcessedMillis',
         'update_user_id': 'updateUserId',
+        'query': 'query',
+        'include_obsolete_metrics': 'includeObsoleteMetrics',
         'additional_information': 'additionalInformation',
         'last_query_time': 'lastQueryTime',
         'in_trash': 'inTrash',
@@ -88,29 +86,29 @@ class DerivedMetricDefinition(object):
         'hosts_used': 'hostsUsed',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'query_qb_enabled': 'queryQBEnabled',
         'query_qb_serialization': 'queryQBSerialization',
         'last_error_message': 'lastErrorMessage',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'deleted': 'deleted'
+        'deleted': 'deleted',
+        'name': 'name'
     }
 
-    def __init__(self, created=None, name=None, id=None, query=None, minutes=None, tags=None, status=None, updated=None, include_obsolete_metrics=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, additional_information=None, last_query_time=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, points_scanned_at_last_query=None, metrics_used=None, hosts_used=None, creator_id=None, updater_id=None, query_qb_enabled=None, query_qb_serialization=None, last_error_message=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+    def __init__(self, created=None, minutes=None, tags=None, status=None, updated=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, query=None, include_obsolete_metrics=None, additional_information=None, last_query_time=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, points_scanned_at_last_query=None, metrics_used=None, hosts_used=None, creator_id=None, updater_id=None, id=None, query_qb_enabled=None, query_qb_serialization=None, last_error_message=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, name=None):  # noqa: E501
         """DerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
         self._created = None
-        self._name = None
-        self._id = None
-        self._query = None
         self._minutes = None
         self._tags = None
         self._status = None
         self._updated = None
-        self._include_obsolete_metrics = None
         self._process_rate_minutes = None
         self._last_processed_millis = None
         self._update_user_id = None
+        self._query = None
+        self._include_obsolete_metrics = None
         self._additional_information = None
         self._last_query_time = None
         self._in_trash = None
@@ -122,20 +120,18 @@ def __init__(self, created=None, name=None, id=None, query=None, minutes=None, t
         self._hosts_used = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._query_qb_enabled = None
         self._query_qb_serialization = None
         self._last_error_message = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._deleted = None
+        self._name = None
         self.discriminator = None
 
         if created is not None:
             self.created = created
-        self.name = name
-        if id is not None:
-            self.id = id
-        self.query = query
         self.minutes = minutes
         if tags is not None:
             self.tags = tags
@@ -143,14 +139,15 @@ def __init__(self, created=None, name=None, id=None, query=None, minutes=None, t
             self.status = status
         if updated is not None:
             self.updated = updated
-        if include_obsolete_metrics is not None:
-            self.include_obsolete_metrics = include_obsolete_metrics
         if process_rate_minutes is not None:
             self.process_rate_minutes = process_rate_minutes
         if last_processed_millis is not None:
             self.last_processed_millis = last_processed_millis
         if update_user_id is not None:
             self.update_user_id = update_user_id
+        self.query = query
+        if include_obsolete_metrics is not None:
+            self.include_obsolete_metrics = include_obsolete_metrics
         if additional_information is not None:
             self.additional_information = additional_information
         if last_query_time is not None:
@@ -173,6 +170,8 @@ def __init__(self, created=None, name=None, id=None, query=None, minutes=None, t
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
         if query_qb_enabled is not None:
             self.query_qb_enabled = query_qb_enabled
         if query_qb_serialization is not None:
@@ -185,6 +184,7 @@ def __init__(self, created=None, name=None, id=None, query=None, minutes=None, t
             self.updated_epoch_millis = updated_epoch_millis
         if deleted is not None:
             self.deleted = deleted
+        self.name = name
 
     @property
     def created(self):
@@ -209,75 +209,6 @@ def created(self, created):
 
         self._created = created
 
-    @property
-    def name(self):
-        """Gets the name of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The name of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this DerivedMetricDefinition.
-
-
-        :param name: The name of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def id(self):
-        """Gets the id of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this DerivedMetricDefinition.
-
-
-        :param id: The id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
-    @property
-    def query(self):
-        """Gets the query of this DerivedMetricDefinition.  # noqa: E501
-
-        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
-
-        :return: The query of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._query
-
-    @query.setter
-    def query(self, query):
-        """Sets the query of this DerivedMetricDefinition.
-
-        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
-
-        :param query: The query of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-        if query is None:
-            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
-
-        self._query = query
-
     @property
     def minutes(self):
         """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
@@ -370,29 +301,6 @@ def updated(self, updated):
 
         self._updated = updated
 
-    @property
-    def include_obsolete_metrics(self):
-        """Gets the include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
-
-        Whether to include obsolete metrics in query  # noqa: E501
-
-        :return: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
-        """
-        return self._include_obsolete_metrics
-
-    @include_obsolete_metrics.setter
-    def include_obsolete_metrics(self, include_obsolete_metrics):
-        """Sets the include_obsolete_metrics of this DerivedMetricDefinition.
-
-        Whether to include obsolete metrics in query  # noqa: E501
-
-        :param include_obsolete_metrics: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
-        """
-
-        self._include_obsolete_metrics = include_obsolete_metrics
-
     @property
     def process_rate_minutes(self):
         """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
@@ -462,6 +370,54 @@ def update_user_id(self, update_user_id):
 
         self._update_user_id = update_user_id
 
+    @property
+    def query(self):
+        """Gets the query of this DerivedMetricDefinition.  # noqa: E501
+
+        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
+
+        :return: The query of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._query
+
+    @query.setter
+    def query(self, query):
+        """Sets the query of this DerivedMetricDefinition.
+
+        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
+
+        :param query: The query of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+        if query is None:
+            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
+
+        self._query = query
+
+    @property
+    def include_obsolete_metrics(self):
+        """Gets the include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+
+        Whether to include obsolete metrics in query  # noqa: E501
+
+        :return: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
+        """
+        return self._include_obsolete_metrics
+
+    @include_obsolete_metrics.setter
+    def include_obsolete_metrics(self, include_obsolete_metrics):
+        """Sets the include_obsolete_metrics of this DerivedMetricDefinition.
+
+        Whether to include obsolete metrics in query  # noqa: E501
+
+        :param include_obsolete_metrics: The include_obsolete_metrics of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
+        """
+
+        self._include_obsolete_metrics = include_obsolete_metrics
+
     @property
     def additional_information(self):
         """Gets the additional_information of this DerivedMetricDefinition.  # noqa: E501
@@ -707,6 +663,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DerivedMetricDefinition.
+
+
+        :param id: The id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def query_qb_enabled(self):
         """Gets the query_qb_enabled of this DerivedMetricDefinition.  # noqa: E501
@@ -839,6 +816,29 @@ def deleted(self, deleted):
 
         self._deleted = deleted
 
+    @property
+    def name(self):
+        """Gets the name of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The name of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DerivedMetricDefinition.
+
+
+        :param name: The name of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 9fbc93a..a17cbba 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -33,26 +33,47 @@ class EC2Configuration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'host_name_tags': 'list[str]',
-        'base_credentials': 'AWSBaseCredentials'
+        'base_credentials': 'AWSBaseCredentials',
+        'host_name_tags': 'list[str]'
     }
 
     attribute_map = {
-        'host_name_tags': 'hostNameTags',
-        'base_credentials': 'baseCredentials'
+        'base_credentials': 'baseCredentials',
+        'host_name_tags': 'hostNameTags'
     }
 
-    def __init__(self, host_name_tags=None, base_credentials=None):  # noqa: E501
+    def __init__(self, base_credentials=None, host_name_tags=None):  # noqa: E501
         """EC2Configuration - a model defined in Swagger"""  # noqa: E501
 
-        self._host_name_tags = None
         self._base_credentials = None
+        self._host_name_tags = None
         self.discriminator = None
 
-        if host_name_tags is not None:
-            self.host_name_tags = host_name_tags
         if base_credentials is not None:
             self.base_credentials = base_credentials
+        if host_name_tags is not None:
+            self.host_name_tags = host_name_tags
+
+    @property
+    def base_credentials(self):
+        """Gets the base_credentials of this EC2Configuration.  # noqa: E501
+
+
+        :return: The base_credentials of this EC2Configuration.  # noqa: E501
+        :rtype: AWSBaseCredentials
+        """
+        return self._base_credentials
+
+    @base_credentials.setter
+    def base_credentials(self, base_credentials):
+        """Sets the base_credentials of this EC2Configuration.
+
+
+        :param base_credentials: The base_credentials of this EC2Configuration.  # noqa: E501
+        :type: AWSBaseCredentials
+        """
+
+        self._base_credentials = base_credentials
 
     @property
     def host_name_tags(self):
@@ -77,27 +98,6 @@ def host_name_tags(self, host_name_tags):
 
         self._host_name_tags = host_name_tags
 
-    @property
-    def base_credentials(self):
-        """Gets the base_credentials of this EC2Configuration.  # noqa: E501
-
-
-        :return: The base_credentials of this EC2Configuration.  # noqa: E501
-        :rtype: AWSBaseCredentials
-        """
-        return self._base_credentials
-
-    @base_credentials.setter
-    def base_credentials(self, base_credentials):
-        """Sets the base_credentials of this EC2Configuration.
-
-
-        :param base_credentials: The base_credentials of this EC2Configuration.  # noqa: E501
-        :type: AWSBaseCredentials
-        """
-
-        self._base_credentials = base_credentials
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index e0cbac8..4458b24 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -31,96 +31,99 @@ class Event(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'end_time': 'int',
         'start_time': 'int',
         'table': 'str',
-        'end_time': 'int',
-        'name': 'str',
-        'annotations': 'dict(str, str)',
-        'id': 'str',
+        'can_delete': 'bool',
+        'can_close': 'bool',
+        'creator_type': 'list[str]',
         'tags': 'list[str]',
+        'annotations': 'dict(str, str)',
         'created_at': 'int',
         'is_user_event': 'bool',
-        'updated_at': 'int',
+        'summarized_events': 'int',
         'hosts': 'list[str]',
         'is_ephemeral': 'bool',
         'creator_id': 'str',
         'updater_id': 'str',
-        'summarized_events': 'int',
+        'updated_at': 'int',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'can_delete': 'bool',
-        'can_close': 'bool',
-        'creator_type': 'list[str]',
-        'running_state': 'str'
+        'running_state': 'str',
+        'name': 'str'
     }
 
     attribute_map = {
+        'end_time': 'endTime',
         'start_time': 'startTime',
         'table': 'table',
-        'end_time': 'endTime',
-        'name': 'name',
-        'annotations': 'annotations',
-        'id': 'id',
+        'can_delete': 'canDelete',
+        'can_close': 'canClose',
+        'creator_type': 'creatorType',
         'tags': 'tags',
+        'annotations': 'annotations',
         'created_at': 'createdAt',
         'is_user_event': 'isUserEvent',
-        'updated_at': 'updatedAt',
+        'summarized_events': 'summarizedEvents',
         'hosts': 'hosts',
         'is_ephemeral': 'isEphemeral',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
-        'summarized_events': 'summarizedEvents',
+        'updated_at': 'updatedAt',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'can_delete': 'canDelete',
-        'can_close': 'canClose',
-        'creator_type': 'creatorType',
-        'running_state': 'runningState'
+        'running_state': 'runningState',
+        'name': 'name'
     }
 
-    def __init__(self, start_time=None, table=None, end_time=None, name=None, annotations=None, id=None, tags=None, created_at=None, is_user_event=None, updated_at=None, hosts=None, is_ephemeral=None, creator_id=None, updater_id=None, summarized_events=None, created_epoch_millis=None, updated_epoch_millis=None, can_delete=None, can_close=None, creator_type=None, running_state=None):  # noqa: E501
+    def __init__(self, end_time=None, start_time=None, table=None, can_delete=None, can_close=None, creator_type=None, tags=None, annotations=None, created_at=None, is_user_event=None, summarized_events=None, hosts=None, is_ephemeral=None, creator_id=None, updater_id=None, updated_at=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, running_state=None, name=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
+        self._end_time = None
         self._start_time = None
         self._table = None
-        self._end_time = None
-        self._name = None
-        self._annotations = None
-        self._id = None
+        self._can_delete = None
+        self._can_close = None
+        self._creator_type = None
         self._tags = None
+        self._annotations = None
         self._created_at = None
         self._is_user_event = None
-        self._updated_at = None
+        self._summarized_events = None
         self._hosts = None
         self._is_ephemeral = None
         self._creator_id = None
         self._updater_id = None
-        self._summarized_events = None
+        self._updated_at = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._can_delete = None
-        self._can_close = None
-        self._creator_type = None
         self._running_state = None
+        self._name = None
         self.discriminator = None
 
+        if end_time is not None:
+            self.end_time = end_time
         self.start_time = start_time
         if table is not None:
             self.table = table
-        if end_time is not None:
-            self.end_time = end_time
-        self.name = name
-        self.annotations = annotations
-        if id is not None:
-            self.id = id
+        if can_delete is not None:
+            self.can_delete = can_delete
+        if can_close is not None:
+            self.can_close = can_close
+        if creator_type is not None:
+            self.creator_type = creator_type
         if tags is not None:
             self.tags = tags
+        self.annotations = annotations
         if created_at is not None:
             self.created_at = created_at
         if is_user_event is not None:
             self.is_user_event = is_user_event
-        if updated_at is not None:
-            self.updated_at = updated_at
+        if summarized_events is not None:
+            self.summarized_events = summarized_events
         if hosts is not None:
             self.hosts = hosts
         if is_ephemeral is not None:
@@ -129,20 +132,40 @@ def __init__(self, start_time=None, table=None, end_time=None, name=None, annota
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
-        if summarized_events is not None:
-            self.summarized_events = summarized_events
+        if updated_at is not None:
+            self.updated_at = updated_at
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if can_delete is not None:
-            self.can_delete = can_delete
-        if can_close is not None:
-            self.can_close = can_close
-        if creator_type is not None:
-            self.creator_type = creator_type
         if running_state is not None:
             self.running_state = running_state
+        self.name = name
+
+    @property
+    def end_time(self):
+        """Gets the end_time of this Event.  # noqa: E501
+
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :return: The end_time of this Event.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_time
+
+    @end_time.setter
+    def end_time(self, end_time):
+        """Sets the end_time of this Event.
+
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :param end_time: The end_time of this Event.  # noqa: E501
+        :type: int
+        """
+
+        self._end_time = end_time
 
     @property
     def start_time(self):
@@ -193,98 +216,74 @@ def table(self, table):
         self._table = table
 
     @property
-    def end_time(self):
-        """Gets the end_time of this Event.  # noqa: E501
-
-        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
-
-        :return: The end_time of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._end_time
-
-    @end_time.setter
-    def end_time(self, end_time):
-        """Sets the end_time of this Event.
-
-        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
-
-        :param end_time: The end_time of this Event.  # noqa: E501
-        :type: int
-        """
-
-        self._end_time = end_time
-
-    @property
-    def name(self):
-        """Gets the name of this Event.  # noqa: E501
+    def can_delete(self):
+        """Gets the can_delete of this Event.  # noqa: E501
 
-        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
 
-        :return: The name of this Event.  # noqa: E501
-        :rtype: str
+        :return: The can_delete of this Event.  # noqa: E501
+        :rtype: bool
         """
-        return self._name
+        return self._can_delete
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Event.
+    @can_delete.setter
+    def can_delete(self, can_delete):
+        """Sets the can_delete of this Event.
 
-        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
 
-        :param name: The name of this Event.  # noqa: E501
-        :type: str
+        :param can_delete: The can_delete of this Event.  # noqa: E501
+        :type: bool
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._can_delete = can_delete
 
     @property
-    def annotations(self):
-        """Gets the annotations of this Event.  # noqa: E501
+    def can_close(self):
+        """Gets the can_close of this Event.  # noqa: E501
 
-        A string->string map of additional annotations on the event  # noqa: E501
 
-        :return: The annotations of this Event.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The can_close of this Event.  # noqa: E501
+        :rtype: bool
         """
-        return self._annotations
+        return self._can_close
 
-    @annotations.setter
-    def annotations(self, annotations):
-        """Sets the annotations of this Event.
+    @can_close.setter
+    def can_close(self, can_close):
+        """Sets the can_close of this Event.
 
-        A string->string map of additional annotations on the event  # noqa: E501
 
-        :param annotations: The annotations of this Event.  # noqa: E501
-        :type: dict(str, str)
+        :param can_close: The can_close of this Event.  # noqa: E501
+        :type: bool
         """
-        if annotations is None:
-            raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
 
-        self._annotations = annotations
+        self._can_close = can_close
 
     @property
-    def id(self):
-        """Gets the id of this Event.  # noqa: E501
+    def creator_type(self):
+        """Gets the creator_type of this Event.  # noqa: E501
 
 
-        :return: The id of this Event.  # noqa: E501
-        :rtype: str
+        :return: The creator_type of this Event.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._id
+        return self._creator_type
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Event.
+    @creator_type.setter
+    def creator_type(self, creator_type):
+        """Sets the creator_type of this Event.
 
 
-        :param id: The id of this Event.  # noqa: E501
-        :type: str
+        :param creator_type: The creator_type of this Event.  # noqa: E501
+        :type: list[str]
         """
+        allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
+        if not set(creator_type).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
 
-        self._id = id
+        self._creator_type = creator_type
 
     @property
     def tags(self):
@@ -309,6 +308,31 @@ def tags(self, tags):
 
         self._tags = tags
 
+    @property
+    def annotations(self):
+        """Gets the annotations of this Event.  # noqa: E501
+
+        A string->string map of additional annotations on the event  # noqa: E501
+
+        :return: The annotations of this Event.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._annotations
+
+    @annotations.setter
+    def annotations(self, annotations):
+        """Sets the annotations of this Event.
+
+        A string->string map of additional annotations on the event  # noqa: E501
+
+        :param annotations: The annotations of this Event.  # noqa: E501
+        :type: dict(str, str)
+        """
+        if annotations is None:
+            raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
+
+        self._annotations = annotations
+
     @property
     def created_at(self):
         """Gets the created_at of this Event.  # noqa: E501
@@ -354,25 +378,27 @@ def is_user_event(self, is_user_event):
         self._is_user_event = is_user_event
 
     @property
-    def updated_at(self):
-        """Gets the updated_at of this Event.  # noqa: E501
+    def summarized_events(self):
+        """Gets the summarized_events of this Event.  # noqa: E501
 
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
-        :return: The updated_at of this Event.  # noqa: E501
+        :return: The summarized_events of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._updated_at
+        return self._summarized_events
 
-    @updated_at.setter
-    def updated_at(self, updated_at):
-        """Sets the updated_at of this Event.
+    @summarized_events.setter
+    def summarized_events(self, summarized_events):
+        """Sets the summarized_events of this Event.
 
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
-        :param updated_at: The updated_at of this Event.  # noqa: E501
+        :param summarized_events: The summarized_events of this Event.  # noqa: E501
         :type: int
         """
 
-        self._updated_at = updated_at
+        self._summarized_events = summarized_events
 
     @property
     def hosts(self):
@@ -463,27 +489,46 @@ def updater_id(self, updater_id):
         self._updater_id = updater_id
 
     @property
-    def summarized_events(self):
-        """Gets the summarized_events of this Event.  # noqa: E501
+    def updated_at(self):
+        """Gets the updated_at of this Event.  # noqa: E501
 
-        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
-        :return: The summarized_events of this Event.  # noqa: E501
+        :return: The updated_at of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._summarized_events
+        return self._updated_at
 
-    @summarized_events.setter
-    def summarized_events(self, summarized_events):
-        """Sets the summarized_events of this Event.
+    @updated_at.setter
+    def updated_at(self, updated_at):
+        """Sets the updated_at of this Event.
 
-        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
-        :param summarized_events: The summarized_events of this Event.  # noqa: E501
+        :param updated_at: The updated_at of this Event.  # noqa: E501
         :type: int
         """
 
-        self._summarized_events = summarized_events
+        self._updated_at = updated_at
+
+    @property
+    def id(self):
+        """Gets the id of this Event.  # noqa: E501
+
+
+        :return: The id of this Event.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Event.
+
+
+        :param id: The id of this Event.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
 
     @property
     def created_epoch_millis(self):
@@ -527,76 +572,6 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
-    @property
-    def can_delete(self):
-        """Gets the can_delete of this Event.  # noqa: E501
-
-
-        :return: The can_delete of this Event.  # noqa: E501
-        :rtype: bool
-        """
-        return self._can_delete
-
-    @can_delete.setter
-    def can_delete(self, can_delete):
-        """Sets the can_delete of this Event.
-
-
-        :param can_delete: The can_delete of this Event.  # noqa: E501
-        :type: bool
-        """
-
-        self._can_delete = can_delete
-
-    @property
-    def can_close(self):
-        """Gets the can_close of this Event.  # noqa: E501
-
-
-        :return: The can_close of this Event.  # noqa: E501
-        :rtype: bool
-        """
-        return self._can_close
-
-    @can_close.setter
-    def can_close(self, can_close):
-        """Sets the can_close of this Event.
-
-
-        :param can_close: The can_close of this Event.  # noqa: E501
-        :type: bool
-        """
-
-        self._can_close = can_close
-
-    @property
-    def creator_type(self):
-        """Gets the creator_type of this Event.  # noqa: E501
-
-
-        :return: The creator_type of this Event.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._creator_type
-
-    @creator_type.setter
-    def creator_type(self, creator_type):
-        """Sets the creator_type of this Event.
-
-
-        :param creator_type: The creator_type of this Event.  # noqa: E501
-        :type: list[str]
-        """
-        allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
-        if not set(creator_type).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
-
-        self._creator_type = creator_type
-
     @property
     def running_state(self):
         """Gets the running_state of this Event.  # noqa: E501
@@ -624,6 +599,31 @@ def running_state(self, running_state):
 
         self._running_state = running_state
 
+    @property
+    def name(self):
+        """Gets the name of this Event.  # noqa: E501
+
+        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
+
+        :return: The name of this Event.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Event.
+
+        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
+
+        :param name: The name of this Event.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index 023cace..0be4dc7 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -32,56 +32,59 @@ class ExternalLink(object):
     """
     swagger_types = {
         'description': 'str',
-        'name': 'str',
-        'id': 'str',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
+        'created_epoch_millis': 'int',
+        'updated_epoch_millis': 'int',
         'template': 'str',
         'metric_filter_regex': 'str',
         'source_filter_regex': 'str',
         'point_tag_filter_regexes': 'dict(str, str)',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int'
+        'name': 'str'
     }
 
     attribute_map = {
         'description': 'description',
-        'name': 'name',
-        'id': 'id',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
+        'created_epoch_millis': 'createdEpochMillis',
+        'updated_epoch_millis': 'updatedEpochMillis',
         'template': 'template',
         'metric_filter_regex': 'metricFilterRegex',
         'source_filter_regex': 'sourceFilterRegex',
         'point_tag_filter_regexes': 'pointTagFilterRegexes',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis'
+        'name': 'name'
     }
 
-    def __init__(self, description=None, name=None, id=None, creator_id=None, updater_id=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None, created_epoch_millis=None, updated_epoch_millis=None):  # noqa: E501
+    def __init__(self, description=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None, name=None):  # noqa: E501
         """ExternalLink - a model defined in Swagger"""  # noqa: E501
 
         self._description = None
-        self._name = None
-        self._id = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
+        self._created_epoch_millis = None
+        self._updated_epoch_millis = None
         self._template = None
         self._metric_filter_regex = None
         self._source_filter_regex = None
         self._point_tag_filter_regexes = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
+        self._name = None
         self.discriminator = None
 
         self.description = description
-        self.name = name
-        if id is not None:
-            self.id = id
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
         self.template = template
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
@@ -89,10 +92,7 @@ def __init__(self, description=None, name=None, id=None, creator_id=None, update
             self.source_filter_regex = source_filter_regex
         if point_tag_filter_regexes is not None:
             self.point_tag_filter_regexes = point_tag_filter_regexes
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
+        self.name = name
 
     @property
     def description(self):
@@ -120,29 +120,46 @@ def description(self, description):
         self._description = description
 
     @property
-    def name(self):
-        """Gets the name of this ExternalLink.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this ExternalLink.  # noqa: E501
 
-        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :return: The name of this ExternalLink.  # noqa: E501
+        :return: The creator_id of this ExternalLink.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._creator_id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ExternalLink.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this ExternalLink.
 
-        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :param name: The name of this ExternalLink.  # noqa: E501
+        :param creator_id: The creator_id of this ExternalLink.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._creator_id = creator_id
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this ExternalLink.  # noqa: E501
+
+
+        :return: The updater_id of this ExternalLink.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this ExternalLink.
+
+
+        :param updater_id: The updater_id of this ExternalLink.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
 
     @property
     def id(self):
@@ -166,46 +183,46 @@ def id(self, id):
         self._id = id
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this ExternalLink.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
 
 
-        :return: The creator_id of this ExternalLink.  # noqa: E501
-        :rtype: str
+        :return: The created_epoch_millis of this ExternalLink.  # noqa: E501
+        :rtype: int
         """
-        return self._creator_id
+        return self._created_epoch_millis
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this ExternalLink.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this ExternalLink.
 
 
-        :param creator_id: The creator_id of this ExternalLink.  # noqa: E501
-        :type: str
+        :param created_epoch_millis: The created_epoch_millis of this ExternalLink.  # noqa: E501
+        :type: int
         """
 
-        self._creator_id = creator_id
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this ExternalLink.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this ExternalLink.  # noqa: E501
 
 
-        :return: The updater_id of this ExternalLink.  # noqa: E501
-        :rtype: str
+        :return: The updated_epoch_millis of this ExternalLink.  # noqa: E501
+        :rtype: int
         """
-        return self._updater_id
+        return self._updated_epoch_millis
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this ExternalLink.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this ExternalLink.
 
 
-        :param updater_id: The updater_id of this ExternalLink.  # noqa: E501
-        :type: str
+        :param updated_epoch_millis: The updated_epoch_millis of this ExternalLink.  # noqa: E501
+        :type: int
         """
 
-        self._updater_id = updater_id
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
     def template(self):
@@ -302,46 +319,29 @@ def point_tag_filter_regexes(self, point_tag_filter_regexes):
         self._point_tag_filter_regexes = point_tag_filter_regexes
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this ExternalLink.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this ExternalLink.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this ExternalLink.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this ExternalLink.  # noqa: E501
+    def name(self):
+        """Gets the name of this ExternalLink.  # noqa: E501
 
+        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :return: The updated_epoch_millis of this ExternalLink.  # noqa: E501
-        :rtype: int
+        :return: The name of this ExternalLink.  # noqa: E501
+        :rtype: str
         """
-        return self._updated_epoch_millis
+        return self._name
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this ExternalLink.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ExternalLink.
 
+        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this ExternalLink.  # noqa: E501
-        :type: int
+        :param name: The name of this ExternalLink.  # noqa: E501
+        :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._updated_epoch_millis = updated_epoch_millis
+        self._name = name
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index 40b028a..db452be 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -31,28 +31,53 @@ class GCPBillingConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'project_id': 'str',
         'gcp_api_key': 'str',
-        'gcp_json_key': 'str',
-        'project_id': 'str'
+        'gcp_json_key': 'str'
     }
 
     attribute_map = {
+        'project_id': 'projectId',
         'gcp_api_key': 'gcpApiKey',
-        'gcp_json_key': 'gcpJsonKey',
-        'project_id': 'projectId'
+        'gcp_json_key': 'gcpJsonKey'
     }
 
-    def __init__(self, gcp_api_key=None, gcp_json_key=None, project_id=None):  # noqa: E501
+    def __init__(self, project_id=None, gcp_api_key=None, gcp_json_key=None):  # noqa: E501
         """GCPBillingConfiguration - a model defined in Swagger"""  # noqa: E501
 
+        self._project_id = None
         self._gcp_api_key = None
         self._gcp_json_key = None
-        self._project_id = None
         self.discriminator = None
 
+        self.project_id = project_id
         self.gcp_api_key = gcp_api_key
         self.gcp_json_key = gcp_json_key
-        self.project_id = project_id
+
+    @property
+    def project_id(self):
+        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
+
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
+
+        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_id
+
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPBillingConfiguration.
+
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
+
+        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :type: str
+        """
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
+
+        self._project_id = project_id
 
     @property
     def gcp_api_key(self):
@@ -104,31 +129,6 @@ def gcp_json_key(self, gcp_json_key):
 
         self._gcp_json_key = gcp_json_key
 
-    @property
-    def project_id(self):
-        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
-
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
-
-        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._project_id
-
-    @project_id.setter
-    def project_id(self, project_id):
-        """Sets the project_id of this GCPBillingConfiguration.
-
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
-
-        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
-        :type: str
-        """
-        if project_id is None:
-            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
-
-        self._project_id = project_id
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index ebb500b..5d23956 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -31,64 +31,59 @@ class GCPConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'categories_to_fetch': 'list[str]',
+        'project_id': 'str',
         'metric_filter_regex': 'str',
         'gcp_json_key': 'str',
-        'project_id': 'str'
+        'categories_to_fetch': 'list[str]'
     }
 
     attribute_map = {
-        'categories_to_fetch': 'categoriesToFetch',
+        'project_id': 'projectId',
         'metric_filter_regex': 'metricFilterRegex',
         'gcp_json_key': 'gcpJsonKey',
-        'project_id': 'projectId'
+        'categories_to_fetch': 'categoriesToFetch'
     }
 
-    def __init__(self, categories_to_fetch=None, metric_filter_regex=None, gcp_json_key=None, project_id=None):  # noqa: E501
+    def __init__(self, project_id=None, metric_filter_regex=None, gcp_json_key=None, categories_to_fetch=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._categories_to_fetch = None
+        self._project_id = None
         self._metric_filter_regex = None
         self._gcp_json_key = None
-        self._project_id = None
+        self._categories_to_fetch = None
         self.discriminator = None
 
-        if categories_to_fetch is not None:
-            self.categories_to_fetch = categories_to_fetch
+        self.project_id = project_id
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
         self.gcp_json_key = gcp_json_key
-        self.project_id = project_id
+        if categories_to_fetch is not None:
+            self.categories_to_fetch = categories_to_fetch
 
     @property
-    def categories_to_fetch(self):
-        """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
+    def project_id(self):
+        """Gets the project_id of this GCPConfiguration.  # noqa: E501
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
-        :rtype: list[str]
+        :return: The project_id of this GCPConfiguration.  # noqa: E501
+        :rtype: str
         """
-        return self._categories_to_fetch
+        return self._project_id
 
-    @categories_to_fetch.setter
-    def categories_to_fetch(self, categories_to_fetch):
-        """Sets the categories_to_fetch of this GCPConfiguration.
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPConfiguration.
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
-        :type: list[str]
+        :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
+        :type: str
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
-        if not set(categories_to_fetch).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
 
-        self._categories_to_fetch = categories_to_fetch
+        self._project_id = project_id
 
     @property
     def metric_filter_regex(self):
@@ -139,29 +134,34 @@ def gcp_json_key(self, gcp_json_key):
         self._gcp_json_key = gcp_json_key
 
     @property
-    def project_id(self):
-        """Gets the project_id of this GCPConfiguration.  # noqa: E501
+    def categories_to_fetch(self):
+        """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
 
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
 
-        :return: The project_id of this GCPConfiguration.  # noqa: E501
-        :rtype: str
+        :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._project_id
+        return self._categories_to_fetch
 
-    @project_id.setter
-    def project_id(self, project_id):
-        """Sets the project_id of this GCPConfiguration.
+    @categories_to_fetch.setter
+    def categories_to_fetch(self, categories_to_fetch):
+        """Sets the categories_to_fetch of this GCPConfiguration.
 
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
 
-        :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
-        :type: str
+        :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
+        :type: list[str]
         """
-        if project_id is None:
-            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
+        if not set(categories_to_fetch).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
 
-        self._project_id = project_id
+        self._categories_to_fetch = categories_to_fetch
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 4c6f8e9..bcd0cfb 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -37,17 +37,16 @@ class Integration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'description': 'str',
         'version': 'str',
-        'metrics': 'IntegrationMetrics',
         'icon': 'str',
-        'description': 'str',
-        'name': 'str',
-        'id': 'str',
+        'metrics': 'IntegrationMetrics',
         'base_url': 'str',
         'status': 'IntegrationStatus',
         'alerts': 'list[IntegrationAlert]',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'alias_of': 'str',
@@ -55,21 +54,21 @@ class Integration(object):
         'dashboards': 'list[IntegrationDashboard]',
         'deleted': 'bool',
         'overview': 'str',
-        'setup': 'str'
+        'setup': 'str',
+        'name': 'str'
     }
 
     attribute_map = {
+        'description': 'description',
         'version': 'version',
-        'metrics': 'metrics',
         'icon': 'icon',
-        'description': 'description',
-        'name': 'name',
-        'id': 'id',
+        'metrics': 'metrics',
         'base_url': 'baseUrl',
         'status': 'status',
         'alerts': 'alerts',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'alias_of': 'aliasOf',
@@ -77,23 +76,23 @@ class Integration(object):
         'dashboards': 'dashboards',
         'deleted': 'deleted',
         'overview': 'overview',
-        'setup': 'setup'
+        'setup': 'setup',
+        'name': 'name'
     }
 
-    def __init__(self, version=None, metrics=None, icon=None, description=None, name=None, id=None, base_url=None, status=None, alerts=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, alias_of=None, alias_integrations=None, dashboards=None, deleted=None, overview=None, setup=None):  # noqa: E501
+    def __init__(self, description=None, version=None, icon=None, metrics=None, base_url=None, status=None, alerts=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, alias_of=None, alias_integrations=None, dashboards=None, deleted=None, overview=None, setup=None, name=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
 
+        self._description = None
         self._version = None
-        self._metrics = None
         self._icon = None
-        self._description = None
-        self._name = None
-        self._id = None
+        self._metrics = None
         self._base_url = None
         self._status = None
         self._alerts = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._alias_of = None
@@ -102,16 +101,14 @@ def __init__(self, version=None, metrics=None, icon=None, description=None, name
         self._deleted = None
         self._overview = None
         self._setup = None
+        self._name = None
         self.discriminator = None
 
+        self.description = description
         self.version = version
+        self.icon = icon
         if metrics is not None:
             self.metrics = metrics
-        self.icon = icon
-        self.description = description
-        self.name = name
-        if id is not None:
-            self.id = id
         if base_url is not None:
             self.base_url = base_url
         if status is not None:
@@ -122,6 +119,8 @@ def __init__(self, version=None, metrics=None, icon=None, description=None, name
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
@@ -138,6 +137,32 @@ def __init__(self, version=None, metrics=None, icon=None, description=None, name
             self.overview = overview
         if setup is not None:
             self.setup = setup
+        self.name = name
+
+    @property
+    def description(self):
+        """Gets the description of this Integration.  # noqa: E501
+
+        Integration description  # noqa: E501
+
+        :return: The description of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Integration.
+
+        Integration description  # noqa: E501
+
+        :param description: The description of this Integration.  # noqa: E501
+        :type: str
+        """
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
+
+        self._description = description
 
     @property
     def version(self):
@@ -164,27 +189,6 @@ def version(self, version):
 
         self._version = version
 
-    @property
-    def metrics(self):
-        """Gets the metrics of this Integration.  # noqa: E501
-
-
-        :return: The metrics of this Integration.  # noqa: E501
-        :rtype: IntegrationMetrics
-        """
-        return self._metrics
-
-    @metrics.setter
-    def metrics(self, metrics):
-        """Sets the metrics of this Integration.
-
-
-        :param metrics: The metrics of this Integration.  # noqa: E501
-        :type: IntegrationMetrics
-        """
-
-        self._metrics = metrics
-
     @property
     def icon(self):
         """Gets the icon of this Integration.  # noqa: E501
@@ -211,75 +215,25 @@ def icon(self, icon):
         self._icon = icon
 
     @property
-    def description(self):
-        """Gets the description of this Integration.  # noqa: E501
-
-        Integration description  # noqa: E501
-
-        :return: The description of this Integration.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Integration.
-
-        Integration description  # noqa: E501
-
-        :param description: The description of this Integration.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def name(self):
-        """Gets the name of this Integration.  # noqa: E501
-
-        Integration name  # noqa: E501
-
-        :return: The name of this Integration.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Integration.
-
-        Integration name  # noqa: E501
-
-        :param name: The name of this Integration.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def id(self):
-        """Gets the id of this Integration.  # noqa: E501
+    def metrics(self):
+        """Gets the metrics of this Integration.  # noqa: E501
 
 
-        :return: The id of this Integration.  # noqa: E501
-        :rtype: str
+        :return: The metrics of this Integration.  # noqa: E501
+        :rtype: IntegrationMetrics
         """
-        return self._id
+        return self._metrics
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Integration.
+    @metrics.setter
+    def metrics(self, metrics):
+        """Sets the metrics of this Integration.
 
 
-        :param id: The id of this Integration.  # noqa: E501
-        :type: str
+        :param metrics: The metrics of this Integration.  # noqa: E501
+        :type: IntegrationMetrics
         """
 
-        self._id = id
+        self._metrics = metrics
 
     @property
     def base_url(self):
@@ -390,6 +344,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this Integration.  # noqa: E501
+
+
+        :return: The id of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Integration.
+
+
+        :param id: The id of this Integration.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this Integration.  # noqa: E501
@@ -568,6 +543,31 @@ def setup(self, setup):
 
         self._setup = setup
 
+    @property
+    def name(self):
+        """Gets the name of this Integration.  # noqa: E501
+
+        Integration name  # noqa: E501
+
+        :return: The name of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Integration.
+
+        Integration name  # noqa: E501
+
+        :param name: The name of this Integration.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index f2aeaf0..f48efd9 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -34,32 +34,32 @@ class IntegrationAlert(object):
     """
     swagger_types = {
         'description': 'str',
-        'name': 'str',
         'url': 'str',
-        'alert_obj': 'Alert'
+        'alert_obj': 'Alert',
+        'name': 'str'
     }
 
     attribute_map = {
         'description': 'description',
-        'name': 'name',
         'url': 'url',
-        'alert_obj': 'alertObj'
+        'alert_obj': 'alertObj',
+        'name': 'name'
     }
 
-    def __init__(self, description=None, name=None, url=None, alert_obj=None):  # noqa: E501
+    def __init__(self, description=None, url=None, alert_obj=None, name=None):  # noqa: E501
         """IntegrationAlert - a model defined in Swagger"""  # noqa: E501
 
         self._description = None
-        self._name = None
         self._url = None
         self._alert_obj = None
+        self._name = None
         self.discriminator = None
 
         self.description = description
-        self.name = name
         self.url = url
         if alert_obj is not None:
             self.alert_obj = alert_obj
+        self.name = name
 
     @property
     def description(self):
@@ -86,31 +86,6 @@ def description(self, description):
 
         self._description = description
 
-    @property
-    def name(self):
-        """Gets the name of this IntegrationAlert.  # noqa: E501
-
-        Alert name  # noqa: E501
-
-        :return: The name of this IntegrationAlert.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this IntegrationAlert.
-
-        Alert name  # noqa: E501
-
-        :param name: The name of this IntegrationAlert.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
     @property
     def url(self):
         """Gets the url of this IntegrationAlert.  # noqa: E501
@@ -157,6 +132,31 @@ def alert_obj(self, alert_obj):
 
         self._alert_obj = alert_obj
 
+    @property
+    def name(self):
+        """Gets the name of this IntegrationAlert.  # noqa: E501
+
+        Alert name  # noqa: E501
+
+        :return: The name of this IntegrationAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IntegrationAlert.
+
+        Alert name  # noqa: E501
+
+        :param name: The name of this IntegrationAlert.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index eeeb1b7..326e254 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -31,110 +31,110 @@ class IntegrationAlias(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'icon': 'str',
         'description': 'str',
-        'name': 'str',
+        'icon': 'str',
+        'base_url': 'str',
         'id': 'str',
-        'base_url': 'str'
+        'name': 'str'
     }
 
     attribute_map = {
-        'icon': 'icon',
         'description': 'description',
-        'name': 'name',
+        'icon': 'icon',
+        'base_url': 'baseUrl',
         'id': 'id',
-        'base_url': 'baseUrl'
+        'name': 'name'
     }
 
-    def __init__(self, icon=None, description=None, name=None, id=None, base_url=None):  # noqa: E501
+    def __init__(self, description=None, icon=None, base_url=None, id=None, name=None):  # noqa: E501
         """IntegrationAlias - a model defined in Swagger"""  # noqa: E501
 
-        self._icon = None
         self._description = None
-        self._name = None
-        self._id = None
+        self._icon = None
         self._base_url = None
+        self._id = None
+        self._name = None
         self.discriminator = None
 
-        if icon is not None:
-            self.icon = icon
         if description is not None:
             self.description = description
-        if name is not None:
-            self.name = name
-        if id is not None:
-            self.id = id
+        if icon is not None:
+            self.icon = icon
         if base_url is not None:
             self.base_url = base_url
+        if id is not None:
+            self.id = id
+        if name is not None:
+            self.name = name
 
     @property
-    def icon(self):
-        """Gets the icon of this IntegrationAlias.  # noqa: E501
+    def description(self):
+        """Gets the description of this IntegrationAlias.  # noqa: E501
 
-        Icon path of the alias Integration  # noqa: E501
+        Description of the alias Integration  # noqa: E501
 
-        :return: The icon of this IntegrationAlias.  # noqa: E501
+        :return: The description of this IntegrationAlias.  # noqa: E501
         :rtype: str
         """
-        return self._icon
+        return self._description
 
-    @icon.setter
-    def icon(self, icon):
-        """Sets the icon of this IntegrationAlias.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this IntegrationAlias.
 
-        Icon path of the alias Integration  # noqa: E501
+        Description of the alias Integration  # noqa: E501
 
-        :param icon: The icon of this IntegrationAlias.  # noqa: E501
+        :param description: The description of this IntegrationAlias.  # noqa: E501
         :type: str
         """
 
-        self._icon = icon
+        self._description = description
 
     @property
-    def description(self):
-        """Gets the description of this IntegrationAlias.  # noqa: E501
+    def icon(self):
+        """Gets the icon of this IntegrationAlias.  # noqa: E501
 
-        Description of the alias Integration  # noqa: E501
+        Icon path of the alias Integration  # noqa: E501
 
-        :return: The description of this IntegrationAlias.  # noqa: E501
+        :return: The icon of this IntegrationAlias.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._icon
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this IntegrationAlias.
+    @icon.setter
+    def icon(self, icon):
+        """Sets the icon of this IntegrationAlias.
 
-        Description of the alias Integration  # noqa: E501
+        Icon path of the alias Integration  # noqa: E501
 
-        :param description: The description of this IntegrationAlias.  # noqa: E501
+        :param icon: The icon of this IntegrationAlias.  # noqa: E501
         :type: str
         """
 
-        self._description = description
+        self._icon = icon
 
     @property
-    def name(self):
-        """Gets the name of this IntegrationAlias.  # noqa: E501
+    def base_url(self):
+        """Gets the base_url of this IntegrationAlias.  # noqa: E501
 
-        Name of the alias Integration  # noqa: E501
+        Base URL of this alias Integration  # noqa: E501
 
-        :return: The name of this IntegrationAlias.  # noqa: E501
+        :return: The base_url of this IntegrationAlias.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._base_url
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this IntegrationAlias.
+    @base_url.setter
+    def base_url(self, base_url):
+        """Sets the base_url of this IntegrationAlias.
 
-        Name of the alias Integration  # noqa: E501
+        Base URL of this alias Integration  # noqa: E501
 
-        :param name: The name of this IntegrationAlias.  # noqa: E501
+        :param base_url: The base_url of this IntegrationAlias.  # noqa: E501
         :type: str
         """
 
-        self._name = name
+        self._base_url = base_url
 
     @property
     def id(self):
@@ -160,27 +160,27 @@ def id(self, id):
         self._id = id
 
     @property
-    def base_url(self):
-        """Gets the base_url of this IntegrationAlias.  # noqa: E501
+    def name(self):
+        """Gets the name of this IntegrationAlias.  # noqa: E501
 
-        Base URL of this alias Integration  # noqa: E501
+        Name of the alias Integration  # noqa: E501
 
-        :return: The base_url of this IntegrationAlias.  # noqa: E501
+        :return: The name of this IntegrationAlias.  # noqa: E501
         :rtype: str
         """
-        return self._base_url
+        return self._name
 
-    @base_url.setter
-    def base_url(self, base_url):
-        """Sets the base_url of this IntegrationAlias.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IntegrationAlias.
 
-        Base URL of this alias Integration  # noqa: E501
+        Name of the alias Integration  # noqa: E501
 
-        :param base_url: The base_url of this IntegrationAlias.  # noqa: E501
+        :param name: The name of this IntegrationAlias.  # noqa: E501
         :type: str
         """
 
-        self._base_url = base_url
+        self._name = name
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 6a1778b..6ff85ff 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -34,32 +34,32 @@ class IntegrationDashboard(object):
     """
     swagger_types = {
         'description': 'str',
-        'name': 'str',
         'url': 'str',
-        'dashboard_obj': 'Dashboard'
+        'dashboard_obj': 'Dashboard',
+        'name': 'str'
     }
 
     attribute_map = {
         'description': 'description',
-        'name': 'name',
         'url': 'url',
-        'dashboard_obj': 'dashboardObj'
+        'dashboard_obj': 'dashboardObj',
+        'name': 'name'
     }
 
-    def __init__(self, description=None, name=None, url=None, dashboard_obj=None):  # noqa: E501
+    def __init__(self, description=None, url=None, dashboard_obj=None, name=None):  # noqa: E501
         """IntegrationDashboard - a model defined in Swagger"""  # noqa: E501
 
         self._description = None
-        self._name = None
         self._url = None
         self._dashboard_obj = None
+        self._name = None
         self.discriminator = None
 
         self.description = description
-        self.name = name
         self.url = url
         if dashboard_obj is not None:
             self.dashboard_obj = dashboard_obj
+        self.name = name
 
     @property
     def description(self):
@@ -86,31 +86,6 @@ def description(self, description):
 
         self._description = description
 
-    @property
-    def name(self):
-        """Gets the name of this IntegrationDashboard.  # noqa: E501
-
-        Dashboard name  # noqa: E501
-
-        :return: The name of this IntegrationDashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this IntegrationDashboard.
-
-        Dashboard name  # noqa: E501
-
-        :param name: The name of this IntegrationDashboard.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
     @property
     def url(self):
         """Gets the url of this IntegrationDashboard.  # noqa: E501
@@ -157,6 +132,31 @@ def dashboard_obj(self, dashboard_obj):
 
         self._dashboard_obj = dashboard_obj
 
+    @property
+    def name(self):
+        """Gets the name of this IntegrationDashboard.  # noqa: E501
+
+        Dashboard name  # noqa: E501
+
+        :return: The name of this IntegrationDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IntegrationDashboard.
+
+        Dashboard name  # noqa: E501
+
+        :param name: The name of this IntegrationDashboard.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 1704fbf..adbba3a 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -33,59 +33,34 @@ class IntegrationManifestGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'title': 'str',
         'integrations': 'list[str]',
         'integration_objs': 'list[Integration]',
+        'title': 'str',
         'subtitle': 'str'
     }
 
     attribute_map = {
-        'title': 'title',
         'integrations': 'integrations',
         'integration_objs': 'integrationObjs',
+        'title': 'title',
         'subtitle': 'subtitle'
     }
 
-    def __init__(self, title=None, integrations=None, integration_objs=None, subtitle=None):  # noqa: E501
+    def __init__(self, integrations=None, integration_objs=None, title=None, subtitle=None):  # noqa: E501
         """IntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._title = None
         self._integrations = None
         self._integration_objs = None
+        self._title = None
         self._subtitle = None
         self.discriminator = None
 
-        self.title = title
         self.integrations = integrations
         if integration_objs is not None:
             self.integration_objs = integration_objs
+        self.title = title
         self.subtitle = subtitle
 
-    @property
-    def title(self):
-        """Gets the title of this IntegrationManifestGroup.  # noqa: E501
-
-        Title of this integration group  # noqa: E501
-
-        :return: The title of this IntegrationManifestGroup.  # noqa: E501
-        :rtype: str
-        """
-        return self._title
-
-    @title.setter
-    def title(self, title):
-        """Sets the title of this IntegrationManifestGroup.
-
-        Title of this integration group  # noqa: E501
-
-        :param title: The title of this IntegrationManifestGroup.  # noqa: E501
-        :type: str
-        """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
-
-        self._title = title
-
     @property
     def integrations(self):
         """Gets the integrations of this IntegrationManifestGroup.  # noqa: E501
@@ -134,6 +109,31 @@ def integration_objs(self, integration_objs):
 
         self._integration_objs = integration_objs
 
+    @property
+    def title(self):
+        """Gets the title of this IntegrationManifestGroup.  # noqa: E501
+
+        Title of this integration group  # noqa: E501
+
+        :return: The title of this IntegrationManifestGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this IntegrationManifestGroup.
+
+        Title of this integration group  # noqa: E501
+
+        :param title: The title of this IntegrationManifestGroup.  # noqa: E501
+        :type: str
+        """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+
+        self._title = title
+
     @property
     def subtitle(self):
         """Gets the subtitle of this IntegrationManifestGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index dcf9f4a..6359432 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -32,78 +32,76 @@ class MaintenanceWindow(object):
     """
     swagger_types = {
         'reason': 'str',
-        'id': 'str',
         'customer_id': 'str',
+        'relevant_customer_tags': 'list[str]',
         'title': 'str',
         'start_time_in_seconds': 'int',
         'end_time_in_seconds': 'int',
-        'relevant_customer_tags': 'list[str]',
         'relevant_host_tags': 'list[str]',
         'relevant_host_names': 'list[str]',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'relevant_host_tags_anded': 'bool',
         'host_tag_group_host_names_group_anded': 'bool',
         'event_name': 'str',
-        'running_state': 'str',
-        'sort_attr': 'int'
+        'sort_attr': 'int',
+        'running_state': 'str'
     }
 
     attribute_map = {
         'reason': 'reason',
-        'id': 'id',
         'customer_id': 'customerId',
+        'relevant_customer_tags': 'relevantCustomerTags',
         'title': 'title',
         'start_time_in_seconds': 'startTimeInSeconds',
         'end_time_in_seconds': 'endTimeInSeconds',
-        'relevant_customer_tags': 'relevantCustomerTags',
         'relevant_host_tags': 'relevantHostTags',
         'relevant_host_names': 'relevantHostNames',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'relevant_host_tags_anded': 'relevantHostTagsAnded',
         'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
         'event_name': 'eventName',
-        'running_state': 'runningState',
-        'sort_attr': 'sortAttr'
+        'sort_attr': 'sortAttr',
+        'running_state': 'runningState'
     }
 
-    def __init__(self, reason=None, id=None, customer_id=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, relevant_customer_tags=None, relevant_host_tags=None, relevant_host_names=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, event_name=None, running_state=None, sort_attr=None):  # noqa: E501
+    def __init__(self, reason=None, customer_id=None, relevant_customer_tags=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, relevant_host_tags=None, relevant_host_names=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, event_name=None, sort_attr=None, running_state=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
         self._reason = None
-        self._id = None
         self._customer_id = None
+        self._relevant_customer_tags = None
         self._title = None
         self._start_time_in_seconds = None
         self._end_time_in_seconds = None
-        self._relevant_customer_tags = None
         self._relevant_host_tags = None
         self._relevant_host_names = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._relevant_host_tags_anded = None
         self._host_tag_group_host_names_group_anded = None
         self._event_name = None
-        self._running_state = None
         self._sort_attr = None
+        self._running_state = None
         self.discriminator = None
 
         self.reason = reason
-        if id is not None:
-            self.id = id
         if customer_id is not None:
             self.customer_id = customer_id
+        self.relevant_customer_tags = relevant_customer_tags
         self.title = title
         self.start_time_in_seconds = start_time_in_seconds
         self.end_time_in_seconds = end_time_in_seconds
-        self.relevant_customer_tags = relevant_customer_tags
         if relevant_host_tags is not None:
             self.relevant_host_tags = relevant_host_tags
         if relevant_host_names is not None:
@@ -112,6 +110,8 @@ def __init__(self, reason=None, id=None, customer_id=None, title=None, start_tim
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
@@ -122,10 +122,10 @@ def __init__(self, reason=None, id=None, customer_id=None, title=None, start_tim
             self.host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
         if event_name is not None:
             self.event_name = event_name
-        if running_state is not None:
-            self.running_state = running_state
         if sort_attr is not None:
             self.sort_attr = sort_attr
+        if running_state is not None:
+            self.running_state = running_state
 
     @property
     def reason(self):
@@ -153,46 +153,50 @@ def reason(self, reason):
         self._reason = reason
 
     @property
-    def id(self):
-        """Gets the id of this MaintenanceWindow.  # noqa: E501
+    def customer_id(self):
+        """Gets the customer_id of this MaintenanceWindow.  # noqa: E501
 
 
-        :return: The id of this MaintenanceWindow.  # noqa: E501
+        :return: The customer_id of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._customer_id
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this MaintenanceWindow.
+    @customer_id.setter
+    def customer_id(self, customer_id):
+        """Sets the customer_id of this MaintenanceWindow.
 
 
-        :param id: The id of this MaintenanceWindow.  # noqa: E501
+        :param customer_id: The customer_id of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
 
-        self._id = id
+        self._customer_id = customer_id
 
     @property
-    def customer_id(self):
-        """Gets the customer_id of this MaintenanceWindow.  # noqa: E501
+    def relevant_customer_tags(self):
+        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
 
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :return: The customer_id of this MaintenanceWindow.  # noqa: E501
-        :rtype: str
+        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._customer_id
+        return self._relevant_customer_tags
 
-    @customer_id.setter
-    def customer_id(self, customer_id):
-        """Sets the customer_id of this MaintenanceWindow.
+    @relevant_customer_tags.setter
+    def relevant_customer_tags(self, relevant_customer_tags):
+        """Sets the relevant_customer_tags of this MaintenanceWindow.
 
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :param customer_id: The customer_id of this MaintenanceWindow.  # noqa: E501
-        :type: str
+        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+        :type: list[str]
         """
+        if relevant_customer_tags is None:
+            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
 
-        self._customer_id = customer_id
+        self._relevant_customer_tags = relevant_customer_tags
 
     @property
     def title(self):
@@ -269,31 +273,6 @@ def end_time_in_seconds(self, end_time_in_seconds):
 
         self._end_time_in_seconds = end_time_in_seconds
 
-    @property
-    def relevant_customer_tags(self):
-        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
-
-        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._relevant_customer_tags
-
-    @relevant_customer_tags.setter
-    def relevant_customer_tags(self, relevant_customer_tags):
-        """Sets the relevant_customer_tags of this MaintenanceWindow.
-
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
-
-        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :type: list[str]
-        """
-        if relevant_customer_tags is None:
-            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
-
-        self._relevant_customer_tags = relevant_customer_tags
-
     @property
     def relevant_host_tags(self):
         """Gets the relevant_host_tags of this MaintenanceWindow.  # noqa: E501
@@ -382,6 +361,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this MaintenanceWindow.  # noqa: E501
+
+
+        :return: The id of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this MaintenanceWindow.
+
+
+        :param id: The id of this MaintenanceWindow.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this MaintenanceWindow.  # noqa: E501
@@ -493,6 +493,29 @@ def event_name(self, event_name):
 
         self._event_name = event_name
 
+    @property
+    def sort_attr(self):
+        """Gets the sort_attr of this MaintenanceWindow.  # noqa: E501
+
+        Numeric value used in default sorting  # noqa: E501
+
+        :return: The sort_attr of this MaintenanceWindow.  # noqa: E501
+        :rtype: int
+        """
+        return self._sort_attr
+
+    @sort_attr.setter
+    def sort_attr(self, sort_attr):
+        """Sets the sort_attr of this MaintenanceWindow.
+
+        Numeric value used in default sorting  # noqa: E501
+
+        :param sort_attr: The sort_attr of this MaintenanceWindow.  # noqa: E501
+        :type: int
+        """
+
+        self._sort_attr = sort_attr
+
     @property
     def running_state(self):
         """Gets the running_state of this MaintenanceWindow.  # noqa: E501
@@ -520,29 +543,6 @@ def running_state(self, running_state):
 
         self._running_state = running_state
 
-    @property
-    def sort_attr(self):
-        """Gets the sort_attr of this MaintenanceWindow.  # noqa: E501
-
-        Numeric value used in default sorting  # noqa: E501
-
-        :return: The sort_attr of this MaintenanceWindow.  # noqa: E501
-        :rtype: int
-        """
-        return self._sort_attr
-
-    @sort_attr.setter
-    def sort_attr(self, sort_attr):
-        """Sets the sort_attr of this MaintenanceWindow.
-
-        Numeric value used in default sorting  # noqa: E501
-
-        :param sort_attr: The sort_attr of this MaintenanceWindow.  # noqa: E501
-        :type: int
-        """
-
-        self._sort_attr = sort_attr
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 758aa5a..e5e87a0 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -31,99 +31,68 @@ class Message(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'scope': 'str',
         'attributes': 'dict(str, str)',
         'source': 'str',
+        'scope': 'str',
         'severity': 'str',
+        'read': 'bool',
+        'title': 'str',
         'id': 'str',
-        'target': 'str',
         'content': 'str',
-        'title': 'str',
         'start_epoch_millis': 'int',
         'end_epoch_millis': 'int',
         'display': 'str',
-        'read': 'bool'
+        'target': 'str'
     }
 
     attribute_map = {
-        'scope': 'scope',
         'attributes': 'attributes',
         'source': 'source',
+        'scope': 'scope',
         'severity': 'severity',
+        'read': 'read',
+        'title': 'title',
         'id': 'id',
-        'target': 'target',
         'content': 'content',
-        'title': 'title',
         'start_epoch_millis': 'startEpochMillis',
         'end_epoch_millis': 'endEpochMillis',
         'display': 'display',
-        'read': 'read'
+        'target': 'target'
     }
 
-    def __init__(self, scope=None, attributes=None, source=None, severity=None, id=None, target=None, content=None, title=None, start_epoch_millis=None, end_epoch_millis=None, display=None, read=None):  # noqa: E501
+    def __init__(self, attributes=None, source=None, scope=None, severity=None, read=None, title=None, id=None, content=None, start_epoch_millis=None, end_epoch_millis=None, display=None, target=None):  # noqa: E501
         """Message - a model defined in Swagger"""  # noqa: E501
 
-        self._scope = None
         self._attributes = None
         self._source = None
+        self._scope = None
         self._severity = None
+        self._read = None
+        self._title = None
         self._id = None
-        self._target = None
         self._content = None
-        self._title = None
         self._start_epoch_millis = None
         self._end_epoch_millis = None
         self._display = None
-        self._read = None
+        self._target = None
         self.discriminator = None
 
-        self.scope = scope
         if attributes is not None:
             self.attributes = attributes
         self.source = source
+        self.scope = scope
         self.severity = severity
+        if read is not None:
+            self.read = read
+        self.title = title
         if id is not None:
             self.id = id
-        if target is not None:
-            self.target = target
         self.content = content
-        self.title = title
         self.start_epoch_millis = start_epoch_millis
         self.end_epoch_millis = end_epoch_millis
         self.display = display
-        if read is not None:
-            self.read = read
-
-    @property
-    def scope(self):
-        """Gets the scope of this Message.  # noqa: E501
-
-        The audience scope that this message should reach  # noqa: E501
-
-        :return: The scope of this Message.  # noqa: E501
-        :rtype: str
-        """
-        return self._scope
-
-    @scope.setter
-    def scope(self, scope):
-        """Sets the scope of this Message.
-
-        The audience scope that this message should reach  # noqa: E501
-
-        :param scope: The scope of this Message.  # noqa: E501
-        :type: str
-        """
-        if scope is None:
-            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
-        if scope not in allowed_values:
-            raise ValueError(
-                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
-                .format(scope, allowed_values)
-            )
-
-        self._scope = scope
+        if target is not None:
+            self.target = target
 
     @property
     def attributes(self):
@@ -173,6 +142,37 @@ def source(self, source):
 
         self._source = source
 
+    @property
+    def scope(self):
+        """Gets the scope of this Message.  # noqa: E501
+
+        The audience scope that this message should reach  # noqa: E501
+
+        :return: The scope of this Message.  # noqa: E501
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this Message.
+
+        The audience scope that this message should reach  # noqa: E501
+
+        :param scope: The scope of this Message.  # noqa: E501
+        :type: str
+        """
+        if scope is None:
+            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
+        allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
+        if scope not in allowed_values:
+            raise ValueError(
+                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
+                .format(scope, allowed_values)
+            )
+
+        self._scope = scope
+
     @property
     def severity(self):
         """Gets the severity of this Message.  # noqa: E501
@@ -205,48 +205,73 @@ def severity(self, severity):
         self._severity = severity
 
     @property
-    def id(self):
-        """Gets the id of this Message.  # noqa: E501
+    def read(self):
+        """Gets the read of this Message.  # noqa: E501
 
+        A derived field for whether the current user has read this message  # noqa: E501
 
-        :return: The id of this Message.  # noqa: E501
+        :return: The read of this Message.  # noqa: E501
+        :rtype: bool
+        """
+        return self._read
+
+    @read.setter
+    def read(self, read):
+        """Sets the read of this Message.
+
+        A derived field for whether the current user has read this message  # noqa: E501
+
+        :param read: The read of this Message.  # noqa: E501
+        :type: bool
+        """
+
+        self._read = read
+
+    @property
+    def title(self):
+        """Gets the title of this Message.  # noqa: E501
+
+        Title of this message  # noqa: E501
+
+        :return: The title of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._title
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Message.
+    @title.setter
+    def title(self, title):
+        """Sets the title of this Message.
 
+        Title of this message  # noqa: E501
 
-        :param id: The id of this Message.  # noqa: E501
+        :param title: The title of this Message.  # noqa: E501
         :type: str
         """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._title = title
 
     @property
-    def target(self):
-        """Gets the target of this Message.  # noqa: E501
+    def id(self):
+        """Gets the id of this Message.  # noqa: E501
 
-        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
 
-        :return: The target of this Message.  # noqa: E501
+        :return: The id of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._target
+        return self._id
 
-    @target.setter
-    def target(self, target):
-        """Sets the target of this Message.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Message.
 
-        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
 
-        :param target: The target of this Message.  # noqa: E501
+        :param id: The id of this Message.  # noqa: E501
         :type: str
         """
 
-        self._target = target
+        self._id = id
 
     @property
     def content(self):
@@ -273,31 +298,6 @@ def content(self, content):
 
         self._content = content
 
-    @property
-    def title(self):
-        """Gets the title of this Message.  # noqa: E501
-
-        Title of this message  # noqa: E501
-
-        :return: The title of this Message.  # noqa: E501
-        :rtype: str
-        """
-        return self._title
-
-    @title.setter
-    def title(self, title):
-        """Sets the title of this Message.
-
-        Title of this message  # noqa: E501
-
-        :param title: The title of this Message.  # noqa: E501
-        :type: str
-        """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
-
-        self._title = title
-
     @property
     def start_epoch_millis(self):
         """Gets the start_epoch_millis of this Message.  # noqa: E501
@@ -380,27 +380,27 @@ def display(self, display):
         self._display = display
 
     @property
-    def read(self):
-        """Gets the read of this Message.  # noqa: E501
+    def target(self):
+        """Gets the target of this Message.  # noqa: E501
 
-        A derived field for whether the current user has read this message  # noqa: E501
+        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
 
-        :return: The read of this Message.  # noqa: E501
-        :rtype: bool
+        :return: The target of this Message.  # noqa: E501
+        :rtype: str
         """
-        return self._read
+        return self._target
 
-    @read.setter
-    def read(self, read):
-        """Sets the read of this Message.
+    @target.setter
+    def target(self, target):
+        """Sets the target of this Message.
 
-        A derived field for whether the current user has read this message  # noqa: E501
+        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
 
-        :param read: The read of this Message.  # noqa: E501
-        :type: bool
+        :param target: The target of this Message.  # noqa: E501
+        :type: str
         """
 
-        self._read = read
+        self._target = target
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index 13d9f0e..c811dc3 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -31,17 +31,17 @@ class Notificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'content_type': 'str',
-        'method': 'str',
         'description': 'str',
-        'id': 'str',
+        'method': 'str',
+        'content_type': 'str',
         'customer_id': 'str',
         'title': 'str',
         'creator_id': 'str',
         'updater_id': 'str',
-        'template': 'str',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
+        'template': 'str',
         'triggers': 'list[str]',
         'recipient': 'str',
         'custom_http_headers': 'dict(str, str)',
@@ -50,17 +50,17 @@ class Notificant(object):
     }
 
     attribute_map = {
-        'content_type': 'contentType',
-        'method': 'method',
         'description': 'description',
-        'id': 'id',
+        'method': 'method',
+        'content_type': 'contentType',
         'customer_id': 'customerId',
         'title': 'title',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
-        'template': 'template',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
+        'template': 'template',
         'triggers': 'triggers',
         'recipient': 'recipient',
         'custom_http_headers': 'customHttpHeaders',
@@ -68,20 +68,20 @@ class Notificant(object):
         'is_html_content': 'isHtmlContent'
     }
 
-    def __init__(self, content_type=None, method=None, description=None, id=None, customer_id=None, title=None, creator_id=None, updater_id=None, template=None, created_epoch_millis=None, updated_epoch_millis=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, is_html_content=None):  # noqa: E501
+    def __init__(self, description=None, method=None, content_type=None, customer_id=None, title=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, is_html_content=None):  # noqa: E501
         """Notificant - a model defined in Swagger"""  # noqa: E501
 
-        self._content_type = None
-        self._method = None
         self._description = None
-        self._id = None
+        self._method = None
+        self._content_type = None
         self._customer_id = None
         self._title = None
         self._creator_id = None
         self._updater_id = None
-        self._template = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
+        self._template = None
         self._triggers = None
         self._recipient = None
         self._custom_http_headers = None
@@ -89,12 +89,10 @@ def __init__(self, content_type=None, method=None, description=None, id=None, cu
         self._is_html_content = None
         self.discriminator = None
 
+        self.description = description
+        self.method = method
         if content_type is not None:
             self.content_type = content_type
-        self.method = method
-        self.description = description
-        if id is not None:
-            self.id = id
         if customer_id is not None:
             self.customer_id = customer_id
         self.title = title
@@ -102,11 +100,13 @@ def __init__(self, content_type=None, method=None, description=None, id=None, cu
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
-        self.template = template
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
+        self.template = template
         self.triggers = triggers
         self.recipient = recipient
         if custom_http_headers is not None:
@@ -117,33 +117,29 @@ def __init__(self, content_type=None, method=None, description=None, id=None, cu
             self.is_html_content = is_html_content
 
     @property
-    def content_type(self):
-        """Gets the content_type of this Notificant.  # noqa: E501
+    def description(self):
+        """Gets the description of this Notificant.  # noqa: E501
 
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
+        Description  # noqa: E501
 
-        :return: The content_type of this Notificant.  # noqa: E501
+        :return: The description of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._content_type
+        return self._description
 
-    @content_type.setter
-    def content_type(self, content_type):
-        """Sets the content_type of this Notificant.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Notificant.
 
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
+        Description  # noqa: E501
 
-        :param content_type: The content_type of this Notificant.  # noqa: E501
+        :param description: The description of this Notificant.  # noqa: E501
         :type: str
         """
-        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
-        if content_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(content_type, allowed_values)
-            )
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._content_type = content_type
+        self._description = description
 
     @property
     def method(self):
@@ -177,50 +173,33 @@ def method(self, method):
         self._method = method
 
     @property
-    def description(self):
-        """Gets the description of this Notificant.  # noqa: E501
-
-        Description  # noqa: E501
-
-        :return: The description of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Notificant.
-
-        Description  # noqa: E501
-
-        :param description: The description of this Notificant.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def id(self):
-        """Gets the id of this Notificant.  # noqa: E501
+    def content_type(self):
+        """Gets the content_type of this Notificant.  # noqa: E501
 
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :return: The id of this Notificant.  # noqa: E501
+        :return: The content_type of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._content_type
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Notificant.
+    @content_type.setter
+    def content_type(self, content_type):
+        """Sets the content_type of this Notificant.
 
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :param id: The id of this Notificant.  # noqa: E501
+        :param content_type: The content_type of this Notificant.  # noqa: E501
         :type: str
         """
+        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
+        if content_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(content_type, allowed_values)
+            )
 
-        self._id = id
+        self._content_type = content_type
 
     @property
     def customer_id(self):
@@ -311,29 +290,25 @@ def updater_id(self, updater_id):
         self._updater_id = updater_id
 
     @property
-    def template(self):
-        """Gets the template of this Notificant.  # noqa: E501
+    def id(self):
+        """Gets the id of this Notificant.  # noqa: E501
 
-        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
 
-        :return: The template of this Notificant.  # noqa: E501
+        :return: The id of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._template
+        return self._id
 
-    @template.setter
-    def template(self, template):
-        """Sets the template of this Notificant.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Notificant.
 
-        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
 
-        :param template: The template of this Notificant.  # noqa: E501
+        :param id: The id of this Notificant.  # noqa: E501
         :type: str
         """
-        if template is None:
-            raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
 
-        self._template = template
+        self._id = id
 
     @property
     def created_epoch_millis(self):
@@ -377,6 +352,31 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
+    @property
+    def template(self):
+        """Gets the template of this Notificant.  # noqa: E501
+
+        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
+
+        :return: The template of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._template
+
+    @template.setter
+    def template(self, template):
+        """Sets the template of this Notificant.
+
+        A mustache template that will form the body of the POST request, email and summary of the PagerDuty.  # noqa: E501
+
+        :param template: The template of this Notificant.  # noqa: E501
+        :type: str
+        """
+        if template is None:
+            raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
+
+        self._template = template
+
     @property
     def triggers(self):
         """Gets the triggers of this Notificant.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 39a7278..c34507b 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -34,77 +34,74 @@ class Proxy(object):
     """
     swagger_types = {
         'version': 'str',
-        'name': 'str',
-        'id': 'str',
         'status': 'str',
         'customer_id': 'str',
         'in_trash': 'bool',
         'hostname': 'str',
-        'last_check_in_time': 'int',
-        'last_known_error': 'str',
-        'last_error_time': 'int',
+        'id': 'str',
         'last_error_event': 'Event',
         'time_drift': 'int',
         'bytes_left_for_buffer': 'int',
         'bytes_per_minute_for_buffer': 'int',
         'local_queue_size': 'int',
+        'last_check_in_time': 'int',
+        'last_known_error': 'str',
+        'last_error_time': 'int',
         'ssh_agent': 'bool',
         'ephemeral': 'bool',
         'deleted': 'bool',
-        'status_cause': 'str'
+        'status_cause': 'str',
+        'name': 'str'
     }
 
     attribute_map = {
         'version': 'version',
-        'name': 'name',
-        'id': 'id',
         'status': 'status',
         'customer_id': 'customerId',
         'in_trash': 'inTrash',
         'hostname': 'hostname',
-        'last_check_in_time': 'lastCheckInTime',
-        'last_known_error': 'lastKnownError',
-        'last_error_time': 'lastErrorTime',
+        'id': 'id',
         'last_error_event': 'lastErrorEvent',
         'time_drift': 'timeDrift',
         'bytes_left_for_buffer': 'bytesLeftForBuffer',
         'bytes_per_minute_for_buffer': 'bytesPerMinuteForBuffer',
         'local_queue_size': 'localQueueSize',
+        'last_check_in_time': 'lastCheckInTime',
+        'last_known_error': 'lastKnownError',
+        'last_error_time': 'lastErrorTime',
         'ssh_agent': 'sshAgent',
         'ephemeral': 'ephemeral',
         'deleted': 'deleted',
-        'status_cause': 'statusCause'
+        'status_cause': 'statusCause',
+        'name': 'name'
     }
 
-    def __init__(self, version=None, name=None, id=None, status=None, customer_id=None, in_trash=None, hostname=None, last_check_in_time=None, last_known_error=None, last_error_time=None, last_error_event=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, ssh_agent=None, ephemeral=None, deleted=None, status_cause=None):  # noqa: E501
+    def __init__(self, version=None, status=None, customer_id=None, in_trash=None, hostname=None, id=None, last_error_event=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, last_check_in_time=None, last_known_error=None, last_error_time=None, ssh_agent=None, ephemeral=None, deleted=None, status_cause=None, name=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
         self._version = None
-        self._name = None
-        self._id = None
         self._status = None
         self._customer_id = None
         self._in_trash = None
         self._hostname = None
-        self._last_check_in_time = None
-        self._last_known_error = None
-        self._last_error_time = None
+        self._id = None
         self._last_error_event = None
         self._time_drift = None
         self._bytes_left_for_buffer = None
         self._bytes_per_minute_for_buffer = None
         self._local_queue_size = None
+        self._last_check_in_time = None
+        self._last_known_error = None
+        self._last_error_time = None
         self._ssh_agent = None
         self._ephemeral = None
         self._deleted = None
         self._status_cause = None
+        self._name = None
         self.discriminator = None
 
         if version is not None:
             self.version = version
-        self.name = name
-        if id is not None:
-            self.id = id
         if status is not None:
             self.status = status
         if customer_id is not None:
@@ -113,12 +110,8 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
             self.in_trash = in_trash
         if hostname is not None:
             self.hostname = hostname
-        if last_check_in_time is not None:
-            self.last_check_in_time = last_check_in_time
-        if last_known_error is not None:
-            self.last_known_error = last_known_error
-        if last_error_time is not None:
-            self.last_error_time = last_error_time
+        if id is not None:
+            self.id = id
         if last_error_event is not None:
             self.last_error_event = last_error_event
         if time_drift is not None:
@@ -129,6 +122,12 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
             self.bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
         if local_queue_size is not None:
             self.local_queue_size = local_queue_size
+        if last_check_in_time is not None:
+            self.last_check_in_time = last_check_in_time
+        if last_known_error is not None:
+            self.last_known_error = last_known_error
+        if last_error_time is not None:
+            self.last_error_time = last_error_time
         if ssh_agent is not None:
             self.ssh_agent = ssh_agent
         if ephemeral is not None:
@@ -137,6 +136,7 @@ def __init__(self, version=None, name=None, id=None, status=None, customer_id=No
             self.deleted = deleted
         if status_cause is not None:
             self.status_cause = status_cause
+        self.name = name
 
     @property
     def version(self):
@@ -159,52 +159,6 @@ def version(self, version):
 
         self._version = version
 
-    @property
-    def name(self):
-        """Gets the name of this Proxy.  # noqa: E501
-
-        Proxy name (modifiable)  # noqa: E501
-
-        :return: The name of this Proxy.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Proxy.
-
-        Proxy name (modifiable)  # noqa: E501
-
-        :param name: The name of this Proxy.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def id(self):
-        """Gets the id of this Proxy.  # noqa: E501
-
-
-        :return: The id of this Proxy.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Proxy.
-
-
-        :param id: The id of this Proxy.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
     @property
     def status(self):
         """Gets the status of this Proxy.  # noqa: E501
@@ -300,73 +254,25 @@ def hostname(self, hostname):
         self._hostname = hostname
 
     @property
-    def last_check_in_time(self):
-        """Gets the last_check_in_time of this Proxy.  # noqa: E501
-
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
-
-        :return: The last_check_in_time of this Proxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_check_in_time
-
-    @last_check_in_time.setter
-    def last_check_in_time(self, last_check_in_time):
-        """Sets the last_check_in_time of this Proxy.
-
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
-
-        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
-        :type: int
-        """
-
-        self._last_check_in_time = last_check_in_time
-
-    @property
-    def last_known_error(self):
-        """Gets the last_known_error of this Proxy.  # noqa: E501
+    def id(self):
+        """Gets the id of this Proxy.  # noqa: E501
 
-        deprecated  # noqa: E501
 
-        :return: The last_known_error of this Proxy.  # noqa: E501
+        :return: The id of this Proxy.  # noqa: E501
         :rtype: str
         """
-        return self._last_known_error
+        return self._id
 
-    @last_known_error.setter
-    def last_known_error(self, last_known_error):
-        """Sets the last_known_error of this Proxy.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Proxy.
 
-        deprecated  # noqa: E501
 
-        :param last_known_error: The last_known_error of this Proxy.  # noqa: E501
+        :param id: The id of this Proxy.  # noqa: E501
         :type: str
         """
 
-        self._last_known_error = last_known_error
-
-    @property
-    def last_error_time(self):
-        """Gets the last_error_time of this Proxy.  # noqa: E501
-
-        deprecated  # noqa: E501
-
-        :return: The last_error_time of this Proxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_error_time
-
-    @last_error_time.setter
-    def last_error_time(self, last_error_time):
-        """Sets the last_error_time of this Proxy.
-
-        deprecated  # noqa: E501
-
-        :param last_error_time: The last_error_time of this Proxy.  # noqa: E501
-        :type: int
-        """
-
-        self._last_error_time = last_error_time
+        self._id = id
 
     @property
     def last_error_event(self):
@@ -481,6 +387,75 @@ def local_queue_size(self, local_queue_size):
 
         self._local_queue_size = local_queue_size
 
+    @property
+    def last_check_in_time(self):
+        """Gets the last_check_in_time of this Proxy.  # noqa: E501
+
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+
+        :return: The last_check_in_time of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_check_in_time
+
+    @last_check_in_time.setter
+    def last_check_in_time(self, last_check_in_time):
+        """Sets the last_check_in_time of this Proxy.
+
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+
+        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._last_check_in_time = last_check_in_time
+
+    @property
+    def last_known_error(self):
+        """Gets the last_known_error of this Proxy.  # noqa: E501
+
+        deprecated  # noqa: E501
+
+        :return: The last_known_error of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_known_error
+
+    @last_known_error.setter
+    def last_known_error(self, last_known_error):
+        """Sets the last_known_error of this Proxy.
+
+        deprecated  # noqa: E501
+
+        :param last_known_error: The last_known_error of this Proxy.  # noqa: E501
+        :type: str
+        """
+
+        self._last_known_error = last_known_error
+
+    @property
+    def last_error_time(self):
+        """Gets the last_error_time of this Proxy.  # noqa: E501
+
+        deprecated  # noqa: E501
+
+        :return: The last_error_time of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_error_time
+
+    @last_error_time.setter
+    def last_error_time(self, last_error_time):
+        """Sets the last_error_time of this Proxy.
+
+        deprecated  # noqa: E501
+
+        :param last_error_time: The last_error_time of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._last_error_time = last_error_time
+
     @property
     def ssh_agent(self):
         """Gets the ssh_agent of this Proxy.  # noqa: E501
@@ -571,6 +546,31 @@ def status_cause(self, status_cause):
 
         self._status_cause = status_cause
 
+    @property
+    def name(self):
+        """Gets the name of this Proxy.  # noqa: E501
+
+        Proxy name (modifiable)  # noqa: E501
+
+        :return: The name of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Proxy.
+
+        Proxy name (modifiable)  # noqa: E501
+
+        :param name: The name of this Proxy.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index b1330e6..ac5ef02 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -35,41 +35,37 @@ class QueryResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'name': 'str',
-        'query': 'str',
         'warnings': 'str',
         'timeseries': 'list[Timeseries]',
         'stats': 'StatsModel',
         'events': 'list[QueryEvent]',
-        'granularity': 'int'
+        'granularity': 'int',
+        'name': 'str',
+        'query': 'str'
     }
 
     attribute_map = {
-        'name': 'name',
-        'query': 'query',
         'warnings': 'warnings',
         'timeseries': 'timeseries',
         'stats': 'stats',
         'events': 'events',
-        'granularity': 'granularity'
+        'granularity': 'granularity',
+        'name': 'name',
+        'query': 'query'
     }
 
-    def __init__(self, name=None, query=None, warnings=None, timeseries=None, stats=None, events=None, granularity=None):  # noqa: E501
+    def __init__(self, warnings=None, timeseries=None, stats=None, events=None, granularity=None, name=None, query=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
 
-        self._name = None
-        self._query = None
         self._warnings = None
         self._timeseries = None
         self._stats = None
         self._events = None
         self._granularity = None
+        self._name = None
+        self._query = None
         self.discriminator = None
 
-        if name is not None:
-            self.name = name
-        if query is not None:
-            self.query = query
         if warnings is not None:
             self.warnings = warnings
         if timeseries is not None:
@@ -80,52 +76,10 @@ def __init__(self, name=None, query=None, warnings=None, timeseries=None, stats=
             self.events = events
         if granularity is not None:
             self.granularity = granularity
-
-    @property
-    def name(self):
-        """Gets the name of this QueryResult.  # noqa: E501
-
-        The name of this query  # noqa: E501
-
-        :return: The name of this QueryResult.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this QueryResult.
-
-        The name of this query  # noqa: E501
-
-        :param name: The name of this QueryResult.  # noqa: E501
-        :type: str
-        """
-
-        self._name = name
-
-    @property
-    def query(self):
-        """Gets the query of this QueryResult.  # noqa: E501
-
-        The query used to obtain this result  # noqa: E501
-
-        :return: The query of this QueryResult.  # noqa: E501
-        :rtype: str
-        """
-        return self._query
-
-    @query.setter
-    def query(self, query):
-        """Sets the query of this QueryResult.
-
-        The query used to obtain this result  # noqa: E501
-
-        :param query: The query of this QueryResult.  # noqa: E501
-        :type: str
-        """
-
-        self._query = query
+        if name is not None:
+            self.name = name
+        if query is not None:
+            self.query = query
 
     @property
     def warnings(self):
@@ -236,6 +190,52 @@ def granularity(self, granularity):
 
         self._granularity = granularity
 
+    @property
+    def name(self):
+        """Gets the name of this QueryResult.  # noqa: E501
+
+        The name of this query  # noqa: E501
+
+        :return: The name of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this QueryResult.
+
+        The name of this query  # noqa: E501
+
+        :param name: The name of this QueryResult.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def query(self):
+        """Gets the query of this QueryResult.  # noqa: E501
+
+        The query used to obtain this result  # noqa: E501
+
+        :return: The query of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._query
+
+    @query.setter
+    def query(self, query):
+        """Sets the query of this QueryResult.
+
+        The query used to obtain this result  # noqa: E501
+
+        :param query: The query of this QueryResult.  # noqa: E501
+        :type: str
+        """
+
+        self._query = query
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 17455da..440d62a 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -31,48 +31,48 @@ class SavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'id': 'str',
-        'query': 'dict(str, str)',
         'entity_type': 'str',
+        'query': 'dict(str, str)',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
         'user_id': 'str'
     }
 
     attribute_map = {
-        'id': 'id',
-        'query': 'query',
         'entity_type': 'entityType',
+        'query': 'query',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
         'user_id': 'userId'
     }
 
-    def __init__(self, id=None, query=None, entity_type=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, user_id=None):  # noqa: E501
+    def __init__(self, entity_type=None, query=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, user_id=None):  # noqa: E501
         """SavedSearch - a model defined in Swagger"""  # noqa: E501
 
-        self._id = None
-        self._query = None
         self._entity_type = None
+        self._query = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._user_id = None
         self.discriminator = None
 
-        if id is not None:
-            self.id = id
-        self.query = query
         self.entity_type = entity_type
+        self.query = query
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
@@ -81,25 +81,35 @@ def __init__(self, id=None, query=None, entity_type=None, creator_id=None, updat
             self.user_id = user_id
 
     @property
-    def id(self):
-        """Gets the id of this SavedSearch.  # noqa: E501
+    def entity_type(self):
+        """Gets the entity_type of this SavedSearch.  # noqa: E501
 
+        The Wavefront entity type over which to search  # noqa: E501
 
-        :return: The id of this SavedSearch.  # noqa: E501
+        :return: The entity_type of this SavedSearch.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._entity_type
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this SavedSearch.
+    @entity_type.setter
+    def entity_type(self, entity_type):
+        """Sets the entity_type of this SavedSearch.
 
+        The Wavefront entity type over which to search  # noqa: E501
 
-        :param id: The id of this SavedSearch.  # noqa: E501
+        :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
         :type: str
         """
+        if entity_type is None:
+            raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP"]  # noqa: E501
+        if entity_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(entity_type, allowed_values)
+            )
 
-        self._id = id
+        self._entity_type = entity_type
 
     @property
     def query(self):
@@ -126,37 +136,6 @@ def query(self, query):
 
         self._query = query
 
-    @property
-    def entity_type(self):
-        """Gets the entity_type of this SavedSearch.  # noqa: E501
-
-        The Wavefront entity type over which to search  # noqa: E501
-
-        :return: The entity_type of this SavedSearch.  # noqa: E501
-        :rtype: str
-        """
-        return self._entity_type
-
-    @entity_type.setter
-    def entity_type(self, entity_type):
-        """Sets the entity_type of this SavedSearch.
-
-        The Wavefront entity type over which to search  # noqa: E501
-
-        :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
-        :type: str
-        """
-        if entity_type is None:
-            raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP"]  # noqa: E501
-        if entity_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(entity_type, allowed_values)
-            )
-
-        self._entity_type = entity_type
-
     @property
     def creator_id(self):
         """Gets the creator_id of this SavedSearch.  # noqa: E501
@@ -199,6 +178,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this SavedSearch.  # noqa: E501
+
+
+        :return: The id of this SavedSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this SavedSearch.
+
+
+        :param id: The id of this SavedSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this SavedSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 16b5ebb..3786090 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -31,87 +31,64 @@ class Source(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'hidden': 'bool',
         'description': 'str',
-        'id': 'str',
+        'hidden': 'bool',
+        'source_name': 'str',
         'tags': 'dict(str, bool)',
         'creator_id': 'str',
         'updater_id': 'str',
+        'id': 'str',
         'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'marked_new_epoch_millis': 'int',
-        'source_name': 'str'
+        'marked_new_epoch_millis': 'int'
     }
 
     attribute_map = {
-        'hidden': 'hidden',
         'description': 'description',
-        'id': 'id',
+        'hidden': 'hidden',
+        'source_name': 'sourceName',
         'tags': 'tags',
         'creator_id': 'creatorId',
         'updater_id': 'updaterId',
+        'id': 'id',
         'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'marked_new_epoch_millis': 'markedNewEpochMillis',
-        'source_name': 'sourceName'
+        'marked_new_epoch_millis': 'markedNewEpochMillis'
     }
 
-    def __init__(self, hidden=None, description=None, id=None, tags=None, creator_id=None, updater_id=None, created_epoch_millis=None, updated_epoch_millis=None, marked_new_epoch_millis=None, source_name=None):  # noqa: E501
+    def __init__(self, description=None, hidden=None, source_name=None, tags=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, marked_new_epoch_millis=None):  # noqa: E501
         """Source - a model defined in Swagger"""  # noqa: E501
 
-        self._hidden = None
         self._description = None
-        self._id = None
+        self._hidden = None
+        self._source_name = None
         self._tags = None
         self._creator_id = None
         self._updater_id = None
+        self._id = None
         self._created_epoch_millis = None
         self._updated_epoch_millis = None
         self._marked_new_epoch_millis = None
-        self._source_name = None
         self.discriminator = None
 
-        if hidden is not None:
-            self.hidden = hidden
         if description is not None:
             self.description = description
-        self.id = id
+        if hidden is not None:
+            self.hidden = hidden
+        self.source_name = source_name
         if tags is not None:
             self.tags = tags
         if creator_id is not None:
             self.creator_id = creator_id
         if updater_id is not None:
             self.updater_id = updater_id
+        self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if marked_new_epoch_millis is not None:
             self.marked_new_epoch_millis = marked_new_epoch_millis
-        self.source_name = source_name
-
-    @property
-    def hidden(self):
-        """Gets the hidden of this Source.  # noqa: E501
-
-        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
-
-        :return: The hidden of this Source.  # noqa: E501
-        :rtype: bool
-        """
-        return self._hidden
-
-    @hidden.setter
-    def hidden(self, hidden):
-        """Sets the hidden of this Source.
-
-        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
-
-        :param hidden: The hidden of this Source.  # noqa: E501
-        :type: bool
-        """
-
-        self._hidden = hidden
 
     @property
     def description(self):
@@ -137,29 +114,52 @@ def description(self, description):
         self._description = description
 
     @property
-    def id(self):
-        """Gets the id of this Source.  # noqa: E501
+    def hidden(self):
+        """Gets the hidden of this Source.  # noqa: E501
 
-        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
+        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
 
-        :return: The id of this Source.  # noqa: E501
+        :return: The hidden of this Source.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Source.
+
+        A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)  # noqa: E501
+
+        :param hidden: The hidden of this Source.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def source_name(self):
+        """Gets the source_name of this Source.  # noqa: E501
+
+        The name of the source, usually set by ingested telemetry  # noqa: E501
+
+        :return: The source_name of this Source.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._source_name
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Source.
+    @source_name.setter
+    def source_name(self, source_name):
+        """Sets the source_name of this Source.
 
-        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
+        The name of the source, usually set by ingested telemetry  # noqa: E501
 
-        :param id: The id of this Source.  # noqa: E501
+        :param source_name: The source_name of this Source.  # noqa: E501
         :type: str
         """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+        if source_name is None:
+            raise ValueError("Invalid value for `source_name`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._source_name = source_name
 
     @property
     def tags(self):
@@ -226,6 +226,31 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def id(self):
+        """Gets the id of this Source.  # noqa: E501
+
+        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
+
+        :return: The id of this Source.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Source.
+
+        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
+
+        :param id: The id of this Source.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this Source.  # noqa: E501
@@ -291,31 +316,6 @@ def marked_new_epoch_millis(self, marked_new_epoch_millis):
 
         self._marked_new_epoch_millis = marked_new_epoch_millis
 
-    @property
-    def source_name(self):
-        """Gets the source_name of this Source.  # noqa: E501
-
-        The name of the source, usually set by ingested telemetry  # noqa: E501
-
-        :return: The source_name of this Source.  # noqa: E501
-        :rtype: str
-        """
-        return self._source_name
-
-    @source_name.setter
-    def source_name(self, source_name):
-        """Sets the source_name of this Source.
-
-        The name of the source, usually set by ingested telemetry  # noqa: E501
-
-        :param source_name: The source_name of this Source.  # noqa: E501
-        :type: str
-        """
-        if source_name is None:
-            raise ValueError("Invalid value for `source_name`, must not be `None`")  # noqa: E501
-
-        self._source_name = source_name
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index 9edaad9..dad99ba 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -32,38 +32,38 @@ class UserGroupWrite(object):
     """
     swagger_types = {
         'permissions': 'list[str]',
-        'name': 'str',
-        'id': 'str',
         'customer': 'str',
-        'created_epoch_millis': 'int'
+        'id': 'str',
+        'created_epoch_millis': 'int',
+        'name': 'str'
     }
 
     attribute_map = {
         'permissions': 'permissions',
-        'name': 'name',
-        'id': 'id',
         'customer': 'customer',
-        'created_epoch_millis': 'createdEpochMillis'
+        'id': 'id',
+        'created_epoch_millis': 'createdEpochMillis',
+        'name': 'name'
     }
 
-    def __init__(self, permissions=None, name=None, id=None, customer=None, created_epoch_millis=None):  # noqa: E501
+    def __init__(self, permissions=None, customer=None, id=None, created_epoch_millis=None, name=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
 
         self._permissions = None
-        self._name = None
-        self._id = None
         self._customer = None
+        self._id = None
         self._created_epoch_millis = None
+        self._name = None
         self.discriminator = None
 
         self.permissions = permissions
-        self.name = name
-        if id is not None:
-            self.id = id
         if customer is not None:
             self.customer = customer
+        if id is not None:
+            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
+        self.name = name
 
     @property
     def permissions(self):
@@ -91,29 +91,27 @@ def permissions(self, permissions):
         self._permissions = permissions
 
     @property
-    def name(self):
-        """Gets the name of this UserGroupWrite.  # noqa: E501
+    def customer(self):
+        """Gets the customer of this UserGroupWrite.  # noqa: E501
 
-        The name of the user group  # noqa: E501
+        The id of the customer to which the user group belongs  # noqa: E501
 
-        :return: The name of this UserGroupWrite.  # noqa: E501
+        :return: The customer of this UserGroupWrite.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._customer
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this UserGroupWrite.
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserGroupWrite.
 
-        The name of the user group  # noqa: E501
+        The id of the customer to which the user group belongs  # noqa: E501
 
-        :param name: The name of this UserGroupWrite.  # noqa: E501
+        :param customer: The customer of this UserGroupWrite.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._customer = customer
 
     @property
     def id(self):
@@ -138,29 +136,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def customer(self):
-        """Gets the customer of this UserGroupWrite.  # noqa: E501
-
-        The id of the customer to which the user group belongs  # noqa: E501
-
-        :return: The customer of this UserGroupWrite.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer
-
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this UserGroupWrite.
-
-        The id of the customer to which the user group belongs  # noqa: E501
-
-        :param customer: The customer of this UserGroupWrite.  # noqa: E501
-        :type: str
-        """
-
-        self._customer = customer
-
     @property
     def created_epoch_millis(self):
         """Gets the created_epoch_millis of this UserGroupWrite.  # noqa: E501
@@ -182,6 +157,31 @@ def created_epoch_millis(self, created_epoch_millis):
 
         self._created_epoch_millis = created_epoch_millis
 
+    @property
+    def name(self):
+        """Gets the name of this UserGroupWrite.  # noqa: E501
+
+        The name of the user group  # noqa: E501
+
+        :return: The name of this UserGroupWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this UserGroupWrite.
+
+        The name of the user group  # noqa: E501
+
+        :param name: The name of this UserGroupWrite.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From e4ead166e6f97c9dd69a6b4cf7d7c2b266621c6f Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Mon, 18 Mar 2019 15:31:16 -0700
Subject: [PATCH 021/161] Keep Track of a Sorted Copy of Swagger Spec Used.

First, fetch and sort the `swagger.json` file
```
curl https://mon.wavefront.com/api/v2/swagger.json | python3 -m json.tool --sort-keys > .swagger-codegen/swagger.json
```
Then, generate a python client
```
java -jar ~/Applications/swagger-codegen-cli.jar generate -l python \
-i .swagger-codegen/swagger.json \
-c .swagger-codegen/config.json \
--additional-properties basePath=https://YOUR_INSTANCE.wavefront.com,infoEmail=support@wavefront.com
```
---
 .swagger-codegen/swagger.json                 | 13886 ++++++++++++++++
 docs/ACL.md                                   |     2 +-
 docs/AWSBaseCredentials.md                    |     2 +-
 docs/AccessControlListSimple.md               |     2 +-
 docs/Alert.md                                 |    94 +-
 docs/AvroBackedStandardizedDTO.md             |     6 +-
 docs/AzureBaseCredentials.md                  |     2 +-
 docs/AzureConfiguration.md                    |     2 +-
 docs/BusinessActionGroupBasicDTO.md           |     4 +-
 docs/Chart.md                                 |    12 +-
 docs/ChartSettings.md                         |    80 +-
 docs/ChartSourceQuery.md                      |    12 +-
 docs/CloudIntegration.md                      |    40 +-
 docs/CloudTrailConfiguration.md               |     6 +-
 docs/CloudWatchConfiguration.md               |     2 +-
 docs/CustomerFacingUserObject.md              |    12 +-
 docs/CustomerPreferences.md                   |    22 +-
 docs/CustomerPreferencesUpdating.md           |     8 +-
 docs/Dashboard.md                             |    56 +-
 docs/DashboardParameterValue.md               |    12 +-
 docs/DashboardSection.md                      |     2 +-
 docs/DerivedMetricDefinition.md               |    42 +-
 docs/Event.md                                 |    30 +-
 docs/EventSearchRequest.md                    |     2 +-
 docs/ExternalLink.md                          |    14 +-
 docs/FacetResponse.md                         |     6 +-
 docs/FacetSearchRequestContainer.md           |     4 +-
 docs/FacetsResponseContainer.md               |     2 +-
 docs/FacetsSearchRequestContainer.md          |     6 +-
 docs/GCPBillingConfiguration.md               |     2 +-
 docs/GCPConfiguration.md                      |     6 +-
 docs/HistoryEntry.md                          |     6 +-
 docs/HistoryResponse.md                       |     6 +-
 docs/Integration.md                           |    26 +-
 docs/IntegrationAlert.md                      |     4 +-
 docs/IntegrationAlias.md                      |     2 +-
 docs/IntegrationDashboard.md                  |     4 +-
 docs/IntegrationManifestGroup.md              |     4 +-
 docs/IntegrationMetrics.md                    |     8 +-
 docs/IntegrationStatus.md                     |     2 +-
 docs/MaintenanceWindow.md                     |    26 +-
 docs/Message.md                               |    14 +-
 docs/MetricStatus.md                          |     4 +-
 docs/NewRelicConfiguration.md                 |     2 +-
 docs/Notificant.md                            |    22 +-
 docs/PagedAlert.md                            |     6 +-
 docs/PagedAlertWithStats.md                   |     8 +-
 docs/PagedCloudIntegration.md                 |     6 +-
 docs/PagedCustomerFacingUserObject.md         |     6 +-
 docs/PagedDashboard.md                        |     6 +-
 docs/PagedDerivedMetricDefinition.md          |     6 +-
 docs/PagedDerivedMetricDefinitionWithStats.md |     8 +-
 docs/PagedEvent.md                            |     6 +-
 docs/PagedExternalLink.md                     |     6 +-
 docs/PagedIntegration.md                      |     6 +-
 docs/PagedMaintenanceWindow.md                |     6 +-
 docs/PagedMessage.md                          |     6 +-
 docs/PagedNotificant.md                       |     6 +-
 docs/PagedProxy.md                            |     6 +-
 docs/PagedSavedSearch.md                      |     6 +-
 docs/PagedSource.md                           |     6 +-
 docs/PagedUserGroup.md                        |     6 +-
 docs/Point.md                                 |     2 +-
 docs/Proxy.md                                 |    24 +-
 docs/QueryEvent.md                            |     8 +-
 docs/QueryResult.md                           |     6 +-
 docs/RawTimeseries.md                         |     2 +-
 docs/ResponseContainer.md                     |     2 +-
 docs/ResponseContainerAlert.md                |     2 +-
 docs/ResponseContainerCloudIntegration.md     |     2 +-
 docs/ResponseContainerDashboard.md            |     2 +-
 ...esponseContainerDerivedMetricDefinition.md |     2 +-
 docs/ResponseContainerEvent.md                |     2 +-
 docs/ResponseContainerExternalLink.md         |     2 +-
 docs/ResponseContainerFacetResponse.md        |     2 +-
 ...esponseContainerFacetsResponseContainer.md |     2 +-
 docs/ResponseContainerHistoryResponse.md      |     2 +-
 docs/ResponseContainerIntegration.md          |     2 +-
 docs/ResponseContainerIntegrationStatus.md    |     2 +-
 docs/ResponseContainerListACL.md              |     2 +-
 docs/ResponseContainerListIntegration.md      |     2 +-
 ...seContainerListIntegrationManifestGroup.md |     2 +-
 docs/ResponseContainerListString.md           |     2 +-
 docs/ResponseContainerListUserGroup.md        |     2 +-
 docs/ResponseContainerMaintenanceWindow.md    |     2 +-
 docs/ResponseContainerMapStringInteger.md     |     2 +-
 ...onseContainerMapStringIntegrationStatus.md |     2 +-
 docs/ResponseContainerMessage.md              |     2 +-
 docs/ResponseContainerNotificant.md           |     2 +-
 docs/ResponseContainerPagedAlert.md           |     2 +-
 docs/ResponseContainerPagedAlertWithStats.md  |     2 +-
 .../ResponseContainerPagedCloudIntegration.md |     2 +-
 ...eContainerPagedCustomerFacingUserObject.md |     2 +-
 docs/ResponseContainerPagedDashboard.md       |     2 +-
 ...seContainerPagedDerivedMetricDefinition.md |     2 +-
 ...erPagedDerivedMetricDefinitionWithStats.md |     2 +-
 docs/ResponseContainerPagedEvent.md           |     2 +-
 docs/ResponseContainerPagedExternalLink.md    |     2 +-
 docs/ResponseContainerPagedIntegration.md     |     2 +-
 ...ResponseContainerPagedMaintenanceWindow.md |     2 +-
 docs/ResponseContainerPagedMessage.md         |     2 +-
 docs/ResponseContainerPagedNotificant.md      |     2 +-
 docs/ResponseContainerPagedProxy.md           |     2 +-
 docs/ResponseContainerPagedSavedSearch.md     |     2 +-
 docs/ResponseContainerPagedSource.md          |     2 +-
 docs/ResponseContainerPagedUserGroup.md       |     2 +-
 docs/ResponseContainerProxy.md                |     2 +-
 docs/ResponseContainerSavedSearch.md          |     2 +-
 docs/ResponseContainerSource.md               |     2 +-
 docs/ResponseContainerTagsResponse.md         |     2 +-
 docs/ResponseContainerUserGroup.md            |     2 +-
 docs/ResponseStatus.md                        |     4 +-
 docs/SavedSearch.md                           |     8 +-
 docs/SearchQuery.md                           |     2 +-
 docs/Sorting.md                               |     2 +-
 docs/Source.md                                |    10 +-
 docs/SourceLabelPair.md                       |     6 +-
 docs/StatsModel.md                            |    18 +-
 docs/TagsResponse.md                          |     6 +-
 docs/TargetInfo.md                            |     2 +-
 docs/Timeseries.md                            |     4 +-
 docs/User.md                                  |    20 +-
 docs/UserGroup.md                             |    13 +-
 docs/UserGroupWrite.md                        |     4 +-
 docs/UserModel.md                             |     6 +-
 docs/UserRequestDTO.md                        |     4 +-
 docs/UserSettings.md                          |    10 +-
 .../models/access_control_list_simple.py      |    52 +-
 wavefront_api_client/models/acl.py            |    64 +-
 wavefront_api_client/models/alert.py          |  1872 +--
 .../models/avro_backed_standardized_dto.py    |   118 +-
 .../models/aws_base_credentials.py            |    64 +-
 .../models/azure_base_credentials.py          |    64 +-
 .../models/azure_configuration.py             |    62 +-
 .../models/business_action_group_basic_dto.py |    58 +-
 wavefront_api_client/models/chart.py          |   254 +-
 wavefront_api_client/models/chart_settings.py |  1990 +--
 .../models/chart_source_query.py              |   282 +-
 .../models/cloud_integration.py               |   820 +-
 .../models/cloud_trail_configuration.py       |   126 +-
 .../models/cloud_watch_configuration.py       |    62 +-
 .../models/customer_facing_user_object.py     |   238 +-
 .../models/customer_preferences.py            |   480 +-
 .../models/customer_preferences_updating.py   |   182 +-
 wavefront_api_client/models/dashboard.py      |  1108 +-
 .../models/dashboard_parameter_value.py       |   266 +-
 .../models/dashboard_section.py               |    64 +-
 .../models/derived_metric_definition.py       |   840 +-
 wavefront_api_client/models/event.py          |   644 +-
 .../models/event_search_request.py            |    58 +-
 wavefront_api_client/models/external_link.py  |   282 +-
 wavefront_api_client/models/facet_response.py |   170 +-
 .../models/facet_search_request_container.py  |   130 +-
 .../models/facets_response_container.py       |    62 +-
 .../models/facets_search_request_container.py |   150 +-
 .../models/gcp_billing_configuration.py       |    64 +-
 .../models/gcp_configuration.py               |   140 +-
 wavefront_api_client/models/history_entry.py  |   110 +-
 .../models/history_response.py                |   170 +-
 wavefront_api_client/models/integration.py    |   568 +-
 .../models/integration_alert.py               |   114 +-
 .../models/integration_alias.py               |    58 +-
 .../models/integration_dashboard.py           |   114 +-
 .../models/integration_manifest_group.py      |    98 +-
 .../models/integration_metrics.py             |   168 +-
 .../models/integration_status.py              |    78 +-
 .../models/maintenance_window.py              |   552 +-
 wavefront_api_client/models/message.py        |   344 +-
 wavefront_api_client/models/metric_status.py  |    96 +-
 .../models/new_relic_configuration.py         |    64 +-
 wavefront_api_client/models/notificant.py     |   474 +-
 wavefront_api_client/models/paged_alert.py    |   170 +-
 .../models/paged_alert_with_stats.py          |   200 +-
 .../models/paged_cloud_integration.py         |   170 +-
 .../paged_customer_facing_user_object.py      |   170 +-
 .../models/paged_dashboard.py                 |   170 +-
 .../models/paged_derived_metric_definition.py |   170 +-
 ...ed_derived_metric_definition_with_stats.py |   200 +-
 wavefront_api_client/models/paged_event.py    |   170 +-
 .../models/paged_external_link.py             |   170 +-
 .../models/paged_integration.py               |   170 +-
 .../models/paged_maintenance_window.py        |   170 +-
 wavefront_api_client/models/paged_message.py  |   170 +-
 .../models/paged_notificant.py                |   170 +-
 wavefront_api_client/models/paged_proxy.py    |   170 +-
 .../models/paged_saved_search.py              |   170 +-
 wavefront_api_client/models/paged_source.py   |   170 +-
 .../models/paged_user_group.py                |   170 +-
 wavefront_api_client/models/point.py          |    60 +-
 wavefront_api_client/models/proxy.py          |   498 +-
 wavefront_api_client/models/query_event.py    |   198 +-
 wavefront_api_client/models/query_result.py   |   166 +-
 wavefront_api_client/models/raw_timeseries.py |    60 +-
 .../models/response_container.py              |    56 +-
 .../models/response_container_alert.py        |    56 +-
 .../response_container_cloud_integration.py   |    56 +-
 .../models/response_container_dashboard.py    |    56 +-
 ...nse_container_derived_metric_definition.py |    56 +-
 .../models/response_container_event.py        |    56 +-
 .../response_container_external_link.py       |    56 +-
 .../response_container_facet_response.py      |    56 +-
 ...nse_container_facets_response_container.py |    56 +-
 .../response_container_history_response.py    |    56 +-
 .../models/response_container_integration.py  |    56 +-
 .../response_container_integration_status.py  |    56 +-
 .../models/response_container_list_acl.py     |    56 +-
 .../response_container_list_integration.py    |    56 +-
 ...ntainer_list_integration_manifest_group.py |    56 +-
 .../models/response_container_list_string.py  |    56 +-
 .../response_container_list_user_group.py     |    56 +-
 .../response_container_maintenance_window.py  |    56 +-
 .../response_container_map_string_integer.py  |    56 +-
 ...container_map_string_integration_status.py |    56 +-
 .../models/response_container_message.py      |    56 +-
 .../models/response_container_notificant.py   |    56 +-
 .../models/response_container_paged_alert.py  |    56 +-
 ...sponse_container_paged_alert_with_stats.py |    56 +-
 ...ponse_container_paged_cloud_integration.py |    56 +-
 ...ainer_paged_customer_facing_user_object.py |    56 +-
 .../response_container_paged_dashboard.py     |    56 +-
 ...ntainer_paged_derived_metric_definition.py |    56 +-
 ...ed_derived_metric_definition_with_stats.py |    56 +-
 .../models/response_container_paged_event.py  |    56 +-
 .../response_container_paged_external_link.py |    56 +-
 .../response_container_paged_integration.py   |    56 +-
 ...onse_container_paged_maintenance_window.py |    56 +-
 .../response_container_paged_message.py       |    56 +-
 .../response_container_paged_notificant.py    |    56 +-
 .../models/response_container_paged_proxy.py  |    56 +-
 .../response_container_paged_saved_search.py  |    56 +-
 .../models/response_container_paged_source.py |    56 +-
 .../response_container_paged_user_group.py    |    56 +-
 .../models/response_container_proxy.py        |    56 +-
 .../models/response_container_saved_search.py |    56 +-
 .../models/response_container_source.py       |    56 +-
 .../response_container_tags_response.py       |    56 +-
 .../models/response_container_user_group.py   |    56 +-
 .../models/response_status.py                 |    86 +-
 wavefront_api_client/models/saved_search.py   |   170 +-
 wavefront_api_client/models/search_query.py   |    64 +-
 wavefront_api_client/models/sorting.py        |    60 +-
 wavefront_api_client/models/source.py         |   252 +-
 .../models/source_label_pair.py               |   166 +-
 wavefront_api_client/models/stats_model.py    |   366 +-
 wavefront_api_client/models/tags_response.py  |   170 +-
 wavefront_api_client/models/target_info.py    |    58 +-
 wavefront_api_client/models/timeseries.py     |    98 +-
 wavefront_api_client/models/user.py           |   390 +-
 wavefront_api_client/models/user_group.py     |   168 +-
 .../models/user_group_write.py                |    96 +-
 wavefront_api_client/models/user_model.py     |   126 +-
 .../models/user_request_dto.py                |   102 +-
 wavefront_api_client/models/user_settings.py  |   216 +-
 253 files changed, 25767 insertions(+), 11854 deletions(-)
 create mode 100644 .swagger-codegen/swagger.json

diff --git a/.swagger-codegen/swagger.json b/.swagger-codegen/swagger.json
new file mode 100644
index 0000000..2675b2a
--- /dev/null
+++ b/.swagger-codegen/swagger.json
@@ -0,0 +1,13886 @@
+{
+    "basePath": "/",
+    "definitions": {
+        "ACL": {
+            "description": "Api model for ACL",
+            "properties": {
+                "entityId": {
+                    "description": "The entity Id",
+                    "type": "string"
+                },
+                "modifyAcl": {
+                    "description": "List of users and user groups ids that have modify permission",
+                    "items": {
+                        "$ref": "#/definitions/AccessControlElement"
+                    },
+                    "type": "array",
+                    "uniqueItems": true
+                },
+                "viewAcl": {
+                    "description": "List of users and user group ids that have view permission",
+                    "items": {
+                        "$ref": "#/definitions/AccessControlElement"
+                    },
+                    "type": "array",
+                    "uniqueItems": true
+                }
+            },
+            "required": [
+                "entityId",
+                "modifyAcl",
+                "viewAcl"
+            ],
+            "type": "object"
+        },
+        "AWSBaseCredentials": {
+            "properties": {
+                "externalId": {
+                    "description": "The external id corresponding to the Role ARN",
+                    "example": "wave228",
+                    "type": "string"
+                },
+                "roleArn": {
+                    "description": "The Role ARN that the customer has created in AWS IAM to allow access to Wavefront",
+                    "example": "arn:aws:iam::<accountid>:role/<rolename>",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "externalId",
+                "roleArn"
+            ],
+            "type": "object"
+        },
+        "AccessControlElement": {
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AccessControlListSimple": {
+            "properties": {
+                "canModify": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "canView": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "Alert": {
+            "description": "Wavefront Alert",
+            "properties": {
+                "activeMaintenanceWindows": {
+                    "description": "The names of the active maintenance windows that are affecting this alert",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "additionalInformation": {
+                    "description": "User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc",
+                    "type": "string"
+                },
+                "alertType": {
+                    "description": "Alert type.",
+                    "enum": [
+                        "CLASSIC",
+                        "THRESHOLD"
+                    ],
+                    "type": "string"
+                },
+                "alertsLastDay": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "alertsLastMonth": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "alertsLastWeek": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "condition": {
+                    "description": "A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes",
+                    "type": "string"
+                },
+                "conditionQBEnabled": {
+                    "description": "Whether the condition query was created using the Query Builder.  Default false",
+                    "type": "boolean"
+                },
+                "conditionQBSerialization": {
+                    "description": "The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true",
+                    "type": "string"
+                },
+                "conditions": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Multi - alert conditions.",
+                    "type": "object"
+                },
+                "createUserId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "created": {
+                    "description": "When this alert was created, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "deleted": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "displayExpression": {
+                    "description": "A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted",
+                    "type": "string"
+                },
+                "displayExpressionQBEnabled": {
+                    "description": "Whether the display expression query was created using the Query Builder. Default false",
+                    "type": "boolean"
+                },
+                "displayExpressionQBSerialization": {
+                    "description": "The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true",
+                    "type": "string"
+                },
+                "event": {
+                    "$ref": "#/definitions/Event"
+                },
+                "failingHostLabelPairs": {
+                    "description": "Failing host/metric pairs",
+                    "items": {
+                        "$ref": "#/definitions/SourceLabelPair"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "hidden": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "hostsUsed": {
+                    "description": "Number of hosts checked by the alert condition",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "inMaintenanceHostLabelPairs": {
+                    "description": "Lists the sources that will not be checked for this alert, due to matching a maintenance window",
+                    "items": {
+                        "$ref": "#/definitions/SourceLabelPair"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "inTrash": {
+                    "type": "boolean"
+                },
+                "includeObsoleteMetrics": {
+                    "description": "Whether to include obsolete metrics in alert query",
+                    "type": "boolean"
+                },
+                "lastErrorMessage": {
+                    "description": "The last error encountered when running this alert's condition query",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "lastEventTime": {
+                    "description": "Start time (in epoch millis) of the last event associated with this alert.",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastFailedTime": {
+                    "description": "The time of the last error encountered when running this alert's condition query, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastNotificationMillis": {
+                    "description": "When this alert last caused a notification, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastProcessedMillis": {
+                    "description": "The time when this alert was last checked, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastQueryTime": {
+                    "description": "Last query time of the alert, averaged on hourly basis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "metricsUsed": {
+                    "description": "Number of metrics checked by the alert condition",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "minutes": {
+                    "description": "The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "noDataEvent": {
+                    "$ref": "#/definitions/Event",
+                    "description": "No data event related to the alert",
+                    "readOnly": true
+                },
+                "notificants": {
+                    "description": "A derived field listing the webhook ids used by this alert",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "notificationResendFrequencyMinutes": {
+                    "description": "How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "numPointsInFailureFrame": {
+                    "description": "Number of points scanned in alert query time frame.",
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "pointsScannedAtLastQuery": {
+                    "description": "A derived field recording the number of data points scanned when the system last computed this alert's condition",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "prefiringHostLabelPairs": {
+                    "description": "Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter",
+                    "items": {
+                        "$ref": "#/definitions/SourceLabelPair"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "processRateMinutes": {
+                    "description": "The interval between checks for this alert, in minutes.  Defaults to 1 minute",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "queryFailing": {
+                    "description": "Whether there was an exception when the alert condition last ran",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "resolveAfterMinutes": {
+                    "description": "The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "severity": {
+                    "description": "Severity of the alert",
+                    "enum": [
+                        "INFO",
+                        "SMOKE",
+                        "WARN",
+                        "SEVERE"
+                    ],
+                    "type": "string"
+                },
+                "severityList": {
+                    "description": "Alert severity list for multi-threshold type.",
+                    "items": {
+                        "enum": [
+                            "INFO",
+                            "SMOKE",
+                            "WARN",
+                            "SEVERE"
+                        ],
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "snoozed": {
+                    "description": "The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "sortAttr": {
+                    "description": "Attribute used for default alert sort that is derived from state and severity",
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "status": {
+                    "description": "Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "systemOwned": {
+                    "description": "Whether this alert is system-owned and not writeable",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "tags": {
+                    "$ref": "#/definitions/WFTags"
+                },
+                "target": {
+                    "description": "The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes",
+                    "type": "string"
+                },
+                "targetInfo": {
+                    "description": "List of alert targets display information that includes name, id and type.",
+                    "items": {
+                        "$ref": "#/definitions/TargetInfo"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "targets": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Targets for severity.",
+                    "type": "object"
+                },
+                "updateUserId": {
+                    "description": "The user that last updated this alert",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "updated": {
+                    "description": "When the alert was last updated, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "condition",
+                "minutes",
+                "name"
+            ],
+            "type": "object"
+        },
+        "AvroBackedStandardizedDTO": {
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "type": "string"
+                },
+                "deleted": {
+                    "type": "boolean"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AzureActivityLogConfiguration": {
+            "description": "Configurations specific to the Azure activity logs integration. Only applicable when the containing Credential has service=AZUREACTIVITYLOG",
+            "properties": {
+                "baseCredentials": {
+                    "$ref": "#/definitions/AzureBaseCredentials"
+                },
+                "categoryFilter": {
+                    "description": "A list of Azure ActivityLog categories to pull events for.Allowable values are ADMINISTRATIVE, SERVICEHEALTH, ALERT, AUTOSCALE, SECURITY",
+                    "items": {
+                        "enum": [
+                            "ADMINISTRATIVE",
+                            "SERVICEHEALTH",
+                            "ALERT",
+                            "AUTOSCALE",
+                            "SECURITY"
+                        ],
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AzureBaseCredentials": {
+            "properties": {
+                "clientId": {
+                    "description": "Client Id for an Azure service account within your project.",
+                    "type": "string"
+                },
+                "clientSecret": {
+                    "description": "Client Secret for an Azure service account within your project. Use 'saved_secret' to retain the client secret when updating.",
+                    "type": "string"
+                },
+                "tenant": {
+                    "description": "Tenant Id for an Azure service account within your project.",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "clientId",
+                "clientSecret",
+                "tenant"
+            ],
+            "type": "object"
+        },
+        "AzureConfiguration": {
+            "description": "Configurations specific to the Azure integration. Only applicable when the containing Credential has service=AZURE",
+            "properties": {
+                "baseCredentials": {
+                    "$ref": "#/definitions/AzureBaseCredentials"
+                },
+                "categoryFilter": {
+                    "description": "A list of Azure services (such as Microsoft.Compute/virtualMachines, Microsoft.Cache/redis etc) from which to pull metrics.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "metricFilterRegex": {
+                    "description": "A regular expression that a metric name must match (case-insensitively) in order to be ingested",
+                    "example": "^azure.(compute|network|dbforpostgresql).*$",
+                    "type": "string"
+                },
+                "resourceGroupFilter": {
+                    "description": "A list of Azure resource groups from which to pull metrics.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "BusinessActionGroupBasicDTO": {
+            "properties": {
+                "description": {
+                    "type": "string"
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "groupName": {
+                    "type": "string"
+                },
+                "requiredDefault": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "Chart": {
+            "description": "Representation of a Wavefront chart",
+            "properties": {
+                "base": {
+                    "description": "If the chart has a log-scale Y-axis, the base for the logarithms",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "chartAttributes": {
+                    "$ref": "#/definitions/JsonNode",
+                    "description": "Experimental field for chart attributes"
+                },
+                "chartSettings": {
+                    "$ref": "#/definitions/ChartSettings"
+                },
+                "description": {
+                    "description": "Description of the chart",
+                    "type": "string"
+                },
+                "includeObsoleteMetrics": {
+                    "description": "Whether to show obsolete metrics.  Default: false",
+                    "type": "boolean"
+                },
+                "interpolatePoints": {
+                    "description": "Whether to interpolate points in the charts produced. Default: true",
+                    "type": "boolean"
+                },
+                "name": {
+                    "description": "Name of the source",
+                    "type": "string"
+                },
+                "noDefaultEvents": {
+                    "description": "Whether to hide events related to the sources in the charts produced. Default false (i.e. shows events)",
+                    "type": "boolean"
+                },
+                "sources": {
+                    "description": "Query expression to plot on the chart",
+                    "items": {
+                        "$ref": "#/definitions/ChartSourceQuery"
+                    },
+                    "type": "array"
+                },
+                "summarization": {
+                    "description": "Summarization strategy for the chart.  MEAN is default",
+                    "enum": [
+                        "MEAN",
+                        "MEDIAN",
+                        "MIN",
+                        "MAX",
+                        "SUM",
+                        "COUNT",
+                        "LAST",
+                        "FIRST"
+                    ],
+                    "type": "string"
+                },
+                "units": {
+                    "description": "String to label the units of the chart on the Y-axis",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "sources"
+            ],
+            "type": "object"
+        },
+        "ChartSettings": {
+            "description": "Representation of the settings of a Wavefront chart",
+            "properties": {
+                "autoColumnTags": {
+                    "description": "deprecated",
+                    "type": "boolean"
+                },
+                "columnTags": {
+                    "description": "deprecated",
+                    "type": "string"
+                },
+                "customTags": {
+                    "description": "For the tabular view, a list of point tags to display when using the \"custom\" tag display mode",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "expectedDataSpacing": {
+                    "description": "Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "fixedLegendDisplayStats": {
+                    "description": "For a chart with a fixed legend, a list of statistics to display in the legend",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "fixedLegendEnabled": {
+                    "description": "Whether to enable a fixed tabular legend adjacent to the chart",
+                    "type": "boolean"
+                },
+                "fixedLegendFilterField": {
+                    "description": "Statistic to use for determining whether a series is displayed on the fixed legend",
+                    "enum": [
+                        "CURRENT",
+                        "MEAN",
+                        "MEDIAN",
+                        "SUM",
+                        "MIN",
+                        "MAX",
+                        "COUNT"
+                    ],
+                    "type": "string"
+                },
+                "fixedLegendFilterLimit": {
+                    "description": "Number of series to include in the fixed legend",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "fixedLegendFilterSort": {
+                    "description": "Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend",
+                    "enum": [
+                        "TOP",
+                        "BOTTOM"
+                    ],
+                    "type": "string"
+                },
+                "fixedLegendHideLabel": {
+                    "description": "deprecated",
+                    "type": "boolean"
+                },
+                "fixedLegendPosition": {
+                    "description": "Where the fixed legend should be displayed with respect to the chart",
+                    "enum": [
+                        "RIGHT",
+                        "TOP",
+                        "LEFT",
+                        "BOTTOM"
+                    ],
+                    "type": "string"
+                },
+                "fixedLegendUseRawStats": {
+                    "description": "If true, the legend uses non-summarized stats instead of summarized",
+                    "type": "boolean"
+                },
+                "groupBySource": {
+                    "description": "For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row",
+                    "type": "boolean"
+                },
+                "invertDynamicLegendHoverControl": {
+                    "description": "Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)",
+                    "type": "boolean"
+                },
+                "lineType": {
+                    "description": "Plot interpolation type.  linear is default",
+                    "enum": [
+                        "linear",
+                        "step-before",
+                        "step-after",
+                        "basis",
+                        "cardinal",
+                        "monotone"
+                    ],
+                    "type": "string"
+                },
+                "max": {
+                    "description": "Max value of Y-axis.  Set to null or leave blank for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "min": {
+                    "description": "Min value of Y-axis.  Set to null or leave blank for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "numTags": {
+                    "description": "For the tabular view, how many point tags to display",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "plainMarkdownContent": {
+                    "description": "The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.",
+                    "type": "string"
+                },
+                "showHosts": {
+                    "description": "For the tabular view, whether to display sources.  Default: true",
+                    "type": "boolean"
+                },
+                "showLabels": {
+                    "description": "For the tabular view, whether to display labels.  Default: true",
+                    "type": "boolean"
+                },
+                "showRawValues": {
+                    "description": "For the tabular view, whether to display raw values.  Default: false",
+                    "type": "boolean"
+                },
+                "sortValuesDescending": {
+                    "description": "For the tabular view, whether to display display values in descending order.  Default: false",
+                    "type": "boolean"
+                },
+                "sparklineDecimalPrecision": {
+                    "description": "For the single stat view, the decimal precision of the displayed number",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "sparklineDisplayColor": {
+                    "description": "For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
+                    "type": "string"
+                },
+                "sparklineDisplayFontSize": {
+                    "description": "For the single stat view, the font size of the displayed text, in percent",
+                    "type": "string"
+                },
+                "sparklineDisplayHorizontalPosition": {
+                    "description": "For the single stat view, the horizontal position of the displayed text",
+                    "enum": [
+                        "MIDDLE",
+                        "LEFT",
+                        "RIGHT"
+                    ],
+                    "type": "string"
+                },
+                "sparklineDisplayPostfix": {
+                    "description": "For the single stat view, a string to append to the displayed text",
+                    "type": "string"
+                },
+                "sparklineDisplayPrefix": {
+                    "description": "For the single stat view, a string to add before the displayed text",
+                    "type": "string"
+                },
+                "sparklineDisplayValueType": {
+                    "description": "For the single stat view, whether to display the name of the query or the value of query",
+                    "enum": [
+                        "VALUE",
+                        "LABEL"
+                    ],
+                    "type": "string"
+                },
+                "sparklineDisplayVerticalPosition": {
+                    "description": "deprecated",
+                    "type": "string"
+                },
+                "sparklineFillColor": {
+                    "description": "For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
+                    "type": "string"
+                },
+                "sparklineLineColor": {
+                    "description": "For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
+                    "type": "string"
+                },
+                "sparklineSize": {
+                    "description": "For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE",
+                    "enum": [
+                        "BACKGROUND",
+                        "BOTTOM",
+                        "NONE"
+                    ],
+                    "type": "string"
+                },
+                "sparklineValueColorMapApplyTo": {
+                    "description": "For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND",
+                    "enum": [
+                        "TEXT",
+                        "BACKGROUND"
+                    ],
+                    "type": "string"
+                },
+                "sparklineValueColorMapColors": {
+                    "description": "For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "sparklineValueColorMapValues": {
+                    "description": "deprecated",
+                    "items": {
+                        "format": "int64",
+                        "type": "integer"
+                    },
+                    "type": "array"
+                },
+                "sparklineValueColorMapValuesV2": {
+                    "description": "For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors",
+                    "items": {
+                        "format": "float",
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "sparklineValueTextMapText": {
+                    "description": "For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "sparklineValueTextMapThresholds": {
+                    "description": "For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText",
+                    "items": {
+                        "format": "float",
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "stackType": {
+                    "description": "Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream",
+                    "enum": [
+                        "zero",
+                        "expand",
+                        "wiggle",
+                        "silhouette"
+                    ],
+                    "type": "string"
+                },
+                "tagMode": {
+                    "description": "For the tabular view, which mode to use to determine which point tags to display",
+                    "enum": [
+                        "all",
+                        "top",
+                        "custom"
+                    ],
+                    "type": "string"
+                },
+                "timeBasedColoring": {
+                    "description": "Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false",
+                    "type": "boolean"
+                },
+                "type": {
+                    "description": "Chart Type.  'line' refers to the Line Plot, 'scatter' to the Point Plot, 'stacked-area' to the Stacked Area plot, 'table' to the Tabular View, 'scatterploy-xy' to Scatter Plot, 'markdown-widget' to the Markdown display, and 'sparkline' to the Single Stat view",
+                    "enum": [
+                        "line",
+                        "scatterplot",
+                        "stacked-area",
+                        "table",
+                        "scatterplot-xy",
+                        "markdown-widget",
+                        "sparkline"
+                    ],
+                    "type": "string"
+                },
+                "windowSize": {
+                    "description": "Width, in minutes, of the time window to use for \"last\" windowing",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "windowing": {
+                    "description": "For the tabular view, whether to use the full time window for the query or the last X minutes",
+                    "enum": [
+                        "full",
+                        "last"
+                    ],
+                    "type": "string"
+                },
+                "xmax": {
+                    "description": "For x-y scatterplots, max value for X-axis.  Set null for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "xmin": {
+                    "description": "For x-y scatterplots, min value for X-axis.  Set null for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "y0ScaleSIBy1024": {
+                    "description": "Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)",
+                    "type": "boolean"
+                },
+                "y0UnitAutoscaling": {
+                    "description": "Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units",
+                    "type": "boolean"
+                },
+                "y1Max": {
+                    "description": "For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "y1Min": {
+                    "description": "For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "y1ScaleSIBy1024": {
+                    "description": "Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)",
+                    "type": "boolean"
+                },
+                "y1UnitAutoscaling": {
+                    "description": "Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units",
+                    "type": "boolean"
+                },
+                "y1Units": {
+                    "description": "For plots with multiple Y-axes, units for right-side Y-axis",
+                    "type": "string"
+                },
+                "ymax": {
+                    "description": "For x-y scatterplots, max value for Y-axis.  Set null for auto",
+                    "format": "double",
+                    "type": "number"
+                },
+                "ymin": {
+                    "description": "For x-y scatterplots, min value for Y-axis.  Set null for auto",
+                    "format": "double",
+                    "type": "number"
+                }
+            },
+            "required": [
+                "type"
+            ],
+            "type": "object"
+        },
+        "ChartSourceQuery": {
+            "properties": {
+                "disabled": {
+                    "description": "Whether the source is disabled",
+                    "type": "boolean"
+                },
+                "name": {
+                    "description": "Name of the source",
+                    "type": "string"
+                },
+                "query": {
+                    "description": "Query expression to plot on the chart",
+                    "type": "string"
+                },
+                "querybuilderEnabled": {
+                    "description": "Whether or not this source line should have the query builder enabled",
+                    "type": "boolean"
+                },
+                "querybuilderSerialization": {
+                    "description": "Opaque representation of the querybuilder",
+                    "type": "string"
+                },
+                "scatterPlotSource": {
+                    "description": "For scatter plots, does this query source the X-axis or the Y-axis",
+                    "enum": [
+                        "X",
+                        "Y"
+                    ],
+                    "type": "string"
+                },
+                "secondaryAxis": {
+                    "description": "Determines if this source relates to the right hand Y-axis or not",
+                    "type": "boolean"
+                },
+                "sourceColor": {
+                    "description": "The color used to draw all results from this source (auto if unset)",
+                    "type": "string"
+                },
+                "sourceDescription": {
+                    "description": "A description for the purpose of this source",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "query"
+            ],
+            "type": "object"
+        },
+        "CloudIntegration": {
+            "description": "Wavefront Cloud Integration",
+            "properties": {
+                "additionalTags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A list of point tag key-values to add to every point ingested using this integration",
+                    "type": "object"
+                },
+                "azure": {
+                    "$ref": "#/definitions/AzureConfiguration"
+                },
+                "azureActivityLog": {
+                    "$ref": "#/definitions/AzureActivityLogConfiguration"
+                },
+                "cloudTrail": {
+                    "$ref": "#/definitions/CloudTrailConfiguration"
+                },
+                "cloudWatch": {
+                    "$ref": "#/definitions/CloudWatchConfiguration"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "deleted": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "disabled": {
+                    "description": "True when an aws credential failed to authenticate.",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "ec2": {
+                    "$ref": "#/definitions/EC2Configuration"
+                },
+                "forceSave": {
+                    "type": "boolean"
+                },
+                "gcp": {
+                    "$ref": "#/definitions/GCPConfiguration"
+                },
+                "gcpBilling": {
+                    "$ref": "#/definitions/GCPBillingConfiguration"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "inTrash": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "lastError": {
+                    "description": "Digest of the last error encountered by Wavefront servers when fetching data using this integration",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "lastErrorEvent": {
+                    "$ref": "#/definitions/Event"
+                },
+                "lastErrorMs": {
+                    "description": "Time, in epoch millis, of the last error encountered by Wavefront servers when fetching data using this integration",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastMetricCount": {
+                    "description": "Number of metrics / events ingested by this integration the last time it ran",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastProcessingTimestamp": {
+                    "description": "Time, in epoch millis, that this integration was last processed",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastProcessorId": {
+                    "description": "Opaque id of the last Wavefront integrations service to act on this integration",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "lastReceivedDataPointMs": {
+                    "description": "Time that this integration last received a data point, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "name": {
+                    "description": "The human-readable name of this integration",
+                    "type": "string"
+                },
+                "newRelic": {
+                    "$ref": "#/definitions/NewRelicConfiguration"
+                },
+                "service": {
+                    "description": "A value denoting which cloud service this integration integrates with",
+                    "enum": [
+                        "CLOUDWATCH",
+                        "CLOUDTRAIL",
+                        "EC2",
+                        "GCP",
+                        "GCPBILLING",
+                        "TESLA",
+                        "AZURE",
+                        "AZUREACTIVITYLOG"
+                    ],
+                    "type": "string"
+                },
+                "serviceRefreshRateInMins": {
+                    "description": "Service refresh rate in minutes.",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "tesla": {
+                    "$ref": "#/definitions/TeslaConfiguration"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "service"
+            ],
+            "type": "object"
+        },
+        "CloudTrailConfiguration": {
+            "description": "Configurations specific to the CloudTrail AWS integration.  Only applicable when the containing Credential has service=CLOUDTRAIL",
+            "properties": {
+                "baseCredentials": {
+                    "$ref": "#/definitions/AWSBaseCredentials"
+                },
+                "bucketName": {
+                    "description": "Name of the S3 bucket where CloudTrail logs are stored",
+                    "type": "string"
+                },
+                "filterRule": {
+                    "description": "Rule to filter cloud trail log event.",
+                    "type": "string"
+                },
+                "prefix": {
+                    "description": "The common prefix, if any, appended to all CloudTrail log files",
+                    "type": "string"
+                },
+                "region": {
+                    "description": "The AWS region of the S3 bucket where CloudTrail logs are stored",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "bucketName",
+                "region"
+            ],
+            "type": "object"
+        },
+        "CloudWatchConfiguration": {
+            "description": "Configuration specific to the CloudWatch AWS integration.  Only applicable when the containing Credential has service=CLOUDWATCH",
+            "properties": {
+                "baseCredentials": {
+                    "$ref": "#/definitions/AWSBaseCredentials"
+                },
+                "instanceSelectionTags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed",
+                    "type": "object"
+                },
+                "metricFilterRegex": {
+                    "description": "A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested",
+                    "example": "^aws.(billing|instance|sqs|sns|reservedInstance|ebs|route53.health|ec2.status|elb).*$",
+                    "type": "string"
+                },
+                "namespaces": {
+                    "description": "A list of namespace that limit what we query from CloudWatch.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "pointTagFilterRegex": {
+                    "description": "A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested",
+                    "example": "(region|name)",
+                    "type": "string"
+                },
+                "volumeSelectionTags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed",
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "CustomerFacingUserObject": {
+            "properties": {
+                "customer": {
+                    "description": "The id of the customer to which the user belongs",
+                    "type": "string"
+                },
+                "escapedIdentifier": {
+                    "description": "URL Escaped Identifier",
+                    "type": "string"
+                },
+                "gravatarUrl": {
+                    "description": "URL id For User's gravatar (see gravatar.com), if one exists.",
+                    "type": "string"
+                },
+                "groups": {
+                    "description": "List of permission groups this user has been granted access to",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "id": {
+                    "description": "The unique identifier of this user, which should be their valid email address",
+                    "type": "string"
+                },
+                "identifier": {
+                    "description": "The unique identifier of this user, which should be their valid email address",
+                    "type": "string"
+                },
+                "lastSuccessfulLogin": {
+                    "description": "The last time the user logged in, in epoch milliseconds",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "self": {
+                    "description": "Whether this user is the one calling the API",
+                    "type": "boolean"
+                },
+                "userGroups": {
+                    "description": "List of user group identifiers this user belongs to",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "customer",
+                "id",
+                "identifier",
+                "self"
+            ],
+            "type": "object"
+        },
+        "CustomerPreferences": {
+            "description": "Wavefront customer preferences entity",
+            "properties": {
+                "blacklistedEmails": {
+                    "additionalProperties": {
+                        "format": "int32",
+                        "type": "integer"
+                    },
+                    "description": "List of blacklisted emails of the customer",
+                    "type": "object"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "type": "string"
+                },
+                "customerId": {
+                    "description": "The id of the customer preferences are attached to",
+                    "type": "string"
+                },
+                "defaultUserGroups": {
+                    "description": "List of default user groups of the customer",
+                    "items": {
+                        "$ref": "#/definitions/UserGroup"
+                    },
+                    "type": "array"
+                },
+                "deleted": {
+                    "type": "boolean"
+                },
+                "grantModifyAccessToEveryone": {
+                    "description": "Whether modify access of new entites is granted to Everyone or to the Creator",
+                    "type": "boolean"
+                },
+                "hiddenMetricPrefixes": {
+                    "additionalProperties": {
+                        "format": "int32",
+                        "type": "integer"
+                    },
+                    "description": "Metric prefixes which should be hidden from user",
+                    "type": "object"
+                },
+                "hideTSWhenQuerybuilderShown": {
+                    "description": "Whether to hide TS source input when Querybuilder is shown",
+                    "type": "boolean"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "invitePermissions": {
+                    "description": "List of permissions that are assigned to newly invited users",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "landingDashboardSlug": {
+                    "description": "Dashboard where user will be redirected from landing page",
+                    "type": "string"
+                },
+                "showOnboarding": {
+                    "description": "Whether to show onboarding for any new user without an override",
+                    "type": "boolean"
+                },
+                "showQuerybuilderByDefault": {
+                    "description": "Whether the Querybuilder is shown by default",
+                    "type": "boolean"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "customerId",
+                "grantModifyAccessToEveryone",
+                "hideTSWhenQuerybuilderShown",
+                "showOnboarding",
+                "showQuerybuilderByDefault"
+            ],
+            "type": "object"
+        },
+        "CustomerPreferencesUpdating": {
+            "description": "Wavefront customer preferences updating model",
+            "properties": {
+                "defaultUserGroups": {
+                    "description": "List of default user groups of the customer",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "grantModifyAccessToEveryone": {
+                    "description": "Whether modify access of new entites is granted to Everyone or to the Creator",
+                    "type": "boolean"
+                },
+                "hideTSWhenQuerybuilderShown": {
+                    "description": "Whether to hide TS source input when Querybuilder is shown",
+                    "type": "boolean"
+                },
+                "invitePermissions": {
+                    "description": "List of invite permissions to apply for each new user",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "landingDashboardSlug": {
+                    "description": "Dashboard where user will be redirected from landing page",
+                    "type": "string"
+                },
+                "showOnboarding": {
+                    "description": "Whether to show onboarding for any new user without an override",
+                    "type": "boolean"
+                },
+                "showQuerybuilderByDefault": {
+                    "description": "Whether the Querybuilder is shown by default",
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "grantModifyAccessToEveryone",
+                "hideTSWhenQuerybuilderShown",
+                "showOnboarding",
+                "showQuerybuilderByDefault"
+            ],
+            "type": "object"
+        },
+        "Dashboard": {
+            "description": "Wavefront dashboard entity",
+            "properties": {
+                "acl": {
+                    "$ref": "#/definitions/AccessControlListSimple",
+                    "readOnly": true
+                },
+                "canUserModify": {
+                    "type": "boolean"
+                },
+                "chartTitleBgColor": {
+                    "description": "Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue)",
+                    "type": "string"
+                },
+                "chartTitleColor": {
+                    "description": "Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue)",
+                    "type": "string"
+                },
+                "chartTitleScalar": {
+                    "description": "Scale (normally 100) of chart title text size",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "customer": {
+                    "description": "id of the customer to which this dashboard belongs",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "defaultEndTime": {
+                    "description": "Default end time in milliseconds to query charts",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "defaultStartTime": {
+                    "description": "Default start time in milliseconds to query charts",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "defaultTimeWindow": {
+                    "description": "Default time window to query charts",
+                    "type": "string"
+                },
+                "deleted": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "description": {
+                    "description": "Human-readable description of the dashboard",
+                    "type": "string"
+                },
+                "displayDescription": {
+                    "description": "Whether the dashboard description section is opened by default when the dashboard is shown",
+                    "type": "boolean"
+                },
+                "displayQueryParameters": {
+                    "description": "Whether the dashboard parameters section is opened by default when the dashboard is shown",
+                    "type": "boolean"
+                },
+                "displaySectionTableOfContents": {
+                    "description": "Whether the \"pills\" quick-linked the sections of the dashboard are displayed by default when the dashboard is shown",
+                    "type": "boolean"
+                },
+                "eventFilterType": {
+                    "description": "How charts belonging to this dashboard should display events.  BYCHART is default if unspecified",
+                    "enum": [
+                        "BYCHART",
+                        "AUTOMATIC",
+                        "ALL",
+                        "NONE",
+                        "BYDASHBOARD",
+                        "BYCHARTANDDASHBOARD"
+                    ],
+                    "type": "string"
+                },
+                "eventQuery": {
+                    "description": "Event query to run on dashboard charts",
+                    "type": "string"
+                },
+                "favorite": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "hidden": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "id": {
+                    "description": "Unique identifier, also URL slug, of the dashboard",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "Name of the dashboard",
+                    "type": "string"
+                },
+                "numCharts": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "numFavorites": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "orphan": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "parameterDetails": {
+                    "additionalProperties": {
+                        "$ref": "#/definitions/DashboardParameterValue"
+                    },
+                    "description": "The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation",
+                    "type": "object"
+                },
+                "parameters": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Deprecated.  An obsolete representation of dashboard parameters",
+                    "type": "object"
+                },
+                "sections": {
+                    "description": "Dashboard chart sections",
+                    "items": {
+                        "$ref": "#/definitions/DashboardSection"
+                    },
+                    "type": "array"
+                },
+                "systemOwned": {
+                    "description": "Whether this dashboard is system-owned and not writeable",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "tags": {
+                    "$ref": "#/definitions/WFTags"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "url": {
+                    "description": "Unique identifier, also URL slug, of the dashboard",
+                    "type": "string"
+                },
+                "viewsLastDay": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "viewsLastMonth": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "viewsLastWeek": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "sections",
+                "url"
+            ],
+            "type": "object"
+        },
+        "DashboardParameterValue": {
+            "properties": {
+                "allowAll": {
+                    "type": "boolean"
+                },
+                "defaultValue": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "dynamicFieldType": {
+                    "enum": [
+                        "SOURCE",
+                        "SOURCE_TAG",
+                        "METRIC_NAME",
+                        "TAG_KEY",
+                        "MATCHING_SOURCE_TAG"
+                    ],
+                    "type": "string"
+                },
+                "hideFromView": {
+                    "type": "boolean"
+                },
+                "label": {
+                    "type": "string"
+                },
+                "multivalue": {
+                    "type": "boolean"
+                },
+                "parameterType": {
+                    "enum": [
+                        "SIMPLE",
+                        "LIST",
+                        "DYNAMIC"
+                    ],
+                    "type": "string"
+                },
+                "queryValue": {
+                    "type": "string"
+                },
+                "reverseDynSort": {
+                    "description": "Whether to reverse alphabetically sort the returned result.",
+                    "type": "boolean"
+                },
+                "tagKey": {
+                    "type": "string"
+                },
+                "valuesToReadableStrings": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "DashboardSection": {
+            "properties": {
+                "name": {
+                    "description": "Name of this section",
+                    "type": "string"
+                },
+                "rows": {
+                    "description": "Rows of this section",
+                    "items": {
+                        "$ref": "#/definitions/DashboardSectionRow"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "name",
+                "rows"
+            ],
+            "type": "object"
+        },
+        "DashboardSectionRow": {
+            "properties": {
+                "charts": {
+                    "description": "Charts in this section row",
+                    "items": {
+                        "$ref": "#/definitions/Chart"
+                    },
+                    "type": "array"
+                },
+                "heightFactor": {
+                    "description": "Scalar for the height of this row. 100 is normal and default. 50 is half height",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "charts"
+            ],
+            "type": "object"
+        },
+        "DerivedMetricDefinition": {
+            "description": "Wavefront Derived Metric",
+            "properties": {
+                "additionalInformation": {
+                    "description": "User-supplied additional explanatory information for the derived metric",
+                    "type": "string"
+                },
+                "createUserId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "created": {
+                    "description": "When this derived metric was created, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "deleted": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "hostsUsed": {
+                    "description": "Number of hosts checked by the query",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "inTrash": {
+                    "type": "boolean"
+                },
+                "includeObsoleteMetrics": {
+                    "description": "Whether to include obsolete metrics in query",
+                    "type": "boolean"
+                },
+                "lastErrorMessage": {
+                    "description": "The last error encountered when running the query",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "lastFailedTime": {
+                    "description": "The time of the last error encountered when running the query, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastProcessedMillis": {
+                    "description": "The last time when the derived metric query was run, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastQueryTime": {
+                    "description": "Time for the query execute, averaged on hourly basis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "metricsUsed": {
+                    "description": "Number of metrics checked by the query",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "minutes": {
+                    "description": "How frequently the query generating the derived metric is run",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "pointsScannedAtLastQuery": {
+                    "description": "A derived field recording the number of data points scanned when the system last computed the query",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "processRateMinutes": {
+                    "description": "The interval between executing the query, in minutes.  Defaults to 1 minute",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "query": {
+                    "description": "A Wavefront query that is evaluated at regular intervals (default 1m).",
+                    "type": "string"
+                },
+                "queryFailing": {
+                    "description": "Whether there was an exception when the query last ran",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "queryQBEnabled": {
+                    "description": "Whether the query was created using the Query Builder. Default false",
+                    "type": "boolean"
+                },
+                "queryQBSerialization": {
+                    "description": "The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true",
+                    "type": "string"
+                },
+                "status": {
+                    "description": "Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "tags": {
+                    "$ref": "#/definitions/WFTags"
+                },
+                "updateUserId": {
+                    "description": "The user that last updated this derived metric definition",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "updated": {
+                    "description": "When the derived metric definition was last updated, in epoch millis",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "minutes",
+                "name",
+                "query"
+            ],
+            "type": "object"
+        },
+        "EC2Configuration": {
+            "description": "Configurations specific to the EC2 AWS integration.  Only applicable when the containing Credential has service=EC2",
+            "properties": {
+                "baseCredentials": {
+                    "$ref": "#/definitions/AWSBaseCredentials"
+                },
+                "hostNameTags": {
+                    "description": "A list of AWS instance tags that, when found, will be used as the \"source\" name in a series.  Default: [\"hostname\", \"host\", \"name\"].  If no tag in this list is found, the series source is set to the instance id.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "Event": {
+            "description": "Wavefront Event",
+            "properties": {
+                "annotations": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A string->string map of additional annotations on the event",
+                    "type": "object"
+                },
+                "canClose": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "canDelete": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "createdAt": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "creatorType": {
+                    "items": {
+                        "enum": [
+                            "USER",
+                            "ALERT",
+                            "SYSTEM"
+                        ],
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                },
+                "endTime": {
+                    "description": "End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "hosts": {
+                    "description": "A list of sources/hosts affected by the event",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "isEphemeral": {
+                    "description": "Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "isUserEvent": {
+                    "description": "Whether this event was created by a user, versus the system.  Default: system",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "name": {
+                    "description": "The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value",
+                    "type": "string"
+                },
+                "runningState": {
+                    "enum": [
+                        "ONGOING",
+                        "PENDING",
+                        "ENDED"
+                    ],
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "startTime": {
+                    "description": "Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "summarizedEvents": {
+                    "description": "In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "table": {
+                    "description": "The customer to which the event belongs",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "tags": {
+                    "description": "A list of event tags",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "updatedAt": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "annotations",
+                "name",
+                "startTime"
+            ],
+            "type": "object"
+        },
+        "EventSearchRequest": {
+            "properties": {
+                "cursor": {
+                    "description": "The id (exclusive) from which search results resume returning.  Users should supply an entity 'id' to this property.  Its main purpose is to resume where a previous search left off because of the 'limit' parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results",
+                    "type": "string"
+                },
+                "limit": {
+                    "description": "The number of results to return.  Default: 100",
+                    "example": 100,
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "query": {
+                    "description": "A list of queries by which to limit the search results",
+                    "items": {
+                        "$ref": "#/definitions/SearchQuery"
+                    },
+                    "type": "array"
+                },
+                "sortTimeAscending": {
+                    "description": "Whether to sort event results ascending in start time.  Default: false",
+                    "type": "boolean"
+                },
+                "timeRange": {
+                    "$ref": "#/definitions/EventTimeRange"
+                }
+            },
+            "type": "object"
+        },
+        "EventTimeRange": {
+            "description": "Refinement of time range over which to search (for events).  Operates on the *start* time of the event.",
+            "properties": {
+                "earliestStartTimeEpochMillis": {
+                    "description": "Start of search time window, in milliseconds since the Unix Epoch.  Events whose start time occurs after this value will be returned.  If no value is supplied, defaults to 2 hours prior the present time.",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "latestStartTimeEpochMillis": {
+                    "description": "End of the search time window, in milliseconds since the Unix Epoch.  Events whose start time occurs before this value will be returned.   If no value is supplied, defaults to now.",
+                    "format": "int64",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "ExternalLink": {
+            "description": "Links that can be generated from Wavefront to other analytical platforms",
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "description": {
+                    "description": "Human-readable description for this external link",
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "metricFilterRegex": {
+                    "description": "Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "Name of the external link.  Will be displayed in context (right-click) menus on charts",
+                    "type": "string"
+                },
+                "pointTagFilterRegexes": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed",
+                    "type": "object"
+                },
+                "sourceFilterRegex": {
+                    "description": "Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed",
+                    "type": "string"
+                },
+                "template": {
+                    "description": "The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc",
+                    "type": "string"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "description",
+                "name",
+                "template"
+            ],
+            "type": "object"
+        },
+        "FacetResponse": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "FacetSearchRequestContainer": {
+            "properties": {
+                "facetQuery": {
+                    "description": "A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned.",
+                    "type": "string"
+                },
+                "facetQueryMatchingMethod": {
+                    "description": "The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.",
+                    "enum": [
+                        "CONTAINS",
+                        "STARTSWITH",
+                        "EXACT",
+                        "TAGPATH"
+                    ],
+                    "type": "string"
+                },
+                "limit": {
+                    "description": "The number of results to return.  Default: 100",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "offset": {
+                    "description": "The number of results to skip before returning values.  Default: 0",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "query": {
+                    "description": "A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned",
+                    "items": {
+                        "$ref": "#/definitions/SearchQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "FacetsResponseContainer": {
+            "properties": {
+                "facets": {
+                    "additionalProperties": {
+                        "items": {
+                            "type": "string"
+                        },
+                        "type": "array"
+                    },
+                    "description": "The requested facets, returned in a map whose key is the facet property and whose value is a list of facet values",
+                    "type": "object"
+                },
+                "limit": {
+                    "description": "The requested limit",
+                    "format": "int64",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "FacetsSearchRequestContainer": {
+            "properties": {
+                "facetQuery": {
+                    "description": "A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned",
+                    "type": "string"
+                },
+                "facetQueryMatchingMethod": {
+                    "description": "The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.",
+                    "enum": [
+                        "CONTAINS",
+                        "STARTSWITH",
+                        "EXACT",
+                        "TAGPATH"
+                    ],
+                    "type": "string"
+                },
+                "facets": {
+                    "description": "A list of facets (property keys) to return values from found in entities matching 'query'.  Examples are 'tags', 'creatorId', etc",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "description": "The number of results to return.  Default 100",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "query": {
+                    "description": "A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of 'entity search results'.  All facets listed in the 'facets' search parameter of all entities within 'entity search results' are scanned to produce the search results (of facet values).",
+                    "items": {
+                        "$ref": "#/definitions/SearchQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "facets"
+            ],
+            "type": "object"
+        },
+        "GCPBillingConfiguration": {
+            "description": "Configurations specific to the Google Cloud Platform Billing integration.  Only applicable when the containing Credential has service=GCPBilling",
+            "properties": {
+                "gcpApiKey": {
+                    "description": "API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating",
+                    "type": "string"
+                },
+                "gcpJsonKey": {
+                    "description": "Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.",
+                    "type": "string"
+                },
+                "projectId": {
+                    "description": "The Google Cloud Platform (GCP) project id.",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gcpApiKey",
+                "gcpJsonKey",
+                "projectId"
+            ],
+            "type": "object"
+        },
+        "GCPConfiguration": {
+            "description": "Configurations specific to the Google Cloud Platform integration.  Only applicable when the containing Credential has service=GCP",
+            "properties": {
+                "categoriesToFetch": {
+                    "description": "A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN",
+                    "items": {
+                        "enum": [
+                            "APPENGINE",
+                            "BIGQUERY",
+                            "BIGTABLE",
+                            "CLOUDFUNCTIONS",
+                            "CLOUDIOT",
+                            "CLOUDSQL",
+                            "CLOUDTASKS",
+                            "COMPUTE",
+                            "CONTAINER",
+                            "DATAFLOW",
+                            "DATAPROC",
+                            "DATASTORE",
+                            "FIREBASEDATABASE",
+                            "FIREBASEHOSTING",
+                            "INTERCONNECT",
+                            "LOADBALANCING",
+                            "LOGGING",
+                            "ML",
+                            "MONITORING",
+                            "PUBSUB",
+                            "REDIS",
+                            "ROUTER",
+                            "SERVICERUNTIME",
+                            "SPANNER",
+                            "STORAGE",
+                            "TPU",
+                            "VPN"
+                        ],
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "gcpJsonKey": {
+                    "description": "Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.",
+                    "type": "string"
+                },
+                "metricFilterRegex": {
+                    "description": "A regular expression that a metric name must match (case-insensitively) in order to be ingested",
+                    "example": "^gcp.(compute|container|pubsub).*$",
+                    "type": "string"
+                },
+                "projectId": {
+                    "description": "The Google Cloud Platform (GCP) project id.",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gcpJsonKey",
+                "projectId"
+            ],
+            "type": "object"
+        },
+        "HistoryEntry": {
+            "description": "An entry in the edit-history of an entity such as alert or dashboard",
+            "properties": {
+                "changeDescription": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "inTrash": {
+                    "type": "boolean"
+                },
+                "updateTime": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "updateUser": {
+                    "type": "string"
+                },
+                "version": {
+                    "format": "int64",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "HistoryResponse": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/HistoryEntry"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "InstallAlerts": {
+            "description": "Install Alerts",
+            "properties": {
+                "target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Integration": {
+            "description": "Wavefront integrations are a set of incoming metrics along with a bundle of functionality (initially dashboards but alerts, webhooks, and the like in the near future",
+            "properties": {
+                "alerts": {
+                    "description": "A list of alerts belonging to this integration",
+                    "items": {
+                        "$ref": "#/definitions/IntegrationAlert"
+                    },
+                    "type": "array"
+                },
+                "aliasIntegrations": {
+                    "description": "If set, a list of objects describing integrations that alias this one.",
+                    "items": {
+                        "$ref": "#/definitions/IntegrationAlias"
+                    },
+                    "type": "array"
+                },
+                "aliasOf": {
+                    "description": "If set, designates this integration as an alias integration, of the integration whose id is specified.",
+                    "type": "string"
+                },
+                "baseUrl": {
+                    "description": "Base URL for this integration's assets",
+                    "type": "string"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "type": "string"
+                },
+                "dashboards": {
+                    "description": "A list of dashboards belonging to this integration",
+                    "items": {
+                        "$ref": "#/definitions/IntegrationDashboard"
+                    },
+                    "type": "array"
+                },
+                "deleted": {
+                    "type": "boolean"
+                },
+                "description": {
+                    "description": "Integration description",
+                    "type": "string"
+                },
+                "icon": {
+                    "description": "URI path to the integration icon",
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "metrics": {
+                    "$ref": "#/definitions/IntegrationMetrics"
+                },
+                "name": {
+                    "description": "Integration name",
+                    "type": "string"
+                },
+                "overview": {
+                    "description": "Descriptive text giving an overview of integration functionality",
+                    "type": "string"
+                },
+                "setup": {
+                    "description": "How the integration will be set-up",
+                    "type": "string"
+                },
+                "status": {
+                    "$ref": "#/definitions/IntegrationStatus"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "type": "string"
+                },
+                "version": {
+                    "description": "Integration version string",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "description",
+                "icon",
+                "name",
+                "version"
+            ],
+            "type": "object"
+        },
+        "IntegrationAlert": {
+            "description": "A alert definition belonging to a particular integration",
+            "properties": {
+                "alertObj": {
+                    "$ref": "#/definitions/Alert"
+                },
+                "description": {
+                    "description": "Alert description",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "Alert name",
+                    "type": "string"
+                },
+                "url": {
+                    "description": "URL path to the JSON definition of this alert",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "description",
+                "name",
+                "url"
+            ],
+            "type": "object"
+        },
+        "IntegrationAlias": {
+            "description": "An integration that aliases this one",
+            "properties": {
+                "baseUrl": {
+                    "description": "Base URL of this alias Integration",
+                    "type": "string"
+                },
+                "description": {
+                    "description": "Description of the alias Integration",
+                    "type": "string"
+                },
+                "icon": {
+                    "description": "Icon path of the alias Integration",
+                    "type": "string"
+                },
+                "id": {
+                    "description": "ID of the alias Integration",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "Name of the alias Integration",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "IntegrationDashboard": {
+            "description": "A dashboard definition belonging to a particular integration",
+            "properties": {
+                "dashboardObj": {
+                    "$ref": "#/definitions/Dashboard"
+                },
+                "description": {
+                    "description": "Dashboard description",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "Dashboard name",
+                    "type": "string"
+                },
+                "url": {
+                    "description": "URL path to the JSON definition of this dashboard",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "description",
+                "name",
+                "url"
+            ],
+            "type": "object"
+        },
+        "IntegrationManifestGroup": {
+            "description": "A functional group of integrations defined together in a manifest",
+            "properties": {
+                "integrationObjs": {
+                    "description": "Materialized JSONs for integrations belonging to this group, as referenced by `integrations`",
+                    "items": {
+                        "$ref": "#/definitions/Integration"
+                    },
+                    "type": "array"
+                },
+                "integrations": {
+                    "description": "A list of paths to JSON definitions for integrations in this group",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "subtitle": {
+                    "description": "Subtitle of this integration group",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Title of this integration group",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "integrations",
+                "subtitle",
+                "title"
+            ],
+            "type": "object"
+        },
+        "IntegrationMetrics": {
+            "description": "Definition of the metrics belonging this integration",
+            "properties": {
+                "chartObjs": {
+                    "description": "Chart JSONs materialized from the links in `charts`",
+                    "items": {
+                        "$ref": "#/definitions/Chart"
+                    },
+                    "type": "array"
+                },
+                "charts": {
+                    "description": "URLs for JSON definitions of charts that display info about this integration's metrics",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "display": {
+                    "description": "Set of metrics that are displayed in the metric panel during integration setup",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ppsDimensions": {
+                    "description": "For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "prefixes": {
+                    "description": "Set of metric prefix namespaces belonging to this integration",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "required": {
+                    "description": "Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "charts",
+                "display",
+                "prefixes",
+                "required"
+            ],
+            "type": "object"
+        },
+        "IntegrationStatus": {
+            "description": "Status of this integration",
+            "properties": {
+                "alertStatuses": {
+                    "additionalProperties": {
+                        "enum": [
+                            "VISIBLE",
+                            "HIDDEN",
+                            "NOT_LOADED"
+                        ],
+                        "type": "string"
+                    },
+                    "description": "A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`",
+                    "readOnly": true,
+                    "type": "object"
+                },
+                "contentStatus": {
+                    "description": "Status of integration content, e.g. dashboards",
+                    "enum": [
+                        "INVALID",
+                        "NOT_LOADED",
+                        "HIDDEN",
+                        "VISIBLE"
+                    ],
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "installStatus": {
+                    "description": "Whether the customer or an automated process has installed the dashboards for this integration",
+                    "enum": [
+                        "UNDECIDED",
+                        "UNINSTALLED",
+                        "INSTALLED"
+                    ],
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "metricStatuses": {
+                    "additionalProperties": {
+                        "$ref": "#/definitions/MetricStatus"
+                    },
+                    "description": "A Map from names of the required metrics to an object representing their reporting status.  The reporting status object has 3 boolean fields denoting whether the metric has been received during the corresponding time period: `ever`, `recentExceptNow`, and `now`.  `now` is on the order of a few hours, and `recentExceptNow` is on the order of the past few days, excluding the period considered to be `now`.",
+                    "readOnly": true,
+                    "type": "object"
+                }
+            },
+            "required": [
+                "alertStatuses",
+                "contentStatus",
+                "installStatus",
+                "metricStatuses"
+            ],
+            "type": "object"
+        },
+        "IteratorEntryStringJsonNode": {
+            "type": "object"
+        },
+        "IteratorJsonNode": {
+            "type": "object"
+        },
+        "IteratorString": {
+            "type": "object"
+        },
+        "JsonNode": {
+            "type": "object"
+        },
+        "LogicalType": {
+            "properties": {
+                "name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "MaintenanceWindow": {
+            "description": "Wavefront maintenance window entity",
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "customerId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "endTimeInSeconds": {
+                    "description": "The time in epoch seconds when this maintenance window will end",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "eventName": {
+                    "description": "The name of an event associated with the creation/update of this maintenance window",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "hostTagGroupHostNamesGroupAnded": {
+                    "description": "If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false",
+                    "type": "boolean"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "reason": {
+                    "description": "The purpose of this maintenance window",
+                    "type": "string"
+                },
+                "relevantCustomerTags": {
+                    "description": "List of alert tags whose matching alerts will be put into maintenance because of this maintenance window",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "relevantHostNames": {
+                    "description": "List of source/host names that will be put into maintenance because of this maintenance window",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "relevantHostTags": {
+                    "description": "List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "relevantHostTagsAnded": {
+                    "description": "Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false",
+                    "type": "boolean"
+                },
+                "runningState": {
+                    "enum": [
+                        "ONGOING",
+                        "PENDING",
+                        "ENDED"
+                    ],
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "sortAttr": {
+                    "description": "Numeric value used in default sorting",
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "startTimeInSeconds": {
+                    "description": "The time in epoch seconds when this maintenance window will start",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "title": {
+                    "description": "Title of this maintenance window",
+                    "type": "string"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "endTimeInSeconds",
+                "reason",
+                "relevantCustomerTags",
+                "startTimeInSeconds",
+                "title"
+            ],
+            "type": "object"
+        },
+        "Message": {
+            "description": "A message for display to a particular user, all users within a customer, or all users on a cluster",
+            "properties": {
+                "attributes": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A string->string map of additional properties associated with this message",
+                    "type": "object"
+                },
+                "content": {
+                    "description": "Message content",
+                    "type": "string"
+                },
+                "display": {
+                    "description": "The form of display for this message",
+                    "enum": [
+                        "BANNER",
+                        "TOASTER"
+                    ],
+                    "type": "string"
+                },
+                "endEpochMillis": {
+                    "description": "When this message will stop being displayed, in epoch millis",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "read": {
+                    "description": "A derived field for whether the current user has read this message",
+                    "type": "boolean"
+                },
+                "scope": {
+                    "description": "The audience scope that this message should reach",
+                    "enum": [
+                        "CLUSTER",
+                        "CUSTOMER",
+                        "USER"
+                    ],
+                    "type": "string"
+                },
+                "severity": {
+                    "description": "Message severity",
+                    "enum": [
+                        "MARKETING",
+                        "INFO",
+                        "WARN",
+                        "SEVERE"
+                    ],
+                    "type": "string"
+                },
+                "source": {
+                    "description": "Message source.  System messages will com from 'system@wavefront.com'",
+                    "type": "string"
+                },
+                "startEpochMillis": {
+                    "description": "When this message will begin to be displayed, in epoch millis",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "target": {
+                    "description": "For scope=CUSTOMER or scope=USER, the individual customer or user id",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Title of this message",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "display",
+                "endEpochMillis",
+                "scope",
+                "severity",
+                "source",
+                "startEpochMillis",
+                "title"
+            ],
+            "type": "object"
+        },
+        "MetricDetails": {
+            "description": "Details of the reporting metric",
+            "properties": {
+                "host": {
+                    "description": "The source reporting this metric",
+                    "type": "string"
+                },
+                "last_update": {
+                    "description": "Approximate time of last reporting, in milliseconds since the Unix epoch",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "tags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A key-value map of the point tags associated with this source",
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "MetricDetailsResponse": {
+            "description": "Response container for MetricDetails",
+            "properties": {
+                "hosts": {
+                    "description": "List of sources/hosts reporting this metric",
+                    "items": {
+                        "$ref": "#/definitions/MetricDetails"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "MetricStatus": {
+            "properties": {
+                "ever": {
+                    "type": "boolean"
+                },
+                "now": {
+                    "type": "boolean"
+                },
+                "recentExceptNow": {
+                    "type": "boolean"
+                },
+                "status": {
+                    "enum": [
+                        "OK",
+                        "PENDING"
+                    ],
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "NewRelicConfiguration": {
+            "description": "Configurations specific to the NewRelic integration.  Only applicable when the containing Credential has service=NEWRELIC",
+            "properties": {
+                "apiKey": {
+                    "description": "New Relic REST API Key.",
+                    "type": "string"
+                },
+                "appFilterRegex": {
+                    "description": "A regular expression that a application name must match (case-insensitively) in order to collect metrics.",
+                    "example": "^hostingservice-(prod|dev)*$",
+                    "type": "string"
+                },
+                "hostFilterRegex": {
+                    "description": "A regular expression that a host name must match (case-insensitively) in order to collect metrics.",
+                    "example": "host[1-9].xyz.com",
+                    "type": "string"
+                },
+                "newRelicMetricFilters": {
+                    "description": "Application specific metric filter",
+                    "items": {
+                        "$ref": "#/definitions/NewRelicMetricFilters"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "apiKey"
+            ],
+            "type": "object"
+        },
+        "NewRelicMetricFilters": {
+            "properties": {
+                "appName": {
+                    "type": "string"
+                },
+                "metricFilterRegex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Notificant": {
+            "description": "Wavefront notificant entity",
+            "properties": {
+                "contentType": {
+                    "description": "The value of the Content-Type header of the webhook POST request.",
+                    "enum": [
+                        "application/json",
+                        "text/html",
+                        "text/plain",
+                        "application/x-www-form-urlencoded",
+                        ""
+                    ],
+                    "type": "string"
+                },
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "customHttpHeaders": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "A string->string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook",
+                    "type": "object"
+                },
+                "customerId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "description": {
+                    "description": "Description",
+                    "type": "string"
+                },
+                "emailSubject": {
+                    "description": "The subject title of an email notification target",
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "isHtmlContent": {
+                    "description": "Determine whether the email alert target content is sent as html or text.",
+                    "type": "boolean"
+                },
+                "method": {
+                    "description": "The notification method used for notification target.",
+                    "enum": [
+                        "WEBHOOK",
+                        "EMAIL",
+                        "PAGERDUTY"
+                    ],
+                    "type": "string"
+                },
+                "recipient": {
+                    "description": "The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point",
+                    "type": "string"
+                },
+                "template": {
+                    "description": "A mustache template that will form the body of the POST request, email and summary of the PagerDuty.",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Title",
+                    "type": "string"
+                },
+                "triggers": {
+                    "description": "A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED",
+                    "items": {
+                        "enum": [
+                            "ALERT_OPENED",
+                            "ALERT_UPDATED",
+                            "ALERT_RESOLVED",
+                            "ALERT_MAINTENANCE",
+                            "ALERT_SNOOZED",
+                            "ALERT_INVALID",
+                            "ALERT_NO_LONGER_INVALID",
+                            "ALERT_TESTING",
+                            "ALERT_RETRIGGERED",
+                            "ALERT_NO_DATA",
+                            "ALERT_NO_DATA_RESOLVED",
+                            "ALERT_NO_DATA_MAINTENANCE",
+                            "ALERT_SERIES_SEVERITY_UPDATE",
+                            "ALERT_SEVERITY_UPDATE"
+                        ],
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "description",
+                "method",
+                "recipient",
+                "template",
+                "title",
+                "triggers"
+            ],
+            "type": "object"
+        },
+        "Number": {
+            "type": "object"
+        },
+        "PagedAlert": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Alert"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedAlertWithStats": {
+            "properties": {
+                "alertCounts": {
+                    "additionalProperties": {
+                        "format": "int32",
+                        "type": "integer"
+                    },
+                    "description": "A map from alert state to the number of alerts in that state within the search results",
+                    "readOnly": true,
+                    "type": "object"
+                },
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Alert"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedCloudIntegration": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/CloudIntegration"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedCustomerFacingUserObject": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/CustomerFacingUserObject"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedDashboard": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Dashboard"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedDerivedMetricDefinition": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/DerivedMetricDefinition"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedDerivedMetricDefinitionWithStats": {
+            "properties": {
+                "counts": {
+                    "additionalProperties": {
+                        "format": "int32",
+                        "type": "integer"
+                    },
+                    "description": "A map from the state of the derived metric definition to the number of entities in that state within the search results",
+                    "readOnly": true,
+                    "type": "object"
+                },
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/DerivedMetricDefinition"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedEvent": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Event"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedExternalLink": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/ExternalLink"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedIntegration": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Integration"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedMaintenanceWindow": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/MaintenanceWindow"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedMessage": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Message"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedNotificant": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Notificant"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedProxy": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Proxy"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedSavedSearch": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/SavedSearch"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedSource": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/Source"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "PagedUserGroup": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "$ref": "#/definitions/UserGroup"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "Point": {
+            "properties": {
+                "timestamp": {
+                    "description": "The timestamp of the point in milliseconds",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "value": {
+                    "format": "double",
+                    "type": "number"
+                }
+            },
+            "required": [
+                "timestamp",
+                "value"
+            ],
+            "type": "object"
+        },
+        "Proxy": {
+            "description": "Wavefront forwarding proxy",
+            "properties": {
+                "bytesLeftForBuffer": {
+                    "description": "Number of bytes of space remaining in the persistent disk queue of this proxy",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "bytesPerMinuteForBuffer": {
+                    "description": "Bytes used per minute by the persistent disk queue of this proxy",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "customerId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "deleted": {
+                    "type": "boolean"
+                },
+                "ephemeral": {
+                    "description": "When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "hostname": {
+                    "description": "Host name of the machine running the proxy",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "inTrash": {
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "lastCheckInTime": {
+                    "description": "Last time when this proxy checked in (in milliseconds since the unix epoch)",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastErrorEvent": {
+                    "$ref": "#/definitions/Event"
+                },
+                "lastErrorTime": {
+                    "description": "deprecated",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "lastKnownError": {
+                    "description": "deprecated",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "localQueueSize": {
+                    "description": "Number of items in the persistent disk queue of this proxy",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "name": {
+                    "description": "Proxy name (modifiable)",
+                    "type": "string"
+                },
+                "sshAgent": {
+                    "description": "deprecated",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "status": {
+                    "description": "the proxy's status",
+                    "enum": [
+                        "ACTIVE",
+                        "STOPPED_UNKNOWN",
+                        "STOPPED_BY_SERVER"
+                    ],
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "statusCause": {
+                    "description": "The reason why the proxy is in current status",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "timeDrift": {
+                    "description": "Time drift of the proxy's clock compared to Wavefront servers",
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "version": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name"
+            ],
+            "type": "object"
+        },
+        "QueryEvent": {
+            "description": "A representation of events as returned by the querying api, rather than the event api",
+            "properties": {
+                "end": {
+                    "description": "End time of event, in epoch millis",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "hosts": {
+                    "description": "Sources (hosts) to which the event pertains",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "isEphemeral": {
+                    "description": "Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend",
+                    "type": "boolean"
+                },
+                "name": {
+                    "description": "Event name",
+                    "type": "string"
+                },
+                "start": {
+                    "description": "Start time of event, in epoch millis",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "summarized": {
+                    "description": "In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "tags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Tags (annotations) on the event",
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "QueryResult": {
+            "properties": {
+                "events": {
+                    "items": {
+                        "$ref": "#/definitions/QueryEvent"
+                    },
+                    "type": "array"
+                },
+                "granularity": {
+                    "description": "The granularity of the returned results, in seconds",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "name": {
+                    "description": "The name of this query",
+                    "type": "string"
+                },
+                "query": {
+                    "description": "The query used to obtain this result",
+                    "type": "string"
+                },
+                "stats": {
+                    "$ref": "#/definitions/StatsModel"
+                },
+                "timeseries": {
+                    "items": {
+                        "$ref": "#/definitions/Timeseries"
+                    },
+                    "type": "array"
+                },
+                "warnings": {
+                    "description": "The warnings incurred by this query",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "RawTimeseries": {
+            "properties": {
+                "points": {
+                    "items": {
+                        "$ref": "#/definitions/Point"
+                    },
+                    "type": "array"
+                },
+                "tags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Associated tags of the time series",
+                    "type": "object"
+                }
+            },
+            "required": [
+                "points"
+            ],
+            "type": "object"
+        },
+        "ResponseContainer": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "type": "object"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerAlert": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Alert"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerCloudIntegration": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/CloudIntegration"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerDashboard": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Dashboard"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerDerivedMetricDefinition": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/DerivedMetricDefinition"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerEvent": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Event"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerExternalLink": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/ExternalLink"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerFacetResponse": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/FacetResponse"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerFacetsResponseContainer": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/FacetsResponseContainer"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerHistoryResponse": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/HistoryResponse"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerIntegration": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Integration"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerIntegrationStatus": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/IntegrationStatus"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerListACL": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "items": {
+                        "$ref": "#/definitions/ACL"
+                    },
+                    "type": "array"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerListIntegration": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "items": {
+                        "$ref": "#/definitions/Integration"
+                    },
+                    "type": "array"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerListIntegrationManifestGroup": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "items": {
+                        "$ref": "#/definitions/IntegrationManifestGroup"
+                    },
+                    "type": "array"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerListString": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerListUserGroup": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "items": {
+                        "$ref": "#/definitions/UserGroup"
+                    },
+                    "type": "array"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerMaintenanceWindow": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/MaintenanceWindow"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerMapStringInteger": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "additionalProperties": {
+                        "format": "int32",
+                        "type": "integer"
+                    },
+                    "type": "object"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerMapStringIntegrationStatus": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "additionalProperties": {
+                        "$ref": "#/definitions/IntegrationStatus"
+                    },
+                    "type": "object"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerMessage": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Message"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerNotificant": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Notificant"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedAlert": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedAlert"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedAlertWithStats": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedAlertWithStats"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedCloudIntegration": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedCloudIntegration"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedCustomerFacingUserObject": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedCustomerFacingUserObject"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedDashboard": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedDashboard"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedDerivedMetricDefinition": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedDerivedMetricDefinition"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedDerivedMetricDefinitionWithStats": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedDerivedMetricDefinitionWithStats"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedEvent": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedEvent"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedExternalLink": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedExternalLink"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedIntegration": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedIntegration"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedMaintenanceWindow": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedMaintenanceWindow"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedMessage": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedMessage"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedNotificant": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedNotificant"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedProxy": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedProxy"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedSavedSearch": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedSavedSearch"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedSource": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedSource"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerPagedUserGroup": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/PagedUserGroup"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerProxy": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Proxy"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerSavedSearch": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/SavedSearch"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerSource": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/Source"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerTagsResponse": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/TagsResponse"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseContainerUserGroup": {
+            "description": "JSON container for the HTTP response along with status",
+            "properties": {
+                "response": {
+                    "$ref": "#/definitions/UserGroup"
+                },
+                "status": {
+                    "$ref": "#/definitions/ResponseStatus"
+                }
+            },
+            "required": [
+                "status"
+            ],
+            "type": "object"
+        },
+        "ResponseStatus": {
+            "properties": {
+                "code": {
+                    "description": "HTTP Response code corresponding to this response",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "message": {
+                    "description": "Descriptive message of the status of this response",
+                    "type": "string"
+                },
+                "result": {
+                    "enum": [
+                        "OK",
+                        "ERROR"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "code",
+                "result"
+            ],
+            "type": "object"
+        },
+        "SavedSearch": {
+            "description": "Saved queries for searches over Wavefront entities",
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "entityType": {
+                    "description": "The Wavefront entity type over which to search",
+                    "enum": [
+                        "DASHBOARD",
+                        "ALERT",
+                        "MAINTENANCE_WINDOW",
+                        "NOTIFICANT",
+                        "EVENT",
+                        "SOURCE",
+                        "EXTERNAL_LINK",
+                        "AGENT",
+                        "CLOUD_INTEGRATION",
+                        "APPLICATION",
+                        "REGISTERED_QUERY",
+                        "USER",
+                        "USER_GROUP"
+                    ],
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "query": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query",
+                    "type": "object"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "userId": {
+                    "description": "The user for whom this search is saved",
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "entityType",
+                "query"
+            ],
+            "type": "object"
+        },
+        "SearchQuery": {
+            "properties": {
+                "key": {
+                    "description": "The entity facet (key) by which to search.  Valid keys are any property keys returned by the JSON representation of the entity.  Examples are 'creatorId', 'name', etc.  The following special key keywords are also valid:  'tags' performs a search on entity tags, 'tagpath' performs a hierarchical search on tags, with  periods (.) as path level separators.  'freetext' performs a free text search across many fields of the entity",
+                    "type": "string"
+                },
+                "matchingMethod": {
+                    "description": "The method by which search matching is performed.  Default: CONTAINS",
+                    "enum": [
+                        "CONTAINS",
+                        "STARTSWITH",
+                        "EXACT",
+                        "TAGPATH"
+                    ],
+                    "type": "string"
+                },
+                "value": {
+                    "description": "The entity facet value for which to search",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "key",
+                "value"
+            ],
+            "type": "object"
+        },
+        "SortableSearchRequest": {
+            "properties": {
+                "limit": {
+                    "description": "The number of results to return.  Default: 100",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "offset": {
+                    "description": "The number of results to skip before returning values.  Default: 0",
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "query": {
+                    "description": "A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned",
+                    "items": {
+                        "$ref": "#/definitions/SearchQuery"
+                    },
+                    "type": "array"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                }
+            },
+            "type": "object"
+        },
+        "Sorting": {
+            "description": "Specifies how returned items should be sorted",
+            "properties": {
+                "ascending": {
+                    "description": "Whether to sort ascending.  If undefined, sorting is not guaranteed",
+                    "type": "boolean"
+                },
+                "default": {
+                    "description": "Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true.",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "field": {
+                    "description": "The facet by which to sort",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ascending",
+                "field"
+            ],
+            "type": "object"
+        },
+        "Source": {
+            "description": "A source (sometimes called host) of time series data from telemetry ingestion",
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "creatorId": {
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "description": {
+                    "description": "Description of this source",
+                    "type": "string"
+                },
+                "hidden": {
+                    "description": "A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)",
+                    "readOnly": true,
+                    "type": "boolean"
+                },
+                "id": {
+                    "description": "id of this source, must be exactly equivalent to 'sourceName'",
+                    "type": "string"
+                },
+                "markedNewEpochMillis": {
+                    "description": "Epoch Millis when this source was marked as ~status.new",
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "sourceName": {
+                    "description": "The name of the source, usually set by ingested telemetry",
+                    "type": "string"
+                },
+                "tags": {
+                    "additionalProperties": {
+                        "type": "boolean"
+                    },
+                    "description": "A Map (String -> boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true",
+                    "type": "object"
+                },
+                "updatedEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "updaterId": {
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "sourceName"
+            ],
+            "type": "object"
+        },
+        "SourceLabelPair": {
+            "description": "Convenience wrapper for the identifier of a unique series, which consists of a source (host) and a metric or aggregation (label)",
+            "properties": {
+                "firing": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "host": {
+                    "description": "Source (or host).  \"Source\" and \"host\" are synonyms in current versions of wavefront, but the host terminology is deprecated",
+                    "type": "string"
+                },
+                "label": {
+                    "type": "string"
+                },
+                "observed": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "severity": {
+                    "enum": [
+                        "INFO",
+                        "SMOKE",
+                        "WARN",
+                        "SEVERE"
+                    ],
+                    "type": "string"
+                },
+                "tags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "SourceSearchRequestContainer": {
+            "properties": {
+                "cursor": {
+                    "description": "The id (exclusive) from which search results resume returning.  Users should supply an entity 'id' to this property.  Its main purpose is to resume where a previous search left off because of the 'limit' parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results",
+                    "type": "string"
+                },
+                "limit": {
+                    "description": "The number of results to return.  Default: 100",
+                    "example": 100,
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "query": {
+                    "description": "A list of queries by which to limit the search results",
+                    "items": {
+                        "$ref": "#/definitions/SearchQuery"
+                    },
+                    "type": "array"
+                },
+                "sortSourcesAscending": {
+                    "description": "Whether to sort source results ascending lexigraphically by id/sourceName.  Default: true",
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "StatsModel": {
+            "properties": {
+                "buffer_keys": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "cached_compacted_keys": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "compacted_keys": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "compacted_points": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "cpu_ns": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "hosts_used": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "keys": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "latency": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "metrics_used": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "points": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "queries": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "query_tasks": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "s3_keys": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "skipped_compacted_keys": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "summaries": {
+                    "format": "int64",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "TagsResponse": {
+            "properties": {
+                "cursor": {
+                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
+                    "type": "string"
+                },
+                "items": {
+                    "description": "List of requested items",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "limit": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "moreItems": {
+                    "description": "Whether more items are available for return by increment offset or cursor",
+                    "type": "boolean"
+                },
+                "offset": {
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "sort": {
+                    "$ref": "#/definitions/Sorting"
+                },
+                "totalItems": {
+                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
+                    "format": "int32",
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "TargetInfo": {
+            "description": "Alert target display information that includes type, id, and the name of the alert target.",
+            "properties": {
+                "id": {
+                    "description": "ID of the alert target",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "method": {
+                    "description": "Notification method of the alert target",
+                    "enum": [
+                        "EMAIL",
+                        "PAGERDUTY",
+                        "WEBHOOK"
+                    ],
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "name": {
+                    "description": "Name of the alert target",
+                    "readOnly": true,
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "TeslaConfiguration": {
+            "description": "Configurations specific to the Tesla integration.  Only applicable when the containing Credential has service=TESLA",
+            "properties": {
+                "email": {
+                    "description": "Email address for Tesla account login",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "email"
+            ],
+            "type": "object"
+        },
+        "Timeseries": {
+            "properties": {
+                "data": {
+                    "description": "Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp",
+                    "items": {
+                        "items": {
+                            "format": "float",
+                            "type": "number"
+                        },
+                        "type": "array"
+                    },
+                    "type": "array"
+                },
+                "host": {
+                    "description": "Source/Host of this timeseries",
+                    "type": "string"
+                },
+                "label": {
+                    "description": "Label of this timeseries",
+                    "type": "string"
+                },
+                "tags": {
+                    "additionalProperties": {
+                        "type": "string"
+                    },
+                    "description": "Tags (key-value annotations) of this timeseries",
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "User": {
+            "properties": {
+                "apiToken": {
+                    "type": "string"
+                },
+                "apiToken2": {
+                    "type": "string"
+                },
+                "credential": {
+                    "type": "string"
+                },
+                "customer": {
+                    "type": "string"
+                },
+                "groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "identifier": {
+                    "type": "string"
+                },
+                "invalidPasswordAttempts": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "lastLogout": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "lastSuccessfulLogin": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "onboardingState": {
+                    "type": "string"
+                },
+                "provider": {
+                    "type": "string"
+                },
+                "resetToken": {
+                    "type": "string"
+                },
+                "resetTokenCreationMillis": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "settings": {
+                    "$ref": "#/definitions/UserSettings"
+                },
+                "ssoId": {
+                    "type": "string"
+                },
+                "superAdmin": {
+                    "type": "boolean"
+                },
+                "userGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "UserGroup": {
+            "description": "Wavefront user group entity",
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "customer": {
+                    "description": "The id of the customer to which the user group belongs",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "id": {
+                    "description": "The unique identifier of the user group",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "The name of the user group",
+                    "type": "string"
+                },
+                "permissions": {
+                    "description": "List of permissions the user group has been granted access to",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "properties": {
+                    "$ref": "#/definitions/UserGroupPropertiesDTO",
+                    "description": "The properties of the user group(name editable, users editable, etc.)",
+                    "readOnly": true
+                },
+                "userCount": {
+                    "description": "Total number of users that are members of the user group",
+                    "format": "int32",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "users": {
+                    "description": "List(may be incomplete) of users that are members of the user group.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "readOnly": true,
+                    "type": "array"
+                }
+            },
+            "required": [
+                "name",
+                "permissions"
+            ],
+            "type": "object"
+        },
+        "UserGroupPropertiesDTO": {
+            "properties": {
+                "nameEditable": {
+                    "type": "boolean"
+                },
+                "permissionsEditable": {
+                    "type": "boolean"
+                },
+                "usersEditable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "UserGroupWrite": {
+            "description": "Wavefront user group entity for write requests",
+            "properties": {
+                "createdEpochMillis": {
+                    "format": "int64",
+                    "readOnly": true,
+                    "type": "integer"
+                },
+                "customer": {
+                    "description": "The id of the customer to which the user group belongs",
+                    "readOnly": true,
+                    "type": "string"
+                },
+                "id": {
+                    "description": "The unique identifier of the user group",
+                    "type": "string"
+                },
+                "name": {
+                    "description": "The name of the user group",
+                    "type": "string"
+                },
+                "permissions": {
+                    "description": "List of permissions the user group has been granted access to",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "name",
+                "permissions"
+            ],
+            "type": "object"
+        },
+        "UserModel": {
+            "description": "Model for an user object",
+            "properties": {
+                "customer": {
+                    "description": "The id of the customer to which this user belongs",
+                    "type": "string"
+                },
+                "groups": {
+                    "description": "The permissions granted to this user",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "identifier": {
+                    "description": "The unique identifier of this user, which must be their valid email address",
+                    "type": "string"
+                },
+                "lastSuccessfulLogin": {
+                    "format": "int64",
+                    "type": "integer"
+                },
+                "ssoId": {
+                    "type": "string"
+                },
+                "userGroups": {
+                    "description": "The list of user groups the user belongs to",
+                    "items": {
+                        "$ref": "#/definitions/UserGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "customer",
+                "groups",
+                "identifier",
+                "userGroups"
+            ],
+            "type": "object"
+        },
+        "UserRequestDTO": {
+            "properties": {
+                "customer": {
+                    "type": "string"
+                },
+                "groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "identifier": {
+                    "type": "string"
+                },
+                "ssoId": {
+                    "type": "string"
+                },
+                "userGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "UserSettings": {
+            "properties": {
+                "alwaysHideQuerybuilder": {
+                    "type": "boolean"
+                },
+                "chartTitleScalar": {
+                    "format": "int32",
+                    "type": "integer"
+                },
+                "hideTSWhenQuerybuilderShown": {
+                    "type": "boolean"
+                },
+                "landingDashboardSlug": {
+                    "type": "string"
+                },
+                "preferredTimeZone": {
+                    "type": "string"
+                },
+                "showOnboarding": {
+                    "type": "boolean"
+                },
+                "showQuerybuilderByDefault": {
+                    "type": "boolean"
+                },
+                "use24HourTime": {
+                    "type": "boolean"
+                },
+                "useDarkTheme": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "UserToCreate": {
+            "properties": {
+                "emailAddress": {
+                    "description": "The (unique) identifier of the user to create. Must be a valid email address",
+                    "type": "string"
+                },
+                "groups": {
+                    "description": "List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "userGroups": {
+                    "description": "List of user groups to this user. ",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "emailAddress",
+                "groups",
+                "userGroups"
+            ],
+            "type": "object"
+        },
+        "WFTags": {
+            "properties": {
+                "customerTags": {
+                    "description": "Customer-wide tags.  Can be on various wavefront entities such alerts or dashboards.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "info": {
+        "description": "<p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>",
+        "title": "Wavefront REST API",
+        "version": "v2"
+    },
+    "paths": {
+        "/api/v2/alert": {
+            "get": {
+                "description": "",
+                "operationId": "getAllAlert",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all alerts for a customer",
+                "tags": [
+                    "Alert"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createAlert",
+                "parameters": [
+                    {
+                        "description": "Example Classic Body: \n<pre>{\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}</pre>\nExample Threshold Body: \n<pre>{\n    \"name\": \"Alert Name\",\n    \"alertType\": \"THRESHOLD\",\n    \"conditions\": {\n        \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",\n        \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"\n    },\n    \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n    \"minutes\": 5,\n    \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Alert"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/summary": {
+            "get": {
+                "description": "",
+                "operationId": "getAlertsSummary",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMapStringInteger"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Count alerts of various statuses for a customer",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteAlert",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getAlert",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateAlert",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"id\": \"1459375928549\",\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Alert"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"id\": \"1459375928549\",\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/history": {
+            "get": {
+                "description": "",
+                "operationId": "getAlertHistory",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerHistoryResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get the version history of a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/history/{version}": {
+            "get": {
+                "description": "",
+                "operationId": "getAlertVersion",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "format": "int64",
+                        "in": "path",
+                        "name": "version",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific historical version of a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/install": {
+            "post": {
+                "description": "",
+                "operationId": "unhideAlert",
+                "parameters": [
+                    {
+                        "format": "int64",
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Unhide a specific integration alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/snooze": {
+            "post": {
+                "description": "",
+                "operationId": "snoozeAlert",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "format": "int64",
+                        "in": "query",
+                        "name": "seconds",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Snooze a specific alert for some number of seconds",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/tag": {
+            "get": {
+                "description": "",
+                "operationId": "getAlertTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerTagsResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all tags associated with a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setAlertTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set all tags associated with a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/tag/{tagValue}": {
+            "delete": {
+                "description": "",
+                "operationId": "removeAlertTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove a tag from a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addAlertTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Add a tag to a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/undelete": {
+            "post": {
+                "description": "",
+                "operationId": "undeleteAlert",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Undelete a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/uninstall": {
+            "post": {
+                "description": "",
+                "operationId": "hideAlert",
+                "parameters": [
+                    {
+                        "format": "int64",
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Hide a specific integration alert ",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/alert/{id}/unsnooze": {
+            "post": {
+                "description": "",
+                "operationId": "unsnoozeAlert",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Unsnooze a specific alert",
+                "tags": [
+                    "Alert"
+                ]
+            }
+        },
+        "/api/v2/chart/api": {
+            "get": {
+                "description": "Long time spans and small granularities can take a long time to calculate",
+                "operationId": "queryApi",
+                "parameters": [
+                    {
+                        "description": "name used to identify the query",
+                        "in": "query",
+                        "name": "n",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "the query expression to execute",
+                        "in": "query",
+                        "name": "q",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "the start time of the query window in epoch milliseconds",
+                        "in": "query",
+                        "name": "s",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "the end time of the query window in epoch milliseconds (null to use now)",
+                        "in": "query",
+                        "name": "e",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "the granularity of the points returned",
+                        "enum": [
+                            "d",
+                            "h",
+                            "m",
+                            "s"
+                        ],
+                        "in": "query",
+                        "name": "g",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "the approximate maximum number of points to return (may not limit number of points exactly)",
+                        "in": "query",
+                        "name": "p",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "whether series with only points that are outside of the query window will be returned (defaults to true)",
+                        "in": "query",
+                        "name": "i",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "description": "whether events for sources included in the query will be automatically returned by the query",
+                        "in": "query",
+                        "name": "autoEvents",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "description": "summarization strategy to use when bucketing points together",
+                        "enum": [
+                            "MEAN",
+                            "MEDIAN",
+                            "MIN",
+                            "MAX",
+                            "SUM",
+                            "COUNT",
+                            "LAST",
+                            "FIRST"
+                        ],
+                        "in": "query",
+                        "name": "summarization",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "retrieve events more optimally displayed for a list",
+                        "in": "query",
+                        "name": "listMode",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "description": "do not return points outside the query window [s;e), defaults to false",
+                        "in": "query",
+                        "name": "strict",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "description": "include metrics that have not been reporting recently, defaults to false",
+                        "in": "query",
+                        "name": "includeObsoleteMetrics",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "default": false,
+                        "description": "sorts the output so that returned series are in order, defaults to false",
+                        "in": "query",
+                        "name": "sorted",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "default": true,
+                        "description": "whether the query cache is used, defaults to true",
+                        "in": "query",
+                        "name": "cached",
+                        "required": false,
+                        "type": "boolean"
+                    }
+                ],
+                "produces": [
+                    "application/json",
+                    "application/x-javascript; charset=UTF-8",
+                    "application/javascript; charset=UTF-8"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/QueryResult"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity",
+                "tags": [
+                    "Query"
+                ]
+            }
+        },
+        "/api/v2/chart/metric/detail": {
+            "get": {
+                "description": "",
+                "operationId": "getMetricDetails",
+                "parameters": [
+                    {
+                        "description": "Metric name",
+                        "in": "query",
+                        "name": "m",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "limit",
+                        "format": "int32",
+                        "in": "query",
+                        "name": "l",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "description": "cursor value to continue if the number of results exceeds 1000",
+                        "in": "query",
+                        "name": "c",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "collectionFormat": "multi",
+                        "description": "glob pattern for sources to include in the query result",
+                        "in": "query",
+                        "items": {
+                            "type": "string"
+                        },
+                        "name": "h",
+                        "required": false,
+                        "type": "array"
+                    }
+                ],
+                "produces": [
+                    "application/json",
+                    "application/x-javascript",
+                    "application/javascript"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/MetricDetailsResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get more details on a metric, including reporting sources and approximate last time reported",
+                "tags": [
+                    "Metric"
+                ]
+            }
+        },
+        "/api/v2/chart/raw": {
+            "get": {
+                "description": "An API to check if ingested points are as expected.  Points ingested within a single second are averaged when returned.",
+                "operationId": "queryRaw",
+                "parameters": [
+                    {
+                        "description": "host to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.",
+                        "in": "query",
+                        "name": "host",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "source to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.",
+                        "in": "query",
+                        "name": "source",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "metric to query ingested points for (cannot contain wildcards)",
+                        "in": "query",
+                        "name": "metric",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "start time in epoch milliseconds (cannot be more than a day in the past) null to use an hour before endTime",
+                        "format": "int64",
+                        "in": "query",
+                        "name": "startTime",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "description": "end time in epoch milliseconds (cannot be more than a day in the past) null to use now",
+                        "format": "int64",
+                        "in": "query",
+                        "name": "endTime",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/RawTimeseries"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid request parameters"
+                    },
+                    "401": {
+                        "description": "Authorization Error"
+                    },
+                    "404": {
+                        "description": "Metric not found for specified source/host"
+                    },
+                    "500": {
+                        "description": "Server Error"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Perform a raw data query against Wavefront servers that returns second granularity points grouped by tags",
+                "tags": [
+                    "Query"
+                ]
+            }
+        },
+        "/api/v2/cloudintegration": {
+            "get": {
+                "description": "",
+                "operationId": "getAllCloudIntegration",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all cloud integrations for a customer",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createCloudIntegration",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/CloudIntegration"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            }
+        },
+        "/api/v2/cloudintegration/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteCloudIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getCloudIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateCloudIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/CloudIntegration"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            }
+        },
+        "/api/v2/cloudintegration/{id}/disable": {
+            "post": {
+                "description": "",
+                "operationId": "disableCloudIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Disable a specific cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            }
+        },
+        "/api/v2/cloudintegration/{id}/enable": {
+            "post": {
+                "description": "",
+                "operationId": "enableCloudIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Enable a specific cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            }
+        },
+        "/api/v2/cloudintegration/{id}/undelete": {
+            "post": {
+                "description": "",
+                "operationId": "undeleteCloudIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Undelete a specific cloud integration",
+                "tags": [
+                    "Cloud Integration"
+                ]
+            }
+        },
+        "/api/v2/customer/permissions": {
+            "get": {
+                "description": "Returns all permissions' info data",
+                "operationId": "getAllPermissions",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/BusinessActionGroupBasicDTO"
+                            },
+                            "type": "array"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all permissions",
+                "tags": [
+                    "Settings"
+                ]
+            }
+        },
+        "/api/v2/customer/preferences": {
+            "get": {
+                "description": "",
+                "operationId": "getCustomerPreferences",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/CustomerPreferences"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get customer preferences",
+                "tags": [
+                    "Settings"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "postCustomerPreferences",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/CustomerPreferencesUpdating"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/CustomerPreferences"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update selected fields of customer preferences",
+                "tags": [
+                    "Settings"
+                ]
+            }
+        },
+        "/api/v2/customer/preferences/defaultUserGroups": {
+            "get": {
+                "description": "",
+                "operationId": "getDefaultUserGroups",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/User"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerListUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get default user groups customer preferences",
+                "tags": [
+                    "Settings"
+                ]
+            }
+        },
+        "/api/v2/dashboard": {
+            "get": {
+                "description": "",
+                "operationId": "getAllDashboard",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all dashboards for a customer",
+                "tags": [
+                    "Dashboard"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createDashboard",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Dashboard"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/acl": {
+            "get": {
+                "description": "",
+                "operationId": "getAccessControlList",
+                "parameters": [
+                    {
+                        "collectionFormat": "multi",
+                        "in": "query",
+                        "items": {
+                            "type": "string"
+                        },
+                        "name": "id",
+                        "required": false,
+                        "type": "array"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerListACL"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get list of Access Control Lists for the specified dashboards",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/acl/add": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addAccess",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/ACL"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Adds the specified ids to the given dashboards' ACL",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/acl/remove": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "removeAccess",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/ACL"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Removes the specified ids from the given dashboards' ACL",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/acl/set": {
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setAcl",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/ACL"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set ACL for the specified dashboards",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteDashboard",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getDashboard",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateDashboard",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Dashboard"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/favorite": {
+            "post": {
+                "description": "",
+                "operationId": "favoriteDashboard",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Mark a dashboard as favorite",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/history": {
+            "get": {
+                "description": "",
+                "operationId": "getDashboardHistory",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerHistoryResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get the version history of a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/history/{version}": {
+            "get": {
+                "description": "",
+                "operationId": "getDashboardVersion",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "format": "int64",
+                        "in": "path",
+                        "name": "version",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific version of a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/tag": {
+            "get": {
+                "description": "",
+                "operationId": "getDashboardTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerTagsResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all tags associated with a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setDashboardTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set all tags associated with a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/tag/{tagValue}": {
+            "delete": {
+                "description": "",
+                "operationId": "removeDashboardTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove a tag from a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addDashboardTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Add a tag to a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/undelete": {
+            "post": {
+                "description": "",
+                "operationId": "undeleteDashboard",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Undelete a specific dashboard",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/dashboard/{id}/unfavorite": {
+            "post": {
+                "description": "",
+                "operationId": "unfavoriteDashboard",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Unmark a dashboard as favorite",
+                "tags": [
+                    "Dashboard"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric": {
+            "get": {
+                "description": "",
+                "operationId": "getAllDerivedMetrics",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all derived metric definitions for a customer",
+                "tags": [
+                    "Derived Metric"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createDerivedMetric",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"Query Name\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"derivedMetricTag1\"\n    ]\n  }\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/DerivedMetricDefinition"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"Query Name\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"derivedMetricTag1\"\n    ]\n  }\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteDerivedMetric",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getDerivedMetric",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific registered query",
+                "tags": [
+                    "Derived Metric"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateDerivedMetric",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"id\": \"1459375928549\",\n  \"name\": \"Query Name\",\n  \"createUserId\": \"user\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/DerivedMetricDefinition"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"id\": \"1459375928549\",\n  \"name\": \"Query Name\",\n  \"createUserId\": \"user\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric/{id}/history": {
+            "get": {
+                "description": "",
+                "operationId": "getDerivedMetricHistory",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerHistoryResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get the version history of a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric/{id}/history/{version}": {
+            "get": {
+                "description": "",
+                "operationId": "getDerivedMetricByVersion",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "format": "int64",
+                        "in": "path",
+                        "name": "version",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific historical version of a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric/{id}/tag": {
+            "get": {
+                "description": "",
+                "operationId": "getDerivedMetricTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerTagsResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all tags associated with a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setDerivedMetricTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set all tags associated with a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric/{id}/tag/{tagValue}": {
+            "delete": {
+                "description": "",
+                "operationId": "removeTagFromDerivedMetric",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove a tag from a specific Derived Metric",
+                "tags": [
+                    "Derived Metric"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addTagToDerivedMetric",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Add a tag to a specific Derived Metric",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/derivedmetric/{id}/undelete": {
+            "post": {
+                "description": "",
+                "operationId": "undeleteDerivedMetric",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Undelete a specific derived metric definition",
+                "tags": [
+                    "Derived Metric"
+                ]
+            }
+        },
+        "/api/v2/event": {
+            "get": {
+                "description": "",
+                "operationId": "getAllEventsWithTimeRange",
+                "parameters": [
+                    {
+                        "format": "int64",
+                        "in": "query",
+                        "name": "earliestStartTimeEpochMillis",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "format": "int64",
+                        "in": "query",
+                        "name": "latestStartTimeEpochMillis",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "in": "query",
+                        "name": "cursor",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "List all the events for a customer within a time range",
+                "tags": [
+                    "Event"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>",
+                "operationId": "createEvent",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Event"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific event",
+                "tags": [
+                    "Event"
+                ]
+            }
+        },
+        "/api/v2/event/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteEvent",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific event",
+                "tags": [
+                    "Event"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getEvent",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific event",
+                "tags": [
+                    "Event"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>",
+                "operationId": "updateEvent",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Event"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific event",
+                "tags": [
+                    "Event"
+                ]
+            }
+        },
+        "/api/v2/event/{id}/close": {
+            "post": {
+                "description": "",
+                "operationId": "closeEvent",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Close a specific event",
+                "tags": [
+                    "Event"
+                ]
+            }
+        },
+        "/api/v2/event/{id}/tag": {
+            "get": {
+                "description": "",
+                "operationId": "getEventTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerTagsResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all tags associated with a specific event",
+                "tags": [
+                    "Event"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setEventTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set all tags associated with a specific event",
+                "tags": [
+                    "Event"
+                ]
+            }
+        },
+        "/api/v2/event/{id}/tag/{tagValue}": {
+            "delete": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "removeEventTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove a tag from a specific event",
+                "tags": [
+                    "Event"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addEventTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Add a tag to a specific event",
+                "tags": [
+                    "Event"
+                ]
+            }
+        },
+        "/api/v2/extlink": {
+            "get": {
+                "description": "",
+                "operationId": "getAllExternalLink",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedExternalLink"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all external links for a customer",
+                "tags": [
+                    "External Link"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createExternalLink",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/ExternalLink"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerExternalLink"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific external link",
+                "tags": [
+                    "External Link"
+                ]
+            }
+        },
+        "/api/v2/extlink/{id}": {
+            "delete": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "deleteExternalLink",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerExternalLink"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific external link",
+                "tags": [
+                    "External Link"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getExternalLink",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerExternalLink"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific external link",
+                "tags": [
+                    "External Link"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateExternalLink",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/ExternalLink"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerExternalLink"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific external link",
+                "tags": [
+                    "External Link"
+                ]
+            }
+        },
+        "/api/v2/integration": {
+            "get": {
+                "description": "",
+                "operationId": "getAllIntegration",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets a flat list of all Wavefront integrations available, along with their status",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/installed": {
+            "get": {
+                "description": "",
+                "operationId": "getInstalledIntegration",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerListIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets a flat list of all Integrations that are installed, along with their status",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/manifests": {
+            "get": {
+                "description": "",
+                "operationId": "getAllIntegrationInManifests",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerListIntegrationManifestGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets all Wavefront integrations as structured in their integration manifests, along with their status and content",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/manifests/min": {
+            "get": {
+                "description": "",
+                "operationId": "getAllIntegrationInManifestsMin",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerListIntegrationManifestGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets all Wavefront integrations as structured in their integration manifests.",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/status": {
+            "get": {
+                "description": "",
+                "operationId": "getAllIntegrationStatuses",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMapStringIntegrationStatus"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets the status of all Wavefront integrations",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/{id}": {
+            "get": {
+                "description": "",
+                "operationId": "getIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "refresh",
+                        "required": false,
+                        "type": "boolean"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets a single Wavefront integration by its id, along with its status",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/{id}/install": {
+            "post": {
+                "description": "",
+                "operationId": "installIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Installs a Wavefront integration",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/{id}/install-all-alerts": {
+            "post": {
+                "description": "",
+                "operationId": "installAllIntegrationAlerts",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/InstallAlerts"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Enable all alerts associated with this integration",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/{id}/status": {
+            "get": {
+                "description": "",
+                "operationId": "getIntegrationStatus",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets the status of a single Wavefront integration",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/{id}/uninstall": {
+            "post": {
+                "description": "",
+                "operationId": "uninstallIntegration",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Uninstalls a Wavefront integration",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/integration/{id}/uninstall-all-alerts": {
+            "post": {
+                "description": "",
+                "operationId": "uninstallAllIntegrationAlerts",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Disable all alerts associated with this integration",
+                "tags": [
+                    "Integration"
+                ]
+            }
+        },
+        "/api/v2/maintenancewindow": {
+            "get": {
+                "description": "",
+                "operationId": "getAllMaintenanceWindow",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedMaintenanceWindow"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all maintenance windows for a customer",
+                "tags": [
+                    "Maintenance Window"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createMaintenanceWindow",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/MaintenanceWindow"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a maintenance window",
+                "tags": [
+                    "Maintenance Window"
+                ]
+            }
+        },
+        "/api/v2/maintenancewindow/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteMaintenanceWindow",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific maintenance window",
+                "tags": [
+                    "Maintenance Window"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getMaintenanceWindow",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific maintenance window",
+                "tags": [
+                    "Maintenance Window"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateMaintenanceWindow",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/MaintenanceWindow"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific maintenance window",
+                "tags": [
+                    "Maintenance Window"
+                ]
+            }
+        },
+        "/api/v2/message": {
+            "get": {
+                "description": "",
+                "operationId": "userGetMessages",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": true,
+                        "in": "query",
+                        "name": "unreadOnly",
+                        "required": false,
+                        "type": "boolean"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedMessage"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Gets messages applicable to the current user, i.e. within time range and distribution scope",
+                "tags": [
+                    "Message"
+                ]
+            }
+        },
+        "/api/v2/message/{id}/read": {
+            "post": {
+                "description": "",
+                "operationId": "userReadMessage",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerMessage"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Mark a specific message as read",
+                "tags": [
+                    "Message"
+                ]
+            }
+        },
+        "/api/v2/notificant": {
+            "get": {
+                "description": "",
+                "operationId": "getAllNotificants",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all notification targets for a customer",
+                "tags": [
+                    "Notificant"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createNotificant",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Notificant"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a notification target",
+                "tags": [
+                    "Notificant"
+                ]
+            }
+        },
+        "/api/v2/notificant/test/{id}": {
+            "post": {
+                "description": "",
+                "operationId": "testNotificant",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Test a specific notification target",
+                "tags": [
+                    "Notificant"
+                ]
+            }
+        },
+        "/api/v2/notificant/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteNotificant",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific notification target",
+                "tags": [
+                    "Notificant"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getNotificant",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific notification target",
+                "tags": [
+                    "Notificant"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateNotificant",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Notificant"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific notification target",
+                "tags": [
+                    "Notificant"
+                ]
+            }
+        },
+        "/api/v2/proxy": {
+            "get": {
+                "description": "",
+                "operationId": "getAllProxy",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all proxies for a customer",
+                "tags": [
+                    "Proxy"
+                ]
+            }
+        },
+        "/api/v2/proxy/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteProxy",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific proxy",
+                "tags": [
+                    "Proxy"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getProxy",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific proxy",
+                "tags": [
+                    "Proxy"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateProxy",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"New Name for proxy\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Proxy"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"New Name for proxy\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update the name of a specific proxy",
+                "tags": [
+                    "Proxy"
+                ]
+            }
+        },
+        "/api/v2/proxy/{id}/undelete": {
+            "post": {
+                "description": "",
+                "operationId": "undeleteProxy",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Undelete a specific proxy",
+                "tags": [
+                    "Proxy"
+                ]
+            }
+        },
+        "/api/v2/savedsearch": {
+            "get": {
+                "description": "",
+                "operationId": "getAllSavedSearches",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedSavedSearch"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all saved searches for a user",
+                "tags": [
+                    "Saved Search"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createSavedSearch",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SavedSearch"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSavedSearch"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a saved search",
+                "tags": [
+                    "Saved Search"
+                ]
+            }
+        },
+        "/api/v2/savedsearch/type/{entitytype}": {
+            "get": {
+                "description": "",
+                "operationId": "getAllEntityTypeSavedSearches",
+                "parameters": [
+                    {
+                        "enum": [
+                            "DASHBOARD",
+                            "ALERT",
+                            "MAINTENANCE_WINDOW",
+                            "NOTIFICANT",
+                            "EVENT",
+                            "SOURCE",
+                            "EXTERNAL_LINK",
+                            "AGENT",
+                            "CLOUD_INTEGRATION",
+                            "USER",
+                            "USER_GROUP"
+                        ],
+                        "in": "path",
+                        "name": "entitytype",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedSavedSearch"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all saved searches for a specific entity type for a user",
+                "tags": [
+                    "Saved Search"
+                ]
+            }
+        },
+        "/api/v2/savedsearch/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteSavedSearch",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSavedSearch"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific saved search",
+                "tags": [
+                    "Saved Search"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getSavedSearch",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSavedSearch"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific saved search",
+                "tags": [
+                    "Saved Search"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateSavedSearch",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SavedSearch"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSavedSearch"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific saved search",
+                "tags": [
+                    "Saved Search"
+                ]
+            }
+        },
+        "/api/v2/search/alert": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchAlertEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedAlertWithStats"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's non-deleted alerts",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/alert/deleted": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchAlertDeletedEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedAlert"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's deleted alerts",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/alert/deleted/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchAlertDeletedForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's deleted alerts",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/alert/deleted/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchAlertDeletedForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's deleted alerts",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/alert/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchAlertForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's non-deleted alerts",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/alert/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchAlertForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's non-deleted alerts",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/cloudintegration": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchCloudIntegrationEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's non-deleted cloud integrations",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/cloudintegration/deleted": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchCloudIntegrationDeletedEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedCloudIntegration"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's deleted cloud integrations",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/cloudintegration/deleted/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchCloudIntegrationDeletedForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's deleted cloud integrations",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/cloudintegration/deleted/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchCloudIntegrationDeletedForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's deleted cloud integrations",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/cloudintegration/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchCloudIntegrationForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's non-deleted cloud integrations",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/cloudintegration/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchCloudIntegrationForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's non-deleted cloud integrations",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/dashboard": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchDashboardEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's non-deleted dashboards",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/dashboard/deleted": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchDashboardDeletedEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedDashboard"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's deleted dashboards",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/dashboard/deleted/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchDashboardDeletedForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's deleted dashboards",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/dashboard/deleted/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchDashboardDeletedForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's deleted dashboards",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/dashboard/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchDashboardForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's non-deleted dashboards",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/dashboard/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchDashboardForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's non-deleted dashboards",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/derivedmetric": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchRegisteredQueryEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedDerivedMetricDefinitionWithStats"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's non-deleted derived metric definitions",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/derivedmetric/deleted": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchRegisteredQueryDeletedEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedDerivedMetricDefinition"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's deleted derived metric definitions",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/derivedmetric/deleted/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchRegisteredQueryDeletedForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's deleted derived metric definitions",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/derivedmetric/deleted/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchRegisteredQueryDeletedForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's deleted derived metric definitions",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/derivedmetric/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchRegisteredQueryForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's non-deleted derived metric definition",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/derivedmetric/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchRegisteredQueryForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's non-deleted derived metric definitions",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/event": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchReportEventEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/EventSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedEvent"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's events",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/event/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchReportEventForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's events",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/event/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchReportEventForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's events",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/extlink": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchExternalLinkEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedExternalLink"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's external links",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/extlink/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchExternalLinksForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's external links",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/extlink/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchExternalLinksForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's external links",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/maintenancewindow": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchMaintenanceWindowEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedMaintenanceWindow"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's maintenance windows",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/maintenancewindow/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchMaintenanceWindowForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's maintenance windows",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/maintenancewindow/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchMaintenanceWindowForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's maintenance windows",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/notificant": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchNotificantEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's notificants",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/notificant/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchNotficantForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's notificants",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/notificant/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchNotificantForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's notificants",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/proxy": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchProxyEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's non-deleted proxies",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/proxy/deleted": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchProxyDeletedEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedProxy"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's deleted proxies",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/proxy/deleted/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchProxyDeletedForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's deleted proxies",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/proxy/deleted/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchProxyDeletedForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's deleted proxies",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/proxy/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchProxyForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's non-deleted proxies",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/proxy/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchProxyForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's non-deleted proxies",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/source": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchTaggedSourceEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SourceSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedSource"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's sources",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/source/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchTaggedSourceForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's sources",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/source/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchTaggedSourceForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's sources",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/user": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchUserEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedCustomerFacingUserObject"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's users",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/user/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchUserForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's users",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/user/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchUserForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's users",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/usergroup": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchUserGroupEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's user groups",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/usergroup/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchUserGroupForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's user groups",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/usergroup/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchUserGroupForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's user groups",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/webhook": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchWebHookEntities",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/SortableSearchRequest"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Search over a customer's webhooks",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/webhook/facets": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchWebhookForFacets",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetsSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of one or more facets over the customer's webhooks",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/search/webhook/{facet}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "searchWebHookForFacet",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "facet",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/FacetSearchRequestContainer"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerFacetResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Lists the values of a specific facet over the customer's webhooks",
+                "tags": [
+                    "Search"
+                ]
+            }
+        },
+        "/api/v2/source": {
+            "get": {
+                "description": "",
+                "operationId": "getAllSource",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "cursor",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedSource"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all sources for a customer",
+                "tags": [
+                    "Source"
+                ]
+            },
+            "post": {
+                "description": "",
+                "operationId": "createSource",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Source"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSource"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create metadata (description or tags) for a specific source",
+                "tags": [
+                    "Source"
+                ]
+            }
+        },
+        "/api/v2/source/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteSource",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSource"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete metadata (description and tags) for a specific source",
+                "tags": [
+                    "Source"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getSource",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSource"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific source for a customer",
+                "tags": [
+                    "Source"
+                ]
+            },
+            "put": {
+                "description": "The \"hidden\" property is stored as a tag. To set the value, add \"hidden\": &lt;value&gt; to the list of tags.",
+                "operationId": "updateSource",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Source"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerSource"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update metadata (description or tags) for a specific source.",
+                "tags": [
+                    "Source"
+                ]
+            }
+        },
+        "/api/v2/source/{id}/description": {
+            "delete": {
+                "description": "",
+                "operationId": "removeDescription",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove description from a specific source",
+                "tags": [
+                    "Source"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setDescription",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set description associated with a specific source",
+                "tags": [
+                    "Source"
+                ]
+            }
+        },
+        "/api/v2/source/{id}/tag": {
+            "get": {
+                "description": "",
+                "operationId": "getSourceTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerTagsResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all tags associated with a specific source",
+                "tags": [
+                    "Source"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "setSourceTags",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Set all tags associated with a specific source",
+                "tags": [
+                    "Source"
+                ]
+            }
+        },
+        "/api/v2/source/{id}/tag/{tagValue}": {
+            "delete": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "removeSourceTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove a tag from a specific source",
+                "tags": [
+                    "Source"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addSourceTag",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "path",
+                        "name": "tagValue",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainer"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Add a tag to a specific source",
+                "tags": [
+                    "Source"
+                ]
+            }
+        },
+        "/api/v2/user": {
+            "get": {
+                "description": "Returns all users",
+                "operationId": "getAllUser",
+                "parameters": [],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/UserModel"
+                            },
+                            "type": "array"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all users",
+                "tags": [
+                    "User"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createOrUpdateUser",
+                "parameters": [
+                    {
+                        "description": "Whether to send email notification to the user, if created.  Default: false",
+                        "enum": [
+                            "true",
+                            "false"
+                        ],
+                        "in": "query",
+                        "name": "sendEmail",
+                        "required": false,
+                        "type": "boolean"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/UserToCreate"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Creates or updates a user",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/deleteUsers": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "deleteMultipleUsers",
+                "parameters": [
+                    {
+                        "description": "identifiers of list of users which should be deleted",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerListString"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Deletes multiple users",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/grant/{permission}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "grantPermissionToUsers",
+                "parameters": [
+                    {
+                        "description": "Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission",
+                        "enum": [
+                            "agent_management",
+                            "alerts_management",
+                            "dashboard_management",
+                            "embedded_charts",
+                            "events_management",
+                            "external_links_management",
+                            "host_tag_management",
+                            "metrics_management",
+                            "user_management"
+                        ],
+                        "in": "path",
+                        "name": "permission",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "list of users which should be revoked by specified permission",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Grants a specific user permission to multiple users",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/invite": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "inviteUsers",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>[\n{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}\n]</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "$ref": "#/definitions/UserToCreate"
+                            },
+                            "type": "array"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Invite users with given user groups and permissions.",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/revoke/{permission}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "revokePermissionFromUsers",
+                "parameters": [
+                    {
+                        "description": "Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission",
+                        "enum": [
+                            "agent_management",
+                            "alerts_management",
+                            "dashboard_management",
+                            "embedded_charts",
+                            "events_management",
+                            "external_links_management",
+                            "host_tag_management",
+                            "metrics_management",
+                            "user_management"
+                        ],
+                        "in": "path",
+                        "name": "permission",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "list of users which should be revoked by specified permission",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Revokes a specific user permission from multiple users",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteUser",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Deletes a user identified by id",
+                "tags": [
+                    "User"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getUser",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Retrieves a user by identifier (email addr)",
+                "tags": [
+                    "User"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateUser",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"identifier\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/UserRequestDTO"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"identifier\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update user with given user groups and permissions.",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/{id}/addUserGroups": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addUserToUserGroups",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "The list of user groups that should be added to the user",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Adds specific user groups to the user",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/{id}/grant": {
+            "post": {
+                "consumes": [
+                    "application/x-www-form-urlencoded"
+                ],
+                "description": "",
+                "operationId": "grantUserPermission",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission",
+                        "enum": [
+                            "agent_management",
+                            "alerts_management",
+                            "dashboard_management",
+                            "embedded_charts",
+                            "events_management",
+                            "external_links_management",
+                            "host_tag_management",
+                            "metrics_management",
+                            "user_management"
+                        ],
+                        "in": "formData",
+                        "name": "group",
+                        "required": false,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Grants a specific user permission",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/{id}/removeUserGroups": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "removeUserFromUserGroups",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "The list of user groups that should be removed from the user",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Removes specific user groups from the user",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/user/{id}/revoke": {
+            "post": {
+                "consumes": [
+                    "application/x-www-form-urlencoded"
+                ],
+                "description": "",
+                "operationId": "revokeUserPermission",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "formData",
+                        "name": "group",
+                        "required": false,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/UserModel"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Revokes a specific user permission",
+                "tags": [
+                    "User"
+                ]
+            }
+        },
+        "/api/v2/usergroup": {
+            "get": {
+                "description": "",
+                "operationId": "getAllUserGroups",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all user groups for a customer",
+                "tags": [
+                    "UserGroup"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createUserGroup",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/UserGroupWrite"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific user group",
+                "tags": [
+                    "UserGroup"
+                ]
+            }
+        },
+        "/api/v2/usergroup/grant/{permission}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "grantPermissionToUserGroups",
+                "parameters": [
+                    {
+                        "description": "Permission to grant to user group(s).",
+                        "in": "path",
+                        "name": "permission",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "List of user groups.",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Grants a single permission to user group(s)",
+                "tags": [
+                    "UserGroup"
+                ]
+            }
+        },
+        "/api/v2/usergroup/revoke/{permission}": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "revokePermissionFromUserGroups",
+                "parameters": [
+                    {
+                        "description": "Permission to revoke from user group(s).",
+                        "in": "path",
+                        "name": "permission",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "List of user groups.",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Revokes a single permission from user group(s)",
+                "tags": [
+                    "UserGroup"
+                ]
+            }
+        },
+        "/api/v2/usergroup/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteUserGroup",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific user group",
+                "tags": [
+                    "UserGroup"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getUserGroup",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific user group",
+                "tags": [
+                    "UserGroup"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateUserGroup",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"id\": \"UserGroup identifier\",\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/UserGroupWrite"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"id\": \"UserGroup identifier\",\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific user group",
+                "tags": [
+                    "UserGroup"
+                ]
+            }
+        },
+        "/api/v2/usergroup/{id}/addUsers": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "addUsersToUserGroup",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "List of users that should be added to user group",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Add multiple users to a specific user group",
+                "tags": [
+                    "UserGroup"
+                ]
+            }
+        },
+        "/api/v2/usergroup/{id}/removeUsers": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "removeUsersFromUserGroup",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "List of users that should be removed from user group",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerUserGroup"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Remove multiple users from a specific user group",
+                "tags": [
+                    "UserGroup"
+                ]
+            }
+        },
+        "/api/v2/webhook": {
+            "get": {
+                "description": "",
+                "operationId": "getAllWebhooks",
+                "parameters": [
+                    {
+                        "default": 0,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "offset",
+                        "required": false,
+                        "type": "integer"
+                    },
+                    {
+                        "default": 100,
+                        "format": "int32",
+                        "in": "query",
+                        "name": "limit",
+                        "required": false,
+                        "type": "integer"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get all webhooks for a customer",
+                "tags": [
+                    "Webhook"
+                ]
+            },
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "createWebhook",
+                "parameters": [
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Notificant"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Create a specific webhook",
+                "tags": [
+                    "Webhook"
+                ]
+            }
+        },
+        "/api/v2/webhook/{id}": {
+            "delete": {
+                "description": "",
+                "operationId": "deleteWebhook",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Delete a specific webhook",
+                "tags": [
+                    "Webhook"
+                ]
+            },
+            "get": {
+                "description": "",
+                "operationId": "getWebhook",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Get a specific webhook",
+                "tags": [
+                    "Webhook"
+                ]
+            },
+            "put": {
+                "consumes": [
+                    "application/json"
+                ],
+                "description": "",
+                "operationId": "updateWebhook",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Example Body: \n<pre>{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}</pre>",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "$ref": "#/definitions/Notificant"
+                        },
+                        "x-examples": {
+                            "application/json": "{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}"
+                        }
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ResponseContainerNotificant"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Update a specific webhook",
+                "tags": [
+                    "Webhook"
+                ]
+            }
+        },
+        "/report": {
+            "post": {
+                "consumes": [
+                    "application/octet-stream",
+                    "application/x-www-form-urlencoded",
+                    "text/plain"
+                ],
+                "description": "",
+                "operationId": "report",
+                "parameters": [
+                    {
+                        "default": "wavefront",
+                        "description": "Format of data to be ingested",
+                        "enum": [
+                            "wavefront",
+                            "histogram",
+                            "trace"
+                        ],
+                        "in": "query",
+                        "name": "f",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "description": "Data to be ingested, in the specified format.  See https://docs.wavefront.com/direct_ingestion.html for more detail on how to format the data. Example in \"wavefront\" format: \n<pre>test.metric 100 source=test.source</pre>\nwhich ingests a time series point with metric name \"test.metric\", source name \"test.source\", and value of 100 with timestamp of now.",
+                        "in": "body",
+                        "name": "body",
+                        "required": false,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ],
+                "summary": "Directly ingest data/data stream with specified format",
+                "tags": [
+                    "Direct ingestion"
+                ]
+            }
+        }
+    },
+    "securityDefinitions": {
+        "api_key": {
+            "in": "header",
+            "name": "X-AUTH-TOKEN",
+            "type": "apiKey"
+        }
+    },
+    "swagger": "2.0",
+    "tags": [
+        {
+            "name": "Notificant"
+        },
+        {
+            "name": "Cloud Integration"
+        },
+        {
+            "name": "Settings"
+        },
+        {
+            "name": "Webhook"
+        },
+        {
+            "name": "Message"
+        },
+        {
+            "name": "User"
+        },
+        {
+            "name": "Query"
+        },
+        {
+            "name": "Event"
+        },
+        {
+            "name": "Metric"
+        },
+        {
+            "name": "Derived Metric"
+        },
+        {
+            "name": "Alert"
+        },
+        {
+            "name": "Proxy"
+        },
+        {
+            "name": "Maintenance Window"
+        },
+        {
+            "name": "Saved Search"
+        },
+        {
+            "name": "Integration"
+        },
+        {
+            "name": "Direct ingestion"
+        },
+        {
+            "name": "Dashboard"
+        },
+        {
+            "name": "UserGroup"
+        },
+        {
+            "name": "External Link"
+        },
+        {
+            "name": "Search"
+        },
+        {
+            "name": "Source"
+        }
+    ]
+}
diff --git a/docs/ACL.md b/docs/ACL.md
index 443dfdb..f3bbcce 100644
--- a/docs/ACL.md
+++ b/docs/ACL.md
@@ -4,8 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **entity_id** | **str** | The entity Id | 
-**view_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user group ids that have view permission | 
 **modify_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user groups ids that have modify permission | 
+**view_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user group ids that have view permission | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AWSBaseCredentials.md b/docs/AWSBaseCredentials.md
index 66e1545..02520ba 100644
--- a/docs/AWSBaseCredentials.md
+++ b/docs/AWSBaseCredentials.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**role_arn** | **str** | The Role ARN that the customer has created in AWS IAM to allow access to Wavefront | 
 **external_id** | **str** | The external id corresponding to the Role ARN | 
+**role_arn** | **str** | The Role ARN that the customer has created in AWS IAM to allow access to Wavefront | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AccessControlListSimple.md b/docs/AccessControlListSimple.md
index 82c259f..95d06bc 100644
--- a/docs/AccessControlListSimple.md
+++ b/docs/AccessControlListSimple.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**can_view** | **list[str]** |  | [optional] 
 **can_modify** | **list[str]** |  | [optional] 
+**can_view** | **list[str]** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Alert.md b/docs/Alert.md
index 77907c3..1603379 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -3,64 +3,64 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
-**created** | **int** | When this alert was created, in epoch millis | [optional] 
-**hidden** | **bool** |  | [optional] 
-**severity** | **str** | Severity of the alert | [optional] 
-**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
-**tags** | [**WFTags**](WFTags.md) |  | [optional] 
-**status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
-**event** | [**Event**](Event.md) |  | [optional] 
-**updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
-**targets** | **dict(str, str)** | Targets for severity. | [optional] 
-**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
-**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
-**update_user_id** | **str** | The user that last updated this alert | [optional] 
-**condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
-**alert_type** | **str** | Alert type. | [optional] 
-**display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
-**failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
-**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
 **active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
-**condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
-**display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
-**condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
-**display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
-**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
-**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
-**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
-**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
-**conditions** | **dict(str, str)** | Multi - alert conditions. | [optional] 
-**notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
 **additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
-**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
+**alert_type** | **str** | Alert type. | [optional] 
 **alerts_last_day** | **int** |  | [optional] 
-**alerts_last_week** | **int** |  | [optional] 
 **alerts_last_month** | **int** |  | [optional] 
-**in_trash** | **bool** |  | [optional] 
-**query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
+**alerts_last_week** | **int** |  | [optional] 
+**condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
+**condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
+**condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
+**conditions** | **dict(str, str)** | Multi - alert conditions. | [optional] 
 **create_user_id** | **str** |  | [optional] 
+**created** | **int** | When this alert was created, in epoch millis | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
+**display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
+**display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
+**event** | [**Event**](Event.md) |  | [optional] 
+**failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
+**hidden** | **bool** |  | [optional] 
+**hosts_used** | **list[str]** | Number of hosts checked by the alert condition | [optional] 
+**id** | **str** |  | [optional] 
+**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
+**in_trash** | **bool** |  | [optional] 
+**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
+**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
+**last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
 **last_failed_time** | **int** | The time of the last error encountered when running this alert&#39;s condition query, in epoch millis | [optional] 
 **last_notification_millis** | **int** | When this alert last caused a notification, in epoch millis | [optional] 
-**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
-**num_points_in_failure_frame** | **int** | Number of points scanned in alert query time frame. | [optional] 
+**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
+**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the alert condition | [optional] 
-**hosts_used** | **list[str]** | Number of hosts checked by the alert condition | [optional] 
-**system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
-**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** |  | [optional] 
+**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
+**name** | **str** |  | 
+**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
+**notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
 **notification_resend_frequency_minutes** | **int** | How often to re-trigger a continually failing alert. If absent or &lt;&#x3D; 0, no retriggering occurs | [optional] 
-**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**deleted** | **bool** |  | [optional] 
-**sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
+**num_points_in_failure_frame** | **int** | Number of points scanned in alert query time frame. | [optional] 
+**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
+**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
+**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
+**severity** | **str** | Severity of the alert | [optional] 
 **severity_list** | **list[str]** | Alert severity list for multi-threshold type. | [optional] 
-**target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
-**name** | **str** |  | 
+**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
+**sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
+**status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
+**system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
+**tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
+**target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
+**targets** | **dict(str, str)** | Targets for severity. | [optional] 
+**update_user_id** | **str** | The user that last updated this alert | [optional] 
+**updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AvroBackedStandardizedDTO.md b/docs/AvroBackedStandardizedDTO.md
index 8d362b0..d4eb92a 100644
--- a/docs/AvroBackedStandardizedDTO.md
+++ b/docs/AvroBackedStandardizedDTO.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
 **id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**deleted** | **bool** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AzureBaseCredentials.md b/docs/AzureBaseCredentials.md
index 0fa788b..cf51c21 100644
--- a/docs/AzureBaseCredentials.md
+++ b/docs/AzureBaseCredentials.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**tenant** | **str** | Tenant Id for an Azure service account within your project. | 
 **client_id** | **str** | Client Id for an Azure service account within your project. | 
 **client_secret** | **str** | Client Secret for an Azure service account within your project. Use &#39;saved_secret&#39; to retain the client secret when updating. | 
+**tenant** | **str** | Tenant Id for an Azure service account within your project. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AzureConfiguration.md b/docs/AzureConfiguration.md
index 51b7fdf..397f730 100644
--- a/docs/AzureConfiguration.md
+++ b/docs/AzureConfiguration.md
@@ -5,8 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AzureBaseCredentials**](AzureBaseCredentials.md) |  | [optional] 
 **category_filter** | **list[str]** | A list of Azure services (such as Microsoft.Compute/virtualMachines, Microsoft.Cache/redis etc) from which to pull metrics. | [optional] 
-**resource_group_filter** | **list[str]** | A list of Azure resource groups from which to pull metrics. | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**resource_group_filter** | **list[str]** | A list of Azure resource groups from which to pull metrics. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/BusinessActionGroupBasicDTO.md b/docs/BusinessActionGroupBasicDTO.md
index 8d6fd87..0ac2419 100644
--- a/docs/BusinessActionGroupBasicDTO.md
+++ b/docs/BusinessActionGroupBasicDTO.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**group_name** | **str** |  | [optional] 
-**display_name** | **str** |  | [optional] 
 **description** | **str** |  | [optional] 
+**display_name** | **str** |  | [optional] 
+**group_name** | **str** |  | [optional] 
 **required_default** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Chart.md b/docs/Chart.md
index 95351a1..4503846 100644
--- a/docs/Chart.md
+++ b/docs/Chart.md
@@ -4,16 +4,16 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
+**chart_attributes** | [**JsonNode**](JsonNode.md) | Experimental field for chart attributes | [optional] 
+**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
 **description** | **str** | Description of the chart | [optional] 
-**units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
-**interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
-**sources** | [**list[ChartSourceQuery]**](ChartSourceQuery.md) | Query expression to plot on the chart | 
 **include_obsolete_metrics** | **bool** | Whether to show obsolete metrics.  Default: false | [optional] 
+**interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
+**name** | **str** | Name of the source | 
 **no_default_events** | **bool** | Whether to hide events related to the sources in the charts produced. Default false (i.e. shows events) | [optional] 
-**chart_attributes** | [**JsonNode**](JsonNode.md) | Experimental field for chart attributes | [optional] 
+**sources** | [**list[ChartSourceQuery]**](ChartSourceQuery.md) | Query expression to plot on the chart | 
 **summarization** | **str** | Summarization strategy for the chart.  MEAN is default | [optional] 
-**chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
-**name** | **str** | Name of the source | 
+**units** | **str** | String to label the units of the chart on the Y-axis | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index 2823cd1..bf1d9fb 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -3,63 +3,63 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
-**type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
+**auto_column_tags** | **bool** | deprecated | [optional] 
+**column_tags** | **str** | deprecated | [optional] 
+**custom_tags** | **list[str]** | For the tabular view, a list of point tags to display when using the \&quot;custom\&quot; tag display mode | [optional] 
+**expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
+**fixed_legend_display_stats** | **list[str]** | For a chart with a fixed legend, a list of statistics to display in the legend | [optional] 
+**fixed_legend_enabled** | **bool** | Whether to enable a fixed tabular legend adjacent to the chart | [optional] 
+**fixed_legend_filter_field** | **str** | Statistic to use for determining whether a series is displayed on the fixed legend | [optional] 
+**fixed_legend_filter_limit** | **int** | Number of series to include in the fixed legend | [optional] 
+**fixed_legend_filter_sort** | **str** | Whether to display \&quot;Top\&quot;- or \&quot;Bottom\&quot;-ranked series in the fixed legend | [optional] 
+**fixed_legend_hide_label** | **bool** | deprecated | [optional] 
+**fixed_legend_position** | **str** | Where the fixed legend should be displayed with respect to the chart | [optional] 
+**fixed_legend_use_raw_stats** | **bool** | If true, the legend uses non-summarized stats instead of summarized | [optional] 
+**group_by_source** | **bool** | For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row | [optional] 
+**invert_dynamic_legend_hover_control** | **bool** | Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed) | [optional] 
+**line_type** | **str** | Plot interpolation type.  linear is default | [optional] 
 **max** | **float** | Max value of Y-axis.  Set to null or leave blank for auto | [optional] 
-**time_based_coloring** | **bool** | Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false | [optional] 
-**sparkline_display_value_type** | **str** | For the single stat view, whether to display the name of the query or the value of query | [optional] 
+**min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
+**num_tags** | **int** | For the tabular view, how many point tags to display | [optional] 
+**plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
+**show_hosts** | **bool** | For the tabular view, whether to display sources.  Default: true | [optional] 
+**show_labels** | **bool** | For the tabular view, whether to display labels.  Default: true | [optional] 
+**show_raw_values** | **bool** | For the tabular view, whether to display raw values.  Default: false | [optional] 
+**sort_values_descending** | **bool** | For the tabular view, whether to display display values in descending order.  Default: false | [optional] 
+**sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
 **sparkline_display_color** | **str** | For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_display_vertical_position** | **str** | deprecated | [optional] 
-**sparkline_display_horizontal_position** | **str** | For the single stat view, the horizontal position of the displayed text | [optional] 
 **sparkline_display_font_size** | **str** | For the single stat view, the font size of the displayed text, in percent | [optional] 
-**sparkline_display_prefix** | **str** | For the single stat view, a string to add before the displayed text | [optional] 
+**sparkline_display_horizontal_position** | **str** | For the single stat view, the horizontal position of the displayed text | [optional] 
 **sparkline_display_postfix** | **str** | For the single stat view, a string to append to the displayed text | [optional] 
-**sparkline_size** | **str** | For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE | [optional] 
-**sparkline_line_color** | **str** | For the single stat view, the color of the line. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_display_prefix** | **str** | For the single stat view, a string to add before the displayed text | [optional] 
+**sparkline_display_value_type** | **str** | For the single stat view, whether to display the name of the query or the value of query | [optional] 
+**sparkline_display_vertical_position** | **str** | deprecated | [optional] 
 **sparkline_fill_color** | **str** | For the single stat view, the color of the background fill. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_line_color** | **str** | For the single stat view, the color of the line. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_size** | **str** | For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE | [optional] 
+**sparkline_value_color_map_apply_to** | **str** | For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND | [optional] 
 **sparkline_value_color_map_colors** | **list[str]** | For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_value_color_map_values_v2** | **list[float]** | For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors | [optional] 
 **sparkline_value_color_map_values** | **list[int]** | deprecated | [optional] 
-**sparkline_value_color_map_apply_to** | **str** | For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND | [optional] 
-**sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
+**sparkline_value_color_map_values_v2** | **list[float]** | For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors | [optional] 
 **sparkline_value_text_map_text** | **list[str]** | For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds | [optional] 
 **sparkline_value_text_map_thresholds** | **list[float]** | For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText | [optional] 
-**line_type** | **str** | Plot interpolation type.  linear is default | [optional] 
 **stack_type** | **str** | Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y&#x3D;0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream | [optional] 
-**windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
-**window_size** | **int** | Width, in minutes, of the time window to use for \&quot;last\&quot; windowing | [optional] 
-**show_hosts** | **bool** | For the tabular view, whether to display sources.  Default: true | [optional] 
-**show_labels** | **bool** | For the tabular view, whether to display labels.  Default: true | [optional] 
-**show_raw_values** | **bool** | For the tabular view, whether to display raw values.  Default: false | [optional] 
-**auto_column_tags** | **bool** | deprecated | [optional] 
-**column_tags** | **str** | deprecated | [optional] 
 **tag_mode** | **str** | For the tabular view, which mode to use to determine which point tags to display | [optional] 
-**num_tags** | **int** | For the tabular view, how many point tags to display | [optional] 
-**custom_tags** | **list[str]** | For the tabular view, a list of point tags to display when using the \&quot;custom\&quot; tag display mode | [optional] 
-**group_by_source** | **bool** | For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row | [optional] 
-**sort_values_descending** | **bool** | For the tabular view, whether to display display values in descending order.  Default: false | [optional] 
+**time_based_coloring** | **bool** | Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false | [optional] 
+**type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
+**window_size** | **int** | Width, in minutes, of the time window to use for \&quot;last\&quot; windowing | [optional] 
+**windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
+**xmax** | **float** | For x-y scatterplots, max value for X-axis.  Set null for auto | [optional] 
+**xmin** | **float** | For x-y scatterplots, min value for X-axis.  Set null for auto | [optional] 
+**y0_scale_si_by1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
+**y0_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units | [optional] 
 **y1_max** | **float** | For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto | [optional] 
 **y1_min** | **float** | For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto | [optional] 
-**y1_units** | **str** | For plots with multiple Y-axes, units for right-side Y-axis | [optional] 
-**y0_scale_si_by1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
 **y1_scale_si_by1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
-**y0_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units | [optional] 
 **y1_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units | [optional] 
-**invert_dynamic_legend_hover_control** | **bool** | Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed) | [optional] 
-**fixed_legend_enabled** | **bool** | Whether to enable a fixed tabular legend adjacent to the chart | [optional] 
-**fixed_legend_use_raw_stats** | **bool** | If true, the legend uses non-summarized stats instead of summarized | [optional] 
-**fixed_legend_position** | **str** | Where the fixed legend should be displayed with respect to the chart | [optional] 
-**fixed_legend_display_stats** | **list[str]** | For a chart with a fixed legend, a list of statistics to display in the legend | [optional] 
-**fixed_legend_filter_sort** | **str** | Whether to display \&quot;Top\&quot;- or \&quot;Bottom\&quot;-ranked series in the fixed legend | [optional] 
-**fixed_legend_filter_limit** | **int** | Number of series to include in the fixed legend | [optional] 
-**fixed_legend_filter_field** | **str** | Statistic to use for determining whether a series is displayed on the fixed legend | [optional] 
-**fixed_legend_hide_label** | **bool** | deprecated | [optional] 
-**xmax** | **float** | For x-y scatterplots, max value for X-axis.  Set null for auto | [optional] 
-**xmin** | **float** | For x-y scatterplots, min value for X-axis.  Set null for auto | [optional] 
+**y1_units** | **str** | For plots with multiple Y-axes, units for right-side Y-axis | [optional] 
 **ymax** | **float** | For x-y scatterplots, max value for Y-axis.  Set null for auto | [optional] 
 **ymin** | **float** | For x-y scatterplots, min value for Y-axis.  Set null for auto | [optional] 
-**expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
-**plain_markdown_content** | **str** | The Markdown content for a Markdown display, in plain text.  Use this field instead of &#x60;markdownContent&#x60;. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChartSourceQuery.md b/docs/ChartSourceQuery.md
index 22c3a0c..ce45c11 100644
--- a/docs/ChartSourceQuery.md
+++ b/docs/ChartSourceQuery.md
@@ -3,15 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**scatter_plot_source** | **str** | For scatter plots, does this query source the X-axis or the Y-axis | [optional] 
-**querybuilder_serialization** | **str** | Opaque representation of the querybuilder | [optional] 
+**disabled** | **bool** | Whether the source is disabled | [optional] 
+**name** | **str** | Name of the source | 
+**query** | **str** | Query expression to plot on the chart | 
 **querybuilder_enabled** | **bool** | Whether or not this source line should have the query builder enabled | [optional] 
+**querybuilder_serialization** | **str** | Opaque representation of the querybuilder | [optional] 
+**scatter_plot_source** | **str** | For scatter plots, does this query source the X-axis or the Y-axis | [optional] 
 **secondary_axis** | **bool** | Determines if this source relates to the right hand Y-axis or not | [optional] 
-**source_description** | **str** | A description for the purpose of this source | [optional] 
 **source_color** | **str** | The color used to draw all results from this source (auto if unset) | [optional] 
-**query** | **str** | Query expression to plot on the chart | 
-**disabled** | **bool** | Whether the source is disabled | [optional] 
-**name** | **str** | Name of the source | 
+**source_description** | **str** | A description for the purpose of this source | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 7f5ab7c..4366ac8 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -3,35 +3,35 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**force_save** | **bool** |  | [optional] 
-**service** | **str** | A value denoting which cloud service this integration integrates with | 
-**in_trash** | **bool** |  | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** |  | [optional] 
-**last_error_event** | [**Event**](Event.md) |  | [optional] 
 **additional_tags** | **dict(str, str)** | A list of point tag key-values to add to every point ingested using this integration | [optional] 
-**last_received_data_point_ms** | **int** | Time that this integration last received a data point, in epoch millis | [optional] 
-**last_metric_count** | **int** | Number of metrics / events ingested by this integration the last time it ran | [optional] 
-**cloud_watch** | [**CloudWatchConfiguration**](CloudWatchConfiguration.md) |  | [optional] 
+**azure** | [**AzureConfiguration**](AzureConfiguration.md) |  | [optional] 
+**azure_activity_log** | [**AzureActivityLogConfiguration**](AzureActivityLogConfiguration.md) |  | [optional] 
 **cloud_trail** | [**CloudTrailConfiguration**](CloudTrailConfiguration.md) |  | [optional] 
+**cloud_watch** | [**CloudWatchConfiguration**](CloudWatchConfiguration.md) |  | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**disabled** | **bool** | True when an aws credential failed to authenticate. | [optional] 
 **ec2** | [**EC2Configuration**](EC2Configuration.md) |  | [optional] 
+**force_save** | **bool** |  | [optional] 
 **gcp** | [**GCPConfiguration**](GCPConfiguration.md) |  | [optional] 
 **gcp_billing** | [**GCPBillingConfiguration**](GCPBillingConfiguration.md) |  | [optional] 
-**new_relic** | [**NewRelicConfiguration**](NewRelicConfiguration.md) |  | [optional] 
-**tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
-**azure** | [**AzureConfiguration**](AzureConfiguration.md) |  | [optional] 
-**azure_activity_log** | [**AzureActivityLogConfiguration**](AzureActivityLogConfiguration.md) |  | [optional] 
+**id** | **str** |  | [optional] 
+**in_trash** | **bool** |  | [optional] 
 **last_error** | **str** | Digest of the last error encountered by Wavefront servers when fetching data using this integration | [optional] 
+**last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_ms** | **int** | Time, in epoch millis, of the last error encountered by Wavefront servers when fetching data using this integration | [optional] 
-**disabled** | **bool** | True when an aws credential failed to authenticate. | [optional] 
-**last_processor_id** | **str** | Opaque id of the last Wavefront integrations service to act on this integration | [optional] 
+**last_metric_count** | **int** | Number of metrics / events ingested by this integration the last time it ran | [optional] 
 **last_processing_timestamp** | **int** | Time, in epoch millis, that this integration was last processed | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
-**deleted** | **bool** |  | [optional] 
+**last_processor_id** | **str** | Opaque id of the last Wavefront integrations service to act on this integration | [optional] 
+**last_received_data_point_ms** | **int** | Time that this integration last received a data point, in epoch millis | [optional] 
 **name** | **str** | The human-readable name of this integration | 
+**new_relic** | [**NewRelicConfiguration**](NewRelicConfiguration.md) |  | [optional] 
+**service** | **str** | A value denoting which cloud service this integration integrates with | 
+**service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
+**tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudTrailConfiguration.md b/docs/CloudTrailConfiguration.md
index 2a62d35..d772551 100644
--- a/docs/CloudTrailConfiguration.md
+++ b/docs/CloudTrailConfiguration.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**prefix** | **str** | The common prefix, if any, appended to all CloudTrail log files | [optional] 
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
-**region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
-**filter_rule** | **str** | Rule to filter cloud trail log event. | [optional] 
 **bucket_name** | **str** | Name of the S3 bucket where CloudTrail logs are stored | 
+**filter_rule** | **str** | Rule to filter cloud trail log event. | [optional] 
+**prefix** | **str** | The common prefix, if any, appended to all CloudTrail log files | [optional] 
+**region** | **str** | The AWS region of the S3 bucket where CloudTrail logs are stored | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index adfa627..21dbbd0 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -4,11 +4,11 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
+**instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
 **namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
 **volume_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
-**instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index 31f750e..ce116a6 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -3,15 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**user_groups** | **list[str]** | List of user group identifiers this user belongs to | [optional] 
-**identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
-**_self** | **bool** | Whether this user is the one calling the API | 
-**groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
 **customer** | **str** | The id of the customer to which the user belongs | 
+**escaped_identifier** | **str** | URL Escaped Identifier | [optional] 
+**gravatar_url** | **str** | URL id For User&#39;s gravatar (see gravatar.com), if one exists. | [optional] 
+**groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
 **id** | **str** | The unique identifier of this user, which should be their valid email address | 
+**identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
-**gravatar_url** | **str** | URL id For User&#39;s gravatar (see gravatar.com), if one exists. | [optional] 
-**escaped_identifier** | **str** | URL Escaped Identifier | [optional] 
+**_self** | **bool** | Whether this user is the one calling the API | 
+**user_groups** | **list[str]** | List of user group identifiers this user belongs to | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerPreferences.md b/docs/CustomerPreferences.md
index 6c1bb92..bcdff8c 100644
--- a/docs/CustomerPreferences.md
+++ b/docs/CustomerPreferences.md
@@ -3,22 +3,22 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**blacklisted_emails** | **dict(str, int)** | List of blacklisted emails of the customer | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**customer_id** | **str** | The id of the customer preferences are attached to | 
 **default_user_groups** | [**list[UserGroup]**](UserGroup.md) | List of default user groups of the customer | [optional] 
-**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
+**deleted** | **bool** |  | [optional] 
+**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
+**hidden_metric_prefixes** | **dict(str, int)** | Metric prefixes which should be hidden from user | [optional] 
 **hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
-**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
-**customer_id** | **str** | The id of the customer preferences are attached to | 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
 **id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
 **invite_permissions** | **list[str]** | List of permissions that are assigned to newly invited users | [optional] 
-**blacklisted_emails** | **dict(str, int)** | List of blacklisted emails of the customer | [optional] 
-**hidden_metric_prefixes** | **dict(str, int)** | Metric prefixes which should be hidden from user | [optional] 
 **landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
-**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
-**deleted** | **bool** |  | [optional] 
+**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
+**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerPreferencesUpdating.md b/docs/CustomerPreferencesUpdating.md
index f966de3..9aea265 100644
--- a/docs/CustomerPreferencesUpdating.md
+++ b/docs/CustomerPreferencesUpdating.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
+**default_user_groups** | **list[str]** | List of default user groups of the customer | [optional] 
+**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
 **hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
+**invite_permissions** | **list[str]** | List of invite permissions to apply for each new user | [optional] 
 **landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
 **show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
-**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
-**default_user_groups** | **list[str]** | List of default user groups of the customer | [optional] 
-**invite_permissions** | **list[str]** | List of invite permissions to apply for each new user | [optional] 
+**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index 9feee0b..4d37f70 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -3,42 +3,42 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
 **can_user_modify** | **bool** |  | [optional] 
-**description** | **str** | Human-readable description of the dashboard | [optional] 
-**hidden** | **bool** |  | [optional] 
-**parameters** | **dict(str, str)** | Deprecated.  An obsolete representation of dashboard parameters | [optional] 
-**tags** | [**WFTags**](WFTags.md) |  | [optional] 
-**customer** | **str** | id of the customer to which this dashboard belongs | [optional] 
-**url** | **str** | Unique identifier, also URL slug, of the dashboard | 
-**system_owned** | **bool** | Whether this dashboard is system-owned and not writeable | [optional] 
+**chart_title_bg_color** | **str** | Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
+**chart_title_color** | **str** | Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
+**chart_title_scalar** | **int** | Scale (normally 100) of chart title text size | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** | Unique identifier, also URL slug, of the dashboard | 
-**event_filter_type** | **str** | How charts belonging to this dashboard should display events.  BYCHART is default if unspecified | [optional] 
-**sections** | [**list[DashboardSection]**](DashboardSection.md) | Dashboard chart sections | 
-**parameter_details** | [**dict(str, DashboardParameterValue)**](DashboardParameterValue.md) | The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation | [optional] 
+**customer** | **str** | id of the customer to which this dashboard belongs | [optional] 
+**default_end_time** | **int** | Default end time in milliseconds to query charts | [optional] 
+**default_start_time** | **int** | Default start time in milliseconds to query charts | [optional] 
+**default_time_window** | **str** | Default time window to query charts | [optional] 
+**deleted** | **bool** |  | [optional] 
+**description** | **str** | Human-readable description of the dashboard | [optional] 
 **display_description** | **bool** | Whether the dashboard description section is opened by default when the dashboard is shown | [optional] 
-**display_section_table_of_contents** | **bool** | Whether the \&quot;pills\&quot; quick-linked the sections of the dashboard are displayed by default when the dashboard is shown | [optional] 
 **display_query_parameters** | **bool** | Whether the dashboard parameters section is opened by default when the dashboard is shown | [optional] 
-**chart_title_scalar** | **int** | Scale (normally 100) of chart title text size | [optional] 
+**display_section_table_of_contents** | **bool** | Whether the \&quot;pills\&quot; quick-linked the sections of the dashboard are displayed by default when the dashboard is shown | [optional] 
+**event_filter_type** | **str** | How charts belonging to this dashboard should display events.  BYCHART is default if unspecified | [optional] 
 **event_query** | **str** | Event query to run on dashboard charts | [optional] 
-**default_time_window** | **str** | Default time window to query charts | [optional] 
-**default_start_time** | **int** | Default start time in milliseconds to query charts | [optional] 
-**default_end_time** | **int** | Default end time in milliseconds to query charts | [optional] 
-**chart_title_color** | **str** | Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
-**chart_title_bg_color** | **str** | Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
-**views_last_day** | **int** |  | [optional] 
-**views_last_week** | **int** |  | [optional] 
-**views_last_month** | **int** |  | [optional] 
-**acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**deleted** | **bool** |  | [optional] 
-**num_charts** | **int** |  | [optional] 
 **favorite** | **bool** |  | [optional] 
+**hidden** | **bool** |  | [optional] 
+**id** | **str** | Unique identifier, also URL slug, of the dashboard | 
+**name** | **str** | Name of the dashboard | 
+**num_charts** | **int** |  | [optional] 
 **num_favorites** | **int** |  | [optional] 
 **orphan** | **bool** |  | [optional] 
-**name** | **str** | Name of the dashboard | 
+**parameter_details** | [**dict(str, DashboardParameterValue)**](DashboardParameterValue.md) | The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation | [optional] 
+**parameters** | **dict(str, str)** | Deprecated.  An obsolete representation of dashboard parameters | [optional] 
+**sections** | [**list[DashboardSection]**](DashboardSection.md) | Dashboard chart sections | 
+**system_owned** | **bool** | Whether this dashboard is system-owned and not writeable | [optional] 
+**tags** | [**WFTags**](WFTags.md) |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+**url** | **str** | Unique identifier, also URL slug, of the dashboard | 
+**views_last_day** | **int** |  | [optional] 
+**views_last_month** | **int** |  | [optional] 
+**views_last_week** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DashboardParameterValue.md b/docs/DashboardParameterValue.md
index 057098c..383768e 100644
--- a/docs/DashboardParameterValue.md
+++ b/docs/DashboardParameterValue.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**allow_all** | **bool** |  | [optional] 
+**default_value** | **str** |  | [optional] 
 **description** | **str** |  | [optional] 
+**dynamic_field_type** | **str** |  | [optional] 
+**hide_from_view** | **bool** |  | [optional] 
 **label** | **str** |  | [optional] 
 **multivalue** | **bool** |  | [optional] 
-**hide_from_view** | **bool** |  | [optional] 
-**allow_all** | **bool** |  | [optional] 
-**dynamic_field_type** | **str** |  | [optional] 
-**tag_key** | **str** |  | [optional] 
+**parameter_type** | **str** |  | [optional] 
 **query_value** | **str** |  | [optional] 
 **reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
-**parameter_type** | **str** |  | [optional] 
-**default_value** | **str** |  | [optional] 
+**tag_key** | **str** |  | [optional] 
 **values_to_readable_strings** | **dict(str, str)** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/DashboardSection.md b/docs/DashboardSection.md
index 1034466..3fe84cc 100644
--- a/docs/DashboardSection.md
+++ b/docs/DashboardSection.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**rows** | [**list[DashboardSectionRow]**](DashboardSectionRow.md) | Rows of this section | 
 **name** | **str** | Name of this section | 
+**rows** | [**list[DashboardSectionRow]**](DashboardSectionRow.md) | Rows of this section | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index 086a52d..d73f2ad 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -3,35 +3,35 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
+**create_user_id** | **str** |  | [optional] 
 **created** | **int** | When this derived metric was created, in epoch millis | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**hosts_used** | **list[str]** | Number of hosts checked by the query | [optional] 
+**id** | **str** |  | [optional] 
+**in_trash** | **bool** |  | [optional] 
+**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
+**last_error_message** | **str** | The last error encountered when running the query | [optional] 
+**last_failed_time** | **int** | The time of the last error encountered when running the query, in epoch millis | [optional] 
+**last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
+**last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
+**metrics_used** | **list[str]** | Number of metrics checked by the query | [optional] 
 **minutes** | **int** | How frequently the query generating the derived metric is run | 
-**tags** | [**WFTags**](WFTags.md) |  | [optional] 
-**status** | **list[str]** | Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA | [optional] 
-**updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
+**name** | **str** |  | 
+**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
 **process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
-**last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
-**update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
 **query** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m). | 
-**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in query | [optional] 
-**additional_information** | **str** | User-supplied additional explanatory information for the derived metric | [optional] 
-**last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
-**in_trash** | **bool** |  | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the query last ran | [optional] 
-**create_user_id** | **str** |  | [optional] 
-**last_failed_time** | **int** | The time of the last error encountered when running the query, in epoch millis | [optional] 
-**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
-**metrics_used** | **list[str]** | Number of metrics checked by the query | [optional] 
-**hosts_used** | **list[str]** | Number of hosts checked by the query | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** |  | [optional] 
 **query_qb_enabled** | **bool** | Whether the query was created using the Query Builder. Default false | [optional] 
 **query_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true | [optional] 
-**last_error_message** | **str** | The last error encountered when running the query | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
+**status** | **list[str]** | Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA | [optional] 
+**tags** | [**WFTags**](WFTags.md) |  | [optional] 
+**update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
+**updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**deleted** | **bool** |  | [optional] 
-**name** | **str** |  | 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Event.md b/docs/Event.md
index 1f7a5db..ba62f75 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -3,27 +3,27 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
-**start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
-**table** | **str** | The customer to which the event belongs | [optional] 
-**can_delete** | **bool** |  | [optional] 
-**can_close** | **bool** |  | [optional] 
-**creator_type** | **list[str]** |  | [optional] 
-**tags** | **list[str]** | A list of event tags | [optional] 
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
+**can_close** | **bool** |  | [optional] 
+**can_delete** | **bool** |  | [optional] 
 **created_at** | **int** |  | [optional] 
-**is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
-**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**creator_type** | **list[str]** |  | [optional] 
+**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
 **hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
+**id** | **str** |  | [optional] 
 **is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
+**is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
+**name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
+**running_state** | **str** |  | [optional] 
+**start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
+**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
+**table** | **str** | The customer to which the event belongs | [optional] 
+**tags** | **list[str]** | A list of event tags | [optional] 
 **updated_at** | **int** |  | [optional] 
-**id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**running_state** | **str** |  | [optional] 
-**name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EventSearchRequest.md b/docs/EventSearchRequest.md
index 7d5983b..892e504 100644
--- a/docs/EventSearchRequest.md
+++ b/docs/EventSearchRequest.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **cursor** | **str** | The id (exclusive) from which search results resume returning.  Users should supply an entity &#39;id&#39; to this property.  Its main purpose is to resume where a previous search left off because of the &#39;limit&#39; parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results | [optional] 
 **limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results | [optional] 
-**time_range** | [**EventTimeRange**](EventTimeRange.md) |  | [optional] 
 **sort_time_ascending** | **bool** | Whether to sort event results ascending in start time.  Default: false | [optional] 
+**time_range** | [**EventTimeRange**](EventTimeRange.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ExternalLink.md b/docs/ExternalLink.md
index bac2880..8b3da46 100644
--- a/docs/ExternalLink.md
+++ b/docs/ExternalLink.md
@@ -3,17 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**description** | **str** | Human-readable description for this external link | 
+**created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
+**description** | **str** | Human-readable description for this external link | 
 **id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**template** | **str** | The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc | 
 **metric_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
-**source_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
-**point_tag_filter_regexes** | **dict(str, str)** | Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed | [optional] 
 **name** | **str** | Name of the external link.  Will be displayed in context (right-click) menus on charts | 
+**point_tag_filter_regexes** | **dict(str, str)** | Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed | [optional] 
+**source_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
+**template** | **str** | The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FacetResponse.md b/docs/FacetResponse.md
index 77234f7..6147573 100644
--- a/docs/FacetResponse.md
+++ b/docs/FacetResponse.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | **list[str]** | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FacetSearchRequestContainer.md b/docs/FacetSearchRequestContainer.md
index a6c6599..ec3a22a 100644
--- a/docs/FacetSearchRequestContainer.md
+++ b/docs/FacetSearchRequestContainer.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**facet_query** | **str** | A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned. | [optional] 
+**facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
 **limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
-**facet_query** | **str** | A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned. | [optional] 
-**facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FacetsResponseContainer.md b/docs/FacetsResponseContainer.md
index d5c6a01..0c450e4 100644
--- a/docs/FacetsResponseContainer.md
+++ b/docs/FacetsResponseContainer.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**limit** | **int** | The requested limit | [optional] 
 **facets** | **dict(str, list[str])** | The requested facets, returned in a map whose key is the facet property and whose value is a list of facet values | [optional] 
+**limit** | **int** | The requested limit | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FacetsSearchRequestContainer.md b/docs/FacetsSearchRequestContainer.md
index 489f643..035c127 100644
--- a/docs/FacetsSearchRequestContainer.md
+++ b/docs/FacetsSearchRequestContainer.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of &#39;entity search results&#39;.  All facets listed in the &#39;facets&#39; search parameter of all entities within &#39;entity search results&#39; are scanned to produce the search results (of facet values). | [optional] 
-**limit** | **int** | The number of results to return.  Default 100 | [optional] 
-**facets** | **list[str]** | A list of facets (property keys) to return values from found in entities matching &#39;query&#39;.  Examples are &#39;tags&#39;, &#39;creatorId&#39;, etc | 
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
+**facets** | **list[str]** | A list of facets (property keys) to return values from found in entities matching &#39;query&#39;.  Examples are &#39;tags&#39;, &#39;creatorId&#39;, etc | 
+**limit** | **int** | The number of results to return.  Default 100 | [optional] 
+**query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of &#39;entity search results&#39;.  All facets listed in the &#39;facets&#39; search parameter of all entities within &#39;entity search results&#39; are scanned to produce the search results (of facet values). | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GCPBillingConfiguration.md b/docs/GCPBillingConfiguration.md
index 57783ef..cd6d0e1 100644
--- a/docs/GCPBillingConfiguration.md
+++ b/docs/GCPBillingConfiguration.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 **gcp_api_key** | **str** | API key for Google Cloud Platform (GCP). Use &#39;saved_api_key&#39; to retain existing API key when updating | 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index af9d0e2..1d83cee 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
-**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
-**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
 **categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
+**gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HistoryEntry.md b/docs/HistoryEntry.md
index 9453f27..dde72c1 100644
--- a/docs/HistoryEntry.md
+++ b/docs/HistoryEntry.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**change_description** | **list[str]** |  | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**version** | **int** |  | [optional] 
-**update_user** | **str** |  | [optional] 
 **update_time** | **int** |  | [optional] 
-**change_description** | **list[str]** |  | [optional] 
+**update_user** | **str** |  | [optional] 
+**version** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HistoryResponse.md b/docs/HistoryResponse.md
index 9b43117..9fd740d 100644
--- a/docs/HistoryResponse.md
+++ b/docs/HistoryResponse.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[HistoryEntry]**](HistoryEntry.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Integration.md b/docs/Integration.md
index 9d9bc97..b618b11 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -3,25 +3,25 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**description** | **str** | Integration description | 
-**version** | **str** | Integration version string | 
-**icon** | **str** | URI path to the integration icon | 
-**metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
-**base_url** | **str** | Base URL for this integration&#39;s assets | [optional] 
-**status** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
 **alerts** | [**list[IntegrationAlert]**](IntegrationAlert.md) | A list of alerts belonging to this integration | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**alias_of** | **str** | If set, designates this integration as an alias integration, of the integration whose id is specified. | [optional] 
 **alias_integrations** | [**list[IntegrationAlias]**](IntegrationAlias.md) | If set, a list of objects describing integrations that alias this one. | [optional] 
+**alias_of** | **str** | If set, designates this integration as an alias integration, of the integration whose id is specified. | [optional] 
+**base_url** | **str** | Base URL for this integration&#39;s assets | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
 **dashboards** | [**list[IntegrationDashboard]**](IntegrationDashboard.md) | A list of dashboards belonging to this integration | [optional] 
 **deleted** | **bool** |  | [optional] 
+**description** | **str** | Integration description | 
+**icon** | **str** | URI path to the integration icon | 
+**id** | **str** |  | [optional] 
+**metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
+**name** | **str** | Integration name | 
 **overview** | **str** | Descriptive text giving an overview of integration functionality | [optional] 
 **setup** | **str** | How the integration will be set-up | [optional] 
-**name** | **str** | Integration name | 
+**status** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+**version** | **str** | Integration version string | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationAlert.md b/docs/IntegrationAlert.md
index 6b3985c..ca9caed 100644
--- a/docs/IntegrationAlert.md
+++ b/docs/IntegrationAlert.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**description** | **str** | Alert description | 
-**url** | **str** | URL path to the JSON definition of this alert | 
 **alert_obj** | [**Alert**](Alert.md) |  | [optional] 
+**description** | **str** | Alert description | 
 **name** | **str** | Alert name | 
+**url** | **str** | URL path to the JSON definition of this alert | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationAlias.md b/docs/IntegrationAlias.md
index 6d5b419..0884e0e 100644
--- a/docs/IntegrationAlias.md
+++ b/docs/IntegrationAlias.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**base_url** | **str** | Base URL of this alias Integration | [optional] 
 **description** | **str** | Description of the alias Integration | [optional] 
 **icon** | **str** | Icon path of the alias Integration | [optional] 
-**base_url** | **str** | Base URL of this alias Integration | [optional] 
 **id** | **str** | ID of the alias Integration | [optional] 
 **name** | **str** | Name of the alias Integration | [optional] 
 
diff --git a/docs/IntegrationDashboard.md b/docs/IntegrationDashboard.md
index f6f4326..8eaa59f 100644
--- a/docs/IntegrationDashboard.md
+++ b/docs/IntegrationDashboard.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**description** | **str** | Dashboard description | 
-**url** | **str** | URL path to the JSON definition of this dashboard | 
 **dashboard_obj** | [**Dashboard**](Dashboard.md) |  | [optional] 
+**description** | **str** | Dashboard description | 
 **name** | **str** | Dashboard name | 
+**url** | **str** | URL path to the JSON definition of this dashboard | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationManifestGroup.md b/docs/IntegrationManifestGroup.md
index 89894ee..8ff843c 100644
--- a/docs/IntegrationManifestGroup.md
+++ b/docs/IntegrationManifestGroup.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**integrations** | **list[str]** | A list of paths to JSON definitions for integrations in this group | 
 **integration_objs** | [**list[Integration]**](Integration.md) | Materialized JSONs for integrations belonging to this group, as referenced by &#x60;integrations&#x60; | [optional] 
-**title** | **str** | Title of this integration group | 
+**integrations** | **list[str]** | A list of paths to JSON definitions for integrations in this group | 
 **subtitle** | **str** | Subtitle of this integration group | 
+**title** | **str** | Title of this integration group | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationMetrics.md b/docs/IntegrationMetrics.md
index e6235da..28a5fcf 100644
--- a/docs/IntegrationMetrics.md
+++ b/docs/IntegrationMetrics.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**prefixes** | **list[str]** | Set of metric prefix namespaces belonging to this integration | 
-**required** | **list[str]** | Set of \&quot;canary\&quot; metrics that define the \&quot;liveness\&quot; of this integration&#39;s metric ingestion | 
+**chart_objs** | [**list[Chart]**](Chart.md) | Chart JSONs materialized from the links in &#x60;charts&#x60; | [optional] 
 **charts** | **list[str]** | URLs for JSON definitions of charts that display info about this integration&#39;s metrics | 
-**pps_dimensions** | **list[str]** | For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions | [optional] 
 **display** | **list[str]** | Set of metrics that are displayed in the metric panel during integration setup | 
-**chart_objs** | [**list[Chart]**](Chart.md) | Chart JSONs materialized from the links in &#x60;charts&#x60; | [optional] 
+**pps_dimensions** | **list[str]** | For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions | [optional] 
+**prefixes** | **list[str]** | Set of metric prefix namespaces belonging to this integration | 
+**required** | **list[str]** | Set of \&quot;canary\&quot; metrics that define the \&quot;liveness\&quot; of this integration&#39;s metric ingestion | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IntegrationStatus.md b/docs/IntegrationStatus.md
index 4e4b061..6f2a05e 100644
--- a/docs/IntegrationStatus.md
+++ b/docs/IntegrationStatus.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**alert_statuses** | **dict(str, str)** | A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, &#x60;VISIBLE&#x60;, &#x60;HIDDEN&#x60;, and &#x60;NOT_LOADED&#x60; | 
 **content_status** | **str** | Status of integration content, e.g. dashboards | 
 **install_status** | **str** | Whether the customer or an automated process has installed the dashboards for this integration | 
 **metric_statuses** | [**dict(str, MetricStatus)**](MetricStatus.md) | A Map from names of the required metrics to an object representing their reporting status.  The reporting status object has 3 boolean fields denoting whether the metric has been received during the corresponding time period: &#x60;ever&#x60;, &#x60;recentExceptNow&#x60;, and &#x60;now&#x60;.  &#x60;now&#x60; is on the order of a few hours, and &#x60;recentExceptNow&#x60; is on the order of the past few days, excluding the period considered to be &#x60;now&#x60;. | 
-**alert_statuses** | **dict(str, str)** | A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, &#x60;VISIBLE&#x60;, &#x60;HIDDEN&#x60;, and &#x60;NOT_LOADED&#x60; | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index cad2b16..cb8dbed 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -3,24 +3,24 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**reason** | **str** | The purpose of this maintenance window | 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
 **customer_id** | **str** |  | [optional] 
-**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
-**title** | **str** | Title of this maintenance window | 
-**start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
 **end_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will end | 
-**relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
-**relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
+**event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
+**host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
 **id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
+**reason** | **str** | The purpose of this maintenance window | 
+**relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
+**relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
+**relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
 **relevant_host_tags_anded** | **bool** | Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a source/host must contain one of the tags. Default: false | [optional] 
-**host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
-**event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
-**sort_attr** | **int** | Numeric value used in default sorting | [optional] 
 **running_state** | **str** |  | [optional] 
+**sort_attr** | **int** | Numeric value used in default sorting | [optional] 
+**start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
+**title** | **str** | Title of this maintenance window | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Message.md b/docs/Message.md
index 25a55c0..a2d2bbd 100644
--- a/docs/Message.md
+++ b/docs/Message.md
@@ -4,17 +4,17 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **attributes** | **dict(str, str)** | A string-&gt;string map of additional properties associated with this message | [optional] 
-**source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
+**content** | **str** | Message content | 
+**display** | **str** | The form of display for this message | 
+**end_epoch_millis** | **int** | When this message will stop being displayed, in epoch millis | 
+**id** | **str** |  | [optional] 
+**read** | **bool** | A derived field for whether the current user has read this message | [optional] 
 **scope** | **str** | The audience scope that this message should reach | 
 **severity** | **str** | Message severity | 
-**read** | **bool** | A derived field for whether the current user has read this message | [optional] 
-**title** | **str** | Title of this message | 
-**id** | **str** |  | [optional] 
-**content** | **str** | Message content | 
+**source** | **str** | Message source.  System messages will com from &#39;system@wavefront.com&#39; | 
 **start_epoch_millis** | **int** | When this message will begin to be displayed, in epoch millis | 
-**end_epoch_millis** | **int** | When this message will stop being displayed, in epoch millis | 
-**display** | **str** | The form of display for this message | 
 **target** | **str** | For scope&#x3D;CUSTOMER or scope&#x3D;USER, the individual customer or user id | [optional] 
+**title** | **str** | Title of this message | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MetricStatus.md b/docs/MetricStatus.md
index 5594fa8..cba4237 100644
--- a/docs/MetricStatus.md
+++ b/docs/MetricStatus.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | **str** |  | [optional] 
 **ever** | **bool** |  | [optional] 
-**recent_except_now** | **bool** |  | [optional] 
 **now** | **bool** |  | [optional] 
+**recent_except_now** | **bool** |  | [optional] 
+**status** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/NewRelicConfiguration.md b/docs/NewRelicConfiguration.md
index cd1f0c0..a49637d 100644
--- a/docs/NewRelicConfiguration.md
+++ b/docs/NewRelicConfiguration.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**api_key** | **str** | New Relic REST API Key. | 
 **app_filter_regex** | **str** | A regular expression that a application name must match (case-insensitively) in order to collect metrics. | [optional] 
 **host_filter_regex** | **str** | A regular expression that a host name must match (case-insensitively) in order to collect metrics. | [optional] 
 **new_relic_metric_filters** | [**list[NewRelicMetricFilters]**](NewRelicMetricFilters.md) | Application specific metric filter | [optional] 
-**api_key** | **str** | New Relic REST API Key. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Notificant.md b/docs/Notificant.md
index c065863..bc010d1 100644
--- a/docs/Notificant.md
+++ b/docs/Notificant.md
@@ -3,22 +3,22 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**description** | **str** | Description | 
-**method** | **str** | The notification method used for notification target. | 
 **content_type** | **str** | The value of the Content-Type header of the webhook POST request. | [optional] 
-**customer_id** | **str** |  | [optional] 
-**title** | **str** | Title | 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
-**triggers** | **list[str]** | A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED | 
-**recipient** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
+**creator_id** | **str** |  | [optional] 
 **custom_http_headers** | **dict(str, str)** | A string-&gt;string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook | [optional] 
+**customer_id** | **str** |  | [optional] 
+**description** | **str** | Description | 
 **email_subject** | **str** | The subject title of an email notification target | [optional] 
+**id** | **str** |  | [optional] 
 **is_html_content** | **bool** | Determine whether the email alert target content is sent as html or text. | [optional] 
+**method** | **str** | The notification method used for notification target. | 
+**recipient** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
+**template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
+**title** | **str** | Title | 
+**triggers** | **list[str]** | A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedAlert.md b/docs/PagedAlert.md
index 5e6de49..c47bd26 100644
--- a/docs/PagedAlert.md
+++ b/docs/PagedAlert.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Alert]**](Alert.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedAlertWithStats.md b/docs/PagedAlertWithStats.md
index 27c4b49..2cf0c62 100644
--- a/docs/PagedAlertWithStats.md
+++ b/docs/PagedAlertWithStats.md
@@ -3,14 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**alert_counts** | **dict(str, int)** | A map from alert state to the number of alerts in that state within the search results | [optional] 
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Alert]**](Alert.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
-**alert_counts** | **dict(str, int)** | A map from alert state to the number of alerts in that state within the search results | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedCloudIntegration.md b/docs/PagedCloudIntegration.md
index 0371409..df2222d 100644
--- a/docs/PagedCloudIntegration.md
+++ b/docs/PagedCloudIntegration.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[CloudIntegration]**](CloudIntegration.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedCustomerFacingUserObject.md b/docs/PagedCustomerFacingUserObject.md
index b3d5bf0..ccf784b 100644
--- a/docs/PagedCustomerFacingUserObject.md
+++ b/docs/PagedCustomerFacingUserObject.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[CustomerFacingUserObject]**](CustomerFacingUserObject.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedDashboard.md b/docs/PagedDashboard.md
index 630bfc0..c9b8d6a 100644
--- a/docs/PagedDashboard.md
+++ b/docs/PagedDashboard.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Dashboard]**](Dashboard.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedDerivedMetricDefinition.md b/docs/PagedDerivedMetricDefinition.md
index 412bdb8..d5adc6e 100644
--- a/docs/PagedDerivedMetricDefinition.md
+++ b/docs/PagedDerivedMetricDefinition.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[DerivedMetricDefinition]**](DerivedMetricDefinition.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedDerivedMetricDefinitionWithStats.md b/docs/PagedDerivedMetricDefinitionWithStats.md
index e515539..43a0306 100644
--- a/docs/PagedDerivedMetricDefinitionWithStats.md
+++ b/docs/PagedDerivedMetricDefinitionWithStats.md
@@ -3,14 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**counts** | **dict(str, int)** | A map from the state of the derived metric definition to the number of entities in that state within the search results | [optional] 
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[DerivedMetricDefinition]**](DerivedMetricDefinition.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
-**counts** | **dict(str, int)** | A map from the state of the derived metric definition to the number of entities in that state within the search results | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedEvent.md b/docs/PagedEvent.md
index 31d2d31..ef62af6 100644
--- a/docs/PagedEvent.md
+++ b/docs/PagedEvent.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Event]**](Event.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedExternalLink.md b/docs/PagedExternalLink.md
index 0c1723b..99360c3 100644
--- a/docs/PagedExternalLink.md
+++ b/docs/PagedExternalLink.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[ExternalLink]**](ExternalLink.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedIntegration.md b/docs/PagedIntegration.md
index dce1dc9..dece7c3 100644
--- a/docs/PagedIntegration.md
+++ b/docs/PagedIntegration.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Integration]**](Integration.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedMaintenanceWindow.md b/docs/PagedMaintenanceWindow.md
index 325a4c4..604d2dc 100644
--- a/docs/PagedMaintenanceWindow.md
+++ b/docs/PagedMaintenanceWindow.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[MaintenanceWindow]**](MaintenanceWindow.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedMessage.md b/docs/PagedMessage.md
index f1f5a22..9b9b015 100644
--- a/docs/PagedMessage.md
+++ b/docs/PagedMessage.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Message]**](Message.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedNotificant.md b/docs/PagedNotificant.md
index aae55c4..378bb21 100644
--- a/docs/PagedNotificant.md
+++ b/docs/PagedNotificant.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Notificant]**](Notificant.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedProxy.md b/docs/PagedProxy.md
index bbeef39..e9ef3ae 100644
--- a/docs/PagedProxy.md
+++ b/docs/PagedProxy.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Proxy]**](Proxy.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedSavedSearch.md b/docs/PagedSavedSearch.md
index 915b0f6..feaa6d2 100644
--- a/docs/PagedSavedSearch.md
+++ b/docs/PagedSavedSearch.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[SavedSearch]**](SavedSearch.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedSource.md b/docs/PagedSource.md
index 7b46777..bb4fddd 100644
--- a/docs/PagedSource.md
+++ b/docs/PagedSource.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[Source]**](Source.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedUserGroup.md b/docs/PagedUserGroup.md
index d781e1b..e50d851 100644
--- a/docs/PagedUserGroup.md
+++ b/docs/PagedUserGroup.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | [**list[UserGroup]**](UserGroup.md) | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Point.md b/docs/Point.md
index b2bc136..04696e8 100644
--- a/docs/Point.md
+++ b/docs/Point.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**value** | **float** |  | 
 **timestamp** | **int** | The timestamp of the point in milliseconds | 
+**value** | **float** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 9dfee00..fb08217 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -3,25 +3,25 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**version** | **str** |  | [optional] 
-**status** | **str** | the proxy&#39;s status | [optional] 
+**bytes_left_for_buffer** | **int** | Number of bytes of space remaining in the persistent disk queue of this proxy | [optional] 
+**bytes_per_minute_for_buffer** | **int** | Bytes used per minute by the persistent disk queue of this proxy | [optional] 
 **customer_id** | **str** |  | [optional] 
-**in_trash** | **bool** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
-**last_error_event** | [**Event**](Event.md) |  | [optional] 
-**time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
-**bytes_left_for_buffer** | **int** | Number of bytes of space remaining in the persistent disk queue of this proxy | [optional] 
-**bytes_per_minute_for_buffer** | **int** | Bytes used per minute by the persistent disk queue of this proxy | [optional] 
-**local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
+**in_trash** | **bool** |  | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
-**last_known_error** | **str** | deprecated | [optional] 
+**last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
+**last_known_error** | **str** | deprecated | [optional] 
+**local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
+**name** | **str** | Proxy name (modifiable) | 
 **ssh_agent** | **bool** | deprecated | [optional] 
-**ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
-**deleted** | **bool** |  | [optional] 
+**status** | **str** | the proxy&#39;s status | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
-**name** | **str** | Proxy name (modifiable) | 
+**time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
+**version** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/QueryEvent.md b/docs/QueryEvent.md
index 121ec69..c124753 100644
--- a/docs/QueryEvent.md
+++ b/docs/QueryEvent.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **str** | Event name | [optional] 
-**start** | **int** | Start time of event, in epoch millis | [optional] 
 **end** | **int** | End time of event, in epoch millis | [optional] 
-**tags** | **dict(str, str)** | Tags (annotations) on the event | [optional] 
 **hosts** | **list[str]** | Sources (hosts) to which the event pertains | [optional] 
-**summarized** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
 **is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
+**name** | **str** | Event name | [optional] 
+**start** | **int** | Start time of event, in epoch millis | [optional] 
+**summarized** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
+**tags** | **dict(str, str)** | Tags (annotations) on the event | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/QueryResult.md b/docs/QueryResult.md
index 93b4462..9874e20 100644
--- a/docs/QueryResult.md
+++ b/docs/QueryResult.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**warnings** | **str** | The warnings incurred by this query | [optional] 
-**timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
-**stats** | [**StatsModel**](StatsModel.md) |  | [optional] 
 **events** | [**list[QueryEvent]**](QueryEvent.md) |  | [optional] 
 **granularity** | **int** | The granularity of the returned results, in seconds | [optional] 
 **name** | **str** | The name of this query | [optional] 
 **query** | **str** | The query used to obtain this result | [optional] 
+**stats** | [**StatsModel**](StatsModel.md) |  | [optional] 
+**timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
+**warnings** | **str** | The warnings incurred by this query | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RawTimeseries.md b/docs/RawTimeseries.md
index 9e77cfd..5d2ec6c 100644
--- a/docs/RawTimeseries.md
+++ b/docs/RawTimeseries.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**tags** | **dict(str, str)** | Associated tags of the time series | [optional] 
 **points** | [**list[Point]**](Point.md) |  | 
+**tags** | **dict(str, str)** | Associated tags of the time series | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainer.md b/docs/ResponseContainer.md
index 2f2d659..c9db167 100644
--- a/docs/ResponseContainer.md
+++ b/docs/ResponseContainer.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | **object** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerAlert.md b/docs/ResponseContainerAlert.md
index 0390508..25e4816 100644
--- a/docs/ResponseContainerAlert.md
+++ b/docs/ResponseContainerAlert.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Alert**](Alert.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerCloudIntegration.md b/docs/ResponseContainerCloudIntegration.md
index c479064..ee4e1ff 100644
--- a/docs/ResponseContainerCloudIntegration.md
+++ b/docs/ResponseContainerCloudIntegration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**CloudIntegration**](CloudIntegration.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerDashboard.md b/docs/ResponseContainerDashboard.md
index 22ea290..44519a0 100644
--- a/docs/ResponseContainerDashboard.md
+++ b/docs/ResponseContainerDashboard.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Dashboard**](Dashboard.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerDerivedMetricDefinition.md b/docs/ResponseContainerDerivedMetricDefinition.md
index 2067247..35ef0e4 100644
--- a/docs/ResponseContainerDerivedMetricDefinition.md
+++ b/docs/ResponseContainerDerivedMetricDefinition.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerEvent.md b/docs/ResponseContainerEvent.md
index e9cf5b5..a0deefb 100644
--- a/docs/ResponseContainerEvent.md
+++ b/docs/ResponseContainerEvent.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Event**](Event.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerExternalLink.md b/docs/ResponseContainerExternalLink.md
index 590cd27..36934d9 100644
--- a/docs/ResponseContainerExternalLink.md
+++ b/docs/ResponseContainerExternalLink.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**ExternalLink**](ExternalLink.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerFacetResponse.md b/docs/ResponseContainerFacetResponse.md
index c135299..b9f7709 100644
--- a/docs/ResponseContainerFacetResponse.md
+++ b/docs/ResponseContainerFacetResponse.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**FacetResponse**](FacetResponse.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerFacetsResponseContainer.md b/docs/ResponseContainerFacetsResponseContainer.md
index 3dad603..c615302 100644
--- a/docs/ResponseContainerFacetsResponseContainer.md
+++ b/docs/ResponseContainerFacetsResponseContainer.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**FacetsResponseContainer**](FacetsResponseContainer.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerHistoryResponse.md b/docs/ResponseContainerHistoryResponse.md
index 1659544..bd4c153 100644
--- a/docs/ResponseContainerHistoryResponse.md
+++ b/docs/ResponseContainerHistoryResponse.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**HistoryResponse**](HistoryResponse.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerIntegration.md b/docs/ResponseContainerIntegration.md
index b7f40d9..28cba81 100644
--- a/docs/ResponseContainerIntegration.md
+++ b/docs/ResponseContainerIntegration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Integration**](Integration.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerIntegrationStatus.md b/docs/ResponseContainerIntegrationStatus.md
index 4b6aa29..8f776d1 100644
--- a/docs/ResponseContainerIntegrationStatus.md
+++ b/docs/ResponseContainerIntegrationStatus.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerListACL.md b/docs/ResponseContainerListACL.md
index 57296d2..63cc285 100644
--- a/docs/ResponseContainerListACL.md
+++ b/docs/ResponseContainerListACL.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**list[ACL]**](ACL.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerListIntegration.md b/docs/ResponseContainerListIntegration.md
index 053e534..bf40f69 100644
--- a/docs/ResponseContainerListIntegration.md
+++ b/docs/ResponseContainerListIntegration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**list[Integration]**](Integration.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerListIntegrationManifestGroup.md b/docs/ResponseContainerListIntegrationManifestGroup.md
index 826bd1f..5f82f34 100644
--- a/docs/ResponseContainerListIntegrationManifestGroup.md
+++ b/docs/ResponseContainerListIntegrationManifestGroup.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**list[IntegrationManifestGroup]**](IntegrationManifestGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerListString.md b/docs/ResponseContainerListString.md
index b53d0a8..7aee40b 100644
--- a/docs/ResponseContainerListString.md
+++ b/docs/ResponseContainerListString.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | **list[str]** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerListUserGroup.md b/docs/ResponseContainerListUserGroup.md
index 7de1316..f89e7b9 100644
--- a/docs/ResponseContainerListUserGroup.md
+++ b/docs/ResponseContainerListUserGroup.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**list[UserGroup]**](UserGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerMaintenanceWindow.md b/docs/ResponseContainerMaintenanceWindow.md
index 084cfdb..bd23b52 100644
--- a/docs/ResponseContainerMaintenanceWindow.md
+++ b/docs/ResponseContainerMaintenanceWindow.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**MaintenanceWindow**](MaintenanceWindow.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerMapStringInteger.md b/docs/ResponseContainerMapStringInteger.md
index 943445d..0342f42 100644
--- a/docs/ResponseContainerMapStringInteger.md
+++ b/docs/ResponseContainerMapStringInteger.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | **dict(str, int)** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerMapStringIntegrationStatus.md b/docs/ResponseContainerMapStringIntegrationStatus.md
index 3cc714f..02fe003 100644
--- a/docs/ResponseContainerMapStringIntegrationStatus.md
+++ b/docs/ResponseContainerMapStringIntegrationStatus.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**dict(str, IntegrationStatus)**](IntegrationStatus.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerMessage.md b/docs/ResponseContainerMessage.md
index 3c31f46..019462a 100644
--- a/docs/ResponseContainerMessage.md
+++ b/docs/ResponseContainerMessage.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Message**](Message.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerNotificant.md b/docs/ResponseContainerNotificant.md
index bb639a4..1626594 100644
--- a/docs/ResponseContainerNotificant.md
+++ b/docs/ResponseContainerNotificant.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Notificant**](Notificant.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedAlert.md b/docs/ResponseContainerPagedAlert.md
index ffc00f5..76e9add 100644
--- a/docs/ResponseContainerPagedAlert.md
+++ b/docs/ResponseContainerPagedAlert.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedAlert**](PagedAlert.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedAlertWithStats.md b/docs/ResponseContainerPagedAlertWithStats.md
index 2018107..9f33bda 100644
--- a/docs/ResponseContainerPagedAlertWithStats.md
+++ b/docs/ResponseContainerPagedAlertWithStats.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedAlertWithStats**](PagedAlertWithStats.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedCloudIntegration.md b/docs/ResponseContainerPagedCloudIntegration.md
index 7f0729a..f58ab7a 100644
--- a/docs/ResponseContainerPagedCloudIntegration.md
+++ b/docs/ResponseContainerPagedCloudIntegration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedCloudIntegration**](PagedCloudIntegration.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedCustomerFacingUserObject.md b/docs/ResponseContainerPagedCustomerFacingUserObject.md
index 0cd24a1..2c5d975 100644
--- a/docs/ResponseContainerPagedCustomerFacingUserObject.md
+++ b/docs/ResponseContainerPagedCustomerFacingUserObject.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedCustomerFacingUserObject**](PagedCustomerFacingUserObject.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedDashboard.md b/docs/ResponseContainerPagedDashboard.md
index 8eb0a4a..de6fb0c 100644
--- a/docs/ResponseContainerPagedDashboard.md
+++ b/docs/ResponseContainerPagedDashboard.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedDashboard**](PagedDashboard.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedDerivedMetricDefinition.md b/docs/ResponseContainerPagedDerivedMetricDefinition.md
index e23930d..1dceb9f 100644
--- a/docs/ResponseContainerPagedDerivedMetricDefinition.md
+++ b/docs/ResponseContainerPagedDerivedMetricDefinition.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedDerivedMetricDefinition**](PagedDerivedMetricDefinition.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md b/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md
index 10a622a..fe16088 100644
--- a/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md
+++ b/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedDerivedMetricDefinitionWithStats**](PagedDerivedMetricDefinitionWithStats.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedEvent.md b/docs/ResponseContainerPagedEvent.md
index f9a89e8..86711ef 100644
--- a/docs/ResponseContainerPagedEvent.md
+++ b/docs/ResponseContainerPagedEvent.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedEvent**](PagedEvent.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedExternalLink.md b/docs/ResponseContainerPagedExternalLink.md
index b863521..8318bd3 100644
--- a/docs/ResponseContainerPagedExternalLink.md
+++ b/docs/ResponseContainerPagedExternalLink.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedExternalLink**](PagedExternalLink.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedIntegration.md b/docs/ResponseContainerPagedIntegration.md
index d8facd8..e44231a 100644
--- a/docs/ResponseContainerPagedIntegration.md
+++ b/docs/ResponseContainerPagedIntegration.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedIntegration**](PagedIntegration.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedMaintenanceWindow.md b/docs/ResponseContainerPagedMaintenanceWindow.md
index b4bf80c..e31a9b9 100644
--- a/docs/ResponseContainerPagedMaintenanceWindow.md
+++ b/docs/ResponseContainerPagedMaintenanceWindow.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedMaintenanceWindow**](PagedMaintenanceWindow.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedMessage.md b/docs/ResponseContainerPagedMessage.md
index 2fe3760..c4c3c71 100644
--- a/docs/ResponseContainerPagedMessage.md
+++ b/docs/ResponseContainerPagedMessage.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedMessage**](PagedMessage.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedNotificant.md b/docs/ResponseContainerPagedNotificant.md
index 801d780..24c675a 100644
--- a/docs/ResponseContainerPagedNotificant.md
+++ b/docs/ResponseContainerPagedNotificant.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedNotificant**](PagedNotificant.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedProxy.md b/docs/ResponseContainerPagedProxy.md
index 7272819..0a2fbea 100644
--- a/docs/ResponseContainerPagedProxy.md
+++ b/docs/ResponseContainerPagedProxy.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedProxy**](PagedProxy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedSavedSearch.md b/docs/ResponseContainerPagedSavedSearch.md
index 4469e29..72f40e5 100644
--- a/docs/ResponseContainerPagedSavedSearch.md
+++ b/docs/ResponseContainerPagedSavedSearch.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedSavedSearch**](PagedSavedSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedSource.md b/docs/ResponseContainerPagedSource.md
index d7b92ac..11189d0 100644
--- a/docs/ResponseContainerPagedSource.md
+++ b/docs/ResponseContainerPagedSource.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedSource**](PagedSource.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerPagedUserGroup.md b/docs/ResponseContainerPagedUserGroup.md
index 5a8454a..8fc02d2 100644
--- a/docs/ResponseContainerPagedUserGroup.md
+++ b/docs/ResponseContainerPagedUserGroup.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**PagedUserGroup**](PagedUserGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerProxy.md b/docs/ResponseContainerProxy.md
index 5dc9cb4..d597cc0 100644
--- a/docs/ResponseContainerProxy.md
+++ b/docs/ResponseContainerProxy.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Proxy**](Proxy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerSavedSearch.md b/docs/ResponseContainerSavedSearch.md
index b2434bb..1d1143a 100644
--- a/docs/ResponseContainerSavedSearch.md
+++ b/docs/ResponseContainerSavedSearch.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**SavedSearch**](SavedSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerSource.md b/docs/ResponseContainerSource.md
index a14d24c..f02aa5e 100644
--- a/docs/ResponseContainerSource.md
+++ b/docs/ResponseContainerSource.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**Source**](Source.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerTagsResponse.md b/docs/ResponseContainerTagsResponse.md
index b67fa0b..98a2531 100644
--- a/docs/ResponseContainerTagsResponse.md
+++ b/docs/ResponseContainerTagsResponse.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**TagsResponse**](TagsResponse.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseContainerUserGroup.md b/docs/ResponseContainerUserGroup.md
index 0576977..973f2eb 100644
--- a/docs/ResponseContainerUserGroup.md
+++ b/docs/ResponseContainerUserGroup.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 **response** | [**UserGroup**](UserGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ResponseStatus.md b/docs/ResponseStatus.md
index b0cebc8..a910420 100644
--- a/docs/ResponseStatus.md
+++ b/docs/ResponseStatus.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**result** | **str** |  | 
-**message** | **str** | Descriptive message of the status of this response | [optional] 
 **code** | **int** | HTTP Response code corresponding to this response | 
+**message** | **str** | Descriptive message of the status of this response | [optional] 
+**result** | **str** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SavedSearch.md b/docs/SavedSearch.md
index d4adf58..1cb3b58 100644
--- a/docs/SavedSearch.md
+++ b/docs/SavedSearch.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**entity_type** | **str** | The Wavefront entity type over which to search | 
-**query** | **dict(str, str)** | The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query | 
+**created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
+**entity_type** | **str** | The Wavefront entity type over which to search | 
 **id** | **str** |  | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
+**query** | **dict(str, str)** | The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query | 
 **updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
 **user_id** | **str** | The user for whom this search is saved | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/SearchQuery.md b/docs/SearchQuery.md
index aa3c07f..e7883de 100644
--- a/docs/SearchQuery.md
+++ b/docs/SearchQuery.md
@@ -4,8 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **key** | **str** | The entity facet (key) by which to search.  Valid keys are any property keys returned by the JSON representation of the entity.  Examples are &#39;creatorId&#39;, &#39;name&#39;, etc.  The following special key keywords are also valid:  &#39;tags&#39; performs a search on entity tags, &#39;tagpath&#39; performs a hierarchical search on tags, with  periods (.) as path level separators.  &#39;freetext&#39; performs a free text search across many fields of the entity | 
-**value** | **str** | The entity facet value for which to search | 
 **matching_method** | **str** | The method by which search matching is performed.  Default: CONTAINS | [optional] 
+**value** | **str** | The entity facet value for which to search | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Sorting.md b/docs/Sorting.md
index f0c64d7..447bb51 100644
--- a/docs/Sorting.md
+++ b/docs/Sorting.md
@@ -4,8 +4,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ascending** | **bool** | Whether to sort ascending.  If undefined, sorting is not guaranteed | 
-**field** | **str** | The facet by which to sort | 
 **default** | **bool** | Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true. | [optional] 
+**field** | **str** | The facet by which to sort | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Source.md b/docs/Source.md
index fd86ae0..92ac653 100644
--- a/docs/Source.md
+++ b/docs/Source.md
@@ -3,16 +3,16 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
 **description** | **str** | Description of this source | [optional] 
 **hidden** | **bool** | A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things) | [optional] 
+**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
+**marked_new_epoch_millis** | **int** | Epoch Millis when this source was marked as ~status.new | [optional] 
 **source_name** | **str** | The name of the source, usually set by ingested telemetry | 
 **tags** | **dict(str, bool)** | A Map (String -&gt; boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true | [optional] 
-**creator_id** | **str** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-**id** | **str** | id of this source, must be exactly equivalent to &#39;sourceName&#39; | 
-**created_epoch_millis** | **int** |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
-**marked_new_epoch_millis** | **int** | Epoch Millis when this source was marked as ~status.new | [optional] 
+**updater_id** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SourceLabelPair.md b/docs/SourceLabelPair.md
index 53d05f8..61a1bfa 100644
--- a/docs/SourceLabelPair.md
+++ b/docs/SourceLabelPair.md
@@ -3,12 +3,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**firing** | **int** |  | [optional] 
+**host** | **str** | Source (or host).  \&quot;Source\&quot; and \&quot;host\&quot; are synonyms in current versions of wavefront, but the host terminology is deprecated | [optional] 
 **label** | **str** |  | [optional] 
+**observed** | **int** |  | [optional] 
 **severity** | **str** |  | [optional] 
-**host** | **str** | Source (or host).  \&quot;Source\&quot; and \&quot;host\&quot; are synonyms in current versions of wavefront, but the host terminology is deprecated | [optional] 
 **tags** | **dict(str, str)** |  | [optional] 
-**firing** | **int** |  | [optional] 
-**observed** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StatsModel.md b/docs/StatsModel.md
index 61e51af..e992ac6 100644
--- a/docs/StatsModel.md
+++ b/docs/StatsModel.md
@@ -3,21 +3,21 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**keys** | **int** |  | [optional] 
-**points** | **int** |  | [optional] 
-**summaries** | **int** |  | [optional] 
-**queries** | **int** |  | [optional] 
 **buffer_keys** | **int** |  | [optional] 
+**cached_compacted_keys** | **int** |  | [optional] 
 **compacted_keys** | **int** |  | [optional] 
-**skipped_compacted_keys** | **int** |  | [optional] 
 **compacted_points** | **int** |  | [optional] 
-**cached_compacted_keys** | **int** |  | [optional] 
-**latency** | **int** |  | [optional] 
-**s3_keys** | **int** |  | [optional] 
 **cpu_ns** | **int** |  | [optional] 
-**metrics_used** | **int** |  | [optional] 
 **hosts_used** | **int** |  | [optional] 
+**keys** | **int** |  | [optional] 
+**latency** | **int** |  | [optional] 
+**metrics_used** | **int** |  | [optional] 
+**points** | **int** |  | [optional] 
+**queries** | **int** |  | [optional] 
 **query_tasks** | **int** |  | [optional] 
+**s3_keys** | **int** |  | [optional] 
+**skipped_compacted_keys** | **int** |  | [optional] 
+**summaries** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TagsResponse.md b/docs/TagsResponse.md
index bd0e0d2..11ba33c 100644
--- a/docs/TagsResponse.md
+++ b/docs/TagsResponse.md
@@ -3,13 +3,13 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
 **items** | **list[str]** | List of requested items | [optional] 
-**offset** | **int** |  | [optional] 
 **limit** | **int** |  | [optional] 
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 **more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TargetInfo.md b/docs/TargetInfo.md
index 3c13dcf..40a795e 100644
--- a/docs/TargetInfo.md
+++ b/docs/TargetInfo.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**method** | **str** | Notification method of the alert target | [optional] 
 **id** | **str** | ID of the alert target | [optional] 
+**method** | **str** | Notification method of the alert target | [optional] 
 **name** | **str** | Name of the alert target | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Timeseries.md b/docs/Timeseries.md
index 96c26ba..33d9569 100644
--- a/docs/Timeseries.md
+++ b/docs/Timeseries.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**label** | **str** | Label of this timeseries | [optional] 
+**data** | **list[list[float]]** | Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp | [optional] 
 **host** | **str** | Source/Host of this timeseries | [optional] 
+**label** | **str** | Label of this timeseries | [optional] 
 **tags** | **dict(str, str)** | Tags (key-value annotations) of this timeseries | [optional] 
-**data** | **list[list[float]]** | Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/User.md b/docs/User.md
index c27b135..30db5f5 100644
--- a/docs/User.md
+++ b/docs/User.md
@@ -3,23 +3,23 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**identifier** | **str** |  | [optional] 
-**customer** | **str** |  | [optional] 
-**credential** | **str** |  | [optional] 
-**provider** | **str** |  | [optional] 
-**groups** | **list[str]** |  | [optional] 
-**user_groups** | **list[str]** |  | [optional] 
-**reset_token** | **str** |  | [optional] 
 **api_token** | **str** |  | [optional] 
 **api_token2** | **str** |  | [optional] 
-**reset_token_creation_millis** | **int** |  | [optional] 
+**credential** | **str** |  | [optional] 
+**customer** | **str** |  | [optional] 
+**groups** | **list[str]** |  | [optional] 
+**identifier** | **str** |  | [optional] 
 **invalid_password_attempts** | **int** |  | [optional] 
+**last_logout** | **int** |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
-**settings** | [**UserSettings**](UserSettings.md) |  | [optional] 
 **onboarding_state** | **str** |  | [optional] 
-**last_logout** | **int** |  | [optional] 
+**provider** | **str** |  | [optional] 
+**reset_token** | **str** |  | [optional] 
+**reset_token_creation_millis** | **int** |  | [optional] 
+**settings** | [**UserSettings**](UserSettings.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **super_admin** | **bool** |  | [optional] 
+**user_groups** | **list[str]** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserGroup.md b/docs/UserGroup.md
index 21c07a3..949a237 100644
--- a/docs/UserGroup.md
+++ b/docs/UserGroup.md
@@ -3,13 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** | Unique ID for the user group | [optional] 
-**name** | **str** | Name of the user group | 
-**permissions** | **list[str]** | Permission assigned to the user group | 
-**customer** | **str** | ID of the customer to which the user group belongs | [optional] 
-**users** | **list[str]** | List of Users that are members of the user group. Maybe incomplete. | [optional] 
-**user_count** | **int** | Total number of users that are members of the user group | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**customer** | **str** | The id of the customer to which the user group belongs | [optional] 
+**id** | **str** | The unique identifier of the user group | [optional] 
+**name** | **str** | The name of the user group | 
+**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
+**user_count** | **int** | Total number of users that are members of the user group | [optional] 
+**users** | **list[str]** | List(may be incomplete) of users that are members of the user group. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
index c80da0c..8b4d5e4 100644
--- a/docs/UserGroupWrite.md
+++ b/docs/UserGroupWrite.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
+**created_epoch_millis** | **int** |  | [optional] 
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
 **name** | **str** | The name of the user group | 
+**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 3d2b351..b9e88ff 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -3,11 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
 **customer** | **str** | The id of the customer to which this user belongs | 
-**sso_id** | **str** |  | [optional] 
-**last_successful_login** | **int** |  | [optional] 
 **groups** | **list[str]** | The permissions granted to this user | 
+**identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
+**last_successful_login** | **int** |  | [optional] 
+**sso_id** | **str** |  | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of user groups the user belongs to | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
index c344a5a..283caf9 100644
--- a/docs/UserRequestDTO.md
+++ b/docs/UserRequestDTO.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**identifier** | **str** |  | [optional] 
-**sso_id** | **str** |  | [optional] 
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
+**identifier** | **str** |  | [optional] 
+**sso_id** | **str** |  | [optional] 
 **user_groups** | **list[str]** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
index 863633d..73d7534 100644
--- a/docs/UserSettings.md
+++ b/docs/UserSettings.md
@@ -3,15 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**preferred_time_zone** | **str** |  | [optional] 
+**always_hide_querybuilder** | **bool** |  | [optional] 
 **chart_title_scalar** | **int** |  | [optional] 
-**show_querybuilder_by_default** | **bool** |  | [optional] 
 **hide_ts_when_querybuilder_shown** | **bool** |  | [optional] 
-**always_hide_querybuilder** | **bool** |  | [optional] 
-**use24_hour_time** | **bool** |  | [optional] 
-**use_dark_theme** | **bool** |  | [optional] 
 **landing_dashboard_slug** | **str** |  | [optional] 
+**preferred_time_zone** | **str** |  | [optional] 
 **show_onboarding** | **bool** |  | [optional] 
+**show_querybuilder_by_default** | **bool** |  | [optional] 
+**use24_hour_time** | **bool** |  | [optional] 
+**use_dark_theme** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
index 3f9e5f6..6d20052 100644
--- a/wavefront_api_client/models/access_control_list_simple.py
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -31,68 +31,68 @@ class AccessControlListSimple(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'can_view': 'list[str]',
-        'can_modify': 'list[str]'
+        'can_modify': 'list[str]',
+        'can_view': 'list[str]'
     }
 
     attribute_map = {
-        'can_view': 'canView',
-        'can_modify': 'canModify'
+        'can_modify': 'canModify',
+        'can_view': 'canView'
     }
 
-    def __init__(self, can_view=None, can_modify=None):  # noqa: E501
+    def __init__(self, can_modify=None, can_view=None):  # noqa: E501
         """AccessControlListSimple - a model defined in Swagger"""  # noqa: E501
 
-        self._can_view = None
         self._can_modify = None
+        self._can_view = None
         self.discriminator = None
 
-        if can_view is not None:
-            self.can_view = can_view
         if can_modify is not None:
             self.can_modify = can_modify
+        if can_view is not None:
+            self.can_view = can_view
 
     @property
-    def can_view(self):
-        """Gets the can_view of this AccessControlListSimple.  # noqa: E501
+    def can_modify(self):
+        """Gets the can_modify of this AccessControlListSimple.  # noqa: E501
 
 
-        :return: The can_view of this AccessControlListSimple.  # noqa: E501
+        :return: The can_modify of this AccessControlListSimple.  # noqa: E501
         :rtype: list[str]
         """
-        return self._can_view
+        return self._can_modify
 
-    @can_view.setter
-    def can_view(self, can_view):
-        """Sets the can_view of this AccessControlListSimple.
+    @can_modify.setter
+    def can_modify(self, can_modify):
+        """Sets the can_modify of this AccessControlListSimple.
 
 
-        :param can_view: The can_view of this AccessControlListSimple.  # noqa: E501
+        :param can_modify: The can_modify of this AccessControlListSimple.  # noqa: E501
         :type: list[str]
         """
 
-        self._can_view = can_view
+        self._can_modify = can_modify
 
     @property
-    def can_modify(self):
-        """Gets the can_modify of this AccessControlListSimple.  # noqa: E501
+    def can_view(self):
+        """Gets the can_view of this AccessControlListSimple.  # noqa: E501
 
 
-        :return: The can_modify of this AccessControlListSimple.  # noqa: E501
+        :return: The can_view of this AccessControlListSimple.  # noqa: E501
         :rtype: list[str]
         """
-        return self._can_modify
+        return self._can_view
 
-    @can_modify.setter
-    def can_modify(self, can_modify):
-        """Sets the can_modify of this AccessControlListSimple.
+    @can_view.setter
+    def can_view(self, can_view):
+        """Sets the can_view of this AccessControlListSimple.
 
 
-        :param can_modify: The can_modify of this AccessControlListSimple.  # noqa: E501
+        :param can_view: The can_view of this AccessControlListSimple.  # noqa: E501
         :type: list[str]
         """
 
-        self._can_modify = can_modify
+        self._can_view = can_view
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/acl.py b/wavefront_api_client/models/acl.py
index a4e467b..50f7a21 100644
--- a/wavefront_api_client/models/acl.py
+++ b/wavefront_api_client/models/acl.py
@@ -34,27 +34,27 @@ class ACL(object):
     """
     swagger_types = {
         'entity_id': 'str',
-        'view_acl': 'list[AccessControlElement]',
-        'modify_acl': 'list[AccessControlElement]'
+        'modify_acl': 'list[AccessControlElement]',
+        'view_acl': 'list[AccessControlElement]'
     }
 
     attribute_map = {
         'entity_id': 'entityId',
-        'view_acl': 'viewAcl',
-        'modify_acl': 'modifyAcl'
+        'modify_acl': 'modifyAcl',
+        'view_acl': 'viewAcl'
     }
 
-    def __init__(self, entity_id=None, view_acl=None, modify_acl=None):  # noqa: E501
+    def __init__(self, entity_id=None, modify_acl=None, view_acl=None):  # noqa: E501
         """ACL - a model defined in Swagger"""  # noqa: E501
 
         self._entity_id = None
-        self._view_acl = None
         self._modify_acl = None
+        self._view_acl = None
         self.discriminator = None
 
         self.entity_id = entity_id
-        self.view_acl = view_acl
         self.modify_acl = modify_acl
+        self.view_acl = view_acl
 
     @property
     def entity_id(self):
@@ -81,31 +81,6 @@ def entity_id(self, entity_id):
 
         self._entity_id = entity_id
 
-    @property
-    def view_acl(self):
-        """Gets the view_acl of this ACL.  # noqa: E501
-
-        List of users and user group ids that have view permission  # noqa: E501
-
-        :return: The view_acl of this ACL.  # noqa: E501
-        :rtype: list[AccessControlElement]
-        """
-        return self._view_acl
-
-    @view_acl.setter
-    def view_acl(self, view_acl):
-        """Sets the view_acl of this ACL.
-
-        List of users and user group ids that have view permission  # noqa: E501
-
-        :param view_acl: The view_acl of this ACL.  # noqa: E501
-        :type: list[AccessControlElement]
-        """
-        if view_acl is None:
-            raise ValueError("Invalid value for `view_acl`, must not be `None`")  # noqa: E501
-
-        self._view_acl = view_acl
-
     @property
     def modify_acl(self):
         """Gets the modify_acl of this ACL.  # noqa: E501
@@ -131,6 +106,31 @@ def modify_acl(self, modify_acl):
 
         self._modify_acl = modify_acl
 
+    @property
+    def view_acl(self):
+        """Gets the view_acl of this ACL.  # noqa: E501
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :return: The view_acl of this ACL.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._view_acl
+
+    @view_acl.setter
+    def view_acl(self, view_acl):
+        """Sets the view_acl of this ACL.
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :param view_acl: The view_acl of this ACL.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+        if view_acl is None:
+            raise ValueError("Invalid value for `view_acl`, must not be `None`")  # noqa: E501
+
+        self._view_acl = view_acl
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 8271b92..042e5d0 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -36,681 +36,732 @@ class Alert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'last_event_time': 'int',
-        'created': 'int',
-        'hidden': 'bool',
-        'severity': 'str',
-        'minutes': 'int',
-        'tags': 'WFTags',
-        'status': 'list[str]',
-        'event': 'Event',
-        'updated': 'int',
-        'targets': 'dict(str, str)',
-        'process_rate_minutes': 'int',
-        'last_processed_millis': 'int',
-        'update_user_id': 'str',
-        'condition': 'str',
-        'alert_type': 'str',
-        'display_expression': 'str',
-        'failing_host_label_pairs': 'list[SourceLabelPair]',
-        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
         'active_maintenance_windows': 'list[str]',
-        'condition_qb_enabled': 'bool',
-        'display_expression_qb_enabled': 'bool',
-        'condition_qb_serialization': 'str',
-        'display_expression_qb_serialization': 'str',
-        'include_obsolete_metrics': 'bool',
-        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
-        'no_data_event': 'Event',
-        'snoozed': 'int',
-        'conditions': 'dict(str, str)',
-        'notificants': 'list[str]',
         'additional_information': 'str',
-        'last_query_time': 'int',
+        'alert_type': 'str',
         'alerts_last_day': 'int',
-        'alerts_last_week': 'int',
         'alerts_last_month': 'int',
-        'in_trash': 'bool',
-        'query_failing': 'bool',
+        'alerts_last_week': 'int',
+        'condition': 'str',
+        'condition_qb_enabled': 'bool',
+        'condition_qb_serialization': 'str',
+        'conditions': 'dict(str, str)',
         'create_user_id': 'str',
+        'created': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'display_expression': 'str',
+        'display_expression_qb_enabled': 'bool',
+        'display_expression_qb_serialization': 'str',
+        'event': 'Event',
+        'failing_host_label_pairs': 'list[SourceLabelPair]',
+        'hidden': 'bool',
+        'hosts_used': 'list[str]',
+        'id': 'str',
+        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
+        'in_trash': 'bool',
+        'include_obsolete_metrics': 'bool',
+        'last_error_message': 'str',
+        'last_event_time': 'int',
         'last_failed_time': 'int',
         'last_notification_millis': 'int',
-        'points_scanned_at_last_query': 'int',
-        'num_points_in_failure_frame': 'int',
+        'last_processed_millis': 'int',
+        'last_query_time': 'int',
         'metrics_used': 'list[str]',
-        'hosts_used': 'list[str]',
-        'system_owned': 'bool',
-        'resolve_after_minutes': 'int',
-        'creator_id': 'str',
-        'updater_id': 'str',
-        'id': 'str',
+        'minutes': 'int',
+        'name': 'str',
+        'no_data_event': 'Event',
+        'notificants': 'list[str]',
         'notification_resend_frequency_minutes': 'int',
-        'last_error_message': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
-        'deleted': 'bool',
-        'sort_attr': 'int',
+        'num_points_in_failure_frame': 'int',
+        'points_scanned_at_last_query': 'int',
+        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
+        'process_rate_minutes': 'int',
+        'query_failing': 'bool',
+        'resolve_after_minutes': 'int',
+        'severity': 'str',
         'severity_list': 'list[str]',
+        'snoozed': 'int',
+        'sort_attr': 'int',
+        'status': 'list[str]',
+        'system_owned': 'bool',
+        'tags': 'WFTags',
+        'target': 'str',
         'target_info': 'list[TargetInfo]',
-        'name': 'str',
-        'target': 'str'
+        'targets': 'dict(str, str)',
+        'update_user_id': 'str',
+        'updated': 'int',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
     }
 
     attribute_map = {
-        'last_event_time': 'lastEventTime',
-        'created': 'created',
-        'hidden': 'hidden',
-        'severity': 'severity',
-        'minutes': 'minutes',
-        'tags': 'tags',
-        'status': 'status',
-        'event': 'event',
-        'updated': 'updated',
-        'targets': 'targets',
-        'process_rate_minutes': 'processRateMinutes',
-        'last_processed_millis': 'lastProcessedMillis',
-        'update_user_id': 'updateUserId',
-        'condition': 'condition',
-        'alert_type': 'alertType',
-        'display_expression': 'displayExpression',
-        'failing_host_label_pairs': 'failingHostLabelPairs',
-        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
         'active_maintenance_windows': 'activeMaintenanceWindows',
-        'condition_qb_enabled': 'conditionQBEnabled',
-        'display_expression_qb_enabled': 'displayExpressionQBEnabled',
-        'condition_qb_serialization': 'conditionQBSerialization',
-        'display_expression_qb_serialization': 'displayExpressionQBSerialization',
-        'include_obsolete_metrics': 'includeObsoleteMetrics',
-        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
-        'no_data_event': 'noDataEvent',
-        'snoozed': 'snoozed',
-        'conditions': 'conditions',
-        'notificants': 'notificants',
         'additional_information': 'additionalInformation',
-        'last_query_time': 'lastQueryTime',
+        'alert_type': 'alertType',
         'alerts_last_day': 'alertsLastDay',
-        'alerts_last_week': 'alertsLastWeek',
         'alerts_last_month': 'alertsLastMonth',
-        'in_trash': 'inTrash',
-        'query_failing': 'queryFailing',
+        'alerts_last_week': 'alertsLastWeek',
+        'condition': 'condition',
+        'condition_qb_enabled': 'conditionQBEnabled',
+        'condition_qb_serialization': 'conditionQBSerialization',
+        'conditions': 'conditions',
         'create_user_id': 'createUserId',
+        'created': 'created',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'display_expression': 'displayExpression',
+        'display_expression_qb_enabled': 'displayExpressionQBEnabled',
+        'display_expression_qb_serialization': 'displayExpressionQBSerialization',
+        'event': 'event',
+        'failing_host_label_pairs': 'failingHostLabelPairs',
+        'hidden': 'hidden',
+        'hosts_used': 'hostsUsed',
+        'id': 'id',
+        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
+        'in_trash': 'inTrash',
+        'include_obsolete_metrics': 'includeObsoleteMetrics',
+        'last_error_message': 'lastErrorMessage',
+        'last_event_time': 'lastEventTime',
         'last_failed_time': 'lastFailedTime',
         'last_notification_millis': 'lastNotificationMillis',
-        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
-        'num_points_in_failure_frame': 'numPointsInFailureFrame',
+        'last_processed_millis': 'lastProcessedMillis',
+        'last_query_time': 'lastQueryTime',
         'metrics_used': 'metricsUsed',
-        'hosts_used': 'hostsUsed',
-        'system_owned': 'systemOwned',
-        'resolve_after_minutes': 'resolveAfterMinutes',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
-        'id': 'id',
+        'minutes': 'minutes',
+        'name': 'name',
+        'no_data_event': 'noDataEvent',
+        'notificants': 'notificants',
         'notification_resend_frequency_minutes': 'notificationResendFrequencyMinutes',
-        'last_error_message': 'lastErrorMessage',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'deleted': 'deleted',
-        'sort_attr': 'sortAttr',
+        'num_points_in_failure_frame': 'numPointsInFailureFrame',
+        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
+        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
+        'process_rate_minutes': 'processRateMinutes',
+        'query_failing': 'queryFailing',
+        'resolve_after_minutes': 'resolveAfterMinutes',
+        'severity': 'severity',
         'severity_list': 'severityList',
+        'snoozed': 'snoozed',
+        'sort_attr': 'sortAttr',
+        'status': 'status',
+        'system_owned': 'systemOwned',
+        'tags': 'tags',
+        'target': 'target',
         'target_info': 'targetInfo',
-        'name': 'name',
-        'target': 'target'
+        'targets': 'targets',
+        'update_user_id': 'updateUserId',
+        'updated': 'updated',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, last_event_time=None, created=None, hidden=None, severity=None, minutes=None, tags=None, status=None, event=None, updated=None, targets=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, condition=None, alert_type=None, display_expression=None, failing_host_label_pairs=None, in_maintenance_host_label_pairs=None, active_maintenance_windows=None, condition_qb_enabled=None, display_expression_qb_enabled=None, condition_qb_serialization=None, display_expression_qb_serialization=None, include_obsolete_metrics=None, prefiring_host_label_pairs=None, no_data_event=None, snoozed=None, conditions=None, notificants=None, additional_information=None, last_query_time=None, alerts_last_day=None, alerts_last_week=None, alerts_last_month=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, last_notification_millis=None, points_scanned_at_last_query=None, num_points_in_failure_frame=None, metrics_used=None, hosts_used=None, system_owned=None, resolve_after_minutes=None, creator_id=None, updater_id=None, id=None, notification_resend_frequency_minutes=None, last_error_message=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, sort_attr=None, severity_list=None, target_info=None, name=None, target=None):  # noqa: E501
+    def __init__(self, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
-        self._last_event_time = None
-        self._created = None
-        self._hidden = None
-        self._severity = None
-        self._minutes = None
-        self._tags = None
-        self._status = None
-        self._event = None
-        self._updated = None
-        self._targets = None
-        self._process_rate_minutes = None
-        self._last_processed_millis = None
-        self._update_user_id = None
-        self._condition = None
-        self._alert_type = None
-        self._display_expression = None
-        self._failing_host_label_pairs = None
-        self._in_maintenance_host_label_pairs = None
         self._active_maintenance_windows = None
-        self._condition_qb_enabled = None
-        self._display_expression_qb_enabled = None
-        self._condition_qb_serialization = None
-        self._display_expression_qb_serialization = None
-        self._include_obsolete_metrics = None
-        self._prefiring_host_label_pairs = None
-        self._no_data_event = None
-        self._snoozed = None
-        self._conditions = None
-        self._notificants = None
         self._additional_information = None
-        self._last_query_time = None
+        self._alert_type = None
         self._alerts_last_day = None
-        self._alerts_last_week = None
         self._alerts_last_month = None
-        self._in_trash = None
-        self._query_failing = None
+        self._alerts_last_week = None
+        self._condition = None
+        self._condition_qb_enabled = None
+        self._condition_qb_serialization = None
+        self._conditions = None
         self._create_user_id = None
+        self._created = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._display_expression = None
+        self._display_expression_qb_enabled = None
+        self._display_expression_qb_serialization = None
+        self._event = None
+        self._failing_host_label_pairs = None
+        self._hidden = None
+        self._hosts_used = None
+        self._id = None
+        self._in_maintenance_host_label_pairs = None
+        self._in_trash = None
+        self._include_obsolete_metrics = None
+        self._last_error_message = None
+        self._last_event_time = None
         self._last_failed_time = None
         self._last_notification_millis = None
-        self._points_scanned_at_last_query = None
-        self._num_points_in_failure_frame = None
+        self._last_processed_millis = None
+        self._last_query_time = None
         self._metrics_used = None
-        self._hosts_used = None
-        self._system_owned = None
-        self._resolve_after_minutes = None
-        self._creator_id = None
-        self._updater_id = None
-        self._id = None
+        self._minutes = None
+        self._name = None
+        self._no_data_event = None
+        self._notificants = None
         self._notification_resend_frequency_minutes = None
-        self._last_error_message = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._deleted = None
-        self._sort_attr = None
+        self._num_points_in_failure_frame = None
+        self._points_scanned_at_last_query = None
+        self._prefiring_host_label_pairs = None
+        self._process_rate_minutes = None
+        self._query_failing = None
+        self._resolve_after_minutes = None
+        self._severity = None
         self._severity_list = None
-        self._target_info = None
-        self._name = None
+        self._snoozed = None
+        self._sort_attr = None
+        self._status = None
+        self._system_owned = None
+        self._tags = None
         self._target = None
-        self.discriminator = None
-
-        if last_event_time is not None:
-            self.last_event_time = last_event_time
-        if created is not None:
-            self.created = created
-        if hidden is not None:
-            self.hidden = hidden
-        if severity is not None:
-            self.severity = severity
-        self.minutes = minutes
-        if tags is not None:
-            self.tags = tags
-        if status is not None:
-            self.status = status
-        if event is not None:
-            self.event = event
-        if updated is not None:
-            self.updated = updated
-        if targets is not None:
-            self.targets = targets
-        if process_rate_minutes is not None:
-            self.process_rate_minutes = process_rate_minutes
-        if last_processed_millis is not None:
-            self.last_processed_millis = last_processed_millis
-        if update_user_id is not None:
-            self.update_user_id = update_user_id
-        self.condition = condition
-        if alert_type is not None:
-            self.alert_type = alert_type
-        if display_expression is not None:
-            self.display_expression = display_expression
-        if failing_host_label_pairs is not None:
-            self.failing_host_label_pairs = failing_host_label_pairs
-        if in_maintenance_host_label_pairs is not None:
-            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
-        if active_maintenance_windows is not None:
-            self.active_maintenance_windows = active_maintenance_windows
-        if condition_qb_enabled is not None:
-            self.condition_qb_enabled = condition_qb_enabled
-        if display_expression_qb_enabled is not None:
-            self.display_expression_qb_enabled = display_expression_qb_enabled
-        if condition_qb_serialization is not None:
-            self.condition_qb_serialization = condition_qb_serialization
-        if display_expression_qb_serialization is not None:
-            self.display_expression_qb_serialization = display_expression_qb_serialization
-        if include_obsolete_metrics is not None:
-            self.include_obsolete_metrics = include_obsolete_metrics
-        if prefiring_host_label_pairs is not None:
-            self.prefiring_host_label_pairs = prefiring_host_label_pairs
-        if no_data_event is not None:
-            self.no_data_event = no_data_event
-        if snoozed is not None:
-            self.snoozed = snoozed
-        if conditions is not None:
-            self.conditions = conditions
-        if notificants is not None:
-            self.notificants = notificants
+        self._target_info = None
+        self._targets = None
+        self._update_user_id = None
+        self._updated = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if active_maintenance_windows is not None:
+            self.active_maintenance_windows = active_maintenance_windows
         if additional_information is not None:
             self.additional_information = additional_information
-        if last_query_time is not None:
-            self.last_query_time = last_query_time
+        if alert_type is not None:
+            self.alert_type = alert_type
         if alerts_last_day is not None:
             self.alerts_last_day = alerts_last_day
-        if alerts_last_week is not None:
-            self.alerts_last_week = alerts_last_week
         if alerts_last_month is not None:
             self.alerts_last_month = alerts_last_month
-        if in_trash is not None:
-            self.in_trash = in_trash
-        if query_failing is not None:
-            self.query_failing = query_failing
+        if alerts_last_week is not None:
+            self.alerts_last_week = alerts_last_week
+        self.condition = condition
+        if condition_qb_enabled is not None:
+            self.condition_qb_enabled = condition_qb_enabled
+        if condition_qb_serialization is not None:
+            self.condition_qb_serialization = condition_qb_serialization
+        if conditions is not None:
+            self.conditions = conditions
         if create_user_id is not None:
             self.create_user_id = create_user_id
+        if created is not None:
+            self.created = created
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if display_expression is not None:
+            self.display_expression = display_expression
+        if display_expression_qb_enabled is not None:
+            self.display_expression_qb_enabled = display_expression_qb_enabled
+        if display_expression_qb_serialization is not None:
+            self.display_expression_qb_serialization = display_expression_qb_serialization
+        if event is not None:
+            self.event = event
+        if failing_host_label_pairs is not None:
+            self.failing_host_label_pairs = failing_host_label_pairs
+        if hidden is not None:
+            self.hidden = hidden
+        if hosts_used is not None:
+            self.hosts_used = hosts_used
+        if id is not None:
+            self.id = id
+        if in_maintenance_host_label_pairs is not None:
+            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+        if in_trash is not None:
+            self.in_trash = in_trash
+        if include_obsolete_metrics is not None:
+            self.include_obsolete_metrics = include_obsolete_metrics
+        if last_error_message is not None:
+            self.last_error_message = last_error_message
+        if last_event_time is not None:
+            self.last_event_time = last_event_time
         if last_failed_time is not None:
             self.last_failed_time = last_failed_time
         if last_notification_millis is not None:
             self.last_notification_millis = last_notification_millis
-        if points_scanned_at_last_query is not None:
-            self.points_scanned_at_last_query = points_scanned_at_last_query
-        if num_points_in_failure_frame is not None:
-            self.num_points_in_failure_frame = num_points_in_failure_frame
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if last_query_time is not None:
+            self.last_query_time = last_query_time
         if metrics_used is not None:
             self.metrics_used = metrics_used
-        if hosts_used is not None:
-            self.hosts_used = hosts_used
-        if system_owned is not None:
-            self.system_owned = system_owned
-        if resolve_after_minutes is not None:
-            self.resolve_after_minutes = resolve_after_minutes
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if id is not None:
-            self.id = id
+        self.minutes = minutes
+        self.name = name
+        if no_data_event is not None:
+            self.no_data_event = no_data_event
+        if notificants is not None:
+            self.notificants = notificants
         if notification_resend_frequency_minutes is not None:
             self.notification_resend_frequency_minutes = notification_resend_frequency_minutes
-        if last_error_message is not None:
-            self.last_error_message = last_error_message
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        if deleted is not None:
-            self.deleted = deleted
-        if sort_attr is not None:
-            self.sort_attr = sort_attr
+        if num_points_in_failure_frame is not None:
+            self.num_points_in_failure_frame = num_points_in_failure_frame
+        if points_scanned_at_last_query is not None:
+            self.points_scanned_at_last_query = points_scanned_at_last_query
+        if prefiring_host_label_pairs is not None:
+            self.prefiring_host_label_pairs = prefiring_host_label_pairs
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        if query_failing is not None:
+            self.query_failing = query_failing
+        if resolve_after_minutes is not None:
+            self.resolve_after_minutes = resolve_after_minutes
+        if severity is not None:
+            self.severity = severity
         if severity_list is not None:
             self.severity_list = severity_list
-        if target_info is not None:
-            self.target_info = target_info
-        self.name = name
+        if snoozed is not None:
+            self.snoozed = snoozed
+        if sort_attr is not None:
+            self.sort_attr = sort_attr
+        if status is not None:
+            self.status = status
+        if system_owned is not None:
+            self.system_owned = system_owned
+        if tags is not None:
+            self.tags = tags
         if target is not None:
             self.target = target
+        if target_info is not None:
+            self.target_info = target_info
+        if targets is not None:
+            self.targets = targets
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
+        if updated is not None:
+            self.updated = updated
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def last_event_time(self):
-        """Gets the last_event_time of this Alert.  # noqa: E501
+    def active_maintenance_windows(self):
+        """Gets the active_maintenance_windows of this Alert.  # noqa: E501
 
-        Start time (in epoch millis) of the last event associated with this alert.  # noqa: E501
+        The names of the active maintenance windows that are affecting this alert  # noqa: E501
 
-        :return: The last_event_time of this Alert.  # noqa: E501
+        :return: The active_maintenance_windows of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._active_maintenance_windows
+
+    @active_maintenance_windows.setter
+    def active_maintenance_windows(self, active_maintenance_windows):
+        """Sets the active_maintenance_windows of this Alert.
+
+        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+
+        :param active_maintenance_windows: The active_maintenance_windows of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._active_maintenance_windows = active_maintenance_windows
+
+    @property
+    def additional_information(self):
+        """Gets the additional_information of this Alert.  # noqa: E501
+
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+
+        :return: The additional_information of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._additional_information
+
+    @additional_information.setter
+    def additional_information(self, additional_information):
+        """Sets the additional_information of this Alert.
+
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+
+        :param additional_information: The additional_information of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._additional_information = additional_information
+
+    @property
+    def alert_type(self):
+        """Gets the alert_type of this Alert.  # noqa: E501
+
+        Alert type.  # noqa: E501
+
+        :return: The alert_type of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_type
+
+    @alert_type.setter
+    def alert_type(self, alert_type):
+        """Sets the alert_type of this Alert.
+
+        Alert type.  # noqa: E501
+
+        :param alert_type: The alert_type of this Alert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["CLASSIC", "THRESHOLD"]  # noqa: E501
+        if alert_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `alert_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(alert_type, allowed_values)
+            )
+
+        self._alert_type = alert_type
+
+    @property
+    def alerts_last_day(self):
+        """Gets the alerts_last_day of this Alert.  # noqa: E501
+
+
+        :return: The alerts_last_day of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_event_time
+        return self._alerts_last_day
 
-    @last_event_time.setter
-    def last_event_time(self, last_event_time):
-        """Sets the last_event_time of this Alert.
+    @alerts_last_day.setter
+    def alerts_last_day(self, alerts_last_day):
+        """Sets the alerts_last_day of this Alert.
 
-        Start time (in epoch millis) of the last event associated with this alert.  # noqa: E501
 
-        :param last_event_time: The last_event_time of this Alert.  # noqa: E501
+        :param alerts_last_day: The alerts_last_day of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_event_time = last_event_time
+        self._alerts_last_day = alerts_last_day
 
     @property
-    def created(self):
-        """Gets the created of this Alert.  # noqa: E501
+    def alerts_last_month(self):
+        """Gets the alerts_last_month of this Alert.  # noqa: E501
 
-        When this alert was created, in epoch millis  # noqa: E501
 
-        :return: The created of this Alert.  # noqa: E501
+        :return: The alerts_last_month of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._created
+        return self._alerts_last_month
 
-    @created.setter
-    def created(self, created):
-        """Sets the created of this Alert.
+    @alerts_last_month.setter
+    def alerts_last_month(self, alerts_last_month):
+        """Sets the alerts_last_month of this Alert.
 
-        When this alert was created, in epoch millis  # noqa: E501
 
-        :param created: The created of this Alert.  # noqa: E501
+        :param alerts_last_month: The alerts_last_month of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._created = created
+        self._alerts_last_month = alerts_last_month
 
     @property
-    def hidden(self):
-        """Gets the hidden of this Alert.  # noqa: E501
+    def alerts_last_week(self):
+        """Gets the alerts_last_week of this Alert.  # noqa: E501
 
 
-        :return: The hidden of this Alert.  # noqa: E501
-        :rtype: bool
+        :return: The alerts_last_week of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._hidden
+        return self._alerts_last_week
 
-    @hidden.setter
-    def hidden(self, hidden):
-        """Sets the hidden of this Alert.
+    @alerts_last_week.setter
+    def alerts_last_week(self, alerts_last_week):
+        """Sets the alerts_last_week of this Alert.
 
 
-        :param hidden: The hidden of this Alert.  # noqa: E501
-        :type: bool
+        :param alerts_last_week: The alerts_last_week of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._hidden = hidden
+        self._alerts_last_week = alerts_last_week
 
     @property
-    def severity(self):
-        """Gets the severity of this Alert.  # noqa: E501
+    def condition(self):
+        """Gets the condition of this Alert.  # noqa: E501
 
-        Severity of the alert  # noqa: E501
+        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
 
-        :return: The severity of this Alert.  # noqa: E501
+        :return: The condition of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._severity
+        return self._condition
 
-    @severity.setter
-    def severity(self, severity):
-        """Sets the severity of this Alert.
+    @condition.setter
+    def condition(self, condition):
+        """Sets the condition of this Alert.
 
-        Severity of the alert  # noqa: E501
+        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
 
-        :param severity: The severity of this Alert.  # noqa: E501
+        :param condition: The condition of this Alert.  # noqa: E501
         :type: str
         """
-        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
-            raise ValueError(
-                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
-                .format(severity, allowed_values)
-            )
+        if condition is None:
+            raise ValueError("Invalid value for `condition`, must not be `None`")  # noqa: E501
 
-        self._severity = severity
+        self._condition = condition
 
     @property
-    def minutes(self):
-        """Gets the minutes of this Alert.  # noqa: E501
+    def condition_qb_enabled(self):
+        """Gets the condition_qb_enabled of this Alert.  # noqa: E501
 
-        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+        Whether the condition query was created using the Query Builder.  Default false  # noqa: E501
 
-        :return: The minutes of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The condition_qb_enabled of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._minutes
+        return self._condition_qb_enabled
 
-    @minutes.setter
-    def minutes(self, minutes):
-        """Sets the minutes of this Alert.
+    @condition_qb_enabled.setter
+    def condition_qb_enabled(self, condition_qb_enabled):
+        """Sets the condition_qb_enabled of this Alert.
 
-        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+        Whether the condition query was created using the Query Builder.  Default false  # noqa: E501
 
-        :param minutes: The minutes of this Alert.  # noqa: E501
-        :type: int
+        :param condition_qb_enabled: The condition_qb_enabled of this Alert.  # noqa: E501
+        :type: bool
         """
-        if minutes is None:
-            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
-        self._minutes = minutes
+        self._condition_qb_enabled = condition_qb_enabled
 
     @property
-    def tags(self):
-        """Gets the tags of this Alert.  # noqa: E501
+    def condition_qb_serialization(self):
+        """Gets the condition_qb_serialization of this Alert.  # noqa: E501
 
+        The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true  # noqa: E501
 
-        :return: The tags of this Alert.  # noqa: E501
-        :rtype: WFTags
+        :return: The condition_qb_serialization of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._tags
+        return self._condition_qb_serialization
 
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this Alert.
+    @condition_qb_serialization.setter
+    def condition_qb_serialization(self, condition_qb_serialization):
+        """Sets the condition_qb_serialization of this Alert.
 
+        The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true  # noqa: E501
 
-        :param tags: The tags of this Alert.  # noqa: E501
-        :type: WFTags
+        :param condition_qb_serialization: The condition_qb_serialization of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._tags = tags
+        self._condition_qb_serialization = condition_qb_serialization
 
     @property
-    def status(self):
-        """Gets the status of this Alert.  # noqa: E501
+    def conditions(self):
+        """Gets the conditions of this Alert.  # noqa: E501
 
-        Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA  # noqa: E501
+        Multi - alert conditions.  # noqa: E501
 
-        :return: The status of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The conditions of this Alert.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._status
+        return self._conditions
 
-    @status.setter
-    def status(self, status):
-        """Sets the status of this Alert.
+    @conditions.setter
+    def conditions(self, conditions):
+        """Sets the conditions of this Alert.
 
-        Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA  # noqa: E501
+        Multi - alert conditions.  # noqa: E501
 
-        :param status: The status of this Alert.  # noqa: E501
-        :type: list[str]
+        :param conditions: The conditions of this Alert.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._status = status
+        self._conditions = conditions
 
     @property
-    def event(self):
-        """Gets the event of this Alert.  # noqa: E501
+    def create_user_id(self):
+        """Gets the create_user_id of this Alert.  # noqa: E501
 
 
-        :return: The event of this Alert.  # noqa: E501
-        :rtype: Event
+        :return: The create_user_id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._event
+        return self._create_user_id
 
-    @event.setter
-    def event(self, event):
-        """Sets the event of this Alert.
+    @create_user_id.setter
+    def create_user_id(self, create_user_id):
+        """Sets the create_user_id of this Alert.
 
 
-        :param event: The event of this Alert.  # noqa: E501
-        :type: Event
+        :param create_user_id: The create_user_id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._event = event
+        self._create_user_id = create_user_id
 
     @property
-    def updated(self):
-        """Gets the updated of this Alert.  # noqa: E501
+    def created(self):
+        """Gets the created of this Alert.  # noqa: E501
 
-        When the alert was last updated, in epoch millis  # noqa: E501
+        When this alert was created, in epoch millis  # noqa: E501
 
-        :return: The updated of this Alert.  # noqa: E501
+        :return: The created of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._updated
+        return self._created
 
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this Alert.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this Alert.
 
-        When the alert was last updated, in epoch millis  # noqa: E501
+        When this alert was created, in epoch millis  # noqa: E501
 
-        :param updated: The updated of this Alert.  # noqa: E501
+        :param created: The created of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._updated = updated
+        self._created = created
 
     @property
-    def targets(self):
-        """Gets the targets of this Alert.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Alert.  # noqa: E501
 
-        Targets for severity.  # noqa: E501
 
-        :return: The targets of this Alert.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The created_epoch_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._targets
+        return self._created_epoch_millis
 
-    @targets.setter
-    def targets(self, targets):
-        """Sets the targets of this Alert.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Alert.
 
-        Targets for severity.  # noqa: E501
 
-        :param targets: The targets of this Alert.  # noqa: E501
-        :type: dict(str, str)
+        :param created_epoch_millis: The created_epoch_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._targets = targets
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def process_rate_minutes(self):
-        """Gets the process_rate_minutes of this Alert.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this Alert.  # noqa: E501
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :return: The process_rate_minutes of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._process_rate_minutes
+        return self._creator_id
 
-    @process_rate_minutes.setter
-    def process_rate_minutes(self, process_rate_minutes):
-        """Sets the process_rate_minutes of this Alert.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Alert.
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._process_rate_minutes = process_rate_minutes
+        self._creator_id = creator_id
 
     @property
-    def last_processed_millis(self):
-        """Gets the last_processed_millis of this Alert.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this Alert.  # noqa: E501
 
-        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :return: The last_processed_millis of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The deleted of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._last_processed_millis
+        return self._deleted
 
-    @last_processed_millis.setter
-    def last_processed_millis(self, last_processed_millis):
-        """Sets the last_processed_millis of this Alert.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this Alert.
 
-        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
-        :type: int
+        :param deleted: The deleted of this Alert.  # noqa: E501
+        :type: bool
         """
 
-        self._last_processed_millis = last_processed_millis
+        self._deleted = deleted
 
     @property
-    def update_user_id(self):
-        """Gets the update_user_id of this Alert.  # noqa: E501
+    def display_expression(self):
+        """Gets the display_expression of this Alert.  # noqa: E501
 
-        The user that last updated this alert  # noqa: E501
+        A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted  # noqa: E501
 
-        :return: The update_user_id of this Alert.  # noqa: E501
+        :return: The display_expression of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._update_user_id
+        return self._display_expression
 
-    @update_user_id.setter
-    def update_user_id(self, update_user_id):
-        """Sets the update_user_id of this Alert.
+    @display_expression.setter
+    def display_expression(self, display_expression):
+        """Sets the display_expression of this Alert.
 
-        The user that last updated this alert  # noqa: E501
+        A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted  # noqa: E501
 
-        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
+        :param display_expression: The display_expression of this Alert.  # noqa: E501
         :type: str
         """
 
-        self._update_user_id = update_user_id
+        self._display_expression = display_expression
 
     @property
-    def condition(self):
-        """Gets the condition of this Alert.  # noqa: E501
+    def display_expression_qb_enabled(self):
+        """Gets the display_expression_qb_enabled of this Alert.  # noqa: E501
 
-        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
+        Whether the display expression query was created using the Query Builder. Default false  # noqa: E501
 
-        :return: The condition of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The display_expression_qb_enabled of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._condition
+        return self._display_expression_qb_enabled
 
-    @condition.setter
-    def condition(self, condition):
-        """Sets the condition of this Alert.
+    @display_expression_qb_enabled.setter
+    def display_expression_qb_enabled(self, display_expression_qb_enabled):
+        """Sets the display_expression_qb_enabled of this Alert.
 
-        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
+        Whether the display expression query was created using the Query Builder. Default false  # noqa: E501
 
-        :param condition: The condition of this Alert.  # noqa: E501
-        :type: str
+        :param display_expression_qb_enabled: The display_expression_qb_enabled of this Alert.  # noqa: E501
+        :type: bool
         """
-        if condition is None:
-            raise ValueError("Invalid value for `condition`, must not be `None`")  # noqa: E501
 
-        self._condition = condition
+        self._display_expression_qb_enabled = display_expression_qb_enabled
 
     @property
-    def alert_type(self):
-        """Gets the alert_type of this Alert.  # noqa: E501
+    def display_expression_qb_serialization(self):
+        """Gets the display_expression_qb_serialization of this Alert.  # noqa: E501
 
-        Alert type.  # noqa: E501
+        The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true  # noqa: E501
 
-        :return: The alert_type of this Alert.  # noqa: E501
+        :return: The display_expression_qb_serialization of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._alert_type
+        return self._display_expression_qb_serialization
 
-    @alert_type.setter
-    def alert_type(self, alert_type):
-        """Sets the alert_type of this Alert.
+    @display_expression_qb_serialization.setter
+    def display_expression_qb_serialization(self, display_expression_qb_serialization):
+        """Sets the display_expression_qb_serialization of this Alert.
 
-        Alert type.  # noqa: E501
+        The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true  # noqa: E501
 
-        :param alert_type: The alert_type of this Alert.  # noqa: E501
+        :param display_expression_qb_serialization: The display_expression_qb_serialization of this Alert.  # noqa: E501
         :type: str
         """
-        allowed_values = ["CLASSIC", "THRESHOLD"]  # noqa: E501
-        if alert_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `alert_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(alert_type, allowed_values)
-            )
 
-        self._alert_type = alert_type
+        self._display_expression_qb_serialization = display_expression_qb_serialization
 
     @property
-    def display_expression(self):
-        """Gets the display_expression of this Alert.  # noqa: E501
+    def event(self):
+        """Gets the event of this Alert.  # noqa: E501
 
-        A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted  # noqa: E501
 
-        :return: The display_expression of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The event of this Alert.  # noqa: E501
+        :rtype: Event
         """
-        return self._display_expression
+        return self._event
 
-    @display_expression.setter
-    def display_expression(self, display_expression):
-        """Sets the display_expression of this Alert.
+    @event.setter
+    def event(self, event):
+        """Sets the event of this Alert.
 
-        A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted  # noqa: E501
 
-        :param display_expression: The display_expression of this Alert.  # noqa: E501
-        :type: str
+        :param event: The event of this Alert.  # noqa: E501
+        :type: Event
         """
 
-        self._display_expression = display_expression
+        self._event = event
 
     @property
     def failing_host_label_pairs(self):
@@ -736,142 +787,113 @@ def failing_host_label_pairs(self, failing_host_label_pairs):
         self._failing_host_label_pairs = failing_host_label_pairs
 
     @property
-    def in_maintenance_host_label_pairs(self):
-        """Gets the in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+    def hidden(self):
+        """Gets the hidden of this Alert.  # noqa: E501
 
-        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
 
-        :return: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
-        :rtype: list[SourceLabelPair]
+        :return: The hidden of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._in_maintenance_host_label_pairs
+        return self._hidden
 
-    @in_maintenance_host_label_pairs.setter
-    def in_maintenance_host_label_pairs(self, in_maintenance_host_label_pairs):
-        """Sets the in_maintenance_host_label_pairs of this Alert.
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Alert.
 
-        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
 
-        :param in_maintenance_host_label_pairs: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
-        :type: list[SourceLabelPair]
+        :param hidden: The hidden of this Alert.  # noqa: E501
+        :type: bool
         """
 
-        self._in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+        self._hidden = hidden
 
     @property
-    def active_maintenance_windows(self):
-        """Gets the active_maintenance_windows of this Alert.  # noqa: E501
+    def hosts_used(self):
+        """Gets the hosts_used of this Alert.  # noqa: E501
 
-        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+        Number of hosts checked by the alert condition  # noqa: E501
 
-        :return: The active_maintenance_windows of this Alert.  # noqa: E501
+        :return: The hosts_used of this Alert.  # noqa: E501
         :rtype: list[str]
         """
-        return self._active_maintenance_windows
+        return self._hosts_used
 
-    @active_maintenance_windows.setter
-    def active_maintenance_windows(self, active_maintenance_windows):
-        """Sets the active_maintenance_windows of this Alert.
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this Alert.
 
-        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+        Number of hosts checked by the alert condition  # noqa: E501
 
-        :param active_maintenance_windows: The active_maintenance_windows of this Alert.  # noqa: E501
+        :param hosts_used: The hosts_used of this Alert.  # noqa: E501
         :type: list[str]
         """
 
-        self._active_maintenance_windows = active_maintenance_windows
-
-    @property
-    def condition_qb_enabled(self):
-        """Gets the condition_qb_enabled of this Alert.  # noqa: E501
-
-        Whether the condition query was created using the Query Builder.  Default false  # noqa: E501
-
-        :return: The condition_qb_enabled of this Alert.  # noqa: E501
-        :rtype: bool
-        """
-        return self._condition_qb_enabled
-
-    @condition_qb_enabled.setter
-    def condition_qb_enabled(self, condition_qb_enabled):
-        """Sets the condition_qb_enabled of this Alert.
-
-        Whether the condition query was created using the Query Builder.  Default false  # noqa: E501
-
-        :param condition_qb_enabled: The condition_qb_enabled of this Alert.  # noqa: E501
-        :type: bool
-        """
-
-        self._condition_qb_enabled = condition_qb_enabled
+        self._hosts_used = hosts_used
 
     @property
-    def display_expression_qb_enabled(self):
-        """Gets the display_expression_qb_enabled of this Alert.  # noqa: E501
+    def id(self):
+        """Gets the id of this Alert.  # noqa: E501
 
-        Whether the display expression query was created using the Query Builder. Default false  # noqa: E501
 
-        :return: The display_expression_qb_enabled of this Alert.  # noqa: E501
-        :rtype: bool
+        :return: The id of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._display_expression_qb_enabled
+        return self._id
 
-    @display_expression_qb_enabled.setter
-    def display_expression_qb_enabled(self, display_expression_qb_enabled):
-        """Sets the display_expression_qb_enabled of this Alert.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Alert.
 
-        Whether the display expression query was created using the Query Builder. Default false  # noqa: E501
 
-        :param display_expression_qb_enabled: The display_expression_qb_enabled of this Alert.  # noqa: E501
-        :type: bool
+        :param id: The id of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._display_expression_qb_enabled = display_expression_qb_enabled
+        self._id = id
 
     @property
-    def condition_qb_serialization(self):
-        """Gets the condition_qb_serialization of this Alert.  # noqa: E501
+    def in_maintenance_host_label_pairs(self):
+        """Gets the in_maintenance_host_label_pairs of this Alert.  # noqa: E501
 
-        The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true  # noqa: E501
+        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
 
-        :return: The condition_qb_serialization of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
         """
-        return self._condition_qb_serialization
+        return self._in_maintenance_host_label_pairs
 
-    @condition_qb_serialization.setter
-    def condition_qb_serialization(self, condition_qb_serialization):
-        """Sets the condition_qb_serialization of this Alert.
+    @in_maintenance_host_label_pairs.setter
+    def in_maintenance_host_label_pairs(self, in_maintenance_host_label_pairs):
+        """Sets the in_maintenance_host_label_pairs of this Alert.
 
-        The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true  # noqa: E501
+        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
 
-        :param condition_qb_serialization: The condition_qb_serialization of this Alert.  # noqa: E501
-        :type: str
+        :param in_maintenance_host_label_pairs: The in_maintenance_host_label_pairs of this Alert.  # noqa: E501
+        :type: list[SourceLabelPair]
         """
 
-        self._condition_qb_serialization = condition_qb_serialization
+        self._in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
 
     @property
-    def display_expression_qb_serialization(self):
-        """Gets the display_expression_qb_serialization of this Alert.  # noqa: E501
+    def in_trash(self):
+        """Gets the in_trash of this Alert.  # noqa: E501
 
-        The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true  # noqa: E501
 
-        :return: The display_expression_qb_serialization of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The in_trash of this Alert.  # noqa: E501
+        :rtype: bool
         """
-        return self._display_expression_qb_serialization
+        return self._in_trash
 
-    @display_expression_qb_serialization.setter
-    def display_expression_qb_serialization(self, display_expression_qb_serialization):
-        """Sets the display_expression_qb_serialization of this Alert.
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this Alert.
 
-        The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true  # noqa: E501
 
-        :param display_expression_qb_serialization: The display_expression_qb_serialization of this Alert.  # noqa: E501
-        :type: str
+        :param in_trash: The in_trash of this Alert.  # noqa: E501
+        :type: bool
         """
 
-        self._display_expression_qb_serialization = display_expression_qb_serialization
+        self._in_trash = in_trash
 
     @property
     def include_obsolete_metrics(self):
@@ -891,148 +913,125 @@ def include_obsolete_metrics(self, include_obsolete_metrics):
         Whether to include obsolete metrics in alert query  # noqa: E501
 
         :param include_obsolete_metrics: The include_obsolete_metrics of this Alert.  # noqa: E501
-        :type: bool
-        """
-
-        self._include_obsolete_metrics = include_obsolete_metrics
-
-    @property
-    def prefiring_host_label_pairs(self):
-        """Gets the prefiring_host_label_pairs of this Alert.  # noqa: E501
-
-        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
-
-        :return: The prefiring_host_label_pairs of this Alert.  # noqa: E501
-        :rtype: list[SourceLabelPair]
-        """
-        return self._prefiring_host_label_pairs
-
-    @prefiring_host_label_pairs.setter
-    def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
-        """Sets the prefiring_host_label_pairs of this Alert.
-
-        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
-
-        :param prefiring_host_label_pairs: The prefiring_host_label_pairs of this Alert.  # noqa: E501
-        :type: list[SourceLabelPair]
+        :type: bool
         """
 
-        self._prefiring_host_label_pairs = prefiring_host_label_pairs
+        self._include_obsolete_metrics = include_obsolete_metrics
 
     @property
-    def no_data_event(self):
-        """Gets the no_data_event of this Alert.  # noqa: E501
+    def last_error_message(self):
+        """Gets the last_error_message of this Alert.  # noqa: E501
 
-        No data event related to the alert  # noqa: E501
+        The last error encountered when running this alert's condition query  # noqa: E501
 
-        :return: The no_data_event of this Alert.  # noqa: E501
-        :rtype: Event
+        :return: The last_error_message of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._no_data_event
+        return self._last_error_message
 
-    @no_data_event.setter
-    def no_data_event(self, no_data_event):
-        """Sets the no_data_event of this Alert.
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this Alert.
 
-        No data event related to the alert  # noqa: E501
+        The last error encountered when running this alert's condition query  # noqa: E501
 
-        :param no_data_event: The no_data_event of this Alert.  # noqa: E501
-        :type: Event
+        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
+        :type: str
         """
 
-        self._no_data_event = no_data_event
+        self._last_error_message = last_error_message
 
     @property
-    def snoozed(self):
-        """Gets the snoozed of this Alert.  # noqa: E501
+    def last_event_time(self):
+        """Gets the last_event_time of this Alert.  # noqa: E501
 
-        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
+        Start time (in epoch millis) of the last event associated with this alert.  # noqa: E501
 
-        :return: The snoozed of this Alert.  # noqa: E501
+        :return: The last_event_time of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._snoozed
+        return self._last_event_time
 
-    @snoozed.setter
-    def snoozed(self, snoozed):
-        """Sets the snoozed of this Alert.
+    @last_event_time.setter
+    def last_event_time(self, last_event_time):
+        """Sets the last_event_time of this Alert.
 
-        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
+        Start time (in epoch millis) of the last event associated with this alert.  # noqa: E501
 
-        :param snoozed: The snoozed of this Alert.  # noqa: E501
+        :param last_event_time: The last_event_time of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._snoozed = snoozed
+        self._last_event_time = last_event_time
 
     @property
-    def conditions(self):
-        """Gets the conditions of this Alert.  # noqa: E501
+    def last_failed_time(self):
+        """Gets the last_failed_time of this Alert.  # noqa: E501
 
-        Multi - alert conditions.  # noqa: E501
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :return: The conditions of this Alert.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The last_failed_time of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._conditions
+        return self._last_failed_time
 
-    @conditions.setter
-    def conditions(self, conditions):
-        """Sets the conditions of this Alert.
+    @last_failed_time.setter
+    def last_failed_time(self, last_failed_time):
+        """Sets the last_failed_time of this Alert.
 
-        Multi - alert conditions.  # noqa: E501
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
 
-        :param conditions: The conditions of this Alert.  # noqa: E501
-        :type: dict(str, str)
+        :param last_failed_time: The last_failed_time of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._conditions = conditions
+        self._last_failed_time = last_failed_time
 
     @property
-    def notificants(self):
-        """Gets the notificants of this Alert.  # noqa: E501
+    def last_notification_millis(self):
+        """Gets the last_notification_millis of this Alert.  # noqa: E501
 
-        A derived field listing the webhook ids used by this alert  # noqa: E501
+        When this alert last caused a notification, in epoch millis  # noqa: E501
 
-        :return: The notificants of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The last_notification_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._notificants
+        return self._last_notification_millis
 
-    @notificants.setter
-    def notificants(self, notificants):
-        """Sets the notificants of this Alert.
+    @last_notification_millis.setter
+    def last_notification_millis(self, last_notification_millis):
+        """Sets the last_notification_millis of this Alert.
 
-        A derived field listing the webhook ids used by this alert  # noqa: E501
+        When this alert last caused a notification, in epoch millis  # noqa: E501
 
-        :param notificants: The notificants of this Alert.  # noqa: E501
-        :type: list[str]
+        :param last_notification_millis: The last_notification_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._notificants = notificants
+        self._last_notification_millis = last_notification_millis
 
     @property
-    def additional_information(self):
-        """Gets the additional_information of this Alert.  # noqa: E501
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this Alert.  # noqa: E501
 
-        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :return: The additional_information of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The last_processed_millis of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._additional_information
+        return self._last_processed_millis
 
-    @additional_information.setter
-    def additional_information(self, additional_information):
-        """Sets the additional_information of this Alert.
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this Alert.
 
-        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+        The time when this alert was last checked, in epoch millis  # noqa: E501
 
-        :param additional_information: The additional_information of this Alert.  # noqa: E501
-        :type: str
+        :param last_processed_millis: The last_processed_millis of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._additional_information = additional_information
+        self._last_processed_millis = last_processed_millis
 
     @property
     def last_query_time(self):
@@ -1058,178 +1057,167 @@ def last_query_time(self, last_query_time):
         self._last_query_time = last_query_time
 
     @property
-    def alerts_last_day(self):
-        """Gets the alerts_last_day of this Alert.  # noqa: E501
-
-
-        :return: The alerts_last_day of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._alerts_last_day
-
-    @alerts_last_day.setter
-    def alerts_last_day(self, alerts_last_day):
-        """Sets the alerts_last_day of this Alert.
-
-
-        :param alerts_last_day: The alerts_last_day of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._alerts_last_day = alerts_last_day
-
-    @property
-    def alerts_last_week(self):
-        """Gets the alerts_last_week of this Alert.  # noqa: E501
+    def metrics_used(self):
+        """Gets the metrics_used of this Alert.  # noqa: E501
 
+        Number of metrics checked by the alert condition  # noqa: E501
 
-        :return: The alerts_last_week of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The metrics_used of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._alerts_last_week
+        return self._metrics_used
 
-    @alerts_last_week.setter
-    def alerts_last_week(self, alerts_last_week):
-        """Sets the alerts_last_week of this Alert.
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this Alert.
 
+        Number of metrics checked by the alert condition  # noqa: E501
 
-        :param alerts_last_week: The alerts_last_week of this Alert.  # noqa: E501
-        :type: int
+        :param metrics_used: The metrics_used of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._alerts_last_week = alerts_last_week
+        self._metrics_used = metrics_used
 
     @property
-    def alerts_last_month(self):
-        """Gets the alerts_last_month of this Alert.  # noqa: E501
+    def minutes(self):
+        """Gets the minutes of this Alert.  # noqa: E501
 
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
 
-        :return: The alerts_last_month of this Alert.  # noqa: E501
+        :return: The minutes of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._alerts_last_month
+        return self._minutes
 
-    @alerts_last_month.setter
-    def alerts_last_month(self, alerts_last_month):
-        """Sets the alerts_last_month of this Alert.
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this Alert.
 
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
 
-        :param alerts_last_month: The alerts_last_month of this Alert.  # noqa: E501
+        :param minutes: The minutes of this Alert.  # noqa: E501
         :type: int
         """
+        if minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
-        self._alerts_last_month = alerts_last_month
+        self._minutes = minutes
 
     @property
-    def in_trash(self):
-        """Gets the in_trash of this Alert.  # noqa: E501
+    def name(self):
+        """Gets the name of this Alert.  # noqa: E501
 
 
-        :return: The in_trash of this Alert.  # noqa: E501
-        :rtype: bool
+        :return: The name of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._in_trash
+        return self._name
 
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this Alert.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Alert.
 
 
-        :param in_trash: The in_trash of this Alert.  # noqa: E501
-        :type: bool
+        :param name: The name of this Alert.  # noqa: E501
+        :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._in_trash = in_trash
+        self._name = name
 
     @property
-    def query_failing(self):
-        """Gets the query_failing of this Alert.  # noqa: E501
+    def no_data_event(self):
+        """Gets the no_data_event of this Alert.  # noqa: E501
 
-        Whether there was an exception when the alert condition last ran  # noqa: E501
+        No data event related to the alert  # noqa: E501
 
-        :return: The query_failing of this Alert.  # noqa: E501
-        :rtype: bool
+        :return: The no_data_event of this Alert.  # noqa: E501
+        :rtype: Event
         """
-        return self._query_failing
+        return self._no_data_event
 
-    @query_failing.setter
-    def query_failing(self, query_failing):
-        """Sets the query_failing of this Alert.
+    @no_data_event.setter
+    def no_data_event(self, no_data_event):
+        """Sets the no_data_event of this Alert.
 
-        Whether there was an exception when the alert condition last ran  # noqa: E501
+        No data event related to the alert  # noqa: E501
 
-        :param query_failing: The query_failing of this Alert.  # noqa: E501
-        :type: bool
+        :param no_data_event: The no_data_event of this Alert.  # noqa: E501
+        :type: Event
         """
 
-        self._query_failing = query_failing
+        self._no_data_event = no_data_event
 
     @property
-    def create_user_id(self):
-        """Gets the create_user_id of this Alert.  # noqa: E501
+    def notificants(self):
+        """Gets the notificants of this Alert.  # noqa: E501
 
+        A derived field listing the webhook ids used by this alert  # noqa: E501
 
-        :return: The create_user_id of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The notificants of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._create_user_id
+        return self._notificants
 
-    @create_user_id.setter
-    def create_user_id(self, create_user_id):
-        """Sets the create_user_id of this Alert.
+    @notificants.setter
+    def notificants(self, notificants):
+        """Sets the notificants of this Alert.
 
+        A derived field listing the webhook ids used by this alert  # noqa: E501
 
-        :param create_user_id: The create_user_id of this Alert.  # noqa: E501
-        :type: str
+        :param notificants: The notificants of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._create_user_id = create_user_id
+        self._notificants = notificants
 
     @property
-    def last_failed_time(self):
-        """Gets the last_failed_time of this Alert.  # noqa: E501
+    def notification_resend_frequency_minutes(self):
+        """Gets the notification_resend_frequency_minutes of this Alert.  # noqa: E501
 
-        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
+        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
 
-        :return: The last_failed_time of this Alert.  # noqa: E501
+        :return: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_failed_time
+        return self._notification_resend_frequency_minutes
 
-    @last_failed_time.setter
-    def last_failed_time(self, last_failed_time):
-        """Sets the last_failed_time of this Alert.
+    @notification_resend_frequency_minutes.setter
+    def notification_resend_frequency_minutes(self, notification_resend_frequency_minutes):
+        """Sets the notification_resend_frequency_minutes of this Alert.
 
-        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
+        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
 
-        :param last_failed_time: The last_failed_time of this Alert.  # noqa: E501
+        :param notification_resend_frequency_minutes: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_failed_time = last_failed_time
+        self._notification_resend_frequency_minutes = notification_resend_frequency_minutes
 
     @property
-    def last_notification_millis(self):
-        """Gets the last_notification_millis of this Alert.  # noqa: E501
+    def num_points_in_failure_frame(self):
+        """Gets the num_points_in_failure_frame of this Alert.  # noqa: E501
 
-        When this alert last caused a notification, in epoch millis  # noqa: E501
+        Number of points scanned in alert query time frame.  # noqa: E501
 
-        :return: The last_notification_millis of this Alert.  # noqa: E501
+        :return: The num_points_in_failure_frame of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._last_notification_millis
+        return self._num_points_in_failure_frame
 
-    @last_notification_millis.setter
-    def last_notification_millis(self, last_notification_millis):
-        """Sets the last_notification_millis of this Alert.
+    @num_points_in_failure_frame.setter
+    def num_points_in_failure_frame(self, num_points_in_failure_frame):
+        """Sets the num_points_in_failure_frame of this Alert.
 
-        When this alert last caused a notification, in epoch millis  # noqa: E501
+        Number of points scanned in alert query time frame.  # noqa: E501
 
-        :param last_notification_millis: The last_notification_millis of this Alert.  # noqa: E501
+        :param num_points_in_failure_frame: The num_points_in_failure_frame of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._last_notification_millis = last_notification_millis
+        self._num_points_in_failure_frame = num_points_in_failure_frame
 
     @property
     def points_scanned_at_last_query(self):
@@ -1255,96 +1243,73 @@ def points_scanned_at_last_query(self, points_scanned_at_last_query):
         self._points_scanned_at_last_query = points_scanned_at_last_query
 
     @property
-    def num_points_in_failure_frame(self):
-        """Gets the num_points_in_failure_frame of this Alert.  # noqa: E501
-
-        Number of points scanned in alert query time frame.  # noqa: E501
-
-        :return: The num_points_in_failure_frame of this Alert.  # noqa: E501
-        :rtype: int
-        """
-        return self._num_points_in_failure_frame
-
-    @num_points_in_failure_frame.setter
-    def num_points_in_failure_frame(self, num_points_in_failure_frame):
-        """Sets the num_points_in_failure_frame of this Alert.
-
-        Number of points scanned in alert query time frame.  # noqa: E501
-
-        :param num_points_in_failure_frame: The num_points_in_failure_frame of this Alert.  # noqa: E501
-        :type: int
-        """
-
-        self._num_points_in_failure_frame = num_points_in_failure_frame
-
-    @property
-    def metrics_used(self):
-        """Gets the metrics_used of this Alert.  # noqa: E501
+    def prefiring_host_label_pairs(self):
+        """Gets the prefiring_host_label_pairs of this Alert.  # noqa: E501
 
-        Number of metrics checked by the alert condition  # noqa: E501
+        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
 
-        :return: The metrics_used of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The prefiring_host_label_pairs of this Alert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
         """
-        return self._metrics_used
+        return self._prefiring_host_label_pairs
 
-    @metrics_used.setter
-    def metrics_used(self, metrics_used):
-        """Sets the metrics_used of this Alert.
+    @prefiring_host_label_pairs.setter
+    def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
+        """Sets the prefiring_host_label_pairs of this Alert.
 
-        Number of metrics checked by the alert condition  # noqa: E501
+        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
 
-        :param metrics_used: The metrics_used of this Alert.  # noqa: E501
-        :type: list[str]
+        :param prefiring_host_label_pairs: The prefiring_host_label_pairs of this Alert.  # noqa: E501
+        :type: list[SourceLabelPair]
         """
 
-        self._metrics_used = metrics_used
+        self._prefiring_host_label_pairs = prefiring_host_label_pairs
 
     @property
-    def hosts_used(self):
-        """Gets the hosts_used of this Alert.  # noqa: E501
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this Alert.  # noqa: E501
 
-        Number of hosts checked by the alert condition  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :return: The hosts_used of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The process_rate_minutes of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._hosts_used
+        return self._process_rate_minutes
 
-    @hosts_used.setter
-    def hosts_used(self, hosts_used):
-        """Sets the hosts_used of this Alert.
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this Alert.
 
-        Number of hosts checked by the alert condition  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :param hosts_used: The hosts_used of this Alert.  # noqa: E501
-        :type: list[str]
+        :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._hosts_used = hosts_used
+        self._process_rate_minutes = process_rate_minutes
 
     @property
-    def system_owned(self):
-        """Gets the system_owned of this Alert.  # noqa: E501
+    def query_failing(self):
+        """Gets the query_failing of this Alert.  # noqa: E501
 
-        Whether this alert is system-owned and not writeable  # noqa: E501
+        Whether there was an exception when the alert condition last ran  # noqa: E501
 
-        :return: The system_owned of this Alert.  # noqa: E501
+        :return: The query_failing of this Alert.  # noqa: E501
         :rtype: bool
         """
-        return self._system_owned
+        return self._query_failing
 
-    @system_owned.setter
-    def system_owned(self, system_owned):
-        """Sets the system_owned of this Alert.
+    @query_failing.setter
+    def query_failing(self, query_failing):
+        """Sets the query_failing of this Alert.
 
-        Whether this alert is system-owned and not writeable  # noqa: E501
+        Whether there was an exception when the alert condition last ran  # noqa: E501
 
-        :param system_owned: The system_owned of this Alert.  # noqa: E501
+        :param query_failing: The query_failing of this Alert.  # noqa: E501
         :type: bool
         """
 
-        self._system_owned = system_owned
+        self._query_failing = query_failing
 
     @property
     def resolve_after_minutes(self):
@@ -1370,229 +1335,199 @@ def resolve_after_minutes(self, resolve_after_minutes):
         self._resolve_after_minutes = resolve_after_minutes
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this Alert.  # noqa: E501
-
-
-        :return: The creator_id of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._creator_id
-
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Alert.
-
-
-        :param creator_id: The creator_id of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._creator_id = creator_id
-
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this Alert.  # noqa: E501
-
-
-        :return: The updater_id of this Alert.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Alert.
-
-
-        :param updater_id: The updater_id of this Alert.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    @property
-    def id(self):
-        """Gets the id of this Alert.  # noqa: E501
+    def severity(self):
+        """Gets the severity of this Alert.  # noqa: E501
 
+        Severity of the alert  # noqa: E501
 
-        :return: The id of this Alert.  # noqa: E501
+        :return: The severity of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._severity
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Alert.
+    @severity.setter
+    def severity(self, severity):
+        """Sets the severity of this Alert.
 
+        Severity of the alert  # noqa: E501
 
-        :param id: The id of this Alert.  # noqa: E501
+        :param severity: The severity of this Alert.  # noqa: E501
         :type: str
         """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if severity not in allowed_values:
+            raise ValueError(
+                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(severity, allowed_values)
+            )
 
-        self._id = id
+        self._severity = severity
 
     @property
-    def notification_resend_frequency_minutes(self):
-        """Gets the notification_resend_frequency_minutes of this Alert.  # noqa: E501
+    def severity_list(self):
+        """Gets the severity_list of this Alert.  # noqa: E501
 
-        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
+        Alert severity list for multi-threshold type.  # noqa: E501
 
-        :return: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The severity_list of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._notification_resend_frequency_minutes
+        return self._severity_list
 
-    @notification_resend_frequency_minutes.setter
-    def notification_resend_frequency_minutes(self, notification_resend_frequency_minutes):
-        """Sets the notification_resend_frequency_minutes of this Alert.
+    @severity_list.setter
+    def severity_list(self, severity_list):
+        """Sets the severity_list of this Alert.
 
-        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
+        Alert severity list for multi-threshold type.  # noqa: E501
 
-        :param notification_resend_frequency_minutes: The notification_resend_frequency_minutes of this Alert.  # noqa: E501
-        :type: int
+        :param severity_list: The severity_list of this Alert.  # noqa: E501
+        :type: list[str]
         """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if not set(severity_list).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `severity_list` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(severity_list) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
 
-        self._notification_resend_frequency_minutes = notification_resend_frequency_minutes
+        self._severity_list = severity_list
 
     @property
-    def last_error_message(self):
-        """Gets the last_error_message of this Alert.  # noqa: E501
+    def snoozed(self):
+        """Gets the snoozed of this Alert.  # noqa: E501
 
-        The last error encountered when running this alert's condition query  # noqa: E501
+        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
 
-        :return: The last_error_message of this Alert.  # noqa: E501
-        :rtype: str
+        :return: The snoozed of this Alert.  # noqa: E501
+        :rtype: int
         """
-        return self._last_error_message
+        return self._snoozed
 
-    @last_error_message.setter
-    def last_error_message(self, last_error_message):
-        """Sets the last_error_message of this Alert.
+    @snoozed.setter
+    def snoozed(self, snoozed):
+        """Sets the snoozed of this Alert.
 
-        The last error encountered when running this alert's condition query  # noqa: E501
+        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
 
-        :param last_error_message: The last_error_message of this Alert.  # noqa: E501
-        :type: str
+        :param snoozed: The snoozed of this Alert.  # noqa: E501
+        :type: int
         """
 
-        self._last_error_message = last_error_message
+        self._snoozed = snoozed
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Alert.  # noqa: E501
+    def sort_attr(self):
+        """Gets the sort_attr of this Alert.  # noqa: E501
 
+        Attribute used for default alert sort that is derived from state and severity  # noqa: E501
 
-        :return: The created_epoch_millis of this Alert.  # noqa: E501
+        :return: The sort_attr of this Alert.  # noqa: E501
         :rtype: int
         """
-        return self._created_epoch_millis
+        return self._sort_attr
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Alert.
+    @sort_attr.setter
+    def sort_attr(self, sort_attr):
+        """Sets the sort_attr of this Alert.
 
+        Attribute used for default alert sort that is derived from state and severity  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this Alert.  # noqa: E501
+        :param sort_attr: The sort_attr of this Alert.  # noqa: E501
         :type: int
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._sort_attr = sort_attr
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this Alert.  # noqa: E501
+    def status(self):
+        """Gets the status of this Alert.  # noqa: E501
 
+        Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA  # noqa: E501
 
-        :return: The updated_epoch_millis of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The status of this Alert.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._updated_epoch_millis
+        return self._status
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this Alert.
+    @status.setter
+    def status(self, status):
+        """Sets the status of this Alert.
 
+        Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this Alert.  # noqa: E501
-        :type: int
+        :param status: The status of this Alert.  # noqa: E501
+        :type: list[str]
         """
 
-        self._updated_epoch_millis = updated_epoch_millis
+        self._status = status
 
     @property
-    def deleted(self):
-        """Gets the deleted of this Alert.  # noqa: E501
+    def system_owned(self):
+        """Gets the system_owned of this Alert.  # noqa: E501
 
+        Whether this alert is system-owned and not writeable  # noqa: E501
 
-        :return: The deleted of this Alert.  # noqa: E501
+        :return: The system_owned of this Alert.  # noqa: E501
         :rtype: bool
         """
-        return self._deleted
+        return self._system_owned
 
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this Alert.
+    @system_owned.setter
+    def system_owned(self, system_owned):
+        """Sets the system_owned of this Alert.
 
+        Whether this alert is system-owned and not writeable  # noqa: E501
 
-        :param deleted: The deleted of this Alert.  # noqa: E501
+        :param system_owned: The system_owned of this Alert.  # noqa: E501
         :type: bool
         """
 
-        self._deleted = deleted
+        self._system_owned = system_owned
 
     @property
-    def sort_attr(self):
-        """Gets the sort_attr of this Alert.  # noqa: E501
+    def tags(self):
+        """Gets the tags of this Alert.  # noqa: E501
 
-        Attribute used for default alert sort that is derived from state and severity  # noqa: E501
 
-        :return: The sort_attr of this Alert.  # noqa: E501
-        :rtype: int
+        :return: The tags of this Alert.  # noqa: E501
+        :rtype: WFTags
         """
-        return self._sort_attr
+        return self._tags
 
-    @sort_attr.setter
-    def sort_attr(self, sort_attr):
-        """Sets the sort_attr of this Alert.
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this Alert.
 
-        Attribute used for default alert sort that is derived from state and severity  # noqa: E501
 
-        :param sort_attr: The sort_attr of this Alert.  # noqa: E501
-        :type: int
+        :param tags: The tags of this Alert.  # noqa: E501
+        :type: WFTags
         """
 
-        self._sort_attr = sort_attr
+        self._tags = tags
 
     @property
-    def severity_list(self):
-        """Gets the severity_list of this Alert.  # noqa: E501
+    def target(self):
+        """Gets the target of this Alert.  # noqa: E501
 
-        Alert severity list for multi-threshold type.  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
 
-        :return: The severity_list of this Alert.  # noqa: E501
-        :rtype: list[str]
+        :return: The target of this Alert.  # noqa: E501
+        :rtype: str
         """
-        return self._severity_list
+        return self._target
 
-    @severity_list.setter
-    def severity_list(self, severity_list):
-        """Sets the severity_list of this Alert.
+    @target.setter
+    def target(self, target):
+        """Sets the target of this Alert.
 
-        Alert severity list for multi-threshold type.  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
 
-        :param severity_list: The severity_list of this Alert.  # noqa: E501
-        :type: list[str]
+        :param target: The target of this Alert.  # noqa: E501
+        :type: str
         """
-        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
-        if not set(severity_list).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid values for `severity_list` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(severity_list) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
 
-        self._severity_list = severity_list
+        self._target = target
 
     @property
     def target_info(self):
@@ -1618,50 +1553,115 @@ def target_info(self, target_info):
         self._target_info = target_info
 
     @property
-    def name(self):
-        """Gets the name of this Alert.  # noqa: E501
+    def targets(self):
+        """Gets the targets of this Alert.  # noqa: E501
+
+        Targets for severity.  # noqa: E501
 
+        :return: The targets of this Alert.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._targets
 
-        :return: The name of this Alert.  # noqa: E501
+    @targets.setter
+    def targets(self, targets):
+        """Sets the targets of this Alert.
+
+        Targets for severity.  # noqa: E501
+
+        :param targets: The targets of this Alert.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._targets = targets
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this Alert.  # noqa: E501
+
+        The user that last updated this alert  # noqa: E501
+
+        :return: The update_user_id of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._update_user_id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Alert.
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this Alert.
 
+        The user that last updated this alert  # noqa: E501
 
-        :param name: The name of this Alert.  # noqa: E501
+        :param update_user_id: The update_user_id of this Alert.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._update_user_id = update_user_id
 
     @property
-    def target(self):
-        """Gets the target of this Alert.  # noqa: E501
+    def updated(self):
+        """Gets the updated of this Alert.  # noqa: E501
 
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
+        When the alert was last updated, in epoch millis  # noqa: E501
 
-        :return: The target of this Alert.  # noqa: E501
+        :return: The updated of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated
+
+    @updated.setter
+    def updated(self, updated):
+        """Sets the updated of this Alert.
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :param updated: The updated of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._updated = updated
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Alert.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Alert.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this Alert.  # noqa: E501
+
+
+        :return: The updater_id of this Alert.  # noqa: E501
         :rtype: str
         """
-        return self._target
+        return self._updater_id
 
-    @target.setter
-    def target(self, target):
-        """Sets the target of this Alert.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Alert.
 
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
 
-        :param target: The target of this Alert.  # noqa: E501
+        :param updater_id: The updater_id of this Alert.  # noqa: E501
         :type: str
         """
 
-        self._target = target
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/avro_backed_standardized_dto.py b/wavefront_api_client/models/avro_backed_standardized_dto.py
index f8e31e3..6999370 100644
--- a/wavefront_api_client/models/avro_backed_standardized_dto.py
+++ b/wavefront_api_client/models/avro_backed_standardized_dto.py
@@ -31,46 +31,67 @@ class AvroBackedStandardizedDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'created_epoch_millis': 'int',
         'creator_id': 'str',
-        'updater_id': 'str',
+        'deleted': 'bool',
         'id': 'str',
-        'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'deleted': 'bool'
+        'updater_id': 'str'
     }
 
     attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
+        'deleted': 'deleted',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'deleted': 'deleted'
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, deleted=None, id=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """AvroBackedStandardizedDTO - a model defined in Swagger"""  # noqa: E501
 
+        self._created_epoch_millis = None
         self._creator_id = None
-        self._updater_id = None
+        self._deleted = None
         self._id = None
-        self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._deleted = None
+        self._updater_id = None
         self.discriminator = None
 
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
         if creator_id is not None:
             self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
+        if deleted is not None:
+            self.deleted = deleted
         if id is not None:
             self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if deleted is not None:
-            self.deleted = deleted
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this AvroBackedStandardizedDTO.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
 
     @property
     def creator_id(self):
@@ -94,25 +115,25 @@ def creator_id(self, creator_id):
         self._creator_id = creator_id
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this AvroBackedStandardizedDTO.  # noqa: E501
 
 
-        :return: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: str
+        :return: The deleted of this AvroBackedStandardizedDTO.  # noqa: E501
+        :rtype: bool
         """
-        return self._updater_id
+        return self._deleted
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this AvroBackedStandardizedDTO.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this AvroBackedStandardizedDTO.
 
 
-        :param updater_id: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: str
+        :param deleted: The deleted of this AvroBackedStandardizedDTO.  # noqa: E501
+        :type: bool
         """
 
-        self._updater_id = updater_id
+        self._deleted = deleted
 
     @property
     def id(self):
@@ -135,27 +156,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this AvroBackedStandardizedDTO.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
@@ -178,25 +178,25 @@ def updated_epoch_millis(self, updated_epoch_millis):
         self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def deleted(self):
-        """Gets the deleted of this AvroBackedStandardizedDTO.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
 
 
-        :return: The deleted of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: bool
+        :return: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
+        :rtype: str
         """
-        return self._deleted
+        return self._updater_id
 
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this AvroBackedStandardizedDTO.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this AvroBackedStandardizedDTO.
 
 
-        :param deleted: The deleted of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: bool
+        :param updater_id: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
+        :type: str
         """
 
-        self._deleted = deleted
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index 8ba9a8b..c689b47 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -31,49 +31,24 @@ class AWSBaseCredentials(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'role_arn': 'str',
-        'external_id': 'str'
+        'external_id': 'str',
+        'role_arn': 'str'
     }
 
     attribute_map = {
-        'role_arn': 'roleArn',
-        'external_id': 'externalId'
+        'external_id': 'externalId',
+        'role_arn': 'roleArn'
     }
 
-    def __init__(self, role_arn=None, external_id=None):  # noqa: E501
+    def __init__(self, external_id=None, role_arn=None):  # noqa: E501
         """AWSBaseCredentials - a model defined in Swagger"""  # noqa: E501
 
-        self._role_arn = None
         self._external_id = None
+        self._role_arn = None
         self.discriminator = None
 
-        self.role_arn = role_arn
         self.external_id = external_id
-
-    @property
-    def role_arn(self):
-        """Gets the role_arn of this AWSBaseCredentials.  # noqa: E501
-
-        The Role ARN that the customer has created in AWS IAM to allow access to Wavefront  # noqa: E501
-
-        :return: The role_arn of this AWSBaseCredentials.  # noqa: E501
-        :rtype: str
-        """
-        return self._role_arn
-
-    @role_arn.setter
-    def role_arn(self, role_arn):
-        """Sets the role_arn of this AWSBaseCredentials.
-
-        The Role ARN that the customer has created in AWS IAM to allow access to Wavefront  # noqa: E501
-
-        :param role_arn: The role_arn of this AWSBaseCredentials.  # noqa: E501
-        :type: str
-        """
-        if role_arn is None:
-            raise ValueError("Invalid value for `role_arn`, must not be `None`")  # noqa: E501
-
-        self._role_arn = role_arn
+        self.role_arn = role_arn
 
     @property
     def external_id(self):
@@ -100,6 +75,31 @@ def external_id(self, external_id):
 
         self._external_id = external_id
 
+    @property
+    def role_arn(self):
+        """Gets the role_arn of this AWSBaseCredentials.  # noqa: E501
+
+        The Role ARN that the customer has created in AWS IAM to allow access to Wavefront  # noqa: E501
+
+        :return: The role_arn of this AWSBaseCredentials.  # noqa: E501
+        :rtype: str
+        """
+        return self._role_arn
+
+    @role_arn.setter
+    def role_arn(self, role_arn):
+        """Sets the role_arn of this AWSBaseCredentials.
+
+        The Role ARN that the customer has created in AWS IAM to allow access to Wavefront  # noqa: E501
+
+        :param role_arn: The role_arn of this AWSBaseCredentials.  # noqa: E501
+        :type: str
+        """
+        if role_arn is None:
+            raise ValueError("Invalid value for `role_arn`, must not be `None`")  # noqa: E501
+
+        self._role_arn = role_arn
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 7254211..4aeac68 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -31,53 +31,28 @@ class AzureBaseCredentials(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'tenant': 'str',
         'client_id': 'str',
-        'client_secret': 'str'
+        'client_secret': 'str',
+        'tenant': 'str'
     }
 
     attribute_map = {
-        'tenant': 'tenant',
         'client_id': 'clientId',
-        'client_secret': 'clientSecret'
+        'client_secret': 'clientSecret',
+        'tenant': 'tenant'
     }
 
-    def __init__(self, tenant=None, client_id=None, client_secret=None):  # noqa: E501
+    def __init__(self, client_id=None, client_secret=None, tenant=None):  # noqa: E501
         """AzureBaseCredentials - a model defined in Swagger"""  # noqa: E501
 
-        self._tenant = None
         self._client_id = None
         self._client_secret = None
+        self._tenant = None
         self.discriminator = None
 
-        self.tenant = tenant
         self.client_id = client_id
         self.client_secret = client_secret
-
-    @property
-    def tenant(self):
-        """Gets the tenant of this AzureBaseCredentials.  # noqa: E501
-
-        Tenant Id for an Azure service account within your project.  # noqa: E501
-
-        :return: The tenant of this AzureBaseCredentials.  # noqa: E501
-        :rtype: str
-        """
-        return self._tenant
-
-    @tenant.setter
-    def tenant(self, tenant):
-        """Sets the tenant of this AzureBaseCredentials.
-
-        Tenant Id for an Azure service account within your project.  # noqa: E501
-
-        :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
-        :type: str
-        """
-        if tenant is None:
-            raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
-
-        self._tenant = tenant
+        self.tenant = tenant
 
     @property
     def client_id(self):
@@ -129,6 +104,31 @@ def client_secret(self, client_secret):
 
         self._client_secret = client_secret
 
+    @property
+    def tenant(self):
+        """Gets the tenant of this AzureBaseCredentials.  # noqa: E501
+
+        Tenant Id for an Azure service account within your project.  # noqa: E501
+
+        :return: The tenant of this AzureBaseCredentials.  # noqa: E501
+        :rtype: str
+        """
+        return self._tenant
+
+    @tenant.setter
+    def tenant(self, tenant):
+        """Sets the tenant of this AzureBaseCredentials.
+
+        Tenant Id for an Azure service account within your project.  # noqa: E501
+
+        :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
+        :type: str
+        """
+        if tenant is None:
+            raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
+
+        self._tenant = tenant
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index 761119a..abd36ed 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -35,34 +35,34 @@ class AzureConfiguration(object):
     swagger_types = {
         'base_credentials': 'AzureBaseCredentials',
         'category_filter': 'list[str]',
-        'resource_group_filter': 'list[str]',
-        'metric_filter_regex': 'str'
+        'metric_filter_regex': 'str',
+        'resource_group_filter': 'list[str]'
     }
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
         'category_filter': 'categoryFilter',
-        'resource_group_filter': 'resourceGroupFilter',
-        'metric_filter_regex': 'metricFilterRegex'
+        'metric_filter_regex': 'metricFilterRegex',
+        'resource_group_filter': 'resourceGroupFilter'
     }
 
-    def __init__(self, base_credentials=None, category_filter=None, resource_group_filter=None, metric_filter_regex=None):  # noqa: E501
+    def __init__(self, base_credentials=None, category_filter=None, metric_filter_regex=None, resource_group_filter=None):  # noqa: E501
         """AzureConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._base_credentials = None
         self._category_filter = None
-        self._resource_group_filter = None
         self._metric_filter_regex = None
+        self._resource_group_filter = None
         self.discriminator = None
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
         if category_filter is not None:
             self.category_filter = category_filter
-        if resource_group_filter is not None:
-            self.resource_group_filter = resource_group_filter
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
+        if resource_group_filter is not None:
+            self.resource_group_filter = resource_group_filter
 
     @property
     def base_credentials(self):
@@ -108,29 +108,6 @@ def category_filter(self, category_filter):
 
         self._category_filter = category_filter
 
-    @property
-    def resource_group_filter(self):
-        """Gets the resource_group_filter of this AzureConfiguration.  # noqa: E501
-
-        A list of Azure resource groups from which to pull metrics.  # noqa: E501
-
-        :return: The resource_group_filter of this AzureConfiguration.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._resource_group_filter
-
-    @resource_group_filter.setter
-    def resource_group_filter(self, resource_group_filter):
-        """Sets the resource_group_filter of this AzureConfiguration.
-
-        A list of Azure resource groups from which to pull metrics.  # noqa: E501
-
-        :param resource_group_filter: The resource_group_filter of this AzureConfiguration.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._resource_group_filter = resource_group_filter
-
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this AzureConfiguration.  # noqa: E501
@@ -154,6 +131,29 @@ def metric_filter_regex(self, metric_filter_regex):
 
         self._metric_filter_regex = metric_filter_regex
 
+    @property
+    def resource_group_filter(self):
+        """Gets the resource_group_filter of this AzureConfiguration.  # noqa: E501
+
+        A list of Azure resource groups from which to pull metrics.  # noqa: E501
+
+        :return: The resource_group_filter of this AzureConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._resource_group_filter
+
+    @resource_group_filter.setter
+    def resource_group_filter(self, resource_group_filter):
+        """Sets the resource_group_filter of this AzureConfiguration.
+
+        A list of Azure resource groups from which to pull metrics.  # noqa: E501
+
+        :param resource_group_filter: The resource_group_filter of this AzureConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._resource_group_filter = resource_group_filter
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/business_action_group_basic_dto.py b/wavefront_api_client/models/business_action_group_basic_dto.py
index 763b45a..5d5f087 100644
--- a/wavefront_api_client/models/business_action_group_basic_dto.py
+++ b/wavefront_api_client/models/business_action_group_basic_dto.py
@@ -31,57 +31,57 @@ class BusinessActionGroupBasicDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'group_name': 'str',
-        'display_name': 'str',
         'description': 'str',
+        'display_name': 'str',
+        'group_name': 'str',
         'required_default': 'bool'
     }
 
     attribute_map = {
-        'group_name': 'groupName',
-        'display_name': 'displayName',
         'description': 'description',
+        'display_name': 'displayName',
+        'group_name': 'groupName',
         'required_default': 'requiredDefault'
     }
 
-    def __init__(self, group_name=None, display_name=None, description=None, required_default=None):  # noqa: E501
+    def __init__(self, description=None, display_name=None, group_name=None, required_default=None):  # noqa: E501
         """BusinessActionGroupBasicDTO - a model defined in Swagger"""  # noqa: E501
 
-        self._group_name = None
-        self._display_name = None
         self._description = None
+        self._display_name = None
+        self._group_name = None
         self._required_default = None
         self.discriminator = None
 
-        if group_name is not None:
-            self.group_name = group_name
-        if display_name is not None:
-            self.display_name = display_name
         if description is not None:
             self.description = description
+        if display_name is not None:
+            self.display_name = display_name
+        if group_name is not None:
+            self.group_name = group_name
         if required_default is not None:
             self.required_default = required_default
 
     @property
-    def group_name(self):
-        """Gets the group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+    def description(self):
+        """Gets the description of this BusinessActionGroupBasicDTO.  # noqa: E501
 
 
-        :return: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :return: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
         :rtype: str
         """
-        return self._group_name
+        return self._description
 
-    @group_name.setter
-    def group_name(self, group_name):
-        """Sets the group_name of this BusinessActionGroupBasicDTO.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this BusinessActionGroupBasicDTO.
 
 
-        :param group_name: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :param description: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
         :type: str
         """
 
-        self._group_name = group_name
+        self._description = description
 
     @property
     def display_name(self):
@@ -105,25 +105,25 @@ def display_name(self, display_name):
         self._display_name = display_name
 
     @property
-    def description(self):
-        """Gets the description of this BusinessActionGroupBasicDTO.  # noqa: E501
+    def group_name(self):
+        """Gets the group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
 
 
-        :return: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :return: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._group_name
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this BusinessActionGroupBasicDTO.
+    @group_name.setter
+    def group_name(self, group_name):
+        """Sets the group_name of this BusinessActionGroupBasicDTO.
 
 
-        :param description: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
+        :param group_name: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
         :type: str
         """
 
-        self._description = description
+        self._group_name = group_name
 
     @property
     def required_default(self):
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index c9d83ff..7473f26 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -36,68 +36,68 @@ class Chart(object):
     """
     swagger_types = {
         'base': 'int',
+        'chart_attributes': 'JsonNode',
+        'chart_settings': 'ChartSettings',
         'description': 'str',
-        'units': 'str',
-        'interpolate_points': 'bool',
-        'sources': 'list[ChartSourceQuery]',
         'include_obsolete_metrics': 'bool',
+        'interpolate_points': 'bool',
+        'name': 'str',
         'no_default_events': 'bool',
-        'chart_attributes': 'JsonNode',
+        'sources': 'list[ChartSourceQuery]',
         'summarization': 'str',
-        'chart_settings': 'ChartSettings',
-        'name': 'str'
+        'units': 'str'
     }
 
     attribute_map = {
         'base': 'base',
+        'chart_attributes': 'chartAttributes',
+        'chart_settings': 'chartSettings',
         'description': 'description',
-        'units': 'units',
-        'interpolate_points': 'interpolatePoints',
-        'sources': 'sources',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
+        'interpolate_points': 'interpolatePoints',
+        'name': 'name',
         'no_default_events': 'noDefaultEvents',
-        'chart_attributes': 'chartAttributes',
+        'sources': 'sources',
         'summarization': 'summarization',
-        'chart_settings': 'chartSettings',
-        'name': 'name'
+        'units': 'units'
     }
 
-    def __init__(self, base=None, description=None, units=None, interpolate_points=None, sources=None, include_obsolete_metrics=None, no_default_events=None, chart_attributes=None, summarization=None, chart_settings=None, name=None):  # noqa: E501
+    def __init__(self, base=None, chart_attributes=None, chart_settings=None, description=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
 
         self._base = None
+        self._chart_attributes = None
+        self._chart_settings = None
         self._description = None
-        self._units = None
-        self._interpolate_points = None
-        self._sources = None
         self._include_obsolete_metrics = None
+        self._interpolate_points = None
+        self._name = None
         self._no_default_events = None
-        self._chart_attributes = None
+        self._sources = None
         self._summarization = None
-        self._chart_settings = None
-        self._name = None
+        self._units = None
         self.discriminator = None
 
         if base is not None:
             self.base = base
+        if chart_attributes is not None:
+            self.chart_attributes = chart_attributes
+        if chart_settings is not None:
+            self.chart_settings = chart_settings
         if description is not None:
             self.description = description
-        if units is not None:
-            self.units = units
-        if interpolate_points is not None:
-            self.interpolate_points = interpolate_points
-        self.sources = sources
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
+        if interpolate_points is not None:
+            self.interpolate_points = interpolate_points
+        self.name = name
         if no_default_events is not None:
             self.no_default_events = no_default_events
-        if chart_attributes is not None:
-            self.chart_attributes = chart_attributes
+        self.sources = sources
         if summarization is not None:
             self.summarization = summarization
-        if chart_settings is not None:
-            self.chart_settings = chart_settings
-        self.name = name
+        if units is not None:
+            self.units = units
 
     @property
     def base(self):
@@ -122,6 +122,50 @@ def base(self, base):
 
         self._base = base
 
+    @property
+    def chart_attributes(self):
+        """Gets the chart_attributes of this Chart.  # noqa: E501
+
+        Experimental field for chart attributes  # noqa: E501
+
+        :return: The chart_attributes of this Chart.  # noqa: E501
+        :rtype: JsonNode
+        """
+        return self._chart_attributes
+
+    @chart_attributes.setter
+    def chart_attributes(self, chart_attributes):
+        """Sets the chart_attributes of this Chart.
+
+        Experimental field for chart attributes  # noqa: E501
+
+        :param chart_attributes: The chart_attributes of this Chart.  # noqa: E501
+        :type: JsonNode
+        """
+
+        self._chart_attributes = chart_attributes
+
+    @property
+    def chart_settings(self):
+        """Gets the chart_settings of this Chart.  # noqa: E501
+
+
+        :return: The chart_settings of this Chart.  # noqa: E501
+        :rtype: ChartSettings
+        """
+        return self._chart_settings
+
+    @chart_settings.setter
+    def chart_settings(self, chart_settings):
+        """Sets the chart_settings of this Chart.
+
+
+        :param chart_settings: The chart_settings of this Chart.  # noqa: E501
+        :type: ChartSettings
+        """
+
+        self._chart_settings = chart_settings
+
     @property
     def description(self):
         """Gets the description of this Chart.  # noqa: E501
@@ -146,27 +190,27 @@ def description(self, description):
         self._description = description
 
     @property
-    def units(self):
-        """Gets the units of this Chart.  # noqa: E501
+    def include_obsolete_metrics(self):
+        """Gets the include_obsolete_metrics of this Chart.  # noqa: E501
 
-        String to label the units of the chart on the Y-axis  # noqa: E501
+        Whether to show obsolete metrics.  Default: false  # noqa: E501
 
-        :return: The units of this Chart.  # noqa: E501
-        :rtype: str
+        :return: The include_obsolete_metrics of this Chart.  # noqa: E501
+        :rtype: bool
         """
-        return self._units
+        return self._include_obsolete_metrics
 
-    @units.setter
-    def units(self, units):
-        """Sets the units of this Chart.
+    @include_obsolete_metrics.setter
+    def include_obsolete_metrics(self, include_obsolete_metrics):
+        """Sets the include_obsolete_metrics of this Chart.
 
-        String to label the units of the chart on the Y-axis  # noqa: E501
+        Whether to show obsolete metrics.  Default: false  # noqa: E501
 
-        :param units: The units of this Chart.  # noqa: E501
-        :type: str
+        :param include_obsolete_metrics: The include_obsolete_metrics of this Chart.  # noqa: E501
+        :type: bool
         """
 
-        self._units = units
+        self._include_obsolete_metrics = include_obsolete_metrics
 
     @property
     def interpolate_points(self):
@@ -192,52 +236,29 @@ def interpolate_points(self, interpolate_points):
         self._interpolate_points = interpolate_points
 
     @property
-    def sources(self):
-        """Gets the sources of this Chart.  # noqa: E501
-
-        Query expression to plot on the chart  # noqa: E501
-
-        :return: The sources of this Chart.  # noqa: E501
-        :rtype: list[ChartSourceQuery]
-        """
-        return self._sources
-
-    @sources.setter
-    def sources(self, sources):
-        """Sets the sources of this Chart.
-
-        Query expression to plot on the chart  # noqa: E501
-
-        :param sources: The sources of this Chart.  # noqa: E501
-        :type: list[ChartSourceQuery]
-        """
-        if sources is None:
-            raise ValueError("Invalid value for `sources`, must not be `None`")  # noqa: E501
-
-        self._sources = sources
-
-    @property
-    def include_obsolete_metrics(self):
-        """Gets the include_obsolete_metrics of this Chart.  # noqa: E501
+    def name(self):
+        """Gets the name of this Chart.  # noqa: E501
 
-        Whether to show obsolete metrics.  Default: false  # noqa: E501
+        Name of the source  # noqa: E501
 
-        :return: The include_obsolete_metrics of this Chart.  # noqa: E501
-        :rtype: bool
+        :return: The name of this Chart.  # noqa: E501
+        :rtype: str
         """
-        return self._include_obsolete_metrics
+        return self._name
 
-    @include_obsolete_metrics.setter
-    def include_obsolete_metrics(self, include_obsolete_metrics):
-        """Sets the include_obsolete_metrics of this Chart.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Chart.
 
-        Whether to show obsolete metrics.  Default: false  # noqa: E501
+        Name of the source  # noqa: E501
 
-        :param include_obsolete_metrics: The include_obsolete_metrics of this Chart.  # noqa: E501
-        :type: bool
+        :param name: The name of this Chart.  # noqa: E501
+        :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._include_obsolete_metrics = include_obsolete_metrics
+        self._name = name
 
     @property
     def no_default_events(self):
@@ -263,27 +284,29 @@ def no_default_events(self, no_default_events):
         self._no_default_events = no_default_events
 
     @property
-    def chart_attributes(self):
-        """Gets the chart_attributes of this Chart.  # noqa: E501
+    def sources(self):
+        """Gets the sources of this Chart.  # noqa: E501
 
-        Experimental field for chart attributes  # noqa: E501
+        Query expression to plot on the chart  # noqa: E501
 
-        :return: The chart_attributes of this Chart.  # noqa: E501
-        :rtype: JsonNode
+        :return: The sources of this Chart.  # noqa: E501
+        :rtype: list[ChartSourceQuery]
         """
-        return self._chart_attributes
+        return self._sources
 
-    @chart_attributes.setter
-    def chart_attributes(self, chart_attributes):
-        """Sets the chart_attributes of this Chart.
+    @sources.setter
+    def sources(self, sources):
+        """Sets the sources of this Chart.
 
-        Experimental field for chart attributes  # noqa: E501
+        Query expression to plot on the chart  # noqa: E501
 
-        :param chart_attributes: The chart_attributes of this Chart.  # noqa: E501
-        :type: JsonNode
+        :param sources: The sources of this Chart.  # noqa: E501
+        :type: list[ChartSourceQuery]
         """
+        if sources is None:
+            raise ValueError("Invalid value for `sources`, must not be `None`")  # noqa: E501
 
-        self._chart_attributes = chart_attributes
+        self._sources = sources
 
     @property
     def summarization(self):
@@ -315,50 +338,27 @@ def summarization(self, summarization):
         self._summarization = summarization
 
     @property
-    def chart_settings(self):
-        """Gets the chart_settings of this Chart.  # noqa: E501
-
-
-        :return: The chart_settings of this Chart.  # noqa: E501
-        :rtype: ChartSettings
-        """
-        return self._chart_settings
-
-    @chart_settings.setter
-    def chart_settings(self, chart_settings):
-        """Sets the chart_settings of this Chart.
-
-
-        :param chart_settings: The chart_settings of this Chart.  # noqa: E501
-        :type: ChartSettings
-        """
-
-        self._chart_settings = chart_settings
-
-    @property
-    def name(self):
-        """Gets the name of this Chart.  # noqa: E501
+    def units(self):
+        """Gets the units of this Chart.  # noqa: E501
 
-        Name of the source  # noqa: E501
+        String to label the units of the chart on the Y-axis  # noqa: E501
 
-        :return: The name of this Chart.  # noqa: E501
+        :return: The units of this Chart.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._units
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Chart.
+    @units.setter
+    def units(self, units):
+        """Sets the units of this Chart.
 
-        Name of the source  # noqa: E501
+        String to label the units of the chart on the Y-axis  # noqa: E501
 
-        :param name: The name of this Chart.  # noqa: E501
+        :param units: The units of this Chart.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._units = units
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 321ca4f..821dc02 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -31,746 +31,853 @@ class ChartSettings(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'min': 'float',
-        'type': 'str',
+        'auto_column_tags': 'bool',
+        'column_tags': 'str',
+        'custom_tags': 'list[str]',
+        'expected_data_spacing': 'int',
+        'fixed_legend_display_stats': 'list[str]',
+        'fixed_legend_enabled': 'bool',
+        'fixed_legend_filter_field': 'str',
+        'fixed_legend_filter_limit': 'int',
+        'fixed_legend_filter_sort': 'str',
+        'fixed_legend_hide_label': 'bool',
+        'fixed_legend_position': 'str',
+        'fixed_legend_use_raw_stats': 'bool',
+        'group_by_source': 'bool',
+        'invert_dynamic_legend_hover_control': 'bool',
+        'line_type': 'str',
         'max': 'float',
-        'time_based_coloring': 'bool',
-        'sparkline_display_value_type': 'str',
+        'min': 'float',
+        'num_tags': 'int',
+        'plain_markdown_content': 'str',
+        'show_hosts': 'bool',
+        'show_labels': 'bool',
+        'show_raw_values': 'bool',
+        'sort_values_descending': 'bool',
+        'sparkline_decimal_precision': 'int',
         'sparkline_display_color': 'str',
-        'sparkline_display_vertical_position': 'str',
-        'sparkline_display_horizontal_position': 'str',
         'sparkline_display_font_size': 'str',
-        'sparkline_display_prefix': 'str',
+        'sparkline_display_horizontal_position': 'str',
         'sparkline_display_postfix': 'str',
-        'sparkline_size': 'str',
-        'sparkline_line_color': 'str',
+        'sparkline_display_prefix': 'str',
+        'sparkline_display_value_type': 'str',
+        'sparkline_display_vertical_position': 'str',
         'sparkline_fill_color': 'str',
+        'sparkline_line_color': 'str',
+        'sparkline_size': 'str',
+        'sparkline_value_color_map_apply_to': 'str',
         'sparkline_value_color_map_colors': 'list[str]',
-        'sparkline_value_color_map_values_v2': 'list[float]',
         'sparkline_value_color_map_values': 'list[int]',
-        'sparkline_value_color_map_apply_to': 'str',
-        'sparkline_decimal_precision': 'int',
+        'sparkline_value_color_map_values_v2': 'list[float]',
         'sparkline_value_text_map_text': 'list[str]',
         'sparkline_value_text_map_thresholds': 'list[float]',
-        'line_type': 'str',
         'stack_type': 'str',
-        'windowing': 'str',
-        'window_size': 'int',
-        'show_hosts': 'bool',
-        'show_labels': 'bool',
-        'show_raw_values': 'bool',
-        'auto_column_tags': 'bool',
-        'column_tags': 'str',
         'tag_mode': 'str',
-        'num_tags': 'int',
-        'custom_tags': 'list[str]',
-        'group_by_source': 'bool',
-        'sort_values_descending': 'bool',
+        'time_based_coloring': 'bool',
+        'type': 'str',
+        'window_size': 'int',
+        'windowing': 'str',
+        'xmax': 'float',
+        'xmin': 'float',
+        'y0_scale_si_by1024': 'bool',
+        'y0_unit_autoscaling': 'bool',
         'y1_max': 'float',
         'y1_min': 'float',
-        'y1_units': 'str',
-        'y0_scale_si_by1024': 'bool',
         'y1_scale_si_by1024': 'bool',
-        'y0_unit_autoscaling': 'bool',
         'y1_unit_autoscaling': 'bool',
-        'invert_dynamic_legend_hover_control': 'bool',
-        'fixed_legend_enabled': 'bool',
-        'fixed_legend_use_raw_stats': 'bool',
-        'fixed_legend_position': 'str',
-        'fixed_legend_display_stats': 'list[str]',
-        'fixed_legend_filter_sort': 'str',
-        'fixed_legend_filter_limit': 'int',
-        'fixed_legend_filter_field': 'str',
-        'fixed_legend_hide_label': 'bool',
-        'xmax': 'float',
-        'xmin': 'float',
+        'y1_units': 'str',
         'ymax': 'float',
-        'ymin': 'float',
-        'expected_data_spacing': 'int',
-        'plain_markdown_content': 'str'
+        'ymin': 'float'
     }
 
     attribute_map = {
-        'min': 'min',
-        'type': 'type',
+        'auto_column_tags': 'autoColumnTags',
+        'column_tags': 'columnTags',
+        'custom_tags': 'customTags',
+        'expected_data_spacing': 'expectedDataSpacing',
+        'fixed_legend_display_stats': 'fixedLegendDisplayStats',
+        'fixed_legend_enabled': 'fixedLegendEnabled',
+        'fixed_legend_filter_field': 'fixedLegendFilterField',
+        'fixed_legend_filter_limit': 'fixedLegendFilterLimit',
+        'fixed_legend_filter_sort': 'fixedLegendFilterSort',
+        'fixed_legend_hide_label': 'fixedLegendHideLabel',
+        'fixed_legend_position': 'fixedLegendPosition',
+        'fixed_legend_use_raw_stats': 'fixedLegendUseRawStats',
+        'group_by_source': 'groupBySource',
+        'invert_dynamic_legend_hover_control': 'invertDynamicLegendHoverControl',
+        'line_type': 'lineType',
         'max': 'max',
-        'time_based_coloring': 'timeBasedColoring',
-        'sparkline_display_value_type': 'sparklineDisplayValueType',
+        'min': 'min',
+        'num_tags': 'numTags',
+        'plain_markdown_content': 'plainMarkdownContent',
+        'show_hosts': 'showHosts',
+        'show_labels': 'showLabels',
+        'show_raw_values': 'showRawValues',
+        'sort_values_descending': 'sortValuesDescending',
+        'sparkline_decimal_precision': 'sparklineDecimalPrecision',
         'sparkline_display_color': 'sparklineDisplayColor',
-        'sparkline_display_vertical_position': 'sparklineDisplayVerticalPosition',
-        'sparkline_display_horizontal_position': 'sparklineDisplayHorizontalPosition',
         'sparkline_display_font_size': 'sparklineDisplayFontSize',
-        'sparkline_display_prefix': 'sparklineDisplayPrefix',
+        'sparkline_display_horizontal_position': 'sparklineDisplayHorizontalPosition',
         'sparkline_display_postfix': 'sparklineDisplayPostfix',
-        'sparkline_size': 'sparklineSize',
-        'sparkline_line_color': 'sparklineLineColor',
+        'sparkline_display_prefix': 'sparklineDisplayPrefix',
+        'sparkline_display_value_type': 'sparklineDisplayValueType',
+        'sparkline_display_vertical_position': 'sparklineDisplayVerticalPosition',
         'sparkline_fill_color': 'sparklineFillColor',
+        'sparkline_line_color': 'sparklineLineColor',
+        'sparkline_size': 'sparklineSize',
+        'sparkline_value_color_map_apply_to': 'sparklineValueColorMapApplyTo',
         'sparkline_value_color_map_colors': 'sparklineValueColorMapColors',
-        'sparkline_value_color_map_values_v2': 'sparklineValueColorMapValuesV2',
         'sparkline_value_color_map_values': 'sparklineValueColorMapValues',
-        'sparkline_value_color_map_apply_to': 'sparklineValueColorMapApplyTo',
-        'sparkline_decimal_precision': 'sparklineDecimalPrecision',
+        'sparkline_value_color_map_values_v2': 'sparklineValueColorMapValuesV2',
         'sparkline_value_text_map_text': 'sparklineValueTextMapText',
         'sparkline_value_text_map_thresholds': 'sparklineValueTextMapThresholds',
-        'line_type': 'lineType',
         'stack_type': 'stackType',
-        'windowing': 'windowing',
-        'window_size': 'windowSize',
-        'show_hosts': 'showHosts',
-        'show_labels': 'showLabels',
-        'show_raw_values': 'showRawValues',
-        'auto_column_tags': 'autoColumnTags',
-        'column_tags': 'columnTags',
         'tag_mode': 'tagMode',
-        'num_tags': 'numTags',
-        'custom_tags': 'customTags',
-        'group_by_source': 'groupBySource',
-        'sort_values_descending': 'sortValuesDescending',
+        'time_based_coloring': 'timeBasedColoring',
+        'type': 'type',
+        'window_size': 'windowSize',
+        'windowing': 'windowing',
+        'xmax': 'xmax',
+        'xmin': 'xmin',
+        'y0_scale_si_by1024': 'y0ScaleSIBy1024',
+        'y0_unit_autoscaling': 'y0UnitAutoscaling',
         'y1_max': 'y1Max',
         'y1_min': 'y1Min',
-        'y1_units': 'y1Units',
-        'y0_scale_si_by1024': 'y0ScaleSIBy1024',
         'y1_scale_si_by1024': 'y1ScaleSIBy1024',
-        'y0_unit_autoscaling': 'y0UnitAutoscaling',
         'y1_unit_autoscaling': 'y1UnitAutoscaling',
-        'invert_dynamic_legend_hover_control': 'invertDynamicLegendHoverControl',
-        'fixed_legend_enabled': 'fixedLegendEnabled',
-        'fixed_legend_use_raw_stats': 'fixedLegendUseRawStats',
-        'fixed_legend_position': 'fixedLegendPosition',
-        'fixed_legend_display_stats': 'fixedLegendDisplayStats',
-        'fixed_legend_filter_sort': 'fixedLegendFilterSort',
-        'fixed_legend_filter_limit': 'fixedLegendFilterLimit',
-        'fixed_legend_filter_field': 'fixedLegendFilterField',
-        'fixed_legend_hide_label': 'fixedLegendHideLabel',
-        'xmax': 'xmax',
-        'xmin': 'xmin',
+        'y1_units': 'y1Units',
         'ymax': 'ymax',
-        'ymin': 'ymin',
-        'expected_data_spacing': 'expectedDataSpacing',
-        'plain_markdown_content': 'plainMarkdownContent'
+        'ymin': 'ymin'
     }
 
-    def __init__(self, min=None, type=None, max=None, time_based_coloring=None, sparkline_display_value_type=None, sparkline_display_color=None, sparkline_display_vertical_position=None, sparkline_display_horizontal_position=None, sparkline_display_font_size=None, sparkline_display_prefix=None, sparkline_display_postfix=None, sparkline_size=None, sparkline_line_color=None, sparkline_fill_color=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values_v2=None, sparkline_value_color_map_values=None, sparkline_value_color_map_apply_to=None, sparkline_decimal_precision=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, line_type=None, stack_type=None, windowing=None, window_size=None, show_hosts=None, show_labels=None, show_raw_values=None, auto_column_tags=None, column_tags=None, tag_mode=None, num_tags=None, custom_tags=None, group_by_source=None, sort_values_descending=None, y1_max=None, y1_min=None, y1_units=None, y0_scale_si_by1024=None, y1_scale_si_by1024=None, y0_unit_autoscaling=None, y1_unit_autoscaling=None, invert_dynamic_legend_hover_control=None, fixed_legend_enabled=None, fixed_legend_use_raw_stats=None, fixed_legend_position=None, fixed_legend_display_stats=None, fixed_legend_filter_sort=None, fixed_legend_filter_limit=None, fixed_legend_filter_field=None, fixed_legend_hide_label=None, xmax=None, xmin=None, ymax=None, ymin=None, expected_data_spacing=None, plain_markdown_content=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, column_tags=None, custom_tags=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
-        self._min = None
-        self._type = None
+        self._auto_column_tags = None
+        self._column_tags = None
+        self._custom_tags = None
+        self._expected_data_spacing = None
+        self._fixed_legend_display_stats = None
+        self._fixed_legend_enabled = None
+        self._fixed_legend_filter_field = None
+        self._fixed_legend_filter_limit = None
+        self._fixed_legend_filter_sort = None
+        self._fixed_legend_hide_label = None
+        self._fixed_legend_position = None
+        self._fixed_legend_use_raw_stats = None
+        self._group_by_source = None
+        self._invert_dynamic_legend_hover_control = None
+        self._line_type = None
         self._max = None
-        self._time_based_coloring = None
-        self._sparkline_display_value_type = None
+        self._min = None
+        self._num_tags = None
+        self._plain_markdown_content = None
+        self._show_hosts = None
+        self._show_labels = None
+        self._show_raw_values = None
+        self._sort_values_descending = None
+        self._sparkline_decimal_precision = None
         self._sparkline_display_color = None
-        self._sparkline_display_vertical_position = None
-        self._sparkline_display_horizontal_position = None
         self._sparkline_display_font_size = None
-        self._sparkline_display_prefix = None
+        self._sparkline_display_horizontal_position = None
         self._sparkline_display_postfix = None
-        self._sparkline_size = None
-        self._sparkline_line_color = None
+        self._sparkline_display_prefix = None
+        self._sparkline_display_value_type = None
+        self._sparkline_display_vertical_position = None
         self._sparkline_fill_color = None
+        self._sparkline_line_color = None
+        self._sparkline_size = None
+        self._sparkline_value_color_map_apply_to = None
         self._sparkline_value_color_map_colors = None
-        self._sparkline_value_color_map_values_v2 = None
         self._sparkline_value_color_map_values = None
-        self._sparkline_value_color_map_apply_to = None
-        self._sparkline_decimal_precision = None
+        self._sparkline_value_color_map_values_v2 = None
         self._sparkline_value_text_map_text = None
         self._sparkline_value_text_map_thresholds = None
-        self._line_type = None
         self._stack_type = None
-        self._windowing = None
-        self._window_size = None
-        self._show_hosts = None
-        self._show_labels = None
-        self._show_raw_values = None
-        self._auto_column_tags = None
-        self._column_tags = None
         self._tag_mode = None
-        self._num_tags = None
-        self._custom_tags = None
-        self._group_by_source = None
-        self._sort_values_descending = None
+        self._time_based_coloring = None
+        self._type = None
+        self._window_size = None
+        self._windowing = None
+        self._xmax = None
+        self._xmin = None
+        self._y0_scale_si_by1024 = None
+        self._y0_unit_autoscaling = None
         self._y1_max = None
         self._y1_min = None
-        self._y1_units = None
-        self._y0_scale_si_by1024 = None
         self._y1_scale_si_by1024 = None
-        self._y0_unit_autoscaling = None
         self._y1_unit_autoscaling = None
-        self._invert_dynamic_legend_hover_control = None
-        self._fixed_legend_enabled = None
-        self._fixed_legend_use_raw_stats = None
-        self._fixed_legend_position = None
-        self._fixed_legend_display_stats = None
-        self._fixed_legend_filter_sort = None
-        self._fixed_legend_filter_limit = None
-        self._fixed_legend_filter_field = None
-        self._fixed_legend_hide_label = None
-        self._xmax = None
-        self._xmin = None
+        self._y1_units = None
         self._ymax = None
         self._ymin = None
-        self._expected_data_spacing = None
-        self._plain_markdown_content = None
         self.discriminator = None
 
-        if min is not None:
-            self.min = min
-        self.type = type
+        if auto_column_tags is not None:
+            self.auto_column_tags = auto_column_tags
+        if column_tags is not None:
+            self.column_tags = column_tags
+        if custom_tags is not None:
+            self.custom_tags = custom_tags
+        if expected_data_spacing is not None:
+            self.expected_data_spacing = expected_data_spacing
+        if fixed_legend_display_stats is not None:
+            self.fixed_legend_display_stats = fixed_legend_display_stats
+        if fixed_legend_enabled is not None:
+            self.fixed_legend_enabled = fixed_legend_enabled
+        if fixed_legend_filter_field is not None:
+            self.fixed_legend_filter_field = fixed_legend_filter_field
+        if fixed_legend_filter_limit is not None:
+            self.fixed_legend_filter_limit = fixed_legend_filter_limit
+        if fixed_legend_filter_sort is not None:
+            self.fixed_legend_filter_sort = fixed_legend_filter_sort
+        if fixed_legend_hide_label is not None:
+            self.fixed_legend_hide_label = fixed_legend_hide_label
+        if fixed_legend_position is not None:
+            self.fixed_legend_position = fixed_legend_position
+        if fixed_legend_use_raw_stats is not None:
+            self.fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
+        if group_by_source is not None:
+            self.group_by_source = group_by_source
+        if invert_dynamic_legend_hover_control is not None:
+            self.invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
+        if line_type is not None:
+            self.line_type = line_type
         if max is not None:
             self.max = max
-        if time_based_coloring is not None:
-            self.time_based_coloring = time_based_coloring
-        if sparkline_display_value_type is not None:
-            self.sparkline_display_value_type = sparkline_display_value_type
+        if min is not None:
+            self.min = min
+        if num_tags is not None:
+            self.num_tags = num_tags
+        if plain_markdown_content is not None:
+            self.plain_markdown_content = plain_markdown_content
+        if show_hosts is not None:
+            self.show_hosts = show_hosts
+        if show_labels is not None:
+            self.show_labels = show_labels
+        if show_raw_values is not None:
+            self.show_raw_values = show_raw_values
+        if sort_values_descending is not None:
+            self.sort_values_descending = sort_values_descending
+        if sparkline_decimal_precision is not None:
+            self.sparkline_decimal_precision = sparkline_decimal_precision
         if sparkline_display_color is not None:
             self.sparkline_display_color = sparkline_display_color
-        if sparkline_display_vertical_position is not None:
-            self.sparkline_display_vertical_position = sparkline_display_vertical_position
-        if sparkline_display_horizontal_position is not None:
-            self.sparkline_display_horizontal_position = sparkline_display_horizontal_position
         if sparkline_display_font_size is not None:
             self.sparkline_display_font_size = sparkline_display_font_size
-        if sparkline_display_prefix is not None:
-            self.sparkline_display_prefix = sparkline_display_prefix
+        if sparkline_display_horizontal_position is not None:
+            self.sparkline_display_horizontal_position = sparkline_display_horizontal_position
         if sparkline_display_postfix is not None:
             self.sparkline_display_postfix = sparkline_display_postfix
-        if sparkline_size is not None:
-            self.sparkline_size = sparkline_size
-        if sparkline_line_color is not None:
-            self.sparkline_line_color = sparkline_line_color
+        if sparkline_display_prefix is not None:
+            self.sparkline_display_prefix = sparkline_display_prefix
+        if sparkline_display_value_type is not None:
+            self.sparkline_display_value_type = sparkline_display_value_type
+        if sparkline_display_vertical_position is not None:
+            self.sparkline_display_vertical_position = sparkline_display_vertical_position
         if sparkline_fill_color is not None:
             self.sparkline_fill_color = sparkline_fill_color
+        if sparkline_line_color is not None:
+            self.sparkline_line_color = sparkline_line_color
+        if sparkline_size is not None:
+            self.sparkline_size = sparkline_size
+        if sparkline_value_color_map_apply_to is not None:
+            self.sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
         if sparkline_value_color_map_colors is not None:
             self.sparkline_value_color_map_colors = sparkline_value_color_map_colors
-        if sparkline_value_color_map_values_v2 is not None:
-            self.sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
         if sparkline_value_color_map_values is not None:
             self.sparkline_value_color_map_values = sparkline_value_color_map_values
-        if sparkline_value_color_map_apply_to is not None:
-            self.sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
-        if sparkline_decimal_precision is not None:
-            self.sparkline_decimal_precision = sparkline_decimal_precision
+        if sparkline_value_color_map_values_v2 is not None:
+            self.sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
         if sparkline_value_text_map_text is not None:
             self.sparkline_value_text_map_text = sparkline_value_text_map_text
         if sparkline_value_text_map_thresholds is not None:
             self.sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
-        if line_type is not None:
-            self.line_type = line_type
         if stack_type is not None:
             self.stack_type = stack_type
-        if windowing is not None:
-            self.windowing = windowing
-        if window_size is not None:
-            self.window_size = window_size
-        if show_hosts is not None:
-            self.show_hosts = show_hosts
-        if show_labels is not None:
-            self.show_labels = show_labels
-        if show_raw_values is not None:
-            self.show_raw_values = show_raw_values
-        if auto_column_tags is not None:
-            self.auto_column_tags = auto_column_tags
-        if column_tags is not None:
-            self.column_tags = column_tags
         if tag_mode is not None:
             self.tag_mode = tag_mode
-        if num_tags is not None:
-            self.num_tags = num_tags
-        if custom_tags is not None:
-            self.custom_tags = custom_tags
-        if group_by_source is not None:
-            self.group_by_source = group_by_source
-        if sort_values_descending is not None:
-            self.sort_values_descending = sort_values_descending
+        if time_based_coloring is not None:
+            self.time_based_coloring = time_based_coloring
+        self.type = type
+        if window_size is not None:
+            self.window_size = window_size
+        if windowing is not None:
+            self.windowing = windowing
+        if xmax is not None:
+            self.xmax = xmax
+        if xmin is not None:
+            self.xmin = xmin
+        if y0_scale_si_by1024 is not None:
+            self.y0_scale_si_by1024 = y0_scale_si_by1024
+        if y0_unit_autoscaling is not None:
+            self.y0_unit_autoscaling = y0_unit_autoscaling
         if y1_max is not None:
             self.y1_max = y1_max
         if y1_min is not None:
             self.y1_min = y1_min
-        if y1_units is not None:
-            self.y1_units = y1_units
-        if y0_scale_si_by1024 is not None:
-            self.y0_scale_si_by1024 = y0_scale_si_by1024
         if y1_scale_si_by1024 is not None:
             self.y1_scale_si_by1024 = y1_scale_si_by1024
-        if y0_unit_autoscaling is not None:
-            self.y0_unit_autoscaling = y0_unit_autoscaling
         if y1_unit_autoscaling is not None:
             self.y1_unit_autoscaling = y1_unit_autoscaling
-        if invert_dynamic_legend_hover_control is not None:
-            self.invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
-        if fixed_legend_enabled is not None:
-            self.fixed_legend_enabled = fixed_legend_enabled
-        if fixed_legend_use_raw_stats is not None:
-            self.fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
-        if fixed_legend_position is not None:
-            self.fixed_legend_position = fixed_legend_position
-        if fixed_legend_display_stats is not None:
-            self.fixed_legend_display_stats = fixed_legend_display_stats
-        if fixed_legend_filter_sort is not None:
-            self.fixed_legend_filter_sort = fixed_legend_filter_sort
-        if fixed_legend_filter_limit is not None:
-            self.fixed_legend_filter_limit = fixed_legend_filter_limit
-        if fixed_legend_filter_field is not None:
-            self.fixed_legend_filter_field = fixed_legend_filter_field
-        if fixed_legend_hide_label is not None:
-            self.fixed_legend_hide_label = fixed_legend_hide_label
-        if xmax is not None:
-            self.xmax = xmax
-        if xmin is not None:
-            self.xmin = xmin
+        if y1_units is not None:
+            self.y1_units = y1_units
         if ymax is not None:
             self.ymax = ymax
         if ymin is not None:
             self.ymin = ymin
-        if expected_data_spacing is not None:
-            self.expected_data_spacing = expected_data_spacing
-        if plain_markdown_content is not None:
-            self.plain_markdown_content = plain_markdown_content
 
     @property
-    def min(self):
-        """Gets the min of this ChartSettings.  # noqa: E501
+    def auto_column_tags(self):
+        """Gets the auto_column_tags of this ChartSettings.  # noqa: E501
+
+        deprecated  # noqa: E501
+
+        :return: The auto_column_tags of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._auto_column_tags
+
+    @auto_column_tags.setter
+    def auto_column_tags(self, auto_column_tags):
+        """Sets the auto_column_tags of this ChartSettings.
+
+        deprecated  # noqa: E501
+
+        :param auto_column_tags: The auto_column_tags of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._auto_column_tags = auto_column_tags
+
+    @property
+    def column_tags(self):
+        """Gets the column_tags of this ChartSettings.  # noqa: E501
+
+        deprecated  # noqa: E501
+
+        :return: The column_tags of this ChartSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._column_tags
+
+    @column_tags.setter
+    def column_tags(self, column_tags):
+        """Sets the column_tags of this ChartSettings.
+
+        deprecated  # noqa: E501
+
+        :param column_tags: The column_tags of this ChartSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._column_tags = column_tags
+
+    @property
+    def custom_tags(self):
+        """Gets the custom_tags of this ChartSettings.  # noqa: E501
 
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
 
-        :return: The min of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The custom_tags of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._min
+        return self._custom_tags
 
-    @min.setter
-    def min(self, min):
-        """Sets the min of this ChartSettings.
+    @custom_tags.setter
+    def custom_tags(self, custom_tags):
+        """Sets the custom_tags of this ChartSettings.
 
-        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
 
-        :param min: The min of this ChartSettings.  # noqa: E501
-        :type: float
+        :param custom_tags: The custom_tags of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
 
-        self._min = min
+        self._custom_tags = custom_tags
 
     @property
-    def type(self):
-        """Gets the type of this ChartSettings.  # noqa: E501
+    def expected_data_spacing(self):
+        """Gets the expected_data_spacing of this ChartSettings.  # noqa: E501
 
-        Chart Type.  'line' refers to the Line Plot, 'scatter' to the Point Plot, 'stacked-area' to the Stacked Area plot, 'table' to the Tabular View, 'scatterploy-xy' to Scatter Plot, 'markdown-widget' to the Markdown display, and 'sparkline' to the Single Stat view  # noqa: E501
+        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
 
-        :return: The type of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The expected_data_spacing of this ChartSettings.  # noqa: E501
+        :rtype: int
         """
-        return self._type
+        return self._expected_data_spacing
 
-    @type.setter
-    def type(self, type):
-        """Sets the type of this ChartSettings.
+    @expected_data_spacing.setter
+    def expected_data_spacing(self, expected_data_spacing):
+        """Sets the expected_data_spacing of this ChartSettings.
 
-        Chart Type.  'line' refers to the Line Plot, 'scatter' to the Point Plot, 'stacked-area' to the Stacked Area plot, 'table' to the Tabular View, 'scatterploy-xy' to Scatter Plot, 'markdown-widget' to the Markdown display, and 'sparkline' to the Single Stat view  # noqa: E501
+        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
 
-        :param type: The type of this ChartSettings.  # noqa: E501
-        :type: str
+        :param expected_data_spacing: The expected_data_spacing of this ChartSettings.  # noqa: E501
+        :type: int
         """
-        if type is None:
-            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
-        allowed_values = ["line", "scatterplot", "stacked-area", "table", "scatterplot-xy", "markdown-widget", "sparkline"]  # noqa: E501
-        if type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
-                .format(type, allowed_values)
-            )
 
-        self._type = type
+        self._expected_data_spacing = expected_data_spacing
 
     @property
-    def max(self):
-        """Gets the max of this ChartSettings.  # noqa: E501
+    def fixed_legend_display_stats(self):
+        """Gets the fixed_legend_display_stats of this ChartSettings.  # noqa: E501
 
-        Max value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
 
-        :return: The max of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._max
+        return self._fixed_legend_display_stats
 
-    @max.setter
-    def max(self, max):
-        """Sets the max of this ChartSettings.
+    @fixed_legend_display_stats.setter
+    def fixed_legend_display_stats(self, fixed_legend_display_stats):
+        """Sets the fixed_legend_display_stats of this ChartSettings.
 
-        Max value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
+        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
 
-        :param max: The max of this ChartSettings.  # noqa: E501
-        :type: float
+        :param fixed_legend_display_stats: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
 
-        self._max = max
+        self._fixed_legend_display_stats = fixed_legend_display_stats
 
     @property
-    def time_based_coloring(self):
-        """Gets the time_based_coloring of this ChartSettings.  # noqa: E501
+    def fixed_legend_enabled(self):
+        """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
 
-        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
+        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
 
-        :return: The time_based_coloring of this ChartSettings.  # noqa: E501
+        :return: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._time_based_coloring
+        return self._fixed_legend_enabled
 
-    @time_based_coloring.setter
-    def time_based_coloring(self, time_based_coloring):
-        """Sets the time_based_coloring of this ChartSettings.
+    @fixed_legend_enabled.setter
+    def fixed_legend_enabled(self, fixed_legend_enabled):
+        """Sets the fixed_legend_enabled of this ChartSettings.
 
-        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
+        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
 
-        :param time_based_coloring: The time_based_coloring of this ChartSettings.  # noqa: E501
+        :param fixed_legend_enabled: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._time_based_coloring = time_based_coloring
+        self._fixed_legend_enabled = fixed_legend_enabled
 
     @property
-    def sparkline_display_value_type(self):
-        """Gets the sparkline_display_value_type of this ChartSettings.  # noqa: E501
+    def fixed_legend_filter_field(self):
+        """Gets the fixed_legend_filter_field of this ChartSettings.  # noqa: E501
 
-        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
+        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
 
-        :return: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
+        :return: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._sparkline_display_value_type
+        return self._fixed_legend_filter_field
 
-    @sparkline_display_value_type.setter
-    def sparkline_display_value_type(self, sparkline_display_value_type):
-        """Sets the sparkline_display_value_type of this ChartSettings.
+    @fixed_legend_filter_field.setter
+    def fixed_legend_filter_field(self, fixed_legend_filter_field):
+        """Sets the fixed_legend_filter_field of this ChartSettings.
 
-        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
+        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
 
-        :param sparkline_display_value_type: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
+        :param fixed_legend_filter_field: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["VALUE", "LABEL"]  # noqa: E501
-        if sparkline_display_value_type not in allowed_values:
+        allowed_values = ["CURRENT", "MEAN", "MEDIAN", "SUM", "MIN", "MAX", "COUNT"]  # noqa: E501
+        if fixed_legend_filter_field not in allowed_values:
             raise ValueError(
-                "Invalid value for `sparkline_display_value_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_display_value_type, allowed_values)
+                "Invalid value for `fixed_legend_filter_field` ({0}), must be one of {1}"  # noqa: E501
+                .format(fixed_legend_filter_field, allowed_values)
             )
 
-        self._sparkline_display_value_type = sparkline_display_value_type
+        self._fixed_legend_filter_field = fixed_legend_filter_field
 
     @property
-    def sparkline_display_color(self):
-        """Gets the sparkline_display_color of this ChartSettings.  # noqa: E501
+    def fixed_legend_filter_limit(self):
+        """Gets the fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Number of series to include in the fixed legend  # noqa: E501
 
-        :return: The sparkline_display_color of this ChartSettings.  # noqa: E501
+        :return: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+        :rtype: int
+        """
+        return self._fixed_legend_filter_limit
+
+    @fixed_legend_filter_limit.setter
+    def fixed_legend_filter_limit(self, fixed_legend_filter_limit):
+        """Sets the fixed_legend_filter_limit of this ChartSettings.
+
+        Number of series to include in the fixed legend  # noqa: E501
+
+        :param fixed_legend_filter_limit: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+        :type: int
+        """
+
+        self._fixed_legend_filter_limit = fixed_legend_filter_limit
+
+    @property
+    def fixed_legend_filter_sort(self):
+        """Gets the fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
+
+        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
+
+        :return: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._sparkline_display_color
+        return self._fixed_legend_filter_sort
 
-    @sparkline_display_color.setter
-    def sparkline_display_color(self, sparkline_display_color):
-        """Sets the sparkline_display_color of this ChartSettings.
+    @fixed_legend_filter_sort.setter
+    def fixed_legend_filter_sort(self, fixed_legend_filter_sort):
+        """Sets the fixed_legend_filter_sort of this ChartSettings.
 
-        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
 
-        :param sparkline_display_color: The sparkline_display_color of this ChartSettings.  # noqa: E501
+        :param fixed_legend_filter_sort: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
         :type: str
         """
+        allowed_values = ["TOP", "BOTTOM"]  # noqa: E501
+        if fixed_legend_filter_sort not in allowed_values:
+            raise ValueError(
+                "Invalid value for `fixed_legend_filter_sort` ({0}), must be one of {1}"  # noqa: E501
+                .format(fixed_legend_filter_sort, allowed_values)
+            )
 
-        self._sparkline_display_color = sparkline_display_color
+        self._fixed_legend_filter_sort = fixed_legend_filter_sort
 
     @property
-    def sparkline_display_vertical_position(self):
-        """Gets the sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+    def fixed_legend_hide_label(self):
+        """Gets the fixed_legend_hide_label of this ChartSettings.  # noqa: E501
 
         deprecated  # noqa: E501
 
-        :return: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_vertical_position
+        return self._fixed_legend_hide_label
 
-    @sparkline_display_vertical_position.setter
-    def sparkline_display_vertical_position(self, sparkline_display_vertical_position):
-        """Sets the sparkline_display_vertical_position of this ChartSettings.
+    @fixed_legend_hide_label.setter
+    def fixed_legend_hide_label(self, fixed_legend_hide_label):
+        """Sets the fixed_legend_hide_label of this ChartSettings.
 
         deprecated  # noqa: E501
 
-        :param sparkline_display_vertical_position: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+        :param fixed_legend_hide_label: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._fixed_legend_hide_label = fixed_legend_hide_label
+
+    @property
+    def fixed_legend_position(self):
+        """Gets the fixed_legend_position of this ChartSettings.  # noqa: E501
+
+        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
+
+        :return: The fixed_legend_position of this ChartSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._fixed_legend_position
+
+    @fixed_legend_position.setter
+    def fixed_legend_position(self, fixed_legend_position):
+        """Sets the fixed_legend_position of this ChartSettings.
+
+        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
+
+        :param fixed_legend_position: The fixed_legend_position of this ChartSettings.  # noqa: E501
         :type: str
         """
+        allowed_values = ["RIGHT", "TOP", "LEFT", "BOTTOM"]  # noqa: E501
+        if fixed_legend_position not in allowed_values:
+            raise ValueError(
+                "Invalid value for `fixed_legend_position` ({0}), must be one of {1}"  # noqa: E501
+                .format(fixed_legend_position, allowed_values)
+            )
 
-        self._sparkline_display_vertical_position = sparkline_display_vertical_position
+        self._fixed_legend_position = fixed_legend_position
+
+    @property
+    def fixed_legend_use_raw_stats(self):
+        """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+
+        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+
+        :return: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._fixed_legend_use_raw_stats
+
+    @fixed_legend_use_raw_stats.setter
+    def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
+        """Sets the fixed_legend_use_raw_stats of this ChartSettings.
+
+        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+
+        :param fixed_legend_use_raw_stats: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
 
     @property
-    def sparkline_display_horizontal_position(self):
-        """Gets the sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
+    def group_by_source(self):
+        """Gets the group_by_source of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the horizontal position of the displayed text  # noqa: E501
+        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
 
-        :return: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The group_by_source of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_horizontal_position
+        return self._group_by_source
 
-    @sparkline_display_horizontal_position.setter
-    def sparkline_display_horizontal_position(self, sparkline_display_horizontal_position):
-        """Sets the sparkline_display_horizontal_position of this ChartSettings.
+    @group_by_source.setter
+    def group_by_source(self, group_by_source):
+        """Sets the group_by_source of this ChartSettings.
 
-        For the single stat view, the horizontal position of the displayed text  # noqa: E501
+        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
 
-        :param sparkline_display_horizontal_position: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
-        :type: str
+        :param group_by_source: The group_by_source of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["MIDDLE", "LEFT", "RIGHT"]  # noqa: E501
-        if sparkline_display_horizontal_position not in allowed_values:
-            raise ValueError(
-                "Invalid value for `sparkline_display_horizontal_position` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_display_horizontal_position, allowed_values)
-            )
 
-        self._sparkline_display_horizontal_position = sparkline_display_horizontal_position
+        self._group_by_source = group_by_source
 
     @property
-    def sparkline_display_font_size(self):
-        """Gets the sparkline_display_font_size of this ChartSettings.  # noqa: E501
+    def invert_dynamic_legend_hover_control(self):
+        """Gets the invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
+        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
 
-        :return: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_display_font_size
+        return self._invert_dynamic_legend_hover_control
 
-    @sparkline_display_font_size.setter
-    def sparkline_display_font_size(self, sparkline_display_font_size):
-        """Sets the sparkline_display_font_size of this ChartSettings.
+    @invert_dynamic_legend_hover_control.setter
+    def invert_dynamic_legend_hover_control(self, invert_dynamic_legend_hover_control):
+        """Sets the invert_dynamic_legend_hover_control of this ChartSettings.
 
-        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
+        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
 
-        :param sparkline_display_font_size: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
-        :type: str
+        :param invert_dynamic_legend_hover_control: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_display_font_size = sparkline_display_font_size
+        self._invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
 
     @property
-    def sparkline_display_prefix(self):
-        """Gets the sparkline_display_prefix of this ChartSettings.  # noqa: E501
+    def line_type(self):
+        """Gets the line_type of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a string to add before the displayed text  # noqa: E501
+        Plot interpolation type.  linear is default  # noqa: E501
 
-        :return: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
+        :return: The line_type of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._sparkline_display_prefix
+        return self._line_type
 
-    @sparkline_display_prefix.setter
-    def sparkline_display_prefix(self, sparkline_display_prefix):
-        """Sets the sparkline_display_prefix of this ChartSettings.
+    @line_type.setter
+    def line_type(self, line_type):
+        """Sets the line_type of this ChartSettings.
 
-        For the single stat view, a string to add before the displayed text  # noqa: E501
+        Plot interpolation type.  linear is default  # noqa: E501
 
-        :param sparkline_display_prefix: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
+        :param line_type: The line_type of this ChartSettings.  # noqa: E501
         :type: str
         """
+        allowed_values = ["linear", "step-before", "step-after", "basis", "cardinal", "monotone"]  # noqa: E501
+        if line_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `line_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(line_type, allowed_values)
+            )
 
-        self._sparkline_display_prefix = sparkline_display_prefix
+        self._line_type = line_type
 
     @property
-    def sparkline_display_postfix(self):
-        """Gets the sparkline_display_postfix of this ChartSettings.  # noqa: E501
+    def max(self):
+        """Gets the max of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a string to append to the displayed text  # noqa: E501
+        Max value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
 
-        :return: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The max of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._sparkline_display_postfix
+        return self._max
 
-    @sparkline_display_postfix.setter
-    def sparkline_display_postfix(self, sparkline_display_postfix):
-        """Sets the sparkline_display_postfix of this ChartSettings.
+    @max.setter
+    def max(self, max):
+        """Sets the max of this ChartSettings.
 
-        For the single stat view, a string to append to the displayed text  # noqa: E501
+        Max value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
 
-        :param sparkline_display_postfix: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
-        :type: str
+        :param max: The max of this ChartSettings.  # noqa: E501
+        :type: float
         """
 
-        self._sparkline_display_postfix = sparkline_display_postfix
+        self._max = max
 
     @property
-    def sparkline_size(self):
-        """Gets the sparkline_size of this ChartSettings.  # noqa: E501
+    def min(self):
+        """Gets the min of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
 
-        :return: The sparkline_size of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The min of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._sparkline_size
+        return self._min
 
-    @sparkline_size.setter
-    def sparkline_size(self, sparkline_size):
-        """Sets the sparkline_size of this ChartSettings.
+    @min.setter
+    def min(self, min):
+        """Sets the min of this ChartSettings.
 
-        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
+        Min value of Y-axis.  Set to null or leave blank for auto  # noqa: E501
 
-        :param sparkline_size: The sparkline_size of this ChartSettings.  # noqa: E501
-        :type: str
+        :param min: The min of this ChartSettings.  # noqa: E501
+        :type: float
         """
-        allowed_values = ["BACKGROUND", "BOTTOM", "NONE"]  # noqa: E501
-        if sparkline_size not in allowed_values:
-            raise ValueError(
-                "Invalid value for `sparkline_size` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_size, allowed_values)
-            )
 
-        self._sparkline_size = sparkline_size
+        self._min = min
 
     @property
-    def sparkline_line_color(self):
-        """Gets the sparkline_line_color of this ChartSettings.  # noqa: E501
+    def num_tags(self):
+        """Gets the num_tags of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the tabular view, how many point tags to display  # noqa: E501
 
-        :return: The sparkline_line_color of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The num_tags of this ChartSettings.  # noqa: E501
+        :rtype: int
         """
-        return self._sparkline_line_color
+        return self._num_tags
 
-    @sparkline_line_color.setter
-    def sparkline_line_color(self, sparkline_line_color):
-        """Sets the sparkline_line_color of this ChartSettings.
+    @num_tags.setter
+    def num_tags(self, num_tags):
+        """Sets the num_tags of this ChartSettings.
 
-        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the tabular view, how many point tags to display  # noqa: E501
 
-        :param sparkline_line_color: The sparkline_line_color of this ChartSettings.  # noqa: E501
-        :type: str
+        :param num_tags: The num_tags of this ChartSettings.  # noqa: E501
+        :type: int
         """
 
-        self._sparkline_line_color = sparkline_line_color
+        self._num_tags = num_tags
 
     @property
-    def sparkline_fill_color(self):
-        """Gets the sparkline_fill_color of this ChartSettings.  # noqa: E501
+    def plain_markdown_content(self):
+        """Gets the plain_markdown_content of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
 
-        :return: The sparkline_fill_color of this ChartSettings.  # noqa: E501
+        :return: The plain_markdown_content of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._sparkline_fill_color
+        return self._plain_markdown_content
 
-    @sparkline_fill_color.setter
-    def sparkline_fill_color(self, sparkline_fill_color):
-        """Sets the sparkline_fill_color of this ChartSettings.
+    @plain_markdown_content.setter
+    def plain_markdown_content(self, plain_markdown_content):
+        """Sets the plain_markdown_content of this ChartSettings.
 
-        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
 
-        :param sparkline_fill_color: The sparkline_fill_color of this ChartSettings.  # noqa: E501
+        :param plain_markdown_content: The plain_markdown_content of this ChartSettings.  # noqa: E501
         :type: str
         """
 
-        self._sparkline_fill_color = sparkline_fill_color
+        self._plain_markdown_content = plain_markdown_content
 
     @property
-    def sparkline_value_color_map_colors(self):
-        """Gets the sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
+    def show_hosts(self):
+        """Gets the show_hosts of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the tabular view, whether to display sources.  Default: true  # noqa: E501
 
-        :return: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
+        :return: The show_hosts of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_value_color_map_colors
+        return self._show_hosts
 
-    @sparkline_value_color_map_colors.setter
-    def sparkline_value_color_map_colors(self, sparkline_value_color_map_colors):
-        """Sets the sparkline_value_color_map_colors of this ChartSettings.
+    @show_hosts.setter
+    def show_hosts(self, show_hosts):
+        """Sets the show_hosts of this ChartSettings.
 
-        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the tabular view, whether to display sources.  Default: true  # noqa: E501
 
-        :param sparkline_value_color_map_colors: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
-        :type: list[str]
+        :param show_hosts: The show_hosts of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_value_color_map_colors = sparkline_value_color_map_colors
+        self._show_hosts = show_hosts
 
     @property
-    def sparkline_value_color_map_values_v2(self):
-        """Gets the sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
+    def show_labels(self):
+        """Gets the show_labels of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
+        For the tabular view, whether to display labels.  Default: true  # noqa: E501
 
-        :return: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
-        :rtype: list[float]
+        :return: The show_labels of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_value_color_map_values_v2
+        return self._show_labels
 
-    @sparkline_value_color_map_values_v2.setter
-    def sparkline_value_color_map_values_v2(self, sparkline_value_color_map_values_v2):
-        """Sets the sparkline_value_color_map_values_v2 of this ChartSettings.
+    @show_labels.setter
+    def show_labels(self, show_labels):
+        """Sets the show_labels of this ChartSettings.
 
-        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
+        For the tabular view, whether to display labels.  Default: true  # noqa: E501
 
-        :param sparkline_value_color_map_values_v2: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
-        :type: list[float]
+        :param show_labels: The show_labels of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
+        self._show_labels = show_labels
 
     @property
-    def sparkline_value_color_map_values(self):
-        """Gets the sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
+    def show_raw_values(self):
+        """Gets the show_raw_values of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
 
-        :return: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
-        :rtype: list[int]
+        :return: The show_raw_values of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_value_color_map_values
+        return self._show_raw_values
 
-    @sparkline_value_color_map_values.setter
-    def sparkline_value_color_map_values(self, sparkline_value_color_map_values):
-        """Sets the sparkline_value_color_map_values of this ChartSettings.
+    @show_raw_values.setter
+    def show_raw_values(self, show_raw_values):
+        """Sets the show_raw_values of this ChartSettings.
 
-        deprecated  # noqa: E501
+        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
 
-        :param sparkline_value_color_map_values: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
-        :type: list[int]
+        :param show_raw_values: The show_raw_values of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._sparkline_value_color_map_values = sparkline_value_color_map_values
+        self._show_raw_values = show_raw_values
 
     @property
-    def sparkline_value_color_map_apply_to(self):
-        """Gets the sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
+    def sort_values_descending(self):
+        """Gets the sort_values_descending of this ChartSettings.  # noqa: E501
 
-        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
+        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
 
-        :return: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The sort_values_descending of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._sparkline_value_color_map_apply_to
+        return self._sort_values_descending
 
-    @sparkline_value_color_map_apply_to.setter
-    def sparkline_value_color_map_apply_to(self, sparkline_value_color_map_apply_to):
-        """Sets the sparkline_value_color_map_apply_to of this ChartSettings.
+    @sort_values_descending.setter
+    def sort_values_descending(self, sort_values_descending):
+        """Sets the sort_values_descending of this ChartSettings.
 
-        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
+        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
 
-        :param sparkline_value_color_map_apply_to: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
-        :type: str
+        :param sort_values_descending: The sort_values_descending of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["TEXT", "BACKGROUND"]  # noqa: E501
-        if sparkline_value_color_map_apply_to not in allowed_values:
-            raise ValueError(
-                "Invalid value for `sparkline_value_color_map_apply_to` ({0}), must be one of {1}"  # noqa: E501
-                .format(sparkline_value_color_map_apply_to, allowed_values)
-            )
 
-        self._sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
+        self._sort_values_descending = sort_values_descending
 
     @property
     def sparkline_decimal_precision(self):
@@ -796,828 +903,767 @@ def sparkline_decimal_precision(self, sparkline_decimal_precision):
         self._sparkline_decimal_precision = sparkline_decimal_precision
 
     @property
-    def sparkline_value_text_map_text(self):
-        """Gets the sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
-
-        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
-
-        :return: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sparkline_value_text_map_text
-
-    @sparkline_value_text_map_text.setter
-    def sparkline_value_text_map_text(self, sparkline_value_text_map_text):
-        """Sets the sparkline_value_text_map_text of this ChartSettings.
-
-        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
-
-        :param sparkline_value_text_map_text: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sparkline_value_text_map_text = sparkline_value_text_map_text
-
-    @property
-    def sparkline_value_text_map_thresholds(self):
-        """Gets the sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
-
-        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
-
-        :return: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
-        :rtype: list[float]
-        """
-        return self._sparkline_value_text_map_thresholds
-
-    @sparkline_value_text_map_thresholds.setter
-    def sparkline_value_text_map_thresholds(self, sparkline_value_text_map_thresholds):
-        """Sets the sparkline_value_text_map_thresholds of this ChartSettings.
-
-        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
-
-        :param sparkline_value_text_map_thresholds: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
-        :type: list[float]
-        """
-
-        self._sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
-
-    @property
-    def line_type(self):
-        """Gets the line_type of this ChartSettings.  # noqa: E501
+    def sparkline_display_color(self):
+        """Gets the sparkline_display_color of this ChartSettings.  # noqa: E501
 
-        Plot interpolation type.  linear is default  # noqa: E501
+        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The line_type of this ChartSettings.  # noqa: E501
+        :return: The sparkline_display_color of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._line_type
+        return self._sparkline_display_color
 
-    @line_type.setter
-    def line_type(self, line_type):
-        """Sets the line_type of this ChartSettings.
+    @sparkline_display_color.setter
+    def sparkline_display_color(self, sparkline_display_color):
+        """Sets the sparkline_display_color of this ChartSettings.
 
-        Plot interpolation type.  linear is default  # noqa: E501
+        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param line_type: The line_type of this ChartSettings.  # noqa: E501
+        :param sparkline_display_color: The sparkline_display_color of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["linear", "step-before", "step-after", "basis", "cardinal", "monotone"]  # noqa: E501
-        if line_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `line_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(line_type, allowed_values)
-            )
 
-        self._line_type = line_type
+        self._sparkline_display_color = sparkline_display_color
 
     @property
-    def stack_type(self):
-        """Gets the stack_type of this ChartSettings.  # noqa: E501
+    def sparkline_display_font_size(self):
+        """Gets the sparkline_display_font_size of this ChartSettings.  # noqa: E501
 
-        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
+        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
 
-        :return: The stack_type of this ChartSettings.  # noqa: E501
+        :return: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._stack_type
+        return self._sparkline_display_font_size
 
-    @stack_type.setter
-    def stack_type(self, stack_type):
-        """Sets the stack_type of this ChartSettings.
+    @sparkline_display_font_size.setter
+    def sparkline_display_font_size(self, sparkline_display_font_size):
+        """Sets the sparkline_display_font_size of this ChartSettings.
 
-        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
+        For the single stat view, the font size of the displayed text, in percent  # noqa: E501
 
-        :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
+        :param sparkline_display_font_size: The sparkline_display_font_size of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
-        if stack_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(stack_type, allowed_values)
-            )
 
-        self._stack_type = stack_type
+        self._sparkline_display_font_size = sparkline_display_font_size
 
     @property
-    def windowing(self):
-        """Gets the windowing of this ChartSettings.  # noqa: E501
+    def sparkline_display_horizontal_position(self):
+        """Gets the sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
+        For the single stat view, the horizontal position of the displayed text  # noqa: E501
 
-        :return: The windowing of this ChartSettings.  # noqa: E501
+        :return: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._windowing
+        return self._sparkline_display_horizontal_position
 
-    @windowing.setter
-    def windowing(self, windowing):
-        """Sets the windowing of this ChartSettings.
+    @sparkline_display_horizontal_position.setter
+    def sparkline_display_horizontal_position(self, sparkline_display_horizontal_position):
+        """Sets the sparkline_display_horizontal_position of this ChartSettings.
 
-        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
+        For the single stat view, the horizontal position of the displayed text  # noqa: E501
 
-        :param windowing: The windowing of this ChartSettings.  # noqa: E501
+        :param sparkline_display_horizontal_position: The sparkline_display_horizontal_position of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["full", "last"]  # noqa: E501
-        if windowing not in allowed_values:
+        allowed_values = ["MIDDLE", "LEFT", "RIGHT"]  # noqa: E501
+        if sparkline_display_horizontal_position not in allowed_values:
             raise ValueError(
-                "Invalid value for `windowing` ({0}), must be one of {1}"  # noqa: E501
-                .format(windowing, allowed_values)
+                "Invalid value for `sparkline_display_horizontal_position` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_display_horizontal_position, allowed_values)
             )
 
-        self._windowing = windowing
-
-    @property
-    def window_size(self):
-        """Gets the window_size of this ChartSettings.  # noqa: E501
-
-        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
-
-        :return: The window_size of this ChartSettings.  # noqa: E501
-        :rtype: int
-        """
-        return self._window_size
-
-    @window_size.setter
-    def window_size(self, window_size):
-        """Sets the window_size of this ChartSettings.
-
-        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
-
-        :param window_size: The window_size of this ChartSettings.  # noqa: E501
-        :type: int
-        """
-
-        self._window_size = window_size
+        self._sparkline_display_horizontal_position = sparkline_display_horizontal_position
 
     @property
-    def show_hosts(self):
-        """Gets the show_hosts of this ChartSettings.  # noqa: E501
+    def sparkline_display_postfix(self):
+        """Gets the sparkline_display_postfix of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display sources.  Default: true  # noqa: E501
+        For the single stat view, a string to append to the displayed text  # noqa: E501
 
-        :return: The show_hosts of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._show_hosts
+        return self._sparkline_display_postfix
 
-    @show_hosts.setter
-    def show_hosts(self, show_hosts):
-        """Sets the show_hosts of this ChartSettings.
+    @sparkline_display_postfix.setter
+    def sparkline_display_postfix(self, sparkline_display_postfix):
+        """Sets the sparkline_display_postfix of this ChartSettings.
 
-        For the tabular view, whether to display sources.  Default: true  # noqa: E501
+        For the single stat view, a string to append to the displayed text  # noqa: E501
 
-        :param show_hosts: The show_hosts of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_postfix: The sparkline_display_postfix of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._show_hosts = show_hosts
+        self._sparkline_display_postfix = sparkline_display_postfix
 
     @property
-    def show_labels(self):
-        """Gets the show_labels of this ChartSettings.  # noqa: E501
+    def sparkline_display_prefix(self):
+        """Gets the sparkline_display_prefix of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display labels.  Default: true  # noqa: E501
+        For the single stat view, a string to add before the displayed text  # noqa: E501
 
-        :return: The show_labels of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._show_labels
+        return self._sparkline_display_prefix
 
-    @show_labels.setter
-    def show_labels(self, show_labels):
-        """Sets the show_labels of this ChartSettings.
+    @sparkline_display_prefix.setter
+    def sparkline_display_prefix(self, sparkline_display_prefix):
+        """Sets the sparkline_display_prefix of this ChartSettings.
 
-        For the tabular view, whether to display labels.  Default: true  # noqa: E501
+        For the single stat view, a string to add before the displayed text  # noqa: E501
 
-        :param show_labels: The show_labels of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_prefix: The sparkline_display_prefix of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._show_labels = show_labels
+        self._sparkline_display_prefix = sparkline_display_prefix
 
     @property
-    def show_raw_values(self):
-        """Gets the show_raw_values of this ChartSettings.  # noqa: E501
+    def sparkline_display_value_type(self):
+        """Gets the sparkline_display_value_type of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
+        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
 
-        :return: The show_raw_values of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._show_raw_values
+        return self._sparkline_display_value_type
 
-    @show_raw_values.setter
-    def show_raw_values(self, show_raw_values):
-        """Sets the show_raw_values of this ChartSettings.
+    @sparkline_display_value_type.setter
+    def sparkline_display_value_type(self, sparkline_display_value_type):
+        """Sets the sparkline_display_value_type of this ChartSettings.
 
-        For the tabular view, whether to display raw values.  Default: false  # noqa: E501
+        For the single stat view, whether to display the name of the query or the value of query  # noqa: E501
 
-        :param show_raw_values: The show_raw_values of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_value_type: The sparkline_display_value_type of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["VALUE", "LABEL"]  # noqa: E501
+        if sparkline_display_value_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sparkline_display_value_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_display_value_type, allowed_values)
+            )
 
-        self._show_raw_values = show_raw_values
+        self._sparkline_display_value_type = sparkline_display_value_type
 
     @property
-    def auto_column_tags(self):
-        """Gets the auto_column_tags of this ChartSettings.  # noqa: E501
+    def sparkline_display_vertical_position(self):
+        """Gets the sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
 
         deprecated  # noqa: E501
 
-        :return: The auto_column_tags of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._auto_column_tags
+        return self._sparkline_display_vertical_position
 
-    @auto_column_tags.setter
-    def auto_column_tags(self, auto_column_tags):
-        """Sets the auto_column_tags of this ChartSettings.
+    @sparkline_display_vertical_position.setter
+    def sparkline_display_vertical_position(self, sparkline_display_vertical_position):
+        """Sets the sparkline_display_vertical_position of this ChartSettings.
 
         deprecated  # noqa: E501
 
-        :param auto_column_tags: The auto_column_tags of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_display_vertical_position: The sparkline_display_vertical_position of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._auto_column_tags = auto_column_tags
+        self._sparkline_display_vertical_position = sparkline_display_vertical_position
 
     @property
-    def column_tags(self):
-        """Gets the column_tags of this ChartSettings.  # noqa: E501
+    def sparkline_fill_color(self):
+        """Gets the sparkline_fill_color of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The column_tags of this ChartSettings.  # noqa: E501
+        :return: The sparkline_fill_color of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._column_tags
+        return self._sparkline_fill_color
 
-    @column_tags.setter
-    def column_tags(self, column_tags):
-        """Sets the column_tags of this ChartSettings.
+    @sparkline_fill_color.setter
+    def sparkline_fill_color(self, sparkline_fill_color):
+        """Sets the sparkline_fill_color of this ChartSettings.
 
-        deprecated  # noqa: E501
+        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param column_tags: The column_tags of this ChartSettings.  # noqa: E501
+        :param sparkline_fill_color: The sparkline_fill_color of this ChartSettings.  # noqa: E501
         :type: str
         """
 
-        self._column_tags = column_tags
+        self._sparkline_fill_color = sparkline_fill_color
 
     @property
-    def tag_mode(self):
-        """Gets the tag_mode of this ChartSettings.  # noqa: E501
+    def sparkline_line_color(self):
+        """Gets the sparkline_line_color of this ChartSettings.  # noqa: E501
 
-        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
+        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The tag_mode of this ChartSettings.  # noqa: E501
+        :return: The sparkline_line_color of this ChartSettings.  # noqa: E501
         :rtype: str
         """
-        return self._tag_mode
+        return self._sparkline_line_color
 
-    @tag_mode.setter
-    def tag_mode(self, tag_mode):
-        """Sets the tag_mode of this ChartSettings.
+    @sparkline_line_color.setter
+    def sparkline_line_color(self, sparkline_line_color):
+        """Sets the sparkline_line_color of this ChartSettings.
 
-        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
+        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param tag_mode: The tag_mode of this ChartSettings.  # noqa: E501
+        :param sparkline_line_color: The sparkline_line_color of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["all", "top", "custom"]  # noqa: E501
-        if tag_mode not in allowed_values:
-            raise ValueError(
-                "Invalid value for `tag_mode` ({0}), must be one of {1}"  # noqa: E501
-                .format(tag_mode, allowed_values)
-            )
 
-        self._tag_mode = tag_mode
+        self._sparkline_line_color = sparkline_line_color
 
     @property
-    def num_tags(self):
-        """Gets the num_tags of this ChartSettings.  # noqa: E501
+    def sparkline_size(self):
+        """Gets the sparkline_size of this ChartSettings.  # noqa: E501
 
-        For the tabular view, how many point tags to display  # noqa: E501
+        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
 
-        :return: The num_tags of this ChartSettings.  # noqa: E501
-        :rtype: int
+        :return: The sparkline_size of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._num_tags
+        return self._sparkline_size
 
-    @num_tags.setter
-    def num_tags(self, num_tags):
-        """Sets the num_tags of this ChartSettings.
+    @sparkline_size.setter
+    def sparkline_size(self, sparkline_size):
+        """Sets the sparkline_size of this ChartSettings.
 
-        For the tabular view, how many point tags to display  # noqa: E501
+        For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE  # noqa: E501
 
-        :param num_tags: The num_tags of this ChartSettings.  # noqa: E501
-        :type: int
+        :param sparkline_size: The sparkline_size of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["BACKGROUND", "BOTTOM", "NONE"]  # noqa: E501
+        if sparkline_size not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sparkline_size` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_size, allowed_values)
+            )
 
-        self._num_tags = num_tags
+        self._sparkline_size = sparkline_size
 
     @property
-    def custom_tags(self):
-        """Gets the custom_tags of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_apply_to(self):
+        """Gets the sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
 
-        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
+        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
 
-        :return: The custom_tags of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
+        :return: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._custom_tags
+        return self._sparkline_value_color_map_apply_to
 
-    @custom_tags.setter
-    def custom_tags(self, custom_tags):
-        """Sets the custom_tags of this ChartSettings.
+    @sparkline_value_color_map_apply_to.setter
+    def sparkline_value_color_map_apply_to(self, sparkline_value_color_map_apply_to):
+        """Sets the sparkline_value_color_map_apply_to of this ChartSettings.
 
-        For the tabular view, a list of point tags to display when using the \"custom\" tag display mode  # noqa: E501
+        For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND  # noqa: E501
 
-        :param custom_tags: The custom_tags of this ChartSettings.  # noqa: E501
-        :type: list[str]
+        :param sparkline_value_color_map_apply_to: The sparkline_value_color_map_apply_to of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["TEXT", "BACKGROUND"]  # noqa: E501
+        if sparkline_value_color_map_apply_to not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sparkline_value_color_map_apply_to` ({0}), must be one of {1}"  # noqa: E501
+                .format(sparkline_value_color_map_apply_to, allowed_values)
+            )
 
-        self._custom_tags = custom_tags
+        self._sparkline_value_color_map_apply_to = sparkline_value_color_map_apply_to
 
     @property
-    def group_by_source(self):
-        """Gets the group_by_source of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_colors(self):
+        """Gets the sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
+        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :return: The group_by_source of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._group_by_source
+        return self._sparkline_value_color_map_colors
 
-    @group_by_source.setter
-    def group_by_source(self, group_by_source):
-        """Sets the group_by_source of this ChartSettings.
+    @sparkline_value_color_map_colors.setter
+    def sparkline_value_color_map_colors(self, sparkline_value_color_map_colors):
+        """Sets the sparkline_value_color_map_colors of this ChartSettings.
 
-        For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row  # noqa: E501
+        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
 
-        :param group_by_source: The group_by_source of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_value_color_map_colors: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
 
-        self._group_by_source = group_by_source
+        self._sparkline_value_color_map_colors = sparkline_value_color_map_colors
 
     @property
-    def sort_values_descending(self):
-        """Gets the sort_values_descending of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_values(self):
+        """Gets the sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
 
-        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
+        deprecated  # noqa: E501
 
-        :return: The sort_values_descending of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
+        :rtype: list[int]
         """
-        return self._sort_values_descending
+        return self._sparkline_value_color_map_values
 
-    @sort_values_descending.setter
-    def sort_values_descending(self, sort_values_descending):
-        """Sets the sort_values_descending of this ChartSettings.
+    @sparkline_value_color_map_values.setter
+    def sparkline_value_color_map_values(self, sparkline_value_color_map_values):
+        """Sets the sparkline_value_color_map_values of this ChartSettings.
 
-        For the tabular view, whether to display display values in descending order.  Default: false  # noqa: E501
+        deprecated  # noqa: E501
 
-        :param sort_values_descending: The sort_values_descending of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param sparkline_value_color_map_values: The sparkline_value_color_map_values of this ChartSettings.  # noqa: E501
+        :type: list[int]
         """
 
-        self._sort_values_descending = sort_values_descending
+        self._sparkline_value_color_map_values = sparkline_value_color_map_values
 
     @property
-    def y1_max(self):
-        """Gets the y1_max of this ChartSettings.  # noqa: E501
+    def sparkline_value_color_map_values_v2(self):
+        """Gets the sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
 
-        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
 
-        :return: The y1_max of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
+        :rtype: list[float]
         """
-        return self._y1_max
+        return self._sparkline_value_color_map_values_v2
 
-    @y1_max.setter
-    def y1_max(self, y1_max):
-        """Sets the y1_max of this ChartSettings.
+    @sparkline_value_color_map_values_v2.setter
+    def sparkline_value_color_map_values_v2(self, sparkline_value_color_map_values_v2):
+        """Sets the sparkline_value_color_map_values_v2 of this ChartSettings.
 
-        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors  # noqa: E501
 
-        :param y1_max: The y1_max of this ChartSettings.  # noqa: E501
-        :type: float
+        :param sparkline_value_color_map_values_v2: The sparkline_value_color_map_values_v2 of this ChartSettings.  # noqa: E501
+        :type: list[float]
         """
 
-        self._y1_max = y1_max
+        self._sparkline_value_color_map_values_v2 = sparkline_value_color_map_values_v2
 
     @property
-    def y1_min(self):
-        """Gets the y1_min of this ChartSettings.  # noqa: E501
+    def sparkline_value_text_map_text(self):
+        """Gets the sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
 
-        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
 
-        :return: The y1_min of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._y1_min
+        return self._sparkline_value_text_map_text
 
-    @y1_min.setter
-    def y1_min(self, y1_min):
-        """Sets the y1_min of this ChartSettings.
+    @sparkline_value_text_map_text.setter
+    def sparkline_value_text_map_text(self, sparkline_value_text_map_text):
+        """Sets the sparkline_value_text_map_text of this ChartSettings.
 
-        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
+        For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds  # noqa: E501
 
-        :param y1_min: The y1_min of this ChartSettings.  # noqa: E501
-        :type: float
+        :param sparkline_value_text_map_text: The sparkline_value_text_map_text of this ChartSettings.  # noqa: E501
+        :type: list[str]
         """
 
-        self._y1_min = y1_min
+        self._sparkline_value_text_map_text = sparkline_value_text_map_text
 
     @property
-    def y1_units(self):
-        """Gets the y1_units of this ChartSettings.  # noqa: E501
+    def sparkline_value_text_map_thresholds(self):
+        """Gets the sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
 
-        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
+        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
 
-        :return: The y1_units of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
+        :rtype: list[float]
         """
-        return self._y1_units
+        return self._sparkline_value_text_map_thresholds
 
-    @y1_units.setter
-    def y1_units(self, y1_units):
-        """Sets the y1_units of this ChartSettings.
+    @sparkline_value_text_map_thresholds.setter
+    def sparkline_value_text_map_thresholds(self, sparkline_value_text_map_thresholds):
+        """Sets the sparkline_value_text_map_thresholds of this ChartSettings.
 
-        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
+        For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText  # noqa: E501
 
-        :param y1_units: The y1_units of this ChartSettings.  # noqa: E501
-        :type: str
+        :param sparkline_value_text_map_thresholds: The sparkline_value_text_map_thresholds of this ChartSettings.  # noqa: E501
+        :type: list[float]
         """
 
-        self._y1_units = y1_units
+        self._sparkline_value_text_map_thresholds = sparkline_value_text_map_thresholds
 
     @property
-    def y0_scale_si_by1024(self):
-        """Gets the y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+    def stack_type(self):
+        """Gets the stack_type of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
 
-        :return: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The stack_type of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y0_scale_si_by1024
+        return self._stack_type
 
-    @y0_scale_si_by1024.setter
-    def y0_scale_si_by1024(self, y0_scale_si_by1024):
-        """Sets the y0_scale_si_by1024 of this ChartSettings.
+    @stack_type.setter
+    def stack_type(self, stack_type):
+        """Sets the stack_type of this ChartSettings.
 
-        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream  # noqa: E501
 
-        :param y0_scale_si_by1024: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
+        if stack_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(stack_type, allowed_values)
+            )
 
-        self._y0_scale_si_by1024 = y0_scale_si_by1024
+        self._stack_type = stack_type
 
     @property
-    def y1_scale_si_by1024(self):
-        """Gets the y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+    def tag_mode(self):
+        """Gets the tag_mode of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
 
-        :return: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The tag_mode of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y1_scale_si_by1024
+        return self._tag_mode
 
-    @y1_scale_si_by1024.setter
-    def y1_scale_si_by1024(self, y1_scale_si_by1024):
-        """Sets the y1_scale_si_by1024 of this ChartSettings.
+    @tag_mode.setter
+    def tag_mode(self, tag_mode):
+        """Sets the tag_mode of this ChartSettings.
 
-        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
+        For the tabular view, which mode to use to determine which point tags to display  # noqa: E501
 
-        :param y1_scale_si_by1024: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param tag_mode: The tag_mode of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["all", "top", "custom"]  # noqa: E501
+        if tag_mode not in allowed_values:
+            raise ValueError(
+                "Invalid value for `tag_mode` ({0}), must be one of {1}"  # noqa: E501
+                .format(tag_mode, allowed_values)
+            )
 
-        self._y1_scale_si_by1024 = y1_scale_si_by1024
+        self._tag_mode = tag_mode
 
     @property
-    def y0_unit_autoscaling(self):
-        """Gets the y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+    def time_based_coloring(self):
+        """Gets the time_based_coloring of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
 
-        :return: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :return: The time_based_coloring of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._y0_unit_autoscaling
+        return self._time_based_coloring
 
-    @y0_unit_autoscaling.setter
-    def y0_unit_autoscaling(self, y0_unit_autoscaling):
-        """Sets the y0_unit_autoscaling of this ChartSettings.
+    @time_based_coloring.setter
+    def time_based_coloring(self, time_based_coloring):
+        """Sets the time_based_coloring of this ChartSettings.
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
 
-        :param y0_unit_autoscaling: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :param time_based_coloring: The time_based_coloring of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._y0_unit_autoscaling = y0_unit_autoscaling
+        self._time_based_coloring = time_based_coloring
 
     @property
-    def y1_unit_autoscaling(self):
-        """Gets the y1_unit_autoscaling of this ChartSettings.  # noqa: E501
+    def type(self):
+        """Gets the type of this ChartSettings.  # noqa: E501
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        Chart Type.  'line' refers to the Line Plot, 'scatter' to the Point Plot, 'stacked-area' to the Stacked Area plot, 'table' to the Tabular View, 'scatterploy-xy' to Scatter Plot, 'markdown-widget' to the Markdown display, and 'sparkline' to the Single Stat view  # noqa: E501
 
-        :return: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The type of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._y1_unit_autoscaling
+        return self._type
 
-    @y1_unit_autoscaling.setter
-    def y1_unit_autoscaling(self, y1_unit_autoscaling):
-        """Sets the y1_unit_autoscaling of this ChartSettings.
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ChartSettings.
 
-        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
+        Chart Type.  'line' refers to the Line Plot, 'scatter' to the Point Plot, 'stacked-area' to the Stacked Area plot, 'table' to the Tabular View, 'scatterploy-xy' to Scatter Plot, 'markdown-widget' to the Markdown display, and 'sparkline' to the Single Stat view  # noqa: E501
 
-        :param y1_unit_autoscaling: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param type: The type of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        if type is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
+        allowed_values = ["line", "scatterplot", "stacked-area", "table", "scatterplot-xy", "markdown-widget", "sparkline"]  # noqa: E501
+        if type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
 
-        self._y1_unit_autoscaling = y1_unit_autoscaling
+        self._type = type
 
     @property
-    def invert_dynamic_legend_hover_control(self):
-        """Gets the invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
+    def window_size(self):
+        """Gets the window_size of this ChartSettings.  # noqa: E501
 
-        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
+        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
 
-        :return: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The window_size of this ChartSettings.  # noqa: E501
+        :rtype: int
         """
-        return self._invert_dynamic_legend_hover_control
+        return self._window_size
 
-    @invert_dynamic_legend_hover_control.setter
-    def invert_dynamic_legend_hover_control(self, invert_dynamic_legend_hover_control):
-        """Sets the invert_dynamic_legend_hover_control of this ChartSettings.
+    @window_size.setter
+    def window_size(self, window_size):
+        """Sets the window_size of this ChartSettings.
 
-        Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)  # noqa: E501
+        Width, in minutes, of the time window to use for \"last\" windowing  # noqa: E501
 
-        :param invert_dynamic_legend_hover_control: The invert_dynamic_legend_hover_control of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param window_size: The window_size of this ChartSettings.  # noqa: E501
+        :type: int
         """
 
-        self._invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
+        self._window_size = window_size
 
     @property
-    def fixed_legend_enabled(self):
-        """Gets the fixed_legend_enabled of this ChartSettings.  # noqa: E501
+    def windowing(self):
+        """Gets the windowing of this ChartSettings.  # noqa: E501
 
-        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
+        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
 
-        :return: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The windowing of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._fixed_legend_enabled
+        return self._windowing
 
-    @fixed_legend_enabled.setter
-    def fixed_legend_enabled(self, fixed_legend_enabled):
-        """Sets the fixed_legend_enabled of this ChartSettings.
+    @windowing.setter
+    def windowing(self, windowing):
+        """Sets the windowing of this ChartSettings.
 
-        Whether to enable a fixed tabular legend adjacent to the chart  # noqa: E501
+        For the tabular view, whether to use the full time window for the query or the last X minutes  # noqa: E501
 
-        :param fixed_legend_enabled: The fixed_legend_enabled of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param windowing: The windowing of this ChartSettings.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["full", "last"]  # noqa: E501
+        if windowing not in allowed_values:
+            raise ValueError(
+                "Invalid value for `windowing` ({0}), must be one of {1}"  # noqa: E501
+                .format(windowing, allowed_values)
+            )
 
-        self._fixed_legend_enabled = fixed_legend_enabled
+        self._windowing = windowing
 
     @property
-    def fixed_legend_use_raw_stats(self):
-        """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
+    def xmax(self):
+        """Gets the xmax of this ChartSettings.  # noqa: E501
 
-        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
 
-        :return: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
-        :rtype: bool
+        :return: The xmax of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._fixed_legend_use_raw_stats
+        return self._xmax
 
-    @fixed_legend_use_raw_stats.setter
-    def fixed_legend_use_raw_stats(self, fixed_legend_use_raw_stats):
-        """Sets the fixed_legend_use_raw_stats of this ChartSettings.
+    @xmax.setter
+    def xmax(self, xmax):
+        """Sets the xmax of this ChartSettings.
 
-        If true, the legend uses non-summarized stats instead of summarized  # noqa: E501
+        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
 
-        :param fixed_legend_use_raw_stats: The fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
-        :type: bool
+        :param xmax: The xmax of this ChartSettings.  # noqa: E501
+        :type: float
         """
 
-        self._fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
+        self._xmax = xmax
 
     @property
-    def fixed_legend_position(self):
-        """Gets the fixed_legend_position of this ChartSettings.  # noqa: E501
+    def xmin(self):
+        """Gets the xmin of this ChartSettings.  # noqa: E501
 
-        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
+        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
 
-        :return: The fixed_legend_position of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The xmin of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._fixed_legend_position
+        return self._xmin
 
-    @fixed_legend_position.setter
-    def fixed_legend_position(self, fixed_legend_position):
-        """Sets the fixed_legend_position of this ChartSettings.
+    @xmin.setter
+    def xmin(self, xmin):
+        """Sets the xmin of this ChartSettings.
 
-        Where the fixed legend should be displayed with respect to the chart  # noqa: E501
+        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
 
-        :param fixed_legend_position: The fixed_legend_position of this ChartSettings.  # noqa: E501
-        :type: str
+        :param xmin: The xmin of this ChartSettings.  # noqa: E501
+        :type: float
         """
-        allowed_values = ["RIGHT", "TOP", "LEFT", "BOTTOM"]  # noqa: E501
-        if fixed_legend_position not in allowed_values:
-            raise ValueError(
-                "Invalid value for `fixed_legend_position` ({0}), must be one of {1}"  # noqa: E501
-                .format(fixed_legend_position, allowed_values)
-            )
 
-        self._fixed_legend_position = fixed_legend_position
+        self._xmin = xmin
 
     @property
-    def fixed_legend_display_stats(self):
-        """Gets the fixed_legend_display_stats of this ChartSettings.  # noqa: E501
+    def y0_scale_si_by1024(self):
+        """Gets the y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
 
-        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :return: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
-        :rtype: list[str]
+        :return: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._fixed_legend_display_stats
+        return self._y0_scale_si_by1024
 
-    @fixed_legend_display_stats.setter
-    def fixed_legend_display_stats(self, fixed_legend_display_stats):
-        """Sets the fixed_legend_display_stats of this ChartSettings.
+    @y0_scale_si_by1024.setter
+    def y0_scale_si_by1024(self, y0_scale_si_by1024):
+        """Sets the y0_scale_si_by1024 of this ChartSettings.
 
-        For a chart with a fixed legend, a list of statistics to display in the legend  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :param fixed_legend_display_stats: The fixed_legend_display_stats of this ChartSettings.  # noqa: E501
-        :type: list[str]
+        :param y0_scale_si_by1024: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._fixed_legend_display_stats = fixed_legend_display_stats
+        self._y0_scale_si_by1024 = y0_scale_si_by1024
 
     @property
-    def fixed_legend_filter_sort(self):
-        """Gets the fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
+    def y0_unit_autoscaling(self):
+        """Gets the y0_unit_autoscaling of this ChartSettings.  # noqa: E501
 
-        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :return: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._fixed_legend_filter_sort
+        return self._y0_unit_autoscaling
 
-    @fixed_legend_filter_sort.setter
-    def fixed_legend_filter_sort(self, fixed_legend_filter_sort):
-        """Sets the fixed_legend_filter_sort of this ChartSettings.
+    @y0_unit_autoscaling.setter
+    def y0_unit_autoscaling(self, y0_unit_autoscaling):
+        """Sets the y0_unit_autoscaling of this ChartSettings.
 
-        Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :param fixed_legend_filter_sort: The fixed_legend_filter_sort of this ChartSettings.  # noqa: E501
-        :type: str
+        :param y0_unit_autoscaling: The y0_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["TOP", "BOTTOM"]  # noqa: E501
-        if fixed_legend_filter_sort not in allowed_values:
-            raise ValueError(
-                "Invalid value for `fixed_legend_filter_sort` ({0}), must be one of {1}"  # noqa: E501
-                .format(fixed_legend_filter_sort, allowed_values)
-            )
 
-        self._fixed_legend_filter_sort = fixed_legend_filter_sort
+        self._y0_unit_autoscaling = y0_unit_autoscaling
 
     @property
-    def fixed_legend_filter_limit(self):
-        """Gets the fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
+    def y1_max(self):
+        """Gets the y1_max of this ChartSettings.  # noqa: E501
 
-        Number of series to include in the fixed legend  # noqa: E501
+        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :return: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
-        :rtype: int
+        :return: The y1_max of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._fixed_legend_filter_limit
+        return self._y1_max
 
-    @fixed_legend_filter_limit.setter
-    def fixed_legend_filter_limit(self, fixed_legend_filter_limit):
-        """Sets the fixed_legend_filter_limit of this ChartSettings.
+    @y1_max.setter
+    def y1_max(self, y1_max):
+        """Sets the y1_max of this ChartSettings.
 
-        Number of series to include in the fixed legend  # noqa: E501
+        For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :param fixed_legend_filter_limit: The fixed_legend_filter_limit of this ChartSettings.  # noqa: E501
-        :type: int
+        :param y1_max: The y1_max of this ChartSettings.  # noqa: E501
+        :type: float
         """
 
-        self._fixed_legend_filter_limit = fixed_legend_filter_limit
+        self._y1_max = y1_max
 
     @property
-    def fixed_legend_filter_field(self):
-        """Gets the fixed_legend_filter_field of this ChartSettings.  # noqa: E501
+    def y1_min(self):
+        """Gets the y1_min of this ChartSettings.  # noqa: E501
 
-        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
+        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :return: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
-        :rtype: str
+        :return: The y1_min of this ChartSettings.  # noqa: E501
+        :rtype: float
         """
-        return self._fixed_legend_filter_field
+        return self._y1_min
 
-    @fixed_legend_filter_field.setter
-    def fixed_legend_filter_field(self, fixed_legend_filter_field):
-        """Sets the fixed_legend_filter_field of this ChartSettings.
+    @y1_min.setter
+    def y1_min(self, y1_min):
+        """Sets the y1_min of this ChartSettings.
 
-        Statistic to use for determining whether a series is displayed on the fixed legend  # noqa: E501
+        For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto  # noqa: E501
 
-        :param fixed_legend_filter_field: The fixed_legend_filter_field of this ChartSettings.  # noqa: E501
-        :type: str
+        :param y1_min: The y1_min of this ChartSettings.  # noqa: E501
+        :type: float
         """
-        allowed_values = ["CURRENT", "MEAN", "MEDIAN", "SUM", "MIN", "MAX", "COUNT"]  # noqa: E501
-        if fixed_legend_filter_field not in allowed_values:
-            raise ValueError(
-                "Invalid value for `fixed_legend_filter_field` ({0}), must be one of {1}"  # noqa: E501
-                .format(fixed_legend_filter_field, allowed_values)
-            )
 
-        self._fixed_legend_filter_field = fixed_legend_filter_field
+        self._y1_min = y1_min
 
     @property
-    def fixed_legend_hide_label(self):
-        """Gets the fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+    def y1_scale_si_by1024(self):
+        """Gets the y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
 
-        deprecated  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :return: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :return: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._fixed_legend_hide_label
+        return self._y1_scale_si_by1024
 
-    @fixed_legend_hide_label.setter
-    def fixed_legend_hide_label(self, fixed_legend_hide_label):
-        """Sets the fixed_legend_hide_label of this ChartSettings.
+    @y1_scale_si_by1024.setter
+    def y1_scale_si_by1024(self, y1_scale_si_by1024):
+        """Sets the y1_scale_si_by1024 of this ChartSettings.
 
-        deprecated  # noqa: E501
+        Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :param fixed_legend_hide_label: The fixed_legend_hide_label of this ChartSettings.  # noqa: E501
+        :param y1_scale_si_by1024: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._fixed_legend_hide_label = fixed_legend_hide_label
+        self._y1_scale_si_by1024 = y1_scale_si_by1024
 
     @property
-    def xmax(self):
-        """Gets the xmax of this ChartSettings.  # noqa: E501
+    def y1_unit_autoscaling(self):
+        """Gets the y1_unit_autoscaling of this ChartSettings.  # noqa: E501
 
-        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :return: The xmax of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._xmax
+        return self._y1_unit_autoscaling
 
-    @xmax.setter
-    def xmax(self, xmax):
-        """Sets the xmax of this ChartSettings.
+    @y1_unit_autoscaling.setter
+    def y1_unit_autoscaling(self, y1_unit_autoscaling):
+        """Sets the y1_unit_autoscaling of this ChartSettings.
 
-        For x-y scatterplots, max value for X-axis.  Set null for auto  # noqa: E501
+        Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units  # noqa: E501
 
-        :param xmax: The xmax of this ChartSettings.  # noqa: E501
-        :type: float
+        :param y1_unit_autoscaling: The y1_unit_autoscaling of this ChartSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._xmax = xmax
+        self._y1_unit_autoscaling = y1_unit_autoscaling
 
     @property
-    def xmin(self):
-        """Gets the xmin of this ChartSettings.  # noqa: E501
+    def y1_units(self):
+        """Gets the y1_units of this ChartSettings.  # noqa: E501
 
-        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
+        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
 
-        :return: The xmin of this ChartSettings.  # noqa: E501
-        :rtype: float
+        :return: The y1_units of this ChartSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._xmin
+        return self._y1_units
 
-    @xmin.setter
-    def xmin(self, xmin):
-        """Sets the xmin of this ChartSettings.
+    @y1_units.setter
+    def y1_units(self, y1_units):
+        """Sets the y1_units of this ChartSettings.
 
-        For x-y scatterplots, min value for X-axis.  Set null for auto  # noqa: E501
+        For plots with multiple Y-axes, units for right-side Y-axis  # noqa: E501
 
-        :param xmin: The xmin of this ChartSettings.  # noqa: E501
-        :type: float
+        :param y1_units: The y1_units of this ChartSettings.  # noqa: E501
+        :type: str
         """
 
-        self._xmin = xmin
+        self._y1_units = y1_units
 
     @property
     def ymax(self):
@@ -1665,52 +1711,6 @@ def ymin(self, ymin):
 
         self._ymin = ymin
 
-    @property
-    def expected_data_spacing(self):
-        """Gets the expected_data_spacing of this ChartSettings.  # noqa: E501
-
-        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
-
-        :return: The expected_data_spacing of this ChartSettings.  # noqa: E501
-        :rtype: int
-        """
-        return self._expected_data_spacing
-
-    @expected_data_spacing.setter
-    def expected_data_spacing(self, expected_data_spacing):
-        """Sets the expected_data_spacing of this ChartSettings.
-
-        Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s  # noqa: E501
-
-        :param expected_data_spacing: The expected_data_spacing of this ChartSettings.  # noqa: E501
-        :type: int
-        """
-
-        self._expected_data_spacing = expected_data_spacing
-
-    @property
-    def plain_markdown_content(self):
-        """Gets the plain_markdown_content of this ChartSettings.  # noqa: E501
-
-        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
-
-        :return: The plain_markdown_content of this ChartSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._plain_markdown_content
-
-    @plain_markdown_content.setter
-    def plain_markdown_content(self, plain_markdown_content):
-        """Sets the plain_markdown_content of this ChartSettings.
-
-        The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.  # noqa: E501
-
-        :param plain_markdown_content: The plain_markdown_content of this ChartSettings.  # noqa: E501
-        :type: str
-        """
-
-        self._plain_markdown_content = plain_markdown_content
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index b7246bc..6c9c451 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -31,111 +31,132 @@ class ChartSourceQuery(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'scatter_plot_source': 'str',
-        'querybuilder_serialization': 'str',
+        'disabled': 'bool',
+        'name': 'str',
+        'query': 'str',
         'querybuilder_enabled': 'bool',
+        'querybuilder_serialization': 'str',
+        'scatter_plot_source': 'str',
         'secondary_axis': 'bool',
-        'source_description': 'str',
         'source_color': 'str',
-        'query': 'str',
-        'disabled': 'bool',
-        'name': 'str'
+        'source_description': 'str'
     }
 
     attribute_map = {
-        'scatter_plot_source': 'scatterPlotSource',
-        'querybuilder_serialization': 'querybuilderSerialization',
+        'disabled': 'disabled',
+        'name': 'name',
+        'query': 'query',
         'querybuilder_enabled': 'querybuilderEnabled',
+        'querybuilder_serialization': 'querybuilderSerialization',
+        'scatter_plot_source': 'scatterPlotSource',
         'secondary_axis': 'secondaryAxis',
-        'source_description': 'sourceDescription',
         'source_color': 'sourceColor',
-        'query': 'query',
-        'disabled': 'disabled',
-        'name': 'name'
+        'source_description': 'sourceDescription'
     }
 
-    def __init__(self, scatter_plot_source=None, querybuilder_serialization=None, querybuilder_enabled=None, secondary_axis=None, source_description=None, source_color=None, query=None, disabled=None, name=None):  # noqa: E501
+    def __init__(self, disabled=None, name=None, query=None, querybuilder_enabled=None, querybuilder_serialization=None, scatter_plot_source=None, secondary_axis=None, source_color=None, source_description=None):  # noqa: E501
         """ChartSourceQuery - a model defined in Swagger"""  # noqa: E501
 
-        self._scatter_plot_source = None
-        self._querybuilder_serialization = None
+        self._disabled = None
+        self._name = None
+        self._query = None
         self._querybuilder_enabled = None
+        self._querybuilder_serialization = None
+        self._scatter_plot_source = None
         self._secondary_axis = None
-        self._source_description = None
         self._source_color = None
-        self._query = None
-        self._disabled = None
-        self._name = None
+        self._source_description = None
         self.discriminator = None
 
-        if scatter_plot_source is not None:
-            self.scatter_plot_source = scatter_plot_source
-        if querybuilder_serialization is not None:
-            self.querybuilder_serialization = querybuilder_serialization
+        if disabled is not None:
+            self.disabled = disabled
+        self.name = name
+        self.query = query
         if querybuilder_enabled is not None:
             self.querybuilder_enabled = querybuilder_enabled
+        if querybuilder_serialization is not None:
+            self.querybuilder_serialization = querybuilder_serialization
+        if scatter_plot_source is not None:
+            self.scatter_plot_source = scatter_plot_source
         if secondary_axis is not None:
             self.secondary_axis = secondary_axis
-        if source_description is not None:
-            self.source_description = source_description
         if source_color is not None:
             self.source_color = source_color
-        self.query = query
-        if disabled is not None:
-            self.disabled = disabled
-        self.name = name
+        if source_description is not None:
+            self.source_description = source_description
 
     @property
-    def scatter_plot_source(self):
-        """Gets the scatter_plot_source of this ChartSourceQuery.  # noqa: E501
+    def disabled(self):
+        """Gets the disabled of this ChartSourceQuery.  # noqa: E501
 
-        For scatter plots, does this query source the X-axis or the Y-axis  # noqa: E501
+        Whether the source is disabled  # noqa: E501
 
-        :return: The scatter_plot_source of this ChartSourceQuery.  # noqa: E501
+        :return: The disabled of this ChartSourceQuery.  # noqa: E501
+        :rtype: bool
+        """
+        return self._disabled
+
+    @disabled.setter
+    def disabled(self, disabled):
+        """Sets the disabled of this ChartSourceQuery.
+
+        Whether the source is disabled  # noqa: E501
+
+        :param disabled: The disabled of this ChartSourceQuery.  # noqa: E501
+        :type: bool
+        """
+
+        self._disabled = disabled
+
+    @property
+    def name(self):
+        """Gets the name of this ChartSourceQuery.  # noqa: E501
+
+        Name of the source  # noqa: E501
+
+        :return: The name of this ChartSourceQuery.  # noqa: E501
         :rtype: str
         """
-        return self._scatter_plot_source
+        return self._name
 
-    @scatter_plot_source.setter
-    def scatter_plot_source(self, scatter_plot_source):
-        """Sets the scatter_plot_source of this ChartSourceQuery.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ChartSourceQuery.
 
-        For scatter plots, does this query source the X-axis or the Y-axis  # noqa: E501
+        Name of the source  # noqa: E501
 
-        :param scatter_plot_source: The scatter_plot_source of this ChartSourceQuery.  # noqa: E501
+        :param name: The name of this ChartSourceQuery.  # noqa: E501
         :type: str
         """
-        allowed_values = ["X", "Y"]  # noqa: E501
-        if scatter_plot_source not in allowed_values:
-            raise ValueError(
-                "Invalid value for `scatter_plot_source` ({0}), must be one of {1}"  # noqa: E501
-                .format(scatter_plot_source, allowed_values)
-            )
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._scatter_plot_source = scatter_plot_source
+        self._name = name
 
     @property
-    def querybuilder_serialization(self):
-        """Gets the querybuilder_serialization of this ChartSourceQuery.  # noqa: E501
+    def query(self):
+        """Gets the query of this ChartSourceQuery.  # noqa: E501
 
-        Opaque representation of the querybuilder  # noqa: E501
+        Query expression to plot on the chart  # noqa: E501
 
-        :return: The querybuilder_serialization of this ChartSourceQuery.  # noqa: E501
+        :return: The query of this ChartSourceQuery.  # noqa: E501
         :rtype: str
         """
-        return self._querybuilder_serialization
+        return self._query
 
-    @querybuilder_serialization.setter
-    def querybuilder_serialization(self, querybuilder_serialization):
-        """Sets the querybuilder_serialization of this ChartSourceQuery.
+    @query.setter
+    def query(self, query):
+        """Sets the query of this ChartSourceQuery.
 
-        Opaque representation of the querybuilder  # noqa: E501
+        Query expression to plot on the chart  # noqa: E501
 
-        :param querybuilder_serialization: The querybuilder_serialization of this ChartSourceQuery.  # noqa: E501
+        :param query: The query of this ChartSourceQuery.  # noqa: E501
         :type: str
         """
+        if query is None:
+            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
-        self._querybuilder_serialization = querybuilder_serialization
+        self._query = query
 
     @property
     def querybuilder_enabled(self):
@@ -160,6 +181,58 @@ def querybuilder_enabled(self, querybuilder_enabled):
 
         self._querybuilder_enabled = querybuilder_enabled
 
+    @property
+    def querybuilder_serialization(self):
+        """Gets the querybuilder_serialization of this ChartSourceQuery.  # noqa: E501
+
+        Opaque representation of the querybuilder  # noqa: E501
+
+        :return: The querybuilder_serialization of this ChartSourceQuery.  # noqa: E501
+        :rtype: str
+        """
+        return self._querybuilder_serialization
+
+    @querybuilder_serialization.setter
+    def querybuilder_serialization(self, querybuilder_serialization):
+        """Sets the querybuilder_serialization of this ChartSourceQuery.
+
+        Opaque representation of the querybuilder  # noqa: E501
+
+        :param querybuilder_serialization: The querybuilder_serialization of this ChartSourceQuery.  # noqa: E501
+        :type: str
+        """
+
+        self._querybuilder_serialization = querybuilder_serialization
+
+    @property
+    def scatter_plot_source(self):
+        """Gets the scatter_plot_source of this ChartSourceQuery.  # noqa: E501
+
+        For scatter plots, does this query source the X-axis or the Y-axis  # noqa: E501
+
+        :return: The scatter_plot_source of this ChartSourceQuery.  # noqa: E501
+        :rtype: str
+        """
+        return self._scatter_plot_source
+
+    @scatter_plot_source.setter
+    def scatter_plot_source(self, scatter_plot_source):
+        """Sets the scatter_plot_source of this ChartSourceQuery.
+
+        For scatter plots, does this query source the X-axis or the Y-axis  # noqa: E501
+
+        :param scatter_plot_source: The scatter_plot_source of this ChartSourceQuery.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["X", "Y"]  # noqa: E501
+        if scatter_plot_source not in allowed_values:
+            raise ValueError(
+                "Invalid value for `scatter_plot_source` ({0}), must be one of {1}"  # noqa: E501
+                .format(scatter_plot_source, allowed_values)
+            )
+
+        self._scatter_plot_source = scatter_plot_source
+
     @property
     def secondary_axis(self):
         """Gets the secondary_axis of this ChartSourceQuery.  # noqa: E501
@@ -183,29 +256,6 @@ def secondary_axis(self, secondary_axis):
 
         self._secondary_axis = secondary_axis
 
-    @property
-    def source_description(self):
-        """Gets the source_description of this ChartSourceQuery.  # noqa: E501
-
-        A description for the purpose of this source  # noqa: E501
-
-        :return: The source_description of this ChartSourceQuery.  # noqa: E501
-        :rtype: str
-        """
-        return self._source_description
-
-    @source_description.setter
-    def source_description(self, source_description):
-        """Sets the source_description of this ChartSourceQuery.
-
-        A description for the purpose of this source  # noqa: E501
-
-        :param source_description: The source_description of this ChartSourceQuery.  # noqa: E501
-        :type: str
-        """
-
-        self._source_description = source_description
-
     @property
     def source_color(self):
         """Gets the source_color of this ChartSourceQuery.  # noqa: E501
@@ -230,77 +280,27 @@ def source_color(self, source_color):
         self._source_color = source_color
 
     @property
-    def query(self):
-        """Gets the query of this ChartSourceQuery.  # noqa: E501
-
-        Query expression to plot on the chart  # noqa: E501
-
-        :return: The query of this ChartSourceQuery.  # noqa: E501
-        :rtype: str
-        """
-        return self._query
-
-    @query.setter
-    def query(self, query):
-        """Sets the query of this ChartSourceQuery.
-
-        Query expression to plot on the chart  # noqa: E501
-
-        :param query: The query of this ChartSourceQuery.  # noqa: E501
-        :type: str
-        """
-        if query is None:
-            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
-
-        self._query = query
-
-    @property
-    def disabled(self):
-        """Gets the disabled of this ChartSourceQuery.  # noqa: E501
-
-        Whether the source is disabled  # noqa: E501
-
-        :return: The disabled of this ChartSourceQuery.  # noqa: E501
-        :rtype: bool
-        """
-        return self._disabled
-
-    @disabled.setter
-    def disabled(self, disabled):
-        """Sets the disabled of this ChartSourceQuery.
-
-        Whether the source is disabled  # noqa: E501
-
-        :param disabled: The disabled of this ChartSourceQuery.  # noqa: E501
-        :type: bool
-        """
-
-        self._disabled = disabled
-
-    @property
-    def name(self):
-        """Gets the name of this ChartSourceQuery.  # noqa: E501
+    def source_description(self):
+        """Gets the source_description of this ChartSourceQuery.  # noqa: E501
 
-        Name of the source  # noqa: E501
+        A description for the purpose of this source  # noqa: E501
 
-        :return: The name of this ChartSourceQuery.  # noqa: E501
+        :return: The source_description of this ChartSourceQuery.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._source_description
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ChartSourceQuery.
+    @source_description.setter
+    def source_description(self, source_description):
+        """Sets the source_description of this ChartSourceQuery.
 
-        Name of the source  # noqa: E501
+        A description for the purpose of this source  # noqa: E501
 
-        :param name: The name of this ChartSourceQuery.  # noqa: E501
+        :param source_description: The source_description of this ChartSourceQuery.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._source_description = source_description
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 54c6832..3f10c59 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -42,427 +42,352 @@ class CloudIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'force_save': 'bool',
-        'service': 'str',
-        'in_trash': 'bool',
-        'creator_id': 'str',
-        'updater_id': 'str',
-        'id': 'str',
-        'last_error_event': 'Event',
         'additional_tags': 'dict(str, str)',
-        'last_received_data_point_ms': 'int',
-        'last_metric_count': 'int',
-        'cloud_watch': 'CloudWatchConfiguration',
+        'azure': 'AzureConfiguration',
+        'azure_activity_log': 'AzureActivityLogConfiguration',
         'cloud_trail': 'CloudTrailConfiguration',
+        'cloud_watch': 'CloudWatchConfiguration',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'disabled': 'bool',
         'ec2': 'EC2Configuration',
+        'force_save': 'bool',
         'gcp': 'GCPConfiguration',
         'gcp_billing': 'GCPBillingConfiguration',
-        'new_relic': 'NewRelicConfiguration',
-        'tesla': 'TeslaConfiguration',
-        'azure': 'AzureConfiguration',
-        'azure_activity_log': 'AzureActivityLogConfiguration',
+        'id': 'str',
+        'in_trash': 'bool',
         'last_error': 'str',
+        'last_error_event': 'Event',
         'last_error_ms': 'int',
-        'disabled': 'bool',
-        'last_processor_id': 'str',
+        'last_metric_count': 'int',
         'last_processing_timestamp': 'int',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
+        'last_processor_id': 'str',
+        'last_received_data_point_ms': 'int',
+        'name': 'str',
+        'new_relic': 'NewRelicConfiguration',
+        'service': 'str',
         'service_refresh_rate_in_mins': 'int',
-        'deleted': 'bool',
-        'name': 'str'
+        'tesla': 'TeslaConfiguration',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
     }
 
     attribute_map = {
-        'force_save': 'forceSave',
-        'service': 'service',
-        'in_trash': 'inTrash',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
-        'id': 'id',
-        'last_error_event': 'lastErrorEvent',
         'additional_tags': 'additionalTags',
-        'last_received_data_point_ms': 'lastReceivedDataPointMs',
-        'last_metric_count': 'lastMetricCount',
-        'cloud_watch': 'cloudWatch',
+        'azure': 'azure',
+        'azure_activity_log': 'azureActivityLog',
         'cloud_trail': 'cloudTrail',
+        'cloud_watch': 'cloudWatch',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'disabled': 'disabled',
         'ec2': 'ec2',
+        'force_save': 'forceSave',
         'gcp': 'gcp',
         'gcp_billing': 'gcpBilling',
-        'new_relic': 'newRelic',
-        'tesla': 'tesla',
-        'azure': 'azure',
-        'azure_activity_log': 'azureActivityLog',
+        'id': 'id',
+        'in_trash': 'inTrash',
         'last_error': 'lastError',
+        'last_error_event': 'lastErrorEvent',
         'last_error_ms': 'lastErrorMs',
-        'disabled': 'disabled',
-        'last_processor_id': 'lastProcessorId',
+        'last_metric_count': 'lastMetricCount',
         'last_processing_timestamp': 'lastProcessingTimestamp',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
+        'last_processor_id': 'lastProcessorId',
+        'last_received_data_point_ms': 'lastReceivedDataPointMs',
+        'name': 'name',
+        'new_relic': 'newRelic',
+        'service': 'service',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
-        'deleted': 'deleted',
-        'name': 'name'
+        'tesla': 'tesla',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, force_save=None, service=None, in_trash=None, creator_id=None, updater_id=None, id=None, last_error_event=None, additional_tags=None, last_received_data_point_ms=None, last_metric_count=None, cloud_watch=None, cloud_trail=None, ec2=None, gcp=None, gcp_billing=None, new_relic=None, tesla=None, azure=None, azure_activity_log=None, last_error=None, last_error_ms=None, disabled=None, last_processor_id=None, last_processing_timestamp=None, created_epoch_millis=None, updated_epoch_millis=None, service_refresh_rate_in_mins=None, deleted=None, name=None):  # noqa: E501
+    def __init__(self, additional_tags=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
 
-        self._force_save = None
-        self._service = None
-        self._in_trash = None
-        self._creator_id = None
-        self._updater_id = None
-        self._id = None
-        self._last_error_event = None
         self._additional_tags = None
-        self._last_received_data_point_ms = None
-        self._last_metric_count = None
-        self._cloud_watch = None
+        self._azure = None
+        self._azure_activity_log = None
         self._cloud_trail = None
+        self._cloud_watch = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._disabled = None
         self._ec2 = None
+        self._force_save = None
         self._gcp = None
         self._gcp_billing = None
-        self._new_relic = None
-        self._tesla = None
-        self._azure = None
-        self._azure_activity_log = None
+        self._id = None
+        self._in_trash = None
         self._last_error = None
+        self._last_error_event = None
         self._last_error_ms = None
-        self._disabled = None
-        self._last_processor_id = None
+        self._last_metric_count = None
         self._last_processing_timestamp = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._service_refresh_rate_in_mins = None
-        self._deleted = None
+        self._last_processor_id = None
+        self._last_received_data_point_ms = None
         self._name = None
+        self._new_relic = None
+        self._service = None
+        self._service_refresh_rate_in_mins = None
+        self._tesla = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
         self.discriminator = None
 
-        if force_save is not None:
-            self.force_save = force_save
-        self.service = service
-        if in_trash is not None:
-            self.in_trash = in_trash
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if id is not None:
-            self.id = id
-        if last_error_event is not None:
-            self.last_error_event = last_error_event
         if additional_tags is not None:
             self.additional_tags = additional_tags
-        if last_received_data_point_ms is not None:
-            self.last_received_data_point_ms = last_received_data_point_ms
-        if last_metric_count is not None:
-            self.last_metric_count = last_metric_count
-        if cloud_watch is not None:
-            self.cloud_watch = cloud_watch
+        if azure is not None:
+            self.azure = azure
+        if azure_activity_log is not None:
+            self.azure_activity_log = azure_activity_log
         if cloud_trail is not None:
             self.cloud_trail = cloud_trail
+        if cloud_watch is not None:
+            self.cloud_watch = cloud_watch
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if disabled is not None:
+            self.disabled = disabled
         if ec2 is not None:
             self.ec2 = ec2
+        if force_save is not None:
+            self.force_save = force_save
         if gcp is not None:
             self.gcp = gcp
         if gcp_billing is not None:
             self.gcp_billing = gcp_billing
-        if new_relic is not None:
-            self.new_relic = new_relic
-        if tesla is not None:
-            self.tesla = tesla
-        if azure is not None:
-            self.azure = azure
-        if azure_activity_log is not None:
-            self.azure_activity_log = azure_activity_log
+        if id is not None:
+            self.id = id
+        if in_trash is not None:
+            self.in_trash = in_trash
         if last_error is not None:
             self.last_error = last_error
+        if last_error_event is not None:
+            self.last_error_event = last_error_event
         if last_error_ms is not None:
             self.last_error_ms = last_error_ms
-        if disabled is not None:
-            self.disabled = disabled
-        if last_processor_id is not None:
-            self.last_processor_id = last_processor_id
+        if last_metric_count is not None:
+            self.last_metric_count = last_metric_count
         if last_processing_timestamp is not None:
             self.last_processing_timestamp = last_processing_timestamp
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
+        if last_processor_id is not None:
+            self.last_processor_id = last_processor_id
+        if last_received_data_point_ms is not None:
+            self.last_received_data_point_ms = last_received_data_point_ms
+        self.name = name
+        if new_relic is not None:
+            self.new_relic = new_relic
+        self.service = service
         if service_refresh_rate_in_mins is not None:
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
-        if deleted is not None:
-            self.deleted = deleted
-        self.name = name
-
-    @property
-    def force_save(self):
-        """Gets the force_save of this CloudIntegration.  # noqa: E501
-
-
-        :return: The force_save of this CloudIntegration.  # noqa: E501
-        :rtype: bool
-        """
-        return self._force_save
-
-    @force_save.setter
-    def force_save(self, force_save):
-        """Sets the force_save of this CloudIntegration.
-
-
-        :param force_save: The force_save of this CloudIntegration.  # noqa: E501
-        :type: bool
-        """
-
-        self._force_save = force_save
-
-    @property
-    def service(self):
-        """Gets the service of this CloudIntegration.  # noqa: E501
-
-        A value denoting which cloud service this integration integrates with  # noqa: E501
-
-        :return: The service of this CloudIntegration.  # noqa: E501
-        :rtype: str
-        """
-        return self._service
-
-    @service.setter
-    def service(self, service):
-        """Sets the service of this CloudIntegration.
-
-        A value denoting which cloud service this integration integrates with  # noqa: E501
-
-        :param service: The service of this CloudIntegration.  # noqa: E501
-        :type: str
-        """
-        if service is None:
-            raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG"]  # noqa: E501
-        if service not in allowed_values:
-            raise ValueError(
-                "Invalid value for `service` ({0}), must be one of {1}"  # noqa: E501
-                .format(service, allowed_values)
-            )
-
-        self._service = service
-
-    @property
-    def in_trash(self):
-        """Gets the in_trash of this CloudIntegration.  # noqa: E501
-
-
-        :return: The in_trash of this CloudIntegration.  # noqa: E501
-        :rtype: bool
-        """
-        return self._in_trash
-
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this CloudIntegration.
-
-
-        :param in_trash: The in_trash of this CloudIntegration.  # noqa: E501
-        :type: bool
-        """
-
-        self._in_trash = in_trash
+        if tesla is not None:
+            self.tesla = tesla
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this CloudIntegration.  # noqa: E501
+    def additional_tags(self):
+        """Gets the additional_tags of this CloudIntegration.  # noqa: E501
 
+        A list of point tag key-values to add to every point ingested using this integration  # noqa: E501
 
-        :return: The creator_id of this CloudIntegration.  # noqa: E501
-        :rtype: str
+        :return: The additional_tags of this CloudIntegration.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._creator_id
+        return self._additional_tags
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this CloudIntegration.
+    @additional_tags.setter
+    def additional_tags(self, additional_tags):
+        """Sets the additional_tags of this CloudIntegration.
 
+        A list of point tag key-values to add to every point ingested using this integration  # noqa: E501
 
-        :param creator_id: The creator_id of this CloudIntegration.  # noqa: E501
-        :type: str
+        :param additional_tags: The additional_tags of this CloudIntegration.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._creator_id = creator_id
+        self._additional_tags = additional_tags
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this CloudIntegration.  # noqa: E501
+    def azure(self):
+        """Gets the azure of this CloudIntegration.  # noqa: E501
 
 
-        :return: The updater_id of this CloudIntegration.  # noqa: E501
-        :rtype: str
+        :return: The azure of this CloudIntegration.  # noqa: E501
+        :rtype: AzureConfiguration
         """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this CloudIntegration.
+        return self._azure
+
+    @azure.setter
+    def azure(self, azure):
+        """Sets the azure of this CloudIntegration.
 
 
-        :param updater_id: The updater_id of this CloudIntegration.  # noqa: E501
-        :type: str
+        :param azure: The azure of this CloudIntegration.  # noqa: E501
+        :type: AzureConfiguration
         """
 
-        self._updater_id = updater_id
+        self._azure = azure
 
     @property
-    def id(self):
-        """Gets the id of this CloudIntegration.  # noqa: E501
+    def azure_activity_log(self):
+        """Gets the azure_activity_log of this CloudIntegration.  # noqa: E501
 
 
-        :return: The id of this CloudIntegration.  # noqa: E501
-        :rtype: str
+        :return: The azure_activity_log of this CloudIntegration.  # noqa: E501
+        :rtype: AzureActivityLogConfiguration
         """
-        return self._id
+        return self._azure_activity_log
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CloudIntegration.
+    @azure_activity_log.setter
+    def azure_activity_log(self, azure_activity_log):
+        """Sets the azure_activity_log of this CloudIntegration.
 
 
-        :param id: The id of this CloudIntegration.  # noqa: E501
-        :type: str
+        :param azure_activity_log: The azure_activity_log of this CloudIntegration.  # noqa: E501
+        :type: AzureActivityLogConfiguration
         """
 
-        self._id = id
+        self._azure_activity_log = azure_activity_log
 
     @property
-    def last_error_event(self):
-        """Gets the last_error_event of this CloudIntegration.  # noqa: E501
+    def cloud_trail(self):
+        """Gets the cloud_trail of this CloudIntegration.  # noqa: E501
 
 
-        :return: The last_error_event of this CloudIntegration.  # noqa: E501
-        :rtype: Event
+        :return: The cloud_trail of this CloudIntegration.  # noqa: E501
+        :rtype: CloudTrailConfiguration
         """
-        return self._last_error_event
+        return self._cloud_trail
 
-    @last_error_event.setter
-    def last_error_event(self, last_error_event):
-        """Sets the last_error_event of this CloudIntegration.
+    @cloud_trail.setter
+    def cloud_trail(self, cloud_trail):
+        """Sets the cloud_trail of this CloudIntegration.
 
 
-        :param last_error_event: The last_error_event of this CloudIntegration.  # noqa: E501
-        :type: Event
+        :param cloud_trail: The cloud_trail of this CloudIntegration.  # noqa: E501
+        :type: CloudTrailConfiguration
         """
 
-        self._last_error_event = last_error_event
+        self._cloud_trail = cloud_trail
 
     @property
-    def additional_tags(self):
-        """Gets the additional_tags of this CloudIntegration.  # noqa: E501
+    def cloud_watch(self):
+        """Gets the cloud_watch of this CloudIntegration.  # noqa: E501
 
-        A list of point tag key-values to add to every point ingested using this integration  # noqa: E501
 
-        :return: The additional_tags of this CloudIntegration.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The cloud_watch of this CloudIntegration.  # noqa: E501
+        :rtype: CloudWatchConfiguration
         """
-        return self._additional_tags
+        return self._cloud_watch
 
-    @additional_tags.setter
-    def additional_tags(self, additional_tags):
-        """Sets the additional_tags of this CloudIntegration.
+    @cloud_watch.setter
+    def cloud_watch(self, cloud_watch):
+        """Sets the cloud_watch of this CloudIntegration.
 
-        A list of point tag key-values to add to every point ingested using this integration  # noqa: E501
 
-        :param additional_tags: The additional_tags of this CloudIntegration.  # noqa: E501
-        :type: dict(str, str)
+        :param cloud_watch: The cloud_watch of this CloudIntegration.  # noqa: E501
+        :type: CloudWatchConfiguration
         """
 
-        self._additional_tags = additional_tags
+        self._cloud_watch = cloud_watch
 
     @property
-    def last_received_data_point_ms(self):
-        """Gets the last_received_data_point_ms of this CloudIntegration.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this CloudIntegration.  # noqa: E501
 
-        Time that this integration last received a data point, in epoch millis  # noqa: E501
 
-        :return: The last_received_data_point_ms of this CloudIntegration.  # noqa: E501
+        :return: The created_epoch_millis of this CloudIntegration.  # noqa: E501
         :rtype: int
         """
-        return self._last_received_data_point_ms
+        return self._created_epoch_millis
 
-    @last_received_data_point_ms.setter
-    def last_received_data_point_ms(self, last_received_data_point_ms):
-        """Sets the last_received_data_point_ms of this CloudIntegration.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this CloudIntegration.
 
-        Time that this integration last received a data point, in epoch millis  # noqa: E501
 
-        :param last_received_data_point_ms: The last_received_data_point_ms of this CloudIntegration.  # noqa: E501
+        :param created_epoch_millis: The created_epoch_millis of this CloudIntegration.  # noqa: E501
         :type: int
         """
 
-        self._last_received_data_point_ms = last_received_data_point_ms
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def last_metric_count(self):
-        """Gets the last_metric_count of this CloudIntegration.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this CloudIntegration.  # noqa: E501
 
-        Number of metrics / events ingested by this integration the last time it ran  # noqa: E501
 
-        :return: The last_metric_count of this CloudIntegration.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this CloudIntegration.  # noqa: E501
+        :rtype: str
         """
-        return self._last_metric_count
+        return self._creator_id
 
-    @last_metric_count.setter
-    def last_metric_count(self, last_metric_count):
-        """Sets the last_metric_count of this CloudIntegration.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this CloudIntegration.
 
-        Number of metrics / events ingested by this integration the last time it ran  # noqa: E501
 
-        :param last_metric_count: The last_metric_count of this CloudIntegration.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this CloudIntegration.  # noqa: E501
+        :type: str
         """
 
-        self._last_metric_count = last_metric_count
+        self._creator_id = creator_id
 
     @property
-    def cloud_watch(self):
-        """Gets the cloud_watch of this CloudIntegration.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this CloudIntegration.  # noqa: E501
 
 
-        :return: The cloud_watch of this CloudIntegration.  # noqa: E501
-        :rtype: CloudWatchConfiguration
+        :return: The deleted of this CloudIntegration.  # noqa: E501
+        :rtype: bool
         """
-        return self._cloud_watch
+        return self._deleted
 
-    @cloud_watch.setter
-    def cloud_watch(self, cloud_watch):
-        """Sets the cloud_watch of this CloudIntegration.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this CloudIntegration.
 
 
-        :param cloud_watch: The cloud_watch of this CloudIntegration.  # noqa: E501
-        :type: CloudWatchConfiguration
+        :param deleted: The deleted of this CloudIntegration.  # noqa: E501
+        :type: bool
         """
 
-        self._cloud_watch = cloud_watch
+        self._deleted = deleted
 
     @property
-    def cloud_trail(self):
-        """Gets the cloud_trail of this CloudIntegration.  # noqa: E501
+    def disabled(self):
+        """Gets the disabled of this CloudIntegration.  # noqa: E501
 
+        True when an aws credential failed to authenticate.  # noqa: E501
 
-        :return: The cloud_trail of this CloudIntegration.  # noqa: E501
-        :rtype: CloudTrailConfiguration
+        :return: The disabled of this CloudIntegration.  # noqa: E501
+        :rtype: bool
         """
-        return self._cloud_trail
+        return self._disabled
 
-    @cloud_trail.setter
-    def cloud_trail(self, cloud_trail):
-        """Sets the cloud_trail of this CloudIntegration.
+    @disabled.setter
+    def disabled(self, disabled):
+        """Sets the disabled of this CloudIntegration.
 
+        True when an aws credential failed to authenticate.  # noqa: E501
 
-        :param cloud_trail: The cloud_trail of this CloudIntegration.  # noqa: E501
-        :type: CloudTrailConfiguration
+        :param disabled: The disabled of this CloudIntegration.  # noqa: E501
+        :type: bool
         """
 
-        self._cloud_trail = cloud_trail
+        self._disabled = disabled
 
     @property
     def ec2(self):
@@ -485,6 +410,27 @@ def ec2(self, ec2):
 
         self._ec2 = ec2
 
+    @property
+    def force_save(self):
+        """Gets the force_save of this CloudIntegration.  # noqa: E501
+
+
+        :return: The force_save of this CloudIntegration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._force_save
+
+    @force_save.setter
+    def force_save(self, force_save):
+        """Sets the force_save of this CloudIntegration.
+
+
+        :param force_save: The force_save of this CloudIntegration.  # noqa: E501
+        :type: bool
+        """
+
+        self._force_save = force_save
+
     @property
     def gcp(self):
         """Gets the gcp of this CloudIntegration.  # noqa: E501
@@ -528,88 +474,46 @@ def gcp_billing(self, gcp_billing):
         self._gcp_billing = gcp_billing
 
     @property
-    def new_relic(self):
-        """Gets the new_relic of this CloudIntegration.  # noqa: E501
-
-
-        :return: The new_relic of this CloudIntegration.  # noqa: E501
-        :rtype: NewRelicConfiguration
-        """
-        return self._new_relic
-
-    @new_relic.setter
-    def new_relic(self, new_relic):
-        """Sets the new_relic of this CloudIntegration.
-
-
-        :param new_relic: The new_relic of this CloudIntegration.  # noqa: E501
-        :type: NewRelicConfiguration
-        """
-
-        self._new_relic = new_relic
-
-    @property
-    def tesla(self):
-        """Gets the tesla of this CloudIntegration.  # noqa: E501
-
-
-        :return: The tesla of this CloudIntegration.  # noqa: E501
-        :rtype: TeslaConfiguration
-        """
-        return self._tesla
-
-    @tesla.setter
-    def tesla(self, tesla):
-        """Sets the tesla of this CloudIntegration.
-
-
-        :param tesla: The tesla of this CloudIntegration.  # noqa: E501
-        :type: TeslaConfiguration
-        """
-
-        self._tesla = tesla
-
-    @property
-    def azure(self):
-        """Gets the azure of this CloudIntegration.  # noqa: E501
+    def id(self):
+        """Gets the id of this CloudIntegration.  # noqa: E501
 
 
-        :return: The azure of this CloudIntegration.  # noqa: E501
-        :rtype: AzureConfiguration
+        :return: The id of this CloudIntegration.  # noqa: E501
+        :rtype: str
         """
-        return self._azure
+        return self._id
 
-    @azure.setter
-    def azure(self, azure):
-        """Sets the azure of this CloudIntegration.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CloudIntegration.
 
 
-        :param azure: The azure of this CloudIntegration.  # noqa: E501
-        :type: AzureConfiguration
+        :param id: The id of this CloudIntegration.  # noqa: E501
+        :type: str
         """
 
-        self._azure = azure
+        self._id = id
 
     @property
-    def azure_activity_log(self):
-        """Gets the azure_activity_log of this CloudIntegration.  # noqa: E501
+    def in_trash(self):
+        """Gets the in_trash of this CloudIntegration.  # noqa: E501
 
 
-        :return: The azure_activity_log of this CloudIntegration.  # noqa: E501
-        :rtype: AzureActivityLogConfiguration
+        :return: The in_trash of this CloudIntegration.  # noqa: E501
+        :rtype: bool
         """
-        return self._azure_activity_log
+        return self._in_trash
 
-    @azure_activity_log.setter
-    def azure_activity_log(self, azure_activity_log):
-        """Sets the azure_activity_log of this CloudIntegration.
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this CloudIntegration.
 
 
-        :param azure_activity_log: The azure_activity_log of this CloudIntegration.  # noqa: E501
-        :type: AzureActivityLogConfiguration
+        :param in_trash: The in_trash of this CloudIntegration.  # noqa: E501
+        :type: bool
         """
 
-        self._azure_activity_log = azure_activity_log
+        self._in_trash = in_trash
 
     @property
     def last_error(self):
@@ -634,6 +538,27 @@ def last_error(self, last_error):
 
         self._last_error = last_error
 
+    @property
+    def last_error_event(self):
+        """Gets the last_error_event of this CloudIntegration.  # noqa: E501
+
+
+        :return: The last_error_event of this CloudIntegration.  # noqa: E501
+        :rtype: Event
+        """
+        return self._last_error_event
+
+    @last_error_event.setter
+    def last_error_event(self, last_error_event):
+        """Sets the last_error_event of this CloudIntegration.
+
+
+        :param last_error_event: The last_error_event of this CloudIntegration.  # noqa: E501
+        :type: Event
+        """
+
+        self._last_error_event = last_error_event
+
     @property
     def last_error_ms(self):
         """Gets the last_error_ms of this CloudIntegration.  # noqa: E501
@@ -658,27 +583,50 @@ def last_error_ms(self, last_error_ms):
         self._last_error_ms = last_error_ms
 
     @property
-    def disabled(self):
-        """Gets the disabled of this CloudIntegration.  # noqa: E501
+    def last_metric_count(self):
+        """Gets the last_metric_count of this CloudIntegration.  # noqa: E501
 
-        True when an aws credential failed to authenticate.  # noqa: E501
+        Number of metrics / events ingested by this integration the last time it ran  # noqa: E501
 
-        :return: The disabled of this CloudIntegration.  # noqa: E501
-        :rtype: bool
+        :return: The last_metric_count of this CloudIntegration.  # noqa: E501
+        :rtype: int
         """
-        return self._disabled
+        return self._last_metric_count
 
-    @disabled.setter
-    def disabled(self, disabled):
-        """Sets the disabled of this CloudIntegration.
+    @last_metric_count.setter
+    def last_metric_count(self, last_metric_count):
+        """Sets the last_metric_count of this CloudIntegration.
 
-        True when an aws credential failed to authenticate.  # noqa: E501
+        Number of metrics / events ingested by this integration the last time it ran  # noqa: E501
 
-        :param disabled: The disabled of this CloudIntegration.  # noqa: E501
-        :type: bool
+        :param last_metric_count: The last_metric_count of this CloudIntegration.  # noqa: E501
+        :type: int
         """
 
-        self._disabled = disabled
+        self._last_metric_count = last_metric_count
+
+    @property
+    def last_processing_timestamp(self):
+        """Gets the last_processing_timestamp of this CloudIntegration.  # noqa: E501
+
+        Time, in epoch millis, that this integration was last processed  # noqa: E501
+
+        :return: The last_processing_timestamp of this CloudIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_processing_timestamp
+
+    @last_processing_timestamp.setter
+    def last_processing_timestamp(self, last_processing_timestamp):
+        """Sets the last_processing_timestamp of this CloudIntegration.
+
+        Time, in epoch millis, that this integration was last processed  # noqa: E501
+
+        :param last_processing_timestamp: The last_processing_timestamp of this CloudIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._last_processing_timestamp = last_processing_timestamp
 
     @property
     def last_processor_id(self):
@@ -704,69 +652,104 @@ def last_processor_id(self, last_processor_id):
         self._last_processor_id = last_processor_id
 
     @property
-    def last_processing_timestamp(self):
-        """Gets the last_processing_timestamp of this CloudIntegration.  # noqa: E501
+    def last_received_data_point_ms(self):
+        """Gets the last_received_data_point_ms of this CloudIntegration.  # noqa: E501
 
-        Time, in epoch millis, that this integration was last processed  # noqa: E501
+        Time that this integration last received a data point, in epoch millis  # noqa: E501
 
-        :return: The last_processing_timestamp of this CloudIntegration.  # noqa: E501
+        :return: The last_received_data_point_ms of this CloudIntegration.  # noqa: E501
         :rtype: int
         """
-        return self._last_processing_timestamp
+        return self._last_received_data_point_ms
 
-    @last_processing_timestamp.setter
-    def last_processing_timestamp(self, last_processing_timestamp):
-        """Sets the last_processing_timestamp of this CloudIntegration.
+    @last_received_data_point_ms.setter
+    def last_received_data_point_ms(self, last_received_data_point_ms):
+        """Sets the last_received_data_point_ms of this CloudIntegration.
 
-        Time, in epoch millis, that this integration was last processed  # noqa: E501
+        Time that this integration last received a data point, in epoch millis  # noqa: E501
 
-        :param last_processing_timestamp: The last_processing_timestamp of this CloudIntegration.  # noqa: E501
+        :param last_received_data_point_ms: The last_received_data_point_ms of this CloudIntegration.  # noqa: E501
         :type: int
         """
 
-        self._last_processing_timestamp = last_processing_timestamp
+        self._last_received_data_point_ms = last_received_data_point_ms
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this CloudIntegration.  # noqa: E501
+    def name(self):
+        """Gets the name of this CloudIntegration.  # noqa: E501
 
+        The human-readable name of this integration  # noqa: E501
 
-        :return: The created_epoch_millis of this CloudIntegration.  # noqa: E501
-        :rtype: int
+        :return: The name of this CloudIntegration.  # noqa: E501
+        :rtype: str
         """
-        return self._created_epoch_millis
+        return self._name
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this CloudIntegration.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this CloudIntegration.
 
+        The human-readable name of this integration  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this CloudIntegration.  # noqa: E501
-        :type: int
+        :param name: The name of this CloudIntegration.  # noqa: E501
+        :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._created_epoch_millis = created_epoch_millis
+        self._name = name
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this CloudIntegration.  # noqa: E501
+    def new_relic(self):
+        """Gets the new_relic of this CloudIntegration.  # noqa: E501
 
 
-        :return: The updated_epoch_millis of this CloudIntegration.  # noqa: E501
-        :rtype: int
+        :return: The new_relic of this CloudIntegration.  # noqa: E501
+        :rtype: NewRelicConfiguration
         """
-        return self._updated_epoch_millis
+        return self._new_relic
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this CloudIntegration.
+    @new_relic.setter
+    def new_relic(self, new_relic):
+        """Sets the new_relic of this CloudIntegration.
 
 
-        :param updated_epoch_millis: The updated_epoch_millis of this CloudIntegration.  # noqa: E501
-        :type: int
+        :param new_relic: The new_relic of this CloudIntegration.  # noqa: E501
+        :type: NewRelicConfiguration
         """
 
-        self._updated_epoch_millis = updated_epoch_millis
+        self._new_relic = new_relic
+
+    @property
+    def service(self):
+        """Gets the service of this CloudIntegration.  # noqa: E501
+
+        A value denoting which cloud service this integration integrates with  # noqa: E501
+
+        :return: The service of this CloudIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._service
+
+    @service.setter
+    def service(self, service):
+        """Sets the service of this CloudIntegration.
+
+        A value denoting which cloud service this integration integrates with  # noqa: E501
+
+        :param service: The service of this CloudIntegration.  # noqa: E501
+        :type: str
+        """
+        if service is None:
+            raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG"]  # noqa: E501
+        if service not in allowed_values:
+            raise ValueError(
+                "Invalid value for `service` ({0}), must be one of {1}"  # noqa: E501
+                .format(service, allowed_values)
+            )
+
+        self._service = service
 
     @property
     def service_refresh_rate_in_mins(self):
@@ -792,50 +775,67 @@ def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
         self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
 
     @property
-    def deleted(self):
-        """Gets the deleted of this CloudIntegration.  # noqa: E501
+    def tesla(self):
+        """Gets the tesla of this CloudIntegration.  # noqa: E501
 
 
-        :return: The deleted of this CloudIntegration.  # noqa: E501
-        :rtype: bool
+        :return: The tesla of this CloudIntegration.  # noqa: E501
+        :rtype: TeslaConfiguration
         """
-        return self._deleted
+        return self._tesla
 
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this CloudIntegration.
+    @tesla.setter
+    def tesla(self, tesla):
+        """Sets the tesla of this CloudIntegration.
 
 
-        :param deleted: The deleted of this CloudIntegration.  # noqa: E501
-        :type: bool
+        :param tesla: The tesla of this CloudIntegration.  # noqa: E501
+        :type: TeslaConfiguration
         """
 
-        self._deleted = deleted
+        self._tesla = tesla
 
     @property
-    def name(self):
-        """Gets the name of this CloudIntegration.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this CloudIntegration.  # noqa: E501
 
-        The human-readable name of this integration  # noqa: E501
 
-        :return: The name of this CloudIntegration.  # noqa: E501
+        :return: The updated_epoch_millis of this CloudIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this CloudIntegration.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this CloudIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this CloudIntegration.  # noqa: E501
+
+
+        :return: The updater_id of this CloudIntegration.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._updater_id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this CloudIntegration.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this CloudIntegration.
 
-        The human-readable name of this integration  # noqa: E501
 
-        :param name: The name of this CloudIntegration.  # noqa: E501
+        :param updater_id: The updater_id of this CloudIntegration.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index 480e730..e2df08d 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -33,62 +33,39 @@ class CloudTrailConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'prefix': 'str',
         'base_credentials': 'AWSBaseCredentials',
-        'region': 'str',
+        'bucket_name': 'str',
         'filter_rule': 'str',
-        'bucket_name': 'str'
+        'prefix': 'str',
+        'region': 'str'
     }
 
     attribute_map = {
-        'prefix': 'prefix',
         'base_credentials': 'baseCredentials',
-        'region': 'region',
+        'bucket_name': 'bucketName',
         'filter_rule': 'filterRule',
-        'bucket_name': 'bucketName'
+        'prefix': 'prefix',
+        'region': 'region'
     }
 
-    def __init__(self, prefix=None, base_credentials=None, region=None, filter_rule=None, bucket_name=None):  # noqa: E501
+    def __init__(self, base_credentials=None, bucket_name=None, filter_rule=None, prefix=None, region=None):  # noqa: E501
         """CloudTrailConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._prefix = None
         self._base_credentials = None
-        self._region = None
-        self._filter_rule = None
         self._bucket_name = None
+        self._filter_rule = None
+        self._prefix = None
+        self._region = None
         self.discriminator = None
 
-        if prefix is not None:
-            self.prefix = prefix
         if base_credentials is not None:
             self.base_credentials = base_credentials
-        self.region = region
+        self.bucket_name = bucket_name
         if filter_rule is not None:
             self.filter_rule = filter_rule
-        self.bucket_name = bucket_name
-
-    @property
-    def prefix(self):
-        """Gets the prefix of this CloudTrailConfiguration.  # noqa: E501
-
-        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
-
-        :return: The prefix of this CloudTrailConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._prefix
-
-    @prefix.setter
-    def prefix(self, prefix):
-        """Sets the prefix of this CloudTrailConfiguration.
-
-        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
-
-        :param prefix: The prefix of this CloudTrailConfiguration.  # noqa: E501
-        :type: str
-        """
-
-        self._prefix = prefix
+        if prefix is not None:
+            self.prefix = prefix
+        self.region = region
 
     @property
     def base_credentials(self):
@@ -112,29 +89,29 @@ def base_credentials(self, base_credentials):
         self._base_credentials = base_credentials
 
     @property
-    def region(self):
-        """Gets the region of this CloudTrailConfiguration.  # noqa: E501
+    def bucket_name(self):
+        """Gets the bucket_name of this CloudTrailConfiguration.  # noqa: E501
 
-        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
 
-        :return: The region of this CloudTrailConfiguration.  # noqa: E501
+        :return: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._region
+        return self._bucket_name
 
-    @region.setter
-    def region(self, region):
-        """Sets the region of this CloudTrailConfiguration.
+    @bucket_name.setter
+    def bucket_name(self, bucket_name):
+        """Sets the bucket_name of this CloudTrailConfiguration.
 
-        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
 
-        :param region: The region of this CloudTrailConfiguration.  # noqa: E501
+        :param bucket_name: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
         :type: str
         """
-        if region is None:
-            raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
+        if bucket_name is None:
+            raise ValueError("Invalid value for `bucket_name`, must not be `None`")  # noqa: E501
 
-        self._region = region
+        self._bucket_name = bucket_name
 
     @property
     def filter_rule(self):
@@ -160,29 +137,52 @@ def filter_rule(self, filter_rule):
         self._filter_rule = filter_rule
 
     @property
-    def bucket_name(self):
-        """Gets the bucket_name of this CloudTrailConfiguration.  # noqa: E501
+    def prefix(self):
+        """Gets the prefix of this CloudTrailConfiguration.  # noqa: E501
 
-        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
 
-        :return: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
+        :return: The prefix of this CloudTrailConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._bucket_name
+        return self._prefix
 
-    @bucket_name.setter
-    def bucket_name(self, bucket_name):
-        """Sets the bucket_name of this CloudTrailConfiguration.
+    @prefix.setter
+    def prefix(self, prefix):
+        """Sets the prefix of this CloudTrailConfiguration.
 
-        Name of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+        The common prefix, if any, appended to all CloudTrail log files  # noqa: E501
 
-        :param bucket_name: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
+        :param prefix: The prefix of this CloudTrailConfiguration.  # noqa: E501
         :type: str
         """
-        if bucket_name is None:
-            raise ValueError("Invalid value for `bucket_name`, must not be `None`")  # noqa: E501
 
-        self._bucket_name = bucket_name
+        self._prefix = prefix
+
+    @property
+    def region(self):
+        """Gets the region of this CloudTrailConfiguration.  # noqa: E501
+
+        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+
+        :return: The region of this CloudTrailConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._region
+
+    @region.setter
+    def region(self, region):
+        """Sets the region of this CloudTrailConfiguration.
+
+        The AWS region of the S3 bucket where CloudTrail logs are stored  # noqa: E501
+
+        :param region: The region of this CloudTrailConfiguration.  # noqa: E501
+        :type: str
+        """
+        if region is None:
+            raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
+
+        self._region = region
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index a6c6039..036ed6c 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -34,35 +34,37 @@ class CloudWatchConfiguration(object):
     """
     swagger_types = {
         'base_credentials': 'AWSBaseCredentials',
+        'instance_selection_tags': 'dict(str, str)',
         'metric_filter_regex': 'str',
         'namespaces': 'list[str]',
         'point_tag_filter_regex': 'str',
-        'volume_selection_tags': 'dict(str, str)',
-        'instance_selection_tags': 'dict(str, str)'
+        'volume_selection_tags': 'dict(str, str)'
     }
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
+        'instance_selection_tags': 'instanceSelectionTags',
         'metric_filter_regex': 'metricFilterRegex',
         'namespaces': 'namespaces',
         'point_tag_filter_regex': 'pointTagFilterRegex',
-        'volume_selection_tags': 'volumeSelectionTags',
-        'instance_selection_tags': 'instanceSelectionTags'
+        'volume_selection_tags': 'volumeSelectionTags'
     }
 
-    def __init__(self, base_credentials=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None, instance_selection_tags=None):  # noqa: E501
+    def __init__(self, base_credentials=None, instance_selection_tags=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._base_credentials = None
+        self._instance_selection_tags = None
         self._metric_filter_regex = None
         self._namespaces = None
         self._point_tag_filter_regex = None
         self._volume_selection_tags = None
-        self._instance_selection_tags = None
         self.discriminator = None
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
+        if instance_selection_tags is not None:
+            self.instance_selection_tags = instance_selection_tags
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
         if namespaces is not None:
@@ -71,8 +73,6 @@ def __init__(self, base_credentials=None, metric_filter_regex=None, namespaces=N
             self.point_tag_filter_regex = point_tag_filter_regex
         if volume_selection_tags is not None:
             self.volume_selection_tags = volume_selection_tags
-        if instance_selection_tags is not None:
-            self.instance_selection_tags = instance_selection_tags
 
     @property
     def base_credentials(self):
@@ -95,6 +95,29 @@ def base_credentials(self, base_credentials):
 
         self._base_credentials = base_credentials
 
+    @property
+    def instance_selection_tags(self):
+        """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+
+        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+
+        :return: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._instance_selection_tags
+
+    @instance_selection_tags.setter
+    def instance_selection_tags(self, instance_selection_tags):
+        """Sets the instance_selection_tags of this CloudWatchConfiguration.
+
+        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+
+        :param instance_selection_tags: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._instance_selection_tags = instance_selection_tags
+
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
@@ -187,29 +210,6 @@ def volume_selection_tags(self, volume_selection_tags):
 
         self._volume_selection_tags = volume_selection_tags
 
-    @property
-    def instance_selection_tags(self):
-        """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-
-        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
-
-        :return: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-        :rtype: dict(str, str)
-        """
-        return self._instance_selection_tags
-
-    @instance_selection_tags.setter
-    def instance_selection_tags(self, instance_selection_tags):
-        """Sets the instance_selection_tags of this CloudWatchConfiguration.
-
-        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
-
-        :param instance_selection_tags: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
-        :type: dict(str, str)
-        """
-
-        self._instance_selection_tags = instance_selection_tags
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index a2046e1..f752a84 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -31,130 +31,128 @@ class CustomerFacingUserObject(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'user_groups': 'list[str]',
-        'identifier': 'str',
-        '_self': 'bool',
-        'groups': 'list[str]',
         'customer': 'str',
+        'escaped_identifier': 'str',
+        'gravatar_url': 'str',
+        'groups': 'list[str]',
         'id': 'str',
+        'identifier': 'str',
         'last_successful_login': 'int',
-        'gravatar_url': 'str',
-        'escaped_identifier': 'str'
+        '_self': 'bool',
+        'user_groups': 'list[str]'
     }
 
     attribute_map = {
-        'user_groups': 'userGroups',
-        'identifier': 'identifier',
-        '_self': 'self',
-        'groups': 'groups',
         'customer': 'customer',
+        'escaped_identifier': 'escapedIdentifier',
+        'gravatar_url': 'gravatarUrl',
+        'groups': 'groups',
         'id': 'id',
+        'identifier': 'identifier',
         'last_successful_login': 'lastSuccessfulLogin',
-        'gravatar_url': 'gravatarUrl',
-        'escaped_identifier': 'escapedIdentifier'
+        '_self': 'self',
+        'user_groups': 'userGroups'
     }
 
-    def __init__(self, user_groups=None, identifier=None, _self=None, groups=None, customer=None, id=None, last_successful_login=None, gravatar_url=None, escaped_identifier=None):  # noqa: E501
+    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, last_successful_login=None, _self=None, user_groups=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
-        self._user_groups = None
-        self._identifier = None
-        self.__self = None
-        self._groups = None
         self._customer = None
+        self._escaped_identifier = None
+        self._gravatar_url = None
+        self._groups = None
         self._id = None
+        self._identifier = None
         self._last_successful_login = None
-        self._gravatar_url = None
-        self._escaped_identifier = None
+        self.__self = None
+        self._user_groups = None
         self.discriminator = None
 
-        if user_groups is not None:
-            self.user_groups = user_groups
-        self.identifier = identifier
-        self._self = _self
+        self.customer = customer
+        if escaped_identifier is not None:
+            self.escaped_identifier = escaped_identifier
+        if gravatar_url is not None:
+            self.gravatar_url = gravatar_url
         if groups is not None:
             self.groups = groups
-        self.customer = customer
         self.id = id
+        self.identifier = identifier
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
-        if gravatar_url is not None:
-            self.gravatar_url = gravatar_url
-        if escaped_identifier is not None:
-            self.escaped_identifier = escaped_identifier
+        self._self = _self
+        if user_groups is not None:
+            self.user_groups = user_groups
 
     @property
-    def user_groups(self):
-        """Gets the user_groups of this CustomerFacingUserObject.  # noqa: E501
+    def customer(self):
+        """Gets the customer of this CustomerFacingUserObject.  # noqa: E501
 
-        List of user group identifiers this user belongs to  # noqa: E501
+        The id of the customer to which the user belongs  # noqa: E501
 
-        :return: The user_groups of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: list[str]
+        :return: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: str
         """
-        return self._user_groups
+        return self._customer
 
-    @user_groups.setter
-    def user_groups(self, user_groups):
-        """Sets the user_groups of this CustomerFacingUserObject.
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this CustomerFacingUserObject.
 
-        List of user group identifiers this user belongs to  # noqa: E501
+        The id of the customer to which the user belongs  # noqa: E501
 
-        :param user_groups: The user_groups of this CustomerFacingUserObject.  # noqa: E501
-        :type: list[str]
+        :param customer: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :type: str
         """
+        if customer is None:
+            raise ValueError("Invalid value for `customer`, must not be `None`")  # noqa: E501
 
-        self._user_groups = user_groups
+        self._customer = customer
 
     @property
-    def identifier(self):
-        """Gets the identifier of this CustomerFacingUserObject.  # noqa: E501
+    def escaped_identifier(self):
+        """Gets the escaped_identifier of this CustomerFacingUserObject.  # noqa: E501
 
-        The unique identifier of this user, which should be their valid email address  # noqa: E501
+        URL Escaped Identifier  # noqa: E501
 
-        :return: The identifier of this CustomerFacingUserObject.  # noqa: E501
+        :return: The escaped_identifier of this CustomerFacingUserObject.  # noqa: E501
         :rtype: str
         """
-        return self._identifier
+        return self._escaped_identifier
 
-    @identifier.setter
-    def identifier(self, identifier):
-        """Sets the identifier of this CustomerFacingUserObject.
+    @escaped_identifier.setter
+    def escaped_identifier(self, escaped_identifier):
+        """Sets the escaped_identifier of this CustomerFacingUserObject.
 
-        The unique identifier of this user, which should be their valid email address  # noqa: E501
+        URL Escaped Identifier  # noqa: E501
 
-        :param identifier: The identifier of this CustomerFacingUserObject.  # noqa: E501
+        :param escaped_identifier: The escaped_identifier of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if identifier is None:
-            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
-        self._identifier = identifier
+        self._escaped_identifier = escaped_identifier
 
     @property
-    def _self(self):
-        """Gets the _self of this CustomerFacingUserObject.  # noqa: E501
+    def gravatar_url(self):
+        """Gets the gravatar_url of this CustomerFacingUserObject.  # noqa: E501
 
-        Whether this user is the one calling the API  # noqa: E501
+        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
 
-        :return: The _self of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: bool
+        :return: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: str
         """
-        return self.__self
+        return self._gravatar_url
 
-    @_self.setter
-    def _self(self, _self):
-        """Sets the _self of this CustomerFacingUserObject.
+    @gravatar_url.setter
+    def gravatar_url(self, gravatar_url):
+        """Sets the gravatar_url of this CustomerFacingUserObject.
 
-        Whether this user is the one calling the API  # noqa: E501
+        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
 
-        :param _self: The _self of this CustomerFacingUserObject.  # noqa: E501
-        :type: bool
+        :param gravatar_url: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
+        :type: str
         """
-        if _self is None:
-            raise ValueError("Invalid value for `_self`, must not be `None`")  # noqa: E501
 
-        self.__self = _self
+        self._gravatar_url = gravatar_url
 
     @property
     def groups(self):
@@ -180,54 +178,54 @@ def groups(self, groups):
         self._groups = groups
 
     @property
-    def customer(self):
-        """Gets the customer of this CustomerFacingUserObject.  # noqa: E501
+    def id(self):
+        """Gets the id of this CustomerFacingUserObject.  # noqa: E501
 
-        The id of the customer to which the user belongs  # noqa: E501
+        The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :return: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :return: The id of this CustomerFacingUserObject.  # noqa: E501
         :rtype: str
         """
-        return self._customer
+        return self._id
 
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this CustomerFacingUserObject.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CustomerFacingUserObject.
 
-        The id of the customer to which the user belongs  # noqa: E501
+        The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :param customer: The customer of this CustomerFacingUserObject.  # noqa: E501
+        :param id: The id of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if customer is None:
-            raise ValueError("Invalid value for `customer`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._customer = customer
+        self._id = id
 
     @property
-    def id(self):
-        """Gets the id of this CustomerFacingUserObject.  # noqa: E501
+    def identifier(self):
+        """Gets the identifier of this CustomerFacingUserObject.  # noqa: E501
 
         The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :return: The id of this CustomerFacingUserObject.  # noqa: E501
+        :return: The identifier of this CustomerFacingUserObject.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._identifier
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CustomerFacingUserObject.
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this CustomerFacingUserObject.
 
         The unique identifier of this user, which should be their valid email address  # noqa: E501
 
-        :param id: The id of this CustomerFacingUserObject.  # noqa: E501
+        :param identifier: The identifier of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+        if identifier is None:
+            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._identifier = identifier
 
     @property
     def last_successful_login(self):
@@ -253,50 +251,52 @@ def last_successful_login(self, last_successful_login):
         self._last_successful_login = last_successful_login
 
     @property
-    def gravatar_url(self):
-        """Gets the gravatar_url of this CustomerFacingUserObject.  # noqa: E501
+    def _self(self):
+        """Gets the _self of this CustomerFacingUserObject.  # noqa: E501
 
-        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
+        Whether this user is the one calling the API  # noqa: E501
 
-        :return: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: str
+        :return: The _self of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: bool
         """
-        return self._gravatar_url
+        return self.__self
 
-    @gravatar_url.setter
-    def gravatar_url(self, gravatar_url):
-        """Sets the gravatar_url of this CustomerFacingUserObject.
+    @_self.setter
+    def _self(self, _self):
+        """Sets the _self of this CustomerFacingUserObject.
 
-        URL id For User's gravatar (see gravatar.com), if one exists.  # noqa: E501
+        Whether this user is the one calling the API  # noqa: E501
 
-        :param gravatar_url: The gravatar_url of this CustomerFacingUserObject.  # noqa: E501
-        :type: str
+        :param _self: The _self of this CustomerFacingUserObject.  # noqa: E501
+        :type: bool
         """
+        if _self is None:
+            raise ValueError("Invalid value for `_self`, must not be `None`")  # noqa: E501
 
-        self._gravatar_url = gravatar_url
+        self.__self = _self
 
     @property
-    def escaped_identifier(self):
-        """Gets the escaped_identifier of this CustomerFacingUserObject.  # noqa: E501
+    def user_groups(self):
+        """Gets the user_groups of this CustomerFacingUserObject.  # noqa: E501
 
-        URL Escaped Identifier  # noqa: E501
+        List of user group identifiers this user belongs to  # noqa: E501
 
-        :return: The escaped_identifier of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: str
+        :return: The user_groups of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._escaped_identifier
+        return self._user_groups
 
-    @escaped_identifier.setter
-    def escaped_identifier(self, escaped_identifier):
-        """Sets the escaped_identifier of this CustomerFacingUserObject.
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this CustomerFacingUserObject.
 
-        URL Escaped Identifier  # noqa: E501
+        List of user group identifiers this user belongs to  # noqa: E501
 
-        :param escaped_identifier: The escaped_identifier of this CustomerFacingUserObject.  # noqa: E501
-        :type: str
+        :param user_groups: The user_groups of this CustomerFacingUserObject.  # noqa: E501
+        :type: list[str]
         """
 
-        self._escaped_identifier = escaped_identifier
+        self._user_groups = user_groups
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
index fdb80c6..be5be2b 100644
--- a/wavefront_api_client/models/customer_preferences.py
+++ b/wavefront_api_client/models/customer_preferences.py
@@ -33,189 +33,156 @@ class CustomerPreferences(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'blacklisted_emails': 'dict(str, int)',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'customer_id': 'str',
         'default_user_groups': 'list[UserGroup]',
-        'show_querybuilder_by_default': 'bool',
+        'deleted': 'bool',
+        'grant_modify_access_to_everyone': 'bool',
+        'hidden_metric_prefixes': 'dict(str, int)',
         'hide_ts_when_querybuilder_shown': 'bool',
-        'show_onboarding': 'bool',
-        'customer_id': 'str',
-        'creator_id': 'str',
-        'updater_id': 'str',
         'id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
         'invite_permissions': 'list[str]',
-        'blacklisted_emails': 'dict(str, int)',
-        'hidden_metric_prefixes': 'dict(str, int)',
         'landing_dashboard_slug': 'str',
-        'grant_modify_access_to_everyone': 'bool',
-        'deleted': 'bool'
+        'show_onboarding': 'bool',
+        'show_querybuilder_by_default': 'bool',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
     }
 
     attribute_map = {
+        'blacklisted_emails': 'blacklistedEmails',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'customer_id': 'customerId',
         'default_user_groups': 'defaultUserGroups',
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'deleted': 'deleted',
+        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
+        'hidden_metric_prefixes': 'hiddenMetricPrefixes',
         'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
-        'show_onboarding': 'showOnboarding',
-        'customer_id': 'customerId',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
         'invite_permissions': 'invitePermissions',
-        'blacklisted_emails': 'blacklistedEmails',
-        'hidden_metric_prefixes': 'hiddenMetricPrefixes',
         'landing_dashboard_slug': 'landingDashboardSlug',
-        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
-        'deleted': 'deleted'
+        'show_onboarding': 'showOnboarding',
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, default_user_groups=None, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, show_onboarding=None, customer_id=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, invite_permissions=None, blacklisted_emails=None, hidden_metric_prefixes=None, landing_dashboard_slug=None, grant_modify_access_to_everyone=None, deleted=None):  # noqa: E501
+    def __init__(self, blacklisted_emails=None, created_epoch_millis=None, creator_id=None, customer_id=None, default_user_groups=None, deleted=None, grant_modify_access_to_everyone=None, hidden_metric_prefixes=None, hide_ts_when_querybuilder_shown=None, id=None, invite_permissions=None, landing_dashboard_slug=None, show_onboarding=None, show_querybuilder_by_default=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """CustomerPreferences - a model defined in Swagger"""  # noqa: E501
 
+        self._blacklisted_emails = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._customer_id = None
         self._default_user_groups = None
-        self._show_querybuilder_by_default = None
+        self._deleted = None
+        self._grant_modify_access_to_everyone = None
+        self._hidden_metric_prefixes = None
         self._hide_ts_when_querybuilder_shown = None
-        self._show_onboarding = None
-        self._customer_id = None
-        self._creator_id = None
-        self._updater_id = None
         self._id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
         self._invite_permissions = None
-        self._blacklisted_emails = None
-        self._hidden_metric_prefixes = None
         self._landing_dashboard_slug = None
-        self._grant_modify_access_to_everyone = None
-        self._deleted = None
+        self._show_onboarding = None
+        self._show_querybuilder_by_default = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
         self.discriminator = None
 
+        if blacklisted_emails is not None:
+            self.blacklisted_emails = blacklisted_emails
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        self.customer_id = customer_id
         if default_user_groups is not None:
             self.default_user_groups = default_user_groups
-        self.show_querybuilder_by_default = show_querybuilder_by_default
+        if deleted is not None:
+            self.deleted = deleted
+        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
+        if hidden_metric_prefixes is not None:
+            self.hidden_metric_prefixes = hidden_metric_prefixes
         self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        self.show_onboarding = show_onboarding
-        self.customer_id = customer_id
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
         if id is not None:
             self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
         if invite_permissions is not None:
             self.invite_permissions = invite_permissions
-        if blacklisted_emails is not None:
-            self.blacklisted_emails = blacklisted_emails
-        if hidden_metric_prefixes is not None:
-            self.hidden_metric_prefixes = hidden_metric_prefixes
         if landing_dashboard_slug is not None:
             self.landing_dashboard_slug = landing_dashboard_slug
-        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
-        if deleted is not None:
-            self.deleted = deleted
-
-    @property
-    def default_user_groups(self):
-        """Gets the default_user_groups of this CustomerPreferences.  # noqa: E501
-
-        List of default user groups of the customer  # noqa: E501
-
-        :return: The default_user_groups of this CustomerPreferences.  # noqa: E501
-        :rtype: list[UserGroup]
-        """
-        return self._default_user_groups
-
-    @default_user_groups.setter
-    def default_user_groups(self, default_user_groups):
-        """Sets the default_user_groups of this CustomerPreferences.
-
-        List of default user groups of the customer  # noqa: E501
-
-        :param default_user_groups: The default_user_groups of this CustomerPreferences.  # noqa: E501
-        :type: list[UserGroup]
-        """
-
-        self._default_user_groups = default_user_groups
+        self.show_onboarding = show_onboarding
+        self.show_querybuilder_by_default = show_querybuilder_by_default
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+    def blacklisted_emails(self):
+        """Gets the blacklisted_emails of this CustomerPreferences.  # noqa: E501
 
-        Whether the Querybuilder is shown by default  # noqa: E501
+        List of blacklisted emails of the customer  # noqa: E501
 
-        :return: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
+        :return: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
+        :rtype: dict(str, int)
         """
-        return self._show_querybuilder_by_default
+        return self._blacklisted_emails
 
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this CustomerPreferences.
+    @blacklisted_emails.setter
+    def blacklisted_emails(self, blacklisted_emails):
+        """Sets the blacklisted_emails of this CustomerPreferences.
 
-        Whether the Querybuilder is shown by default  # noqa: E501
+        List of blacklisted emails of the customer  # noqa: E501
 
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-        :type: bool
+        :param blacklisted_emails: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
+        :type: dict(str, int)
         """
-        if show_querybuilder_by_default is None:
-            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
 
-        self._show_querybuilder_by_default = show_querybuilder_by_default
+        self._blacklisted_emails = blacklisted_emails
 
     @property
-    def hide_ts_when_querybuilder_shown(self):
-        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this CustomerPreferences.  # noqa: E501
 
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
 
-        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
+        :return: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :rtype: int
         """
-        return self._hide_ts_when_querybuilder_shown
+        return self._created_epoch_millis
 
-    @hide_ts_when_querybuilder_shown.setter
-    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
-        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferences.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this CustomerPreferences.
 
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
 
-        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-        :type: bool
+        :param created_epoch_millis: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :type: int
         """
-        if hide_ts_when_querybuilder_shown is None:
-            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
 
-        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def show_onboarding(self):
-        """Gets the show_onboarding of this CustomerPreferences.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this CustomerPreferences.  # noqa: E501
 
-        Whether to show onboarding for any new user without an override  # noqa: E501
 
-        :return: The show_onboarding of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
+        :return: The creator_id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
         """
-        return self._show_onboarding
+        return self._creator_id
 
-    @show_onboarding.setter
-    def show_onboarding(self, show_onboarding):
-        """Sets the show_onboarding of this CustomerPreferences.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this CustomerPreferences.
 
-        Whether to show onboarding for any new user without an override  # noqa: E501
 
-        :param show_onboarding: The show_onboarding of this CustomerPreferences.  # noqa: E501
-        :type: bool
+        :param creator_id: The creator_id of this CustomerPreferences.  # noqa: E501
+        :type: str
         """
-        if show_onboarding is None:
-            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
 
-        self._show_onboarding = show_onboarding
+        self._creator_id = creator_id
 
     @property
     def customer_id(self):
@@ -243,109 +210,142 @@ def customer_id(self, customer_id):
         self._customer_id = customer_id
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this CustomerPreferences.  # noqa: E501
+    def default_user_groups(self):
+        """Gets the default_user_groups of this CustomerPreferences.  # noqa: E501
 
+        List of default user groups of the customer  # noqa: E501
 
-        :return: The creator_id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
+        :return: The default_user_groups of this CustomerPreferences.  # noqa: E501
+        :rtype: list[UserGroup]
         """
-        return self._creator_id
+        return self._default_user_groups
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this CustomerPreferences.
+    @default_user_groups.setter
+    def default_user_groups(self, default_user_groups):
+        """Sets the default_user_groups of this CustomerPreferences.
 
+        List of default user groups of the customer  # noqa: E501
 
-        :param creator_id: The creator_id of this CustomerPreferences.  # noqa: E501
-        :type: str
+        :param default_user_groups: The default_user_groups of this CustomerPreferences.  # noqa: E501
+        :type: list[UserGroup]
         """
 
-        self._creator_id = creator_id
+        self._default_user_groups = default_user_groups
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this CustomerPreferences.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this CustomerPreferences.  # noqa: E501
 
 
-        :return: The updater_id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
+        :return: The deleted of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
         """
-        return self._updater_id
+        return self._deleted
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this CustomerPreferences.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this CustomerPreferences.
 
 
-        :param updater_id: The updater_id of this CustomerPreferences.  # noqa: E501
-        :type: str
+        :param deleted: The deleted of this CustomerPreferences.  # noqa: E501
+        :type: bool
         """
 
-        self._updater_id = updater_id
+        self._deleted = deleted
 
     @property
-    def id(self):
-        """Gets the id of this CustomerPreferences.  # noqa: E501
+    def grant_modify_access_to_everyone(self):
+        """Gets the grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
 
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
 
-        :return: The id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
+        :return: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
         """
-        return self._id
+        return self._grant_modify_access_to_everyone
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CustomerPreferences.
+    @grant_modify_access_to_everyone.setter
+    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
+        """Sets the grant_modify_access_to_everyone of this CustomerPreferences.
 
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
 
-        :param id: The id of this CustomerPreferences.  # noqa: E501
-        :type: str
+        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
+        :type: bool
         """
+        if grant_modify_access_to_everyone is None:
+            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this CustomerPreferences.  # noqa: E501
+    def hidden_metric_prefixes(self):
+        """Gets the hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
 
+        Metric prefixes which should be hidden from user  # noqa: E501
 
-        :return: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :rtype: int
+        :return: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
+        :rtype: dict(str, int)
         """
-        return self._created_epoch_millis
+        return self._hidden_metric_prefixes
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this CustomerPreferences.
+    @hidden_metric_prefixes.setter
+    def hidden_metric_prefixes(self, hidden_metric_prefixes):
+        """Sets the hidden_metric_prefixes of this CustomerPreferences.
 
+        Metric prefixes which should be hidden from user  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :type: int
+        :param hidden_metric_prefixes: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
+        :type: dict(str, int)
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._hidden_metric_prefixes = hidden_metric_prefixes
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+    def hide_ts_when_querybuilder_shown(self):
+        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
 
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
 
-        :return: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :rtype: int
+        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
         """
-        return self._updated_epoch_millis
+        return self._hide_ts_when_querybuilder_shown
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this CustomerPreferences.
+    @hide_ts_when_querybuilder_shown.setter
+    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
+        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferences.
 
+        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :type: int
+        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
+        :type: bool
         """
+        if hide_ts_when_querybuilder_shown is None:
+            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
 
-        self._updated_epoch_millis = updated_epoch_millis
+        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+
+    @property
+    def id(self):
+        """Gets the id of this CustomerPreferences.  # noqa: E501
+
+
+        :return: The id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this CustomerPreferences.
+
+
+        :param id: The id of this CustomerPreferences.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
 
     @property
     def invite_permissions(self):
@@ -371,119 +371,119 @@ def invite_permissions(self, invite_permissions):
         self._invite_permissions = invite_permissions
 
     @property
-    def blacklisted_emails(self):
-        """Gets the blacklisted_emails of this CustomerPreferences.  # noqa: E501
+    def landing_dashboard_slug(self):
+        """Gets the landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
 
-        List of blacklisted emails of the customer  # noqa: E501
+        Dashboard where user will be redirected from landing page  # noqa: E501
 
-        :return: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
-        :rtype: dict(str, int)
+        :return: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
+        :rtype: str
         """
-        return self._blacklisted_emails
+        return self._landing_dashboard_slug
 
-    @blacklisted_emails.setter
-    def blacklisted_emails(self, blacklisted_emails):
-        """Sets the blacklisted_emails of this CustomerPreferences.
+    @landing_dashboard_slug.setter
+    def landing_dashboard_slug(self, landing_dashboard_slug):
+        """Sets the landing_dashboard_slug of this CustomerPreferences.
 
-        List of blacklisted emails of the customer  # noqa: E501
+        Dashboard where user will be redirected from landing page  # noqa: E501
 
-        :param blacklisted_emails: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
-        :type: dict(str, int)
+        :param landing_dashboard_slug: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
+        :type: str
         """
 
-        self._blacklisted_emails = blacklisted_emails
+        self._landing_dashboard_slug = landing_dashboard_slug
 
     @property
-    def hidden_metric_prefixes(self):
-        """Gets the hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
+    def show_onboarding(self):
+        """Gets the show_onboarding of this CustomerPreferences.  # noqa: E501
 
-        Metric prefixes which should be hidden from user  # noqa: E501
+        Whether to show onboarding for any new user without an override  # noqa: E501
 
-        :return: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
-        :rtype: dict(str, int)
+        :return: The show_onboarding of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
         """
-        return self._hidden_metric_prefixes
+        return self._show_onboarding
 
-    @hidden_metric_prefixes.setter
-    def hidden_metric_prefixes(self, hidden_metric_prefixes):
-        """Sets the hidden_metric_prefixes of this CustomerPreferences.
+    @show_onboarding.setter
+    def show_onboarding(self, show_onboarding):
+        """Sets the show_onboarding of this CustomerPreferences.
 
-        Metric prefixes which should be hidden from user  # noqa: E501
+        Whether to show onboarding for any new user without an override  # noqa: E501
 
-        :param hidden_metric_prefixes: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
-        :type: dict(str, int)
+        :param show_onboarding: The show_onboarding of this CustomerPreferences.  # noqa: E501
+        :type: bool
         """
+        if show_onboarding is None:
+            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
 
-        self._hidden_metric_prefixes = hidden_metric_prefixes
+        self._show_onboarding = show_onboarding
 
     @property
-    def landing_dashboard_slug(self):
-        """Gets the landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
 
-        Dashboard where user will be redirected from landing page  # noqa: E501
+        Whether the Querybuilder is shown by default  # noqa: E501
 
-        :return: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
-        :rtype: str
+        :return: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+        :rtype: bool
         """
-        return self._landing_dashboard_slug
+        return self._show_querybuilder_by_default
 
-    @landing_dashboard_slug.setter
-    def landing_dashboard_slug(self, landing_dashboard_slug):
-        """Sets the landing_dashboard_slug of this CustomerPreferences.
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this CustomerPreferences.
 
-        Dashboard where user will be redirected from landing page  # noqa: E501
+        Whether the Querybuilder is shown by default  # noqa: E501
 
-        :param landing_dashboard_slug: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
-        :type: str
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
+        :type: bool
         """
+        if show_querybuilder_by_default is None:
+            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
 
-        self._landing_dashboard_slug = landing_dashboard_slug
+        self._show_querybuilder_by_default = show_querybuilder_by_default
 
     @property
-    def grant_modify_access_to_everyone(self):
-        """Gets the grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this CustomerPreferences.  # noqa: E501
 
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
 
-        :return: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
+        :return: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :rtype: int
         """
-        return self._grant_modify_access_to_everyone
+        return self._updated_epoch_millis
 
-    @grant_modify_access_to_everyone.setter
-    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
-        """Sets the grant_modify_access_to_everyone of this CustomerPreferences.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this CustomerPreferences.
 
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
 
-        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
-        :type: bool
+        :param updated_epoch_millis: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
+        :type: int
         """
-        if grant_modify_access_to_everyone is None:
-            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
 
-        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def deleted(self):
-        """Gets the deleted of this CustomerPreferences.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this CustomerPreferences.  # noqa: E501
 
 
-        :return: The deleted of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
+        :return: The updater_id of this CustomerPreferences.  # noqa: E501
+        :rtype: str
         """
-        return self._deleted
+        return self._updater_id
 
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this CustomerPreferences.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this CustomerPreferences.
 
 
-        :param deleted: The deleted of this CustomerPreferences.  # noqa: E501
-        :type: bool
+        :param updater_id: The updater_id of this CustomerPreferences.  # noqa: E501
+        :type: str
         """
 
-        self._deleted = deleted
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/customer_preferences_updating.py b/wavefront_api_client/models/customer_preferences_updating.py
index a7e52c6..3b2b671 100644
--- a/wavefront_api_client/models/customer_preferences_updating.py
+++ b/wavefront_api_client/models/customer_preferences_updating.py
@@ -31,72 +31,95 @@ class CustomerPreferencesUpdating(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'show_querybuilder_by_default': 'bool',
+        'default_user_groups': 'list[str]',
+        'grant_modify_access_to_everyone': 'bool',
         'hide_ts_when_querybuilder_shown': 'bool',
+        'invite_permissions': 'list[str]',
         'landing_dashboard_slug': 'str',
         'show_onboarding': 'bool',
-        'grant_modify_access_to_everyone': 'bool',
-        'default_user_groups': 'list[str]',
-        'invite_permissions': 'list[str]'
+        'show_querybuilder_by_default': 'bool'
     }
 
     attribute_map = {
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'default_user_groups': 'defaultUserGroups',
+        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
         'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
+        'invite_permissions': 'invitePermissions',
         'landing_dashboard_slug': 'landingDashboardSlug',
         'show_onboarding': 'showOnboarding',
-        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
-        'default_user_groups': 'defaultUserGroups',
-        'invite_permissions': 'invitePermissions'
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault'
     }
 
-    def __init__(self, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, show_onboarding=None, grant_modify_access_to_everyone=None, default_user_groups=None, invite_permissions=None):  # noqa: E501
+    def __init__(self, default_user_groups=None, grant_modify_access_to_everyone=None, hide_ts_when_querybuilder_shown=None, invite_permissions=None, landing_dashboard_slug=None, show_onboarding=None, show_querybuilder_by_default=None):  # noqa: E501
         """CustomerPreferencesUpdating - a model defined in Swagger"""  # noqa: E501
 
-        self._show_querybuilder_by_default = None
+        self._default_user_groups = None
+        self._grant_modify_access_to_everyone = None
         self._hide_ts_when_querybuilder_shown = None
+        self._invite_permissions = None
         self._landing_dashboard_slug = None
         self._show_onboarding = None
-        self._grant_modify_access_to_everyone = None
-        self._default_user_groups = None
-        self._invite_permissions = None
+        self._show_querybuilder_by_default = None
         self.discriminator = None
 
-        self.show_querybuilder_by_default = show_querybuilder_by_default
-        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        if landing_dashboard_slug is not None:
-            self.landing_dashboard_slug = landing_dashboard_slug
-        self.show_onboarding = show_onboarding
-        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
         if default_user_groups is not None:
             self.default_user_groups = default_user_groups
+        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
+        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
         if invite_permissions is not None:
             self.invite_permissions = invite_permissions
+        if landing_dashboard_slug is not None:
+            self.landing_dashboard_slug = landing_dashboard_slug
+        self.show_onboarding = show_onboarding
+        self.show_querybuilder_by_default = show_querybuilder_by_default
 
     @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
+    def default_user_groups(self):
+        """Gets the default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
 
-        Whether the Querybuilder is shown by default  # noqa: E501
+        List of default user groups of the customer  # noqa: E501
 
-        :return: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
+        :return: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._default_user_groups
+
+    @default_user_groups.setter
+    def default_user_groups(self, default_user_groups):
+        """Sets the default_user_groups of this CustomerPreferencesUpdating.
+
+        List of default user groups of the customer  # noqa: E501
+
+        :param default_user_groups: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._default_user_groups = default_user_groups
+
+    @property
+    def grant_modify_access_to_everyone(self):
+        """Gets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+
+        :return: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
         :rtype: bool
         """
-        return self._show_querybuilder_by_default
+        return self._grant_modify_access_to_everyone
 
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this CustomerPreferencesUpdating.
+    @grant_modify_access_to_everyone.setter
+    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
+        """Sets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.
 
-        Whether the Querybuilder is shown by default  # noqa: E501
+        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
 
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
+        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
         :type: bool
         """
-        if show_querybuilder_by_default is None:
-            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
+        if grant_modify_access_to_everyone is None:
+            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
 
-        self._show_querybuilder_by_default = show_querybuilder_by_default
+        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
 
     @property
     def hide_ts_when_querybuilder_shown(self):
@@ -123,6 +146,29 @@ def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
 
         self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
 
+    @property
+    def invite_permissions(self):
+        """Gets the invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
+
+        List of invite permissions to apply for each new user  # noqa: E501
+
+        :return: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._invite_permissions
+
+    @invite_permissions.setter
+    def invite_permissions(self, invite_permissions):
+        """Sets the invite_permissions of this CustomerPreferencesUpdating.
+
+        List of invite permissions to apply for each new user  # noqa: E501
+
+        :param invite_permissions: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._invite_permissions = invite_permissions
+
     @property
     def landing_dashboard_slug(self):
         """Gets the landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
@@ -172,75 +218,29 @@ def show_onboarding(self, show_onboarding):
         self._show_onboarding = show_onboarding
 
     @property
-    def grant_modify_access_to_everyone(self):
-        """Gets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
 
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+        Whether the Querybuilder is shown by default  # noqa: E501
 
-        :return: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+        :return: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
         :rtype: bool
         """
-        return self._grant_modify_access_to_everyone
+        return self._show_querybuilder_by_default
 
-    @grant_modify_access_to_everyone.setter
-    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
-        """Sets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this CustomerPreferencesUpdating.
 
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
+        Whether the Querybuilder is shown by default  # noqa: E501
 
-        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
         :type: bool
         """
-        if grant_modify_access_to_everyone is None:
-            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
-
-        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
-
-    @property
-    def default_user_groups(self):
-        """Gets the default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
-
-        List of default user groups of the customer  # noqa: E501
-
-        :return: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._default_user_groups
-
-    @default_user_groups.setter
-    def default_user_groups(self, default_user_groups):
-        """Sets the default_user_groups of this CustomerPreferencesUpdating.
-
-        List of default user groups of the customer  # noqa: E501
-
-        :param default_user_groups: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._default_user_groups = default_user_groups
-
-    @property
-    def invite_permissions(self):
-        """Gets the invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
-
-        List of invite permissions to apply for each new user  # noqa: E501
-
-        :return: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._invite_permissions
-
-    @invite_permissions.setter
-    def invite_permissions(self, invite_permissions):
-        """Sets the invite_permissions of this CustomerPreferencesUpdating.
-
-        List of invite permissions to apply for each new user  # noqa: E501
-
-        :param invite_permissions: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: list[str]
-        """
+        if show_querybuilder_by_default is None:
+            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
 
-        self._invite_permissions = invite_permissions
+        self._show_querybuilder_by_default = show_querybuilder_by_default
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 1cf3c86..52d4798 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -36,372 +36,324 @@ class Dashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'acl': 'AccessControlListSimple',
         'can_user_modify': 'bool',
-        'description': 'str',
-        'hidden': 'bool',
-        'parameters': 'dict(str, str)',
-        'tags': 'WFTags',
-        'customer': 'str',
-        'url': 'str',
-        'system_owned': 'bool',
+        'chart_title_bg_color': 'str',
+        'chart_title_color': 'str',
+        'chart_title_scalar': 'int',
+        'created_epoch_millis': 'int',
         'creator_id': 'str',
-        'updater_id': 'str',
-        'id': 'str',
-        'event_filter_type': 'str',
-        'sections': 'list[DashboardSection]',
-        'parameter_details': 'dict(str, DashboardParameterValue)',
+        'customer': 'str',
+        'default_end_time': 'int',
+        'default_start_time': 'int',
+        'default_time_window': 'str',
+        'deleted': 'bool',
+        'description': 'str',
         'display_description': 'bool',
-        'display_section_table_of_contents': 'bool',
         'display_query_parameters': 'bool',
-        'chart_title_scalar': 'int',
+        'display_section_table_of_contents': 'bool',
+        'event_filter_type': 'str',
         'event_query': 'str',
-        'default_time_window': 'str',
-        'default_start_time': 'int',
-        'default_end_time': 'int',
-        'chart_title_color': 'str',
-        'chart_title_bg_color': 'str',
-        'views_last_day': 'int',
-        'views_last_week': 'int',
-        'views_last_month': 'int',
-        'acl': 'AccessControlListSimple',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
-        'deleted': 'bool',
-        'num_charts': 'int',
         'favorite': 'bool',
+        'hidden': 'bool',
+        'id': 'str',
+        'name': 'str',
+        'num_charts': 'int',
         'num_favorites': 'int',
         'orphan': 'bool',
-        'name': 'str'
+        'parameter_details': 'dict(str, DashboardParameterValue)',
+        'parameters': 'dict(str, str)',
+        'sections': 'list[DashboardSection]',
+        'system_owned': 'bool',
+        'tags': 'WFTags',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str',
+        'url': 'str',
+        'views_last_day': 'int',
+        'views_last_month': 'int',
+        'views_last_week': 'int'
     }
 
     attribute_map = {
+        'acl': 'acl',
         'can_user_modify': 'canUserModify',
-        'description': 'description',
-        'hidden': 'hidden',
-        'parameters': 'parameters',
-        'tags': 'tags',
-        'customer': 'customer',
-        'url': 'url',
-        'system_owned': 'systemOwned',
+        'chart_title_bg_color': 'chartTitleBgColor',
+        'chart_title_color': 'chartTitleColor',
+        'chart_title_scalar': 'chartTitleScalar',
+        'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
-        'id': 'id',
-        'event_filter_type': 'eventFilterType',
-        'sections': 'sections',
-        'parameter_details': 'parameterDetails',
+        'customer': 'customer',
+        'default_end_time': 'defaultEndTime',
+        'default_start_time': 'defaultStartTime',
+        'default_time_window': 'defaultTimeWindow',
+        'deleted': 'deleted',
+        'description': 'description',
         'display_description': 'displayDescription',
-        'display_section_table_of_contents': 'displaySectionTableOfContents',
         'display_query_parameters': 'displayQueryParameters',
-        'chart_title_scalar': 'chartTitleScalar',
+        'display_section_table_of_contents': 'displaySectionTableOfContents',
+        'event_filter_type': 'eventFilterType',
         'event_query': 'eventQuery',
-        'default_time_window': 'defaultTimeWindow',
-        'default_start_time': 'defaultStartTime',
-        'default_end_time': 'defaultEndTime',
-        'chart_title_color': 'chartTitleColor',
-        'chart_title_bg_color': 'chartTitleBgColor',
-        'views_last_day': 'viewsLastDay',
-        'views_last_week': 'viewsLastWeek',
-        'views_last_month': 'viewsLastMonth',
-        'acl': 'acl',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'deleted': 'deleted',
-        'num_charts': 'numCharts',
         'favorite': 'favorite',
+        'hidden': 'hidden',
+        'id': 'id',
+        'name': 'name',
+        'num_charts': 'numCharts',
         'num_favorites': 'numFavorites',
         'orphan': 'orphan',
-        'name': 'name'
+        'parameter_details': 'parameterDetails',
+        'parameters': 'parameters',
+        'sections': 'sections',
+        'system_owned': 'systemOwned',
+        'tags': 'tags',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId',
+        'url': 'url',
+        'views_last_day': 'viewsLastDay',
+        'views_last_month': 'viewsLastMonth',
+        'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, can_user_modify=None, description=None, hidden=None, parameters=None, tags=None, customer=None, url=None, system_owned=None, creator_id=None, updater_id=None, id=None, event_filter_type=None, sections=None, parameter_details=None, display_description=None, display_section_table_of_contents=None, display_query_parameters=None, chart_title_scalar=None, event_query=None, default_time_window=None, default_start_time=None, default_end_time=None, chart_title_color=None, chart_title_bg_color=None, views_last_day=None, views_last_week=None, views_last_month=None, acl=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, num_charts=None, favorite=None, num_favorites=None, orphan=None, name=None):  # noqa: E501
+    def __init__(self, acl=None, can_user_modify=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, hidden=None, id=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
 
+        self._acl = None
         self._can_user_modify = None
-        self._description = None
-        self._hidden = None
-        self._parameters = None
-        self._tags = None
-        self._customer = None
-        self._url = None
-        self._system_owned = None
+        self._chart_title_bg_color = None
+        self._chart_title_color = None
+        self._chart_title_scalar = None
+        self._created_epoch_millis = None
         self._creator_id = None
-        self._updater_id = None
-        self._id = None
-        self._event_filter_type = None
-        self._sections = None
-        self._parameter_details = None
+        self._customer = None
+        self._default_end_time = None
+        self._default_start_time = None
+        self._default_time_window = None
+        self._deleted = None
+        self._description = None
         self._display_description = None
-        self._display_section_table_of_contents = None
         self._display_query_parameters = None
-        self._chart_title_scalar = None
+        self._display_section_table_of_contents = None
+        self._event_filter_type = None
         self._event_query = None
-        self._default_time_window = None
-        self._default_start_time = None
-        self._default_end_time = None
-        self._chart_title_color = None
-        self._chart_title_bg_color = None
-        self._views_last_day = None
-        self._views_last_week = None
-        self._views_last_month = None
-        self._acl = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._deleted = None
-        self._num_charts = None
         self._favorite = None
+        self._hidden = None
+        self._id = None
+        self._name = None
+        self._num_charts = None
         self._num_favorites = None
         self._orphan = None
-        self._name = None
+        self._parameter_details = None
+        self._parameters = None
+        self._sections = None
+        self._system_owned = None
+        self._tags = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self._url = None
+        self._views_last_day = None
+        self._views_last_month = None
+        self._views_last_week = None
         self.discriminator = None
 
+        if acl is not None:
+            self.acl = acl
         if can_user_modify is not None:
             self.can_user_modify = can_user_modify
-        if description is not None:
-            self.description = description
-        if hidden is not None:
-            self.hidden = hidden
-        if parameters is not None:
-            self.parameters = parameters
-        if tags is not None:
-            self.tags = tags
-        if customer is not None:
-            self.customer = customer
-        self.url = url
-        if system_owned is not None:
-            self.system_owned = system_owned
+        if chart_title_bg_color is not None:
+            self.chart_title_bg_color = chart_title_bg_color
+        if chart_title_color is not None:
+            self.chart_title_color = chart_title_color
+        if chart_title_scalar is not None:
+            self.chart_title_scalar = chart_title_scalar
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
         if creator_id is not None:
             self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
-        self.id = id
-        if event_filter_type is not None:
-            self.event_filter_type = event_filter_type
-        self.sections = sections
-        if parameter_details is not None:
-            self.parameter_details = parameter_details
+        if customer is not None:
+            self.customer = customer
+        if default_end_time is not None:
+            self.default_end_time = default_end_time
+        if default_start_time is not None:
+            self.default_start_time = default_start_time
+        if default_time_window is not None:
+            self.default_time_window = default_time_window
+        if deleted is not None:
+            self.deleted = deleted
+        if description is not None:
+            self.description = description
         if display_description is not None:
             self.display_description = display_description
-        if display_section_table_of_contents is not None:
-            self.display_section_table_of_contents = display_section_table_of_contents
         if display_query_parameters is not None:
             self.display_query_parameters = display_query_parameters
-        if chart_title_scalar is not None:
-            self.chart_title_scalar = chart_title_scalar
+        if display_section_table_of_contents is not None:
+            self.display_section_table_of_contents = display_section_table_of_contents
+        if event_filter_type is not None:
+            self.event_filter_type = event_filter_type
         if event_query is not None:
             self.event_query = event_query
-        if default_time_window is not None:
-            self.default_time_window = default_time_window
-        if default_start_time is not None:
-            self.default_start_time = default_start_time
-        if default_end_time is not None:
-            self.default_end_time = default_end_time
-        if chart_title_color is not None:
-            self.chart_title_color = chart_title_color
-        if chart_title_bg_color is not None:
-            self.chart_title_bg_color = chart_title_bg_color
-        if views_last_day is not None:
-            self.views_last_day = views_last_day
-        if views_last_week is not None:
-            self.views_last_week = views_last_week
-        if views_last_month is not None:
-            self.views_last_month = views_last_month
-        if acl is not None:
-            self.acl = acl
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        if deleted is not None:
-            self.deleted = deleted
-        if num_charts is not None:
-            self.num_charts = num_charts
         if favorite is not None:
             self.favorite = favorite
+        if hidden is not None:
+            self.hidden = hidden
+        self.id = id
+        self.name = name
+        if num_charts is not None:
+            self.num_charts = num_charts
         if num_favorites is not None:
             self.num_favorites = num_favorites
         if orphan is not None:
             self.orphan = orphan
-        self.name = name
-
-    @property
-    def can_user_modify(self):
-        """Gets the can_user_modify of this Dashboard.  # noqa: E501
-
-
-        :return: The can_user_modify of this Dashboard.  # noqa: E501
-        :rtype: bool
-        """
-        return self._can_user_modify
-
-    @can_user_modify.setter
-    def can_user_modify(self, can_user_modify):
-        """Sets the can_user_modify of this Dashboard.
-
-
-        :param can_user_modify: The can_user_modify of this Dashboard.  # noqa: E501
-        :type: bool
-        """
-
-        self._can_user_modify = can_user_modify
-
-    @property
-    def description(self):
-        """Gets the description of this Dashboard.  # noqa: E501
-
-        Human-readable description of the dashboard  # noqa: E501
-
-        :return: The description of this Dashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Dashboard.
-
-        Human-readable description of the dashboard  # noqa: E501
-
-        :param description: The description of this Dashboard.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
+        if parameter_details is not None:
+            self.parameter_details = parameter_details
+        if parameters is not None:
+            self.parameters = parameters
+        self.sections = sections
+        if system_owned is not None:
+            self.system_owned = system_owned
+        if tags is not None:
+            self.tags = tags
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+        self.url = url
+        if views_last_day is not None:
+            self.views_last_day = views_last_day
+        if views_last_month is not None:
+            self.views_last_month = views_last_month
+        if views_last_week is not None:
+            self.views_last_week = views_last_week
 
     @property
-    def hidden(self):
-        """Gets the hidden of this Dashboard.  # noqa: E501
+    def acl(self):
+        """Gets the acl of this Dashboard.  # noqa: E501
 
 
-        :return: The hidden of this Dashboard.  # noqa: E501
-        :rtype: bool
+        :return: The acl of this Dashboard.  # noqa: E501
+        :rtype: AccessControlListSimple
         """
-        return self._hidden
+        return self._acl
 
-    @hidden.setter
-    def hidden(self, hidden):
-        """Sets the hidden of this Dashboard.
+    @acl.setter
+    def acl(self, acl):
+        """Sets the acl of this Dashboard.
 
 
-        :param hidden: The hidden of this Dashboard.  # noqa: E501
-        :type: bool
+        :param acl: The acl of this Dashboard.  # noqa: E501
+        :type: AccessControlListSimple
         """
 
-        self._hidden = hidden
+        self._acl = acl
 
     @property
-    def parameters(self):
-        """Gets the parameters of this Dashboard.  # noqa: E501
+    def can_user_modify(self):
+        """Gets the can_user_modify of this Dashboard.  # noqa: E501
 
-        Deprecated.  An obsolete representation of dashboard parameters  # noqa: E501
 
-        :return: The parameters of this Dashboard.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The can_user_modify of this Dashboard.  # noqa: E501
+        :rtype: bool
         """
-        return self._parameters
+        return self._can_user_modify
 
-    @parameters.setter
-    def parameters(self, parameters):
-        """Sets the parameters of this Dashboard.
+    @can_user_modify.setter
+    def can_user_modify(self, can_user_modify):
+        """Sets the can_user_modify of this Dashboard.
 
-        Deprecated.  An obsolete representation of dashboard parameters  # noqa: E501
 
-        :param parameters: The parameters of this Dashboard.  # noqa: E501
-        :type: dict(str, str)
+        :param can_user_modify: The can_user_modify of this Dashboard.  # noqa: E501
+        :type: bool
         """
 
-        self._parameters = parameters
+        self._can_user_modify = can_user_modify
 
     @property
-    def tags(self):
-        """Gets the tags of this Dashboard.  # noqa: E501
+    def chart_title_bg_color(self):
+        """Gets the chart_title_bg_color of this Dashboard.  # noqa: E501
 
+        Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :return: The tags of this Dashboard.  # noqa: E501
-        :rtype: WFTags
+        :return: The chart_title_bg_color of this Dashboard.  # noqa: E501
+        :rtype: str
         """
-        return self._tags
+        return self._chart_title_bg_color
 
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this Dashboard.
+    @chart_title_bg_color.setter
+    def chart_title_bg_color(self, chart_title_bg_color):
+        """Sets the chart_title_bg_color of this Dashboard.
 
+        Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :param tags: The tags of this Dashboard.  # noqa: E501
-        :type: WFTags
+        :param chart_title_bg_color: The chart_title_bg_color of this Dashboard.  # noqa: E501
+        :type: str
         """
 
-        self._tags = tags
+        self._chart_title_bg_color = chart_title_bg_color
 
     @property
-    def customer(self):
-        """Gets the customer of this Dashboard.  # noqa: E501
+    def chart_title_color(self):
+        """Gets the chart_title_color of this Dashboard.  # noqa: E501
 
-        id of the customer to which this dashboard belongs  # noqa: E501
+        Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :return: The customer of this Dashboard.  # noqa: E501
+        :return: The chart_title_color of this Dashboard.  # noqa: E501
         :rtype: str
         """
-        return self._customer
+        return self._chart_title_color
 
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this Dashboard.
+    @chart_title_color.setter
+    def chart_title_color(self, chart_title_color):
+        """Sets the chart_title_color of this Dashboard.
 
-        id of the customer to which this dashboard belongs  # noqa: E501
+        Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :param customer: The customer of this Dashboard.  # noqa: E501
+        :param chart_title_color: The chart_title_color of this Dashboard.  # noqa: E501
         :type: str
         """
 
-        self._customer = customer
+        self._chart_title_color = chart_title_color
 
     @property
-    def url(self):
-        """Gets the url of this Dashboard.  # noqa: E501
+    def chart_title_scalar(self):
+        """Gets the chart_title_scalar of this Dashboard.  # noqa: E501
 
-        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+        Scale (normally 100) of chart title text size  # noqa: E501
 
-        :return: The url of this Dashboard.  # noqa: E501
-        :rtype: str
+        :return: The chart_title_scalar of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._url
+        return self._chart_title_scalar
 
-    @url.setter
-    def url(self, url):
-        """Sets the url of this Dashboard.
+    @chart_title_scalar.setter
+    def chart_title_scalar(self, chart_title_scalar):
+        """Sets the chart_title_scalar of this Dashboard.
 
-        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+        Scale (normally 100) of chart title text size  # noqa: E501
 
-        :param url: The url of this Dashboard.  # noqa: E501
-        :type: str
+        :param chart_title_scalar: The chart_title_scalar of this Dashboard.  # noqa: E501
+        :type: int
         """
-        if url is None:
-            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
 
-        self._url = url
+        self._chart_title_scalar = chart_title_scalar
 
     @property
-    def system_owned(self):
-        """Gets the system_owned of this Dashboard.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Dashboard.  # noqa: E501
 
-        Whether this dashboard is system-owned and not writeable  # noqa: E501
 
-        :return: The system_owned of this Dashboard.  # noqa: E501
-        :rtype: bool
+        :return: The created_epoch_millis of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._system_owned
+        return self._created_epoch_millis
 
-    @system_owned.setter
-    def system_owned(self, system_owned):
-        """Sets the system_owned of this Dashboard.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Dashboard.
 
-        Whether this dashboard is system-owned and not writeable  # noqa: E501
 
-        :param system_owned: The system_owned of this Dashboard.  # noqa: E501
-        :type: bool
+        :param created_epoch_millis: The created_epoch_millis of this Dashboard.  # noqa: E501
+        :type: int
         """
 
-        self._system_owned = system_owned
+        self._created_epoch_millis = created_epoch_millis
 
     @property
     def creator_id(self):
@@ -425,127 +377,140 @@ def creator_id(self, creator_id):
         self._creator_id = creator_id
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this Dashboard.  # noqa: E501
+    def customer(self):
+        """Gets the customer of this Dashboard.  # noqa: E501
 
+        id of the customer to which this dashboard belongs  # noqa: E501
 
-        :return: The updater_id of this Dashboard.  # noqa: E501
+        :return: The customer of this Dashboard.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._customer
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Dashboard.
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this Dashboard.
 
+        id of the customer to which this dashboard belongs  # noqa: E501
 
-        :param updater_id: The updater_id of this Dashboard.  # noqa: E501
+        :param customer: The customer of this Dashboard.  # noqa: E501
         :type: str
         """
 
-        self._updater_id = updater_id
+        self._customer = customer
 
     @property
-    def id(self):
-        """Gets the id of this Dashboard.  # noqa: E501
+    def default_end_time(self):
+        """Gets the default_end_time of this Dashboard.  # noqa: E501
 
-        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+        Default end time in milliseconds to query charts  # noqa: E501
 
-        :return: The id of this Dashboard.  # noqa: E501
-        :rtype: str
+        :return: The default_end_time of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._id
+        return self._default_end_time
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Dashboard.
+    @default_end_time.setter
+    def default_end_time(self, default_end_time):
+        """Sets the default_end_time of this Dashboard.
 
-        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+        Default end time in milliseconds to query charts  # noqa: E501
 
-        :param id: The id of this Dashboard.  # noqa: E501
-        :type: str
+        :param default_end_time: The default_end_time of this Dashboard.  # noqa: E501
+        :type: int
         """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._id = id
+        self._default_end_time = default_end_time
 
     @property
-    def event_filter_type(self):
-        """Gets the event_filter_type of this Dashboard.  # noqa: E501
+    def default_start_time(self):
+        """Gets the default_start_time of this Dashboard.  # noqa: E501
 
-        How charts belonging to this dashboard should display events.  BYCHART is default if unspecified  # noqa: E501
+        Default start time in milliseconds to query charts  # noqa: E501
 
-        :return: The event_filter_type of this Dashboard.  # noqa: E501
+        :return: The default_start_time of this Dashboard.  # noqa: E501
+        :rtype: int
+        """
+        return self._default_start_time
+
+    @default_start_time.setter
+    def default_start_time(self, default_start_time):
+        """Sets the default_start_time of this Dashboard.
+
+        Default start time in milliseconds to query charts  # noqa: E501
+
+        :param default_start_time: The default_start_time of this Dashboard.  # noqa: E501
+        :type: int
+        """
+
+        self._default_start_time = default_start_time
+
+    @property
+    def default_time_window(self):
+        """Gets the default_time_window of this Dashboard.  # noqa: E501
+
+        Default time window to query charts  # noqa: E501
+
+        :return: The default_time_window of this Dashboard.  # noqa: E501
         :rtype: str
         """
-        return self._event_filter_type
+        return self._default_time_window
 
-    @event_filter_type.setter
-    def event_filter_type(self, event_filter_type):
-        """Sets the event_filter_type of this Dashboard.
+    @default_time_window.setter
+    def default_time_window(self, default_time_window):
+        """Sets the default_time_window of this Dashboard.
 
-        How charts belonging to this dashboard should display events.  BYCHART is default if unspecified  # noqa: E501
+        Default time window to query charts  # noqa: E501
 
-        :param event_filter_type: The event_filter_type of this Dashboard.  # noqa: E501
+        :param default_time_window: The default_time_window of this Dashboard.  # noqa: E501
         :type: str
         """
-        allowed_values = ["BYCHART", "AUTOMATIC", "ALL", "NONE", "BYDASHBOARD", "BYCHARTANDDASHBOARD"]  # noqa: E501
-        if event_filter_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `event_filter_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(event_filter_type, allowed_values)
-            )
 
-        self._event_filter_type = event_filter_type
+        self._default_time_window = default_time_window
 
     @property
-    def sections(self):
-        """Gets the sections of this Dashboard.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this Dashboard.  # noqa: E501
 
-        Dashboard chart sections  # noqa: E501
 
-        :return: The sections of this Dashboard.  # noqa: E501
-        :rtype: list[DashboardSection]
+        :return: The deleted of this Dashboard.  # noqa: E501
+        :rtype: bool
         """
-        return self._sections
+        return self._deleted
 
-    @sections.setter
-    def sections(self, sections):
-        """Sets the sections of this Dashboard.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this Dashboard.
 
-        Dashboard chart sections  # noqa: E501
 
-        :param sections: The sections of this Dashboard.  # noqa: E501
-        :type: list[DashboardSection]
+        :param deleted: The deleted of this Dashboard.  # noqa: E501
+        :type: bool
         """
-        if sections is None:
-            raise ValueError("Invalid value for `sections`, must not be `None`")  # noqa: E501
 
-        self._sections = sections
+        self._deleted = deleted
 
     @property
-    def parameter_details(self):
-        """Gets the parameter_details of this Dashboard.  # noqa: E501
-
-        The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation  # noqa: E501
+    def description(self):
+        """Gets the description of this Dashboard.  # noqa: E501
 
-        :return: The parameter_details of this Dashboard.  # noqa: E501
-        :rtype: dict(str, DashboardParameterValue)
+        Human-readable description of the dashboard  # noqa: E501
+
+        :return: The description of this Dashboard.  # noqa: E501
+        :rtype: str
         """
-        return self._parameter_details
+        return self._description
 
-    @parameter_details.setter
-    def parameter_details(self, parameter_details):
-        """Sets the parameter_details of this Dashboard.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Dashboard.
 
-        The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation  # noqa: E501
+        Human-readable description of the dashboard  # noqa: E501
 
-        :param parameter_details: The parameter_details of this Dashboard.  # noqa: E501
-        :type: dict(str, DashboardParameterValue)
+        :param description: The description of this Dashboard.  # noqa: E501
+        :type: str
         """
 
-        self._parameter_details = parameter_details
+        self._description = description
 
     @property
     def display_description(self):
@@ -571,73 +536,79 @@ def display_description(self, display_description):
         self._display_description = display_description
 
     @property
-    def display_section_table_of_contents(self):
-        """Gets the display_section_table_of_contents of this Dashboard.  # noqa: E501
+    def display_query_parameters(self):
+        """Gets the display_query_parameters of this Dashboard.  # noqa: E501
 
-        Whether the \"pills\" quick-linked the sections of the dashboard are displayed by default when the dashboard is shown  # noqa: E501
+        Whether the dashboard parameters section is opened by default when the dashboard is shown  # noqa: E501
 
-        :return: The display_section_table_of_contents of this Dashboard.  # noqa: E501
+        :return: The display_query_parameters of this Dashboard.  # noqa: E501
         :rtype: bool
         """
-        return self._display_section_table_of_contents
+        return self._display_query_parameters
 
-    @display_section_table_of_contents.setter
-    def display_section_table_of_contents(self, display_section_table_of_contents):
-        """Sets the display_section_table_of_contents of this Dashboard.
+    @display_query_parameters.setter
+    def display_query_parameters(self, display_query_parameters):
+        """Sets the display_query_parameters of this Dashboard.
 
-        Whether the \"pills\" quick-linked the sections of the dashboard are displayed by default when the dashboard is shown  # noqa: E501
+        Whether the dashboard parameters section is opened by default when the dashboard is shown  # noqa: E501
 
-        :param display_section_table_of_contents: The display_section_table_of_contents of this Dashboard.  # noqa: E501
+        :param display_query_parameters: The display_query_parameters of this Dashboard.  # noqa: E501
         :type: bool
         """
 
-        self._display_section_table_of_contents = display_section_table_of_contents
+        self._display_query_parameters = display_query_parameters
 
     @property
-    def display_query_parameters(self):
-        """Gets the display_query_parameters of this Dashboard.  # noqa: E501
+    def display_section_table_of_contents(self):
+        """Gets the display_section_table_of_contents of this Dashboard.  # noqa: E501
 
-        Whether the dashboard parameters section is opened by default when the dashboard is shown  # noqa: E501
+        Whether the \"pills\" quick-linked the sections of the dashboard are displayed by default when the dashboard is shown  # noqa: E501
 
-        :return: The display_query_parameters of this Dashboard.  # noqa: E501
+        :return: The display_section_table_of_contents of this Dashboard.  # noqa: E501
         :rtype: bool
         """
-        return self._display_query_parameters
+        return self._display_section_table_of_contents
 
-    @display_query_parameters.setter
-    def display_query_parameters(self, display_query_parameters):
-        """Sets the display_query_parameters of this Dashboard.
+    @display_section_table_of_contents.setter
+    def display_section_table_of_contents(self, display_section_table_of_contents):
+        """Sets the display_section_table_of_contents of this Dashboard.
 
-        Whether the dashboard parameters section is opened by default when the dashboard is shown  # noqa: E501
+        Whether the \"pills\" quick-linked the sections of the dashboard are displayed by default when the dashboard is shown  # noqa: E501
 
-        :param display_query_parameters: The display_query_parameters of this Dashboard.  # noqa: E501
+        :param display_section_table_of_contents: The display_section_table_of_contents of this Dashboard.  # noqa: E501
         :type: bool
         """
 
-        self._display_query_parameters = display_query_parameters
+        self._display_section_table_of_contents = display_section_table_of_contents
 
     @property
-    def chart_title_scalar(self):
-        """Gets the chart_title_scalar of this Dashboard.  # noqa: E501
+    def event_filter_type(self):
+        """Gets the event_filter_type of this Dashboard.  # noqa: E501
 
-        Scale (normally 100) of chart title text size  # noqa: E501
+        How charts belonging to this dashboard should display events.  BYCHART is default if unspecified  # noqa: E501
 
-        :return: The chart_title_scalar of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The event_filter_type of this Dashboard.  # noqa: E501
+        :rtype: str
         """
-        return self._chart_title_scalar
+        return self._event_filter_type
 
-    @chart_title_scalar.setter
-    def chart_title_scalar(self, chart_title_scalar):
-        """Sets the chart_title_scalar of this Dashboard.
+    @event_filter_type.setter
+    def event_filter_type(self, event_filter_type):
+        """Sets the event_filter_type of this Dashboard.
 
-        Scale (normally 100) of chart title text size  # noqa: E501
+        How charts belonging to this dashboard should display events.  BYCHART is default if unspecified  # noqa: E501
 
-        :param chart_title_scalar: The chart_title_scalar of this Dashboard.  # noqa: E501
-        :type: int
+        :param event_filter_type: The event_filter_type of this Dashboard.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["BYCHART", "AUTOMATIC", "ALL", "NONE", "BYDASHBOARD", "BYCHARTANDDASHBOARD"]  # noqa: E501
+        if event_filter_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `event_filter_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(event_filter_type, allowed_values)
+            )
 
-        self._chart_title_scalar = chart_title_scalar
+        self._event_filter_type = event_filter_type
 
     @property
     def event_query(self):
@@ -663,224 +634,274 @@ def event_query(self, event_query):
         self._event_query = event_query
 
     @property
-    def default_time_window(self):
-        """Gets the default_time_window of this Dashboard.  # noqa: E501
+    def favorite(self):
+        """Gets the favorite of this Dashboard.  # noqa: E501
 
-        Default time window to query charts  # noqa: E501
 
-        :return: The default_time_window of this Dashboard.  # noqa: E501
+        :return: The favorite of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._favorite
+
+    @favorite.setter
+    def favorite(self, favorite):
+        """Sets the favorite of this Dashboard.
+
+
+        :param favorite: The favorite of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._favorite = favorite
+
+    @property
+    def hidden(self):
+        """Gets the hidden of this Dashboard.  # noqa: E501
+
+
+        :return: The hidden of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Dashboard.
+
+
+        :param hidden: The hidden of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def id(self):
+        """Gets the id of this Dashboard.  # noqa: E501
+
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+
+        :return: The id of this Dashboard.  # noqa: E501
         :rtype: str
         """
-        return self._default_time_window
+        return self._id
 
-    @default_time_window.setter
-    def default_time_window(self, default_time_window):
-        """Sets the default_time_window of this Dashboard.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Dashboard.
 
-        Default time window to query charts  # noqa: E501
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
 
-        :param default_time_window: The default_time_window of this Dashboard.  # noqa: E501
+        :param id: The id of this Dashboard.  # noqa: E501
         :type: str
         """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._default_time_window = default_time_window
+        self._id = id
 
     @property
-    def default_start_time(self):
-        """Gets the default_start_time of this Dashboard.  # noqa: E501
+    def name(self):
+        """Gets the name of this Dashboard.  # noqa: E501
 
-        Default start time in milliseconds to query charts  # noqa: E501
+        Name of the dashboard  # noqa: E501
 
-        :return: The default_start_time of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The name of this Dashboard.  # noqa: E501
+        :rtype: str
         """
-        return self._default_start_time
+        return self._name
 
-    @default_start_time.setter
-    def default_start_time(self, default_start_time):
-        """Sets the default_start_time of this Dashboard.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Dashboard.
 
-        Default start time in milliseconds to query charts  # noqa: E501
+        Name of the dashboard  # noqa: E501
 
-        :param default_start_time: The default_start_time of this Dashboard.  # noqa: E501
-        :type: int
+        :param name: The name of this Dashboard.  # noqa: E501
+        :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._default_start_time = default_start_time
+        self._name = name
 
     @property
-    def default_end_time(self):
-        """Gets the default_end_time of this Dashboard.  # noqa: E501
+    def num_charts(self):
+        """Gets the num_charts of this Dashboard.  # noqa: E501
 
-        Default end time in milliseconds to query charts  # noqa: E501
 
-        :return: The default_end_time of this Dashboard.  # noqa: E501
+        :return: The num_charts of this Dashboard.  # noqa: E501
         :rtype: int
         """
-        return self._default_end_time
+        return self._num_charts
 
-    @default_end_time.setter
-    def default_end_time(self, default_end_time):
-        """Sets the default_end_time of this Dashboard.
+    @num_charts.setter
+    def num_charts(self, num_charts):
+        """Sets the num_charts of this Dashboard.
 
-        Default end time in milliseconds to query charts  # noqa: E501
 
-        :param default_end_time: The default_end_time of this Dashboard.  # noqa: E501
+        :param num_charts: The num_charts of this Dashboard.  # noqa: E501
         :type: int
         """
 
-        self._default_end_time = default_end_time
+        self._num_charts = num_charts
 
     @property
-    def chart_title_color(self):
-        """Gets the chart_title_color of this Dashboard.  # noqa: E501
+    def num_favorites(self):
+        """Gets the num_favorites of this Dashboard.  # noqa: E501
 
-        Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :return: The chart_title_color of this Dashboard.  # noqa: E501
-        :rtype: str
+        :return: The num_favorites of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._chart_title_color
+        return self._num_favorites
 
-    @chart_title_color.setter
-    def chart_title_color(self, chart_title_color):
-        """Sets the chart_title_color of this Dashboard.
+    @num_favorites.setter
+    def num_favorites(self, num_favorites):
+        """Sets the num_favorites of this Dashboard.
 
-        Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :param chart_title_color: The chart_title_color of this Dashboard.  # noqa: E501
-        :type: str
+        :param num_favorites: The num_favorites of this Dashboard.  # noqa: E501
+        :type: int
         """
 
-        self._chart_title_color = chart_title_color
+        self._num_favorites = num_favorites
 
     @property
-    def chart_title_bg_color(self):
-        """Gets the chart_title_bg_color of this Dashboard.  # noqa: E501
+    def orphan(self):
+        """Gets the orphan of this Dashboard.  # noqa: E501
 
-        Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :return: The chart_title_bg_color of this Dashboard.  # noqa: E501
-        :rtype: str
+        :return: The orphan of this Dashboard.  # noqa: E501
+        :rtype: bool
         """
-        return self._chart_title_bg_color
+        return self._orphan
 
-    @chart_title_bg_color.setter
-    def chart_title_bg_color(self, chart_title_bg_color):
-        """Sets the chart_title_bg_color of this Dashboard.
+    @orphan.setter
+    def orphan(self, orphan):
+        """Sets the orphan of this Dashboard.
 
-        Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue)  # noqa: E501
 
-        :param chart_title_bg_color: The chart_title_bg_color of this Dashboard.  # noqa: E501
-        :type: str
+        :param orphan: The orphan of this Dashboard.  # noqa: E501
+        :type: bool
         """
 
-        self._chart_title_bg_color = chart_title_bg_color
+        self._orphan = orphan
 
     @property
-    def views_last_day(self):
-        """Gets the views_last_day of this Dashboard.  # noqa: E501
+    def parameter_details(self):
+        """Gets the parameter_details of this Dashboard.  # noqa: E501
 
+        The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation  # noqa: E501
 
-        :return: The views_last_day of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The parameter_details of this Dashboard.  # noqa: E501
+        :rtype: dict(str, DashboardParameterValue)
         """
-        return self._views_last_day
+        return self._parameter_details
 
-    @views_last_day.setter
-    def views_last_day(self, views_last_day):
-        """Sets the views_last_day of this Dashboard.
+    @parameter_details.setter
+    def parameter_details(self, parameter_details):
+        """Sets the parameter_details of this Dashboard.
 
+        The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation  # noqa: E501
 
-        :param views_last_day: The views_last_day of this Dashboard.  # noqa: E501
-        :type: int
+        :param parameter_details: The parameter_details of this Dashboard.  # noqa: E501
+        :type: dict(str, DashboardParameterValue)
         """
 
-        self._views_last_day = views_last_day
+        self._parameter_details = parameter_details
 
     @property
-    def views_last_week(self):
-        """Gets the views_last_week of this Dashboard.  # noqa: E501
+    def parameters(self):
+        """Gets the parameters of this Dashboard.  # noqa: E501
 
+        Deprecated.  An obsolete representation of dashboard parameters  # noqa: E501
 
-        :return: The views_last_week of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The parameters of this Dashboard.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._views_last_week
+        return self._parameters
 
-    @views_last_week.setter
-    def views_last_week(self, views_last_week):
-        """Sets the views_last_week of this Dashboard.
+    @parameters.setter
+    def parameters(self, parameters):
+        """Sets the parameters of this Dashboard.
 
+        Deprecated.  An obsolete representation of dashboard parameters  # noqa: E501
 
-        :param views_last_week: The views_last_week of this Dashboard.  # noqa: E501
-        :type: int
+        :param parameters: The parameters of this Dashboard.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._views_last_week = views_last_week
+        self._parameters = parameters
 
     @property
-    def views_last_month(self):
-        """Gets the views_last_month of this Dashboard.  # noqa: E501
+    def sections(self):
+        """Gets the sections of this Dashboard.  # noqa: E501
 
+        Dashboard chart sections  # noqa: E501
 
-        :return: The views_last_month of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The sections of this Dashboard.  # noqa: E501
+        :rtype: list[DashboardSection]
         """
-        return self._views_last_month
+        return self._sections
 
-    @views_last_month.setter
-    def views_last_month(self, views_last_month):
-        """Sets the views_last_month of this Dashboard.
+    @sections.setter
+    def sections(self, sections):
+        """Sets the sections of this Dashboard.
 
+        Dashboard chart sections  # noqa: E501
 
-        :param views_last_month: The views_last_month of this Dashboard.  # noqa: E501
-        :type: int
+        :param sections: The sections of this Dashboard.  # noqa: E501
+        :type: list[DashboardSection]
         """
+        if sections is None:
+            raise ValueError("Invalid value for `sections`, must not be `None`")  # noqa: E501
 
-        self._views_last_month = views_last_month
+        self._sections = sections
 
     @property
-    def acl(self):
-        """Gets the acl of this Dashboard.  # noqa: E501
+    def system_owned(self):
+        """Gets the system_owned of this Dashboard.  # noqa: E501
 
+        Whether this dashboard is system-owned and not writeable  # noqa: E501
 
-        :return: The acl of this Dashboard.  # noqa: E501
-        :rtype: AccessControlListSimple
+        :return: The system_owned of this Dashboard.  # noqa: E501
+        :rtype: bool
         """
-        return self._acl
+        return self._system_owned
 
-    @acl.setter
-    def acl(self, acl):
-        """Sets the acl of this Dashboard.
+    @system_owned.setter
+    def system_owned(self, system_owned):
+        """Sets the system_owned of this Dashboard.
 
+        Whether this dashboard is system-owned and not writeable  # noqa: E501
 
-        :param acl: The acl of this Dashboard.  # noqa: E501
-        :type: AccessControlListSimple
+        :param system_owned: The system_owned of this Dashboard.  # noqa: E501
+        :type: bool
         """
 
-        self._acl = acl
+        self._system_owned = system_owned
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Dashboard.  # noqa: E501
+    def tags(self):
+        """Gets the tags of this Dashboard.  # noqa: E501
 
 
-        :return: The created_epoch_millis of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The tags of this Dashboard.  # noqa: E501
+        :rtype: WFTags
         """
-        return self._created_epoch_millis
+        return self._tags
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Dashboard.
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this Dashboard.
 
 
-        :param created_epoch_millis: The created_epoch_millis of this Dashboard.  # noqa: E501
-        :type: int
+        :param tags: The tags of this Dashboard.  # noqa: E501
+        :type: WFTags
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._tags = tags
 
     @property
     def updated_epoch_millis(self):
@@ -904,134 +925,113 @@ def updated_epoch_millis(self, updated_epoch_millis):
         self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def deleted(self):
-        """Gets the deleted of this Dashboard.  # noqa: E501
-
-
-        :return: The deleted of this Dashboard.  # noqa: E501
-        :rtype: bool
-        """
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this Dashboard.
-
-
-        :param deleted: The deleted of this Dashboard.  # noqa: E501
-        :type: bool
-        """
-
-        self._deleted = deleted
-
-    @property
-    def num_charts(self):
-        """Gets the num_charts of this Dashboard.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Dashboard.  # noqa: E501
 
 
-        :return: The num_charts of this Dashboard.  # noqa: E501
-        :rtype: int
+        :return: The updater_id of this Dashboard.  # noqa: E501
+        :rtype: str
         """
-        return self._num_charts
+        return self._updater_id
 
-    @num_charts.setter
-    def num_charts(self, num_charts):
-        """Sets the num_charts of this Dashboard.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Dashboard.
 
 
-        :param num_charts: The num_charts of this Dashboard.  # noqa: E501
-        :type: int
+        :param updater_id: The updater_id of this Dashboard.  # noqa: E501
+        :type: str
         """
 
-        self._num_charts = num_charts
+        self._updater_id = updater_id
 
     @property
-    def favorite(self):
-        """Gets the favorite of this Dashboard.  # noqa: E501
+    def url(self):
+        """Gets the url of this Dashboard.  # noqa: E501
 
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
 
-        :return: The favorite of this Dashboard.  # noqa: E501
-        :rtype: bool
+        :return: The url of this Dashboard.  # noqa: E501
+        :rtype: str
         """
-        return self._favorite
+        return self._url
 
-    @favorite.setter
-    def favorite(self, favorite):
-        """Sets the favorite of this Dashboard.
+    @url.setter
+    def url(self, url):
+        """Sets the url of this Dashboard.
 
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
 
-        :param favorite: The favorite of this Dashboard.  # noqa: E501
-        :type: bool
+        :param url: The url of this Dashboard.  # noqa: E501
+        :type: str
         """
+        if url is None:
+            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
 
-        self._favorite = favorite
+        self._url = url
 
     @property
-    def num_favorites(self):
-        """Gets the num_favorites of this Dashboard.  # noqa: E501
+    def views_last_day(self):
+        """Gets the views_last_day of this Dashboard.  # noqa: E501
 
 
-        :return: The num_favorites of this Dashboard.  # noqa: E501
+        :return: The views_last_day of this Dashboard.  # noqa: E501
         :rtype: int
         """
-        return self._num_favorites
+        return self._views_last_day
 
-    @num_favorites.setter
-    def num_favorites(self, num_favorites):
-        """Sets the num_favorites of this Dashboard.
+    @views_last_day.setter
+    def views_last_day(self, views_last_day):
+        """Sets the views_last_day of this Dashboard.
 
 
-        :param num_favorites: The num_favorites of this Dashboard.  # noqa: E501
+        :param views_last_day: The views_last_day of this Dashboard.  # noqa: E501
         :type: int
         """
 
-        self._num_favorites = num_favorites
+        self._views_last_day = views_last_day
 
     @property
-    def orphan(self):
-        """Gets the orphan of this Dashboard.  # noqa: E501
+    def views_last_month(self):
+        """Gets the views_last_month of this Dashboard.  # noqa: E501
 
 
-        :return: The orphan of this Dashboard.  # noqa: E501
-        :rtype: bool
+        :return: The views_last_month of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._orphan
+        return self._views_last_month
 
-    @orphan.setter
-    def orphan(self, orphan):
-        """Sets the orphan of this Dashboard.
+    @views_last_month.setter
+    def views_last_month(self, views_last_month):
+        """Sets the views_last_month of this Dashboard.
 
 
-        :param orphan: The orphan of this Dashboard.  # noqa: E501
-        :type: bool
+        :param views_last_month: The views_last_month of this Dashboard.  # noqa: E501
+        :type: int
         """
 
-        self._orphan = orphan
+        self._views_last_month = views_last_month
 
     @property
-    def name(self):
-        """Gets the name of this Dashboard.  # noqa: E501
+    def views_last_week(self):
+        """Gets the views_last_week of this Dashboard.  # noqa: E501
 
-        Name of the dashboard  # noqa: E501
 
-        :return: The name of this Dashboard.  # noqa: E501
-        :rtype: str
+        :return: The views_last_week of this Dashboard.  # noqa: E501
+        :rtype: int
         """
-        return self._name
+        return self._views_last_week
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Dashboard.
+    @views_last_week.setter
+    def views_last_week(self, views_last_week):
+        """Sets the views_last_week of this Dashboard.
 
-        Name of the dashboard  # noqa: E501
 
-        :param name: The name of this Dashboard.  # noqa: E501
-        :type: str
+        :param views_last_week: The views_last_week of this Dashboard.  # noqa: E501
+        :type: int
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._views_last_week = views_last_week
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index b6cafb8..753d5d7 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -31,139 +31,166 @@ class DashboardParameterValue(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'allow_all': 'bool',
+        'default_value': 'str',
         'description': 'str',
+        'dynamic_field_type': 'str',
+        'hide_from_view': 'bool',
         'label': 'str',
         'multivalue': 'bool',
-        'hide_from_view': 'bool',
-        'allow_all': 'bool',
-        'dynamic_field_type': 'str',
-        'tag_key': 'str',
+        'parameter_type': 'str',
         'query_value': 'str',
         'reverse_dyn_sort': 'bool',
-        'parameter_type': 'str',
-        'default_value': 'str',
+        'tag_key': 'str',
         'values_to_readable_strings': 'dict(str, str)'
     }
 
     attribute_map = {
+        'allow_all': 'allowAll',
+        'default_value': 'defaultValue',
         'description': 'description',
+        'dynamic_field_type': 'dynamicFieldType',
+        'hide_from_view': 'hideFromView',
         'label': 'label',
         'multivalue': 'multivalue',
-        'hide_from_view': 'hideFromView',
-        'allow_all': 'allowAll',
-        'dynamic_field_type': 'dynamicFieldType',
-        'tag_key': 'tagKey',
+        'parameter_type': 'parameterType',
         'query_value': 'queryValue',
         'reverse_dyn_sort': 'reverseDynSort',
-        'parameter_type': 'parameterType',
-        'default_value': 'defaultValue',
+        'tag_key': 'tagKey',
         'values_to_readable_strings': 'valuesToReadableStrings'
     }
 
-    def __init__(self, description=None, label=None, multivalue=None, hide_from_view=None, allow_all=None, dynamic_field_type=None, tag_key=None, query_value=None, reverse_dyn_sort=None, parameter_type=None, default_value=None, values_to_readable_strings=None):  # noqa: E501
+    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, values_to_readable_strings=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
 
+        self._allow_all = None
+        self._default_value = None
         self._description = None
+        self._dynamic_field_type = None
+        self._hide_from_view = None
         self._label = None
         self._multivalue = None
-        self._hide_from_view = None
-        self._allow_all = None
-        self._dynamic_field_type = None
-        self._tag_key = None
+        self._parameter_type = None
         self._query_value = None
         self._reverse_dyn_sort = None
-        self._parameter_type = None
-        self._default_value = None
+        self._tag_key = None
         self._values_to_readable_strings = None
         self.discriminator = None
 
+        if allow_all is not None:
+            self.allow_all = allow_all
+        if default_value is not None:
+            self.default_value = default_value
         if description is not None:
             self.description = description
+        if dynamic_field_type is not None:
+            self.dynamic_field_type = dynamic_field_type
+        if hide_from_view is not None:
+            self.hide_from_view = hide_from_view
         if label is not None:
             self.label = label
         if multivalue is not None:
             self.multivalue = multivalue
-        if hide_from_view is not None:
-            self.hide_from_view = hide_from_view
-        if allow_all is not None:
-            self.allow_all = allow_all
-        if dynamic_field_type is not None:
-            self.dynamic_field_type = dynamic_field_type
-        if tag_key is not None:
-            self.tag_key = tag_key
+        if parameter_type is not None:
+            self.parameter_type = parameter_type
         if query_value is not None:
             self.query_value = query_value
         if reverse_dyn_sort is not None:
             self.reverse_dyn_sort = reverse_dyn_sort
-        if parameter_type is not None:
-            self.parameter_type = parameter_type
-        if default_value is not None:
-            self.default_value = default_value
+        if tag_key is not None:
+            self.tag_key = tag_key
         if values_to_readable_strings is not None:
             self.values_to_readable_strings = values_to_readable_strings
 
     @property
-    def description(self):
-        """Gets the description of this DashboardParameterValue.  # noqa: E501
+    def allow_all(self):
+        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The description of this DashboardParameterValue.  # noqa: E501
+        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :rtype: bool
+        """
+        return self._allow_all
+
+    @allow_all.setter
+    def allow_all(self, allow_all):
+        """Sets the allow_all of this DashboardParameterValue.
+
+
+        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
+        :type: bool
+        """
+
+        self._allow_all = allow_all
+
+    @property
+    def default_value(self):
+        """Gets the default_value of this DashboardParameterValue.  # noqa: E501
+
+
+        :return: The default_value of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._default_value
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this DashboardParameterValue.
+    @default_value.setter
+    def default_value(self, default_value):
+        """Sets the default_value of this DashboardParameterValue.
 
 
-        :param description: The description of this DashboardParameterValue.  # noqa: E501
+        :param default_value: The default_value of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._description = description
+        self._default_value = default_value
 
     @property
-    def label(self):
-        """Gets the label of this DashboardParameterValue.  # noqa: E501
+    def description(self):
+        """Gets the description of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The label of this DashboardParameterValue.  # noqa: E501
+        :return: The description of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._label
+        return self._description
 
-    @label.setter
-    def label(self, label):
-        """Sets the label of this DashboardParameterValue.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DashboardParameterValue.
 
 
-        :param label: The label of this DashboardParameterValue.  # noqa: E501
+        :param description: The description of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._label = label
+        self._description = description
 
     @property
-    def multivalue(self):
-        """Gets the multivalue of this DashboardParameterValue.  # noqa: E501
+    def dynamic_field_type(self):
+        """Gets the dynamic_field_type of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The multivalue of this DashboardParameterValue.  # noqa: E501
-        :rtype: bool
+        :return: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
         """
-        return self._multivalue
+        return self._dynamic_field_type
 
-    @multivalue.setter
-    def multivalue(self, multivalue):
-        """Sets the multivalue of this DashboardParameterValue.
+    @dynamic_field_type.setter
+    def dynamic_field_type(self, dynamic_field_type):
+        """Sets the dynamic_field_type of this DashboardParameterValue.
 
 
-        :param multivalue: The multivalue of this DashboardParameterValue.  # noqa: E501
-        :type: bool
+        :param dynamic_field_type: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["SOURCE", "SOURCE_TAG", "METRIC_NAME", "TAG_KEY", "MATCHING_SOURCE_TAG"]  # noqa: E501
+        if dynamic_field_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `dynamic_field_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(dynamic_field_type, allowed_values)
+            )
 
-        self._multivalue = multivalue
+        self._dynamic_field_type = dynamic_field_type
 
     @property
     def hide_from_view(self):
@@ -187,73 +214,73 @@ def hide_from_view(self, hide_from_view):
         self._hide_from_view = hide_from_view
 
     @property
-    def allow_all(self):
-        """Gets the allow_all of this DashboardParameterValue.  # noqa: E501
+    def label(self):
+        """Gets the label of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The allow_all of this DashboardParameterValue.  # noqa: E501
-        :rtype: bool
+        :return: The label of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
         """
-        return self._allow_all
+        return self._label
 
-    @allow_all.setter
-    def allow_all(self, allow_all):
-        """Sets the allow_all of this DashboardParameterValue.
+    @label.setter
+    def label(self, label):
+        """Sets the label of this DashboardParameterValue.
 
 
-        :param allow_all: The allow_all of this DashboardParameterValue.  # noqa: E501
-        :type: bool
+        :param label: The label of this DashboardParameterValue.  # noqa: E501
+        :type: str
         """
 
-        self._allow_all = allow_all
+        self._label = label
 
     @property
-    def dynamic_field_type(self):
-        """Gets the dynamic_field_type of this DashboardParameterValue.  # noqa: E501
+    def multivalue(self):
+        """Gets the multivalue of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
-        :rtype: str
+        :return: The multivalue of this DashboardParameterValue.  # noqa: E501
+        :rtype: bool
         """
-        return self._dynamic_field_type
+        return self._multivalue
 
-    @dynamic_field_type.setter
-    def dynamic_field_type(self, dynamic_field_type):
-        """Sets the dynamic_field_type of this DashboardParameterValue.
+    @multivalue.setter
+    def multivalue(self, multivalue):
+        """Sets the multivalue of this DashboardParameterValue.
 
 
-        :param dynamic_field_type: The dynamic_field_type of this DashboardParameterValue.  # noqa: E501
-        :type: str
+        :param multivalue: The multivalue of this DashboardParameterValue.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["SOURCE", "SOURCE_TAG", "METRIC_NAME", "TAG_KEY", "MATCHING_SOURCE_TAG"]  # noqa: E501
-        if dynamic_field_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `dynamic_field_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(dynamic_field_type, allowed_values)
-            )
 
-        self._dynamic_field_type = dynamic_field_type
+        self._multivalue = multivalue
 
     @property
-    def tag_key(self):
-        """Gets the tag_key of this DashboardParameterValue.  # noqa: E501
+    def parameter_type(self):
+        """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The tag_key of this DashboardParameterValue.  # noqa: E501
+        :return: The parameter_type of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._tag_key
+        return self._parameter_type
 
-    @tag_key.setter
-    def tag_key(self, tag_key):
-        """Sets the tag_key of this DashboardParameterValue.
+    @parameter_type.setter
+    def parameter_type(self, parameter_type):
+        """Sets the parameter_type of this DashboardParameterValue.
 
 
-        :param tag_key: The tag_key of this DashboardParameterValue.  # noqa: E501
+        :param parameter_type: The parameter_type of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
+        allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
+        if parameter_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(parameter_type, allowed_values)
+            )
 
-        self._tag_key = tag_key
+        self._parameter_type = parameter_type
 
     @property
     def query_value(self):
@@ -300,52 +327,25 @@ def reverse_dyn_sort(self, reverse_dyn_sort):
         self._reverse_dyn_sort = reverse_dyn_sort
 
     @property
-    def parameter_type(self):
-        """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
-
-
-        :return: The parameter_type of this DashboardParameterValue.  # noqa: E501
-        :rtype: str
-        """
-        return self._parameter_type
-
-    @parameter_type.setter
-    def parameter_type(self, parameter_type):
-        """Sets the parameter_type of this DashboardParameterValue.
-
-
-        :param parameter_type: The parameter_type of this DashboardParameterValue.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
-        if parameter_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(parameter_type, allowed_values)
-            )
-
-        self._parameter_type = parameter_type
-
-    @property
-    def default_value(self):
-        """Gets the default_value of this DashboardParameterValue.  # noqa: E501
+    def tag_key(self):
+        """Gets the tag_key of this DashboardParameterValue.  # noqa: E501
 
 
-        :return: The default_value of this DashboardParameterValue.  # noqa: E501
+        :return: The tag_key of this DashboardParameterValue.  # noqa: E501
         :rtype: str
         """
-        return self._default_value
+        return self._tag_key
 
-    @default_value.setter
-    def default_value(self, default_value):
-        """Sets the default_value of this DashboardParameterValue.
+    @tag_key.setter
+    def tag_key(self, tag_key):
+        """Sets the tag_key of this DashboardParameterValue.
 
 
-        :param default_value: The default_value of this DashboardParameterValue.  # noqa: E501
+        :param tag_key: The tag_key of this DashboardParameterValue.  # noqa: E501
         :type: str
         """
 
-        self._default_value = default_value
+        self._tag_key = tag_key
 
     @property
     def values_to_readable_strings(self):
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index 6ced669..f3fe571 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -33,49 +33,24 @@ class DashboardSection(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'rows': 'list[DashboardSectionRow]',
-        'name': 'str'
+        'name': 'str',
+        'rows': 'list[DashboardSectionRow]'
     }
 
     attribute_map = {
-        'rows': 'rows',
-        'name': 'name'
+        'name': 'name',
+        'rows': 'rows'
     }
 
-    def __init__(self, rows=None, name=None):  # noqa: E501
+    def __init__(self, name=None, rows=None):  # noqa: E501
         """DashboardSection - a model defined in Swagger"""  # noqa: E501
 
-        self._rows = None
         self._name = None
+        self._rows = None
         self.discriminator = None
 
-        self.rows = rows
         self.name = name
-
-    @property
-    def rows(self):
-        """Gets the rows of this DashboardSection.  # noqa: E501
-
-        Rows of this section  # noqa: E501
-
-        :return: The rows of this DashboardSection.  # noqa: E501
-        :rtype: list[DashboardSectionRow]
-        """
-        return self._rows
-
-    @rows.setter
-    def rows(self, rows):
-        """Sets the rows of this DashboardSection.
-
-        Rows of this section  # noqa: E501
-
-        :param rows: The rows of this DashboardSection.  # noqa: E501
-        :type: list[DashboardSectionRow]
-        """
-        if rows is None:
-            raise ValueError("Invalid value for `rows`, must not be `None`")  # noqa: E501
-
-        self._rows = rows
+        self.rows = rows
 
     @property
     def name(self):
@@ -102,6 +77,31 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def rows(self):
+        """Gets the rows of this DashboardSection.  # noqa: E501
+
+        Rows of this section  # noqa: E501
+
+        :return: The rows of this DashboardSection.  # noqa: E501
+        :rtype: list[DashboardSectionRow]
+        """
+        return self._rows
+
+    @rows.setter
+    def rows(self, rows):
+        """Sets the rows of this DashboardSection.
+
+        Rows of this section  # noqa: E501
+
+        :param rows: The rows of this DashboardSection.  # noqa: E501
+        :type: list[DashboardSectionRow]
+        """
+        if rows is None:
+            raise ValueError("Invalid value for `rows`, must not be `None`")  # noqa: E501
+
+        self._rows = rows
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 70657ca..3408eda 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -33,367 +33,353 @@ class DerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'additional_information': 'str',
+        'create_user_id': 'str',
         'created': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'hosts_used': 'list[str]',
+        'id': 'str',
+        'in_trash': 'bool',
+        'include_obsolete_metrics': 'bool',
+        'last_error_message': 'str',
+        'last_failed_time': 'int',
+        'last_processed_millis': 'int',
+        'last_query_time': 'int',
+        'metrics_used': 'list[str]',
         'minutes': 'int',
-        'tags': 'WFTags',
-        'status': 'list[str]',
-        'updated': 'int',
+        'name': 'str',
+        'points_scanned_at_last_query': 'int',
         'process_rate_minutes': 'int',
-        'last_processed_millis': 'int',
-        'update_user_id': 'str',
         'query': 'str',
-        'include_obsolete_metrics': 'bool',
-        'additional_information': 'str',
-        'last_query_time': 'int',
-        'in_trash': 'bool',
         'query_failing': 'bool',
-        'create_user_id': 'str',
-        'last_failed_time': 'int',
-        'points_scanned_at_last_query': 'int',
-        'metrics_used': 'list[str]',
-        'hosts_used': 'list[str]',
-        'creator_id': 'str',
-        'updater_id': 'str',
-        'id': 'str',
         'query_qb_enabled': 'bool',
         'query_qb_serialization': 'str',
-        'last_error_message': 'str',
-        'created_epoch_millis': 'int',
+        'status': 'list[str]',
+        'tags': 'WFTags',
+        'update_user_id': 'str',
+        'updated': 'int',
         'updated_epoch_millis': 'int',
-        'deleted': 'bool',
-        'name': 'str'
+        'updater_id': 'str'
     }
 
     attribute_map = {
+        'additional_information': 'additionalInformation',
+        'create_user_id': 'createUserId',
         'created': 'created',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'hosts_used': 'hostsUsed',
+        'id': 'id',
+        'in_trash': 'inTrash',
+        'include_obsolete_metrics': 'includeObsoleteMetrics',
+        'last_error_message': 'lastErrorMessage',
+        'last_failed_time': 'lastFailedTime',
+        'last_processed_millis': 'lastProcessedMillis',
+        'last_query_time': 'lastQueryTime',
+        'metrics_used': 'metricsUsed',
         'minutes': 'minutes',
-        'tags': 'tags',
-        'status': 'status',
-        'updated': 'updated',
+        'name': 'name',
+        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
         'process_rate_minutes': 'processRateMinutes',
-        'last_processed_millis': 'lastProcessedMillis',
-        'update_user_id': 'updateUserId',
         'query': 'query',
-        'include_obsolete_metrics': 'includeObsoleteMetrics',
-        'additional_information': 'additionalInformation',
-        'last_query_time': 'lastQueryTime',
-        'in_trash': 'inTrash',
         'query_failing': 'queryFailing',
-        'create_user_id': 'createUserId',
-        'last_failed_time': 'lastFailedTime',
-        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
-        'metrics_used': 'metricsUsed',
-        'hosts_used': 'hostsUsed',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
-        'id': 'id',
         'query_qb_enabled': 'queryQBEnabled',
         'query_qb_serialization': 'queryQBSerialization',
-        'last_error_message': 'lastErrorMessage',
-        'created_epoch_millis': 'createdEpochMillis',
+        'status': 'status',
+        'tags': 'tags',
+        'update_user_id': 'updateUserId',
+        'updated': 'updated',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'deleted': 'deleted',
-        'name': 'name'
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, created=None, minutes=None, tags=None, status=None, updated=None, process_rate_minutes=None, last_processed_millis=None, update_user_id=None, query=None, include_obsolete_metrics=None, additional_information=None, last_query_time=None, in_trash=None, query_failing=None, create_user_id=None, last_failed_time=None, points_scanned_at_last_query=None, metrics_used=None, hosts_used=None, creator_id=None, updater_id=None, id=None, query_qb_enabled=None, query_qb_serialization=None, last_error_message=None, created_epoch_millis=None, updated_epoch_millis=None, deleted=None, name=None):  # noqa: E501
+    def __init__(self, additional_information=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, hosts_used=None, id=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_failed_time=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, points_scanned_at_last_query=None, process_rate_minutes=None, query=None, query_failing=None, query_qb_enabled=None, query_qb_serialization=None, status=None, tags=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """DerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
+        self._additional_information = None
+        self._create_user_id = None
         self._created = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._hosts_used = None
+        self._id = None
+        self._in_trash = None
+        self._include_obsolete_metrics = None
+        self._last_error_message = None
+        self._last_failed_time = None
+        self._last_processed_millis = None
+        self._last_query_time = None
+        self._metrics_used = None
         self._minutes = None
-        self._tags = None
-        self._status = None
-        self._updated = None
+        self._name = None
+        self._points_scanned_at_last_query = None
         self._process_rate_minutes = None
-        self._last_processed_millis = None
-        self._update_user_id = None
         self._query = None
-        self._include_obsolete_metrics = None
-        self._additional_information = None
-        self._last_query_time = None
-        self._in_trash = None
         self._query_failing = None
-        self._create_user_id = None
-        self._last_failed_time = None
-        self._points_scanned_at_last_query = None
-        self._metrics_used = None
-        self._hosts_used = None
-        self._creator_id = None
-        self._updater_id = None
-        self._id = None
         self._query_qb_enabled = None
         self._query_qb_serialization = None
-        self._last_error_message = None
-        self._created_epoch_millis = None
+        self._status = None
+        self._tags = None
+        self._update_user_id = None
+        self._updated = None
         self._updated_epoch_millis = None
-        self._deleted = None
-        self._name = None
+        self._updater_id = None
         self.discriminator = None
 
-        if created is not None:
-            self.created = created
-        self.minutes = minutes
-        if tags is not None:
-            self.tags = tags
-        if status is not None:
-            self.status = status
-        if updated is not None:
-            self.updated = updated
-        if process_rate_minutes is not None:
-            self.process_rate_minutes = process_rate_minutes
-        if last_processed_millis is not None:
-            self.last_processed_millis = last_processed_millis
-        if update_user_id is not None:
-            self.update_user_id = update_user_id
-        self.query = query
-        if include_obsolete_metrics is not None:
-            self.include_obsolete_metrics = include_obsolete_metrics
         if additional_information is not None:
             self.additional_information = additional_information
-        if last_query_time is not None:
-            self.last_query_time = last_query_time
-        if in_trash is not None:
-            self.in_trash = in_trash
-        if query_failing is not None:
-            self.query_failing = query_failing
         if create_user_id is not None:
             self.create_user_id = create_user_id
-        if last_failed_time is not None:
-            self.last_failed_time = last_failed_time
-        if points_scanned_at_last_query is not None:
-            self.points_scanned_at_last_query = points_scanned_at_last_query
-        if metrics_used is not None:
-            self.metrics_used = metrics_used
-        if hosts_used is not None:
-            self.hosts_used = hosts_used
+        if created is not None:
+            self.created = created
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
         if creator_id is not None:
             self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
+        if deleted is not None:
+            self.deleted = deleted
+        if hosts_used is not None:
+            self.hosts_used = hosts_used
         if id is not None:
             self.id = id
+        if in_trash is not None:
+            self.in_trash = in_trash
+        if include_obsolete_metrics is not None:
+            self.include_obsolete_metrics = include_obsolete_metrics
+        if last_error_message is not None:
+            self.last_error_message = last_error_message
+        if last_failed_time is not None:
+            self.last_failed_time = last_failed_time
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if last_query_time is not None:
+            self.last_query_time = last_query_time
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        self.minutes = minutes
+        self.name = name
+        if points_scanned_at_last_query is not None:
+            self.points_scanned_at_last_query = points_scanned_at_last_query
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        self.query = query
+        if query_failing is not None:
+            self.query_failing = query_failing
         if query_qb_enabled is not None:
             self.query_qb_enabled = query_qb_enabled
         if query_qb_serialization is not None:
             self.query_qb_serialization = query_qb_serialization
-        if last_error_message is not None:
-            self.last_error_message = last_error_message
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
+        if status is not None:
+            self.status = status
+        if tags is not None:
+            self.tags = tags
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
+        if updated is not None:
+            self.updated = updated
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if deleted is not None:
-            self.deleted = deleted
-        self.name = name
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def created(self):
-        """Gets the created of this DerivedMetricDefinition.  # noqa: E501
+    def additional_information(self):
+        """Gets the additional_information of this DerivedMetricDefinition.  # noqa: E501
 
-        When this derived metric was created, in epoch millis  # noqa: E501
+        User-supplied additional explanatory information for the derived metric  # noqa: E501
 
-        :return: The created of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The additional_information of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._created
+        return self._additional_information
 
-    @created.setter
-    def created(self, created):
-        """Sets the created of this DerivedMetricDefinition.
+    @additional_information.setter
+    def additional_information(self, additional_information):
+        """Sets the additional_information of this DerivedMetricDefinition.
 
-        When this derived metric was created, in epoch millis  # noqa: E501
+        User-supplied additional explanatory information for the derived metric  # noqa: E501
 
-        :param created: The created of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param additional_information: The additional_information of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
 
-        self._created = created
+        self._additional_information = additional_information
 
     @property
-    def minutes(self):
-        """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
+    def create_user_id(self):
+        """Gets the create_user_id of this DerivedMetricDefinition.  # noqa: E501
 
-        How frequently the query generating the derived metric is run  # noqa: E501
 
-        :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._minutes
+        return self._create_user_id
 
-    @minutes.setter
-    def minutes(self, minutes):
-        """Sets the minutes of this DerivedMetricDefinition.
+    @create_user_id.setter
+    def create_user_id(self, create_user_id):
+        """Sets the create_user_id of this DerivedMetricDefinition.
 
-        How frequently the query generating the derived metric is run  # noqa: E501
 
-        :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param create_user_id: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
-        if minutes is None:
-            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
-        self._minutes = minutes
+        self._create_user_id = create_user_id
 
     @property
-    def tags(self):
-        """Gets the tags of this DerivedMetricDefinition.  # noqa: E501
+    def created(self):
+        """Gets the created of this DerivedMetricDefinition.  # noqa: E501
 
+        When this derived metric was created, in epoch millis  # noqa: E501
 
-        :return: The tags of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: WFTags
+        :return: The created of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
         """
-        return self._tags
+        return self._created
 
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this DerivedMetricDefinition.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DerivedMetricDefinition.
 
+        When this derived metric was created, in epoch millis  # noqa: E501
 
-        :param tags: The tags of this DerivedMetricDefinition.  # noqa: E501
-        :type: WFTags
+        :param created: The created of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
         """
 
-        self._tags = tags
+        self._created = created
 
     @property
-    def status(self):
-        """Gets the status of this DerivedMetricDefinition.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
 
-        Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA  # noqa: E501
 
-        :return: The status of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: list[str]
+        :return: The created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
         """
-        return self._status
+        return self._created_epoch_millis
 
-    @status.setter
-    def status(self, status):
-        """Sets the status of this DerivedMetricDefinition.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this DerivedMetricDefinition.
 
-        Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA  # noqa: E501
 
-        :param status: The status of this DerivedMetricDefinition.  # noqa: E501
-        :type: list[str]
+        :param created_epoch_millis: The created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
         """
 
-        self._status = status
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def updated(self):
-        """Gets the updated of this DerivedMetricDefinition.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this DerivedMetricDefinition.  # noqa: E501
 
-        When the derived metric definition was last updated, in epoch millis  # noqa: E501
 
-        :return: The updated of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
         """
-        return self._updated
+        return self._creator_id
 
-    @updated.setter
-    def updated(self, updated):
-        """Sets the updated of this DerivedMetricDefinition.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this DerivedMetricDefinition.
 
-        When the derived metric definition was last updated, in epoch millis  # noqa: E501
 
-        :param updated: The updated of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
 
-        self._updated = updated
+        self._creator_id = creator_id
 
     @property
-    def process_rate_minutes(self):
-        """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this DerivedMetricDefinition.  # noqa: E501
 
-        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :return: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The deleted of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
         """
-        return self._process_rate_minutes
+        return self._deleted
 
-    @process_rate_minutes.setter
-    def process_rate_minutes(self, process_rate_minutes):
-        """Sets the process_rate_minutes of this DerivedMetricDefinition.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this DerivedMetricDefinition.
 
-        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :param process_rate_minutes: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param deleted: The deleted of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
         """
 
-        self._process_rate_minutes = process_rate_minutes
+        self._deleted = deleted
 
     @property
-    def last_processed_millis(self):
-        """Gets the last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
+    def hosts_used(self):
+        """Gets the hosts_used of this DerivedMetricDefinition.  # noqa: E501
 
-        The last time when the derived metric query was run, in epoch millis  # noqa: E501
+        Number of hosts checked by the query  # noqa: E501
 
-        :return: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: int
+        :return: The hosts_used of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._last_processed_millis
+        return self._hosts_used
 
-    @last_processed_millis.setter
-    def last_processed_millis(self, last_processed_millis):
-        """Sets the last_processed_millis of this DerivedMetricDefinition.
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this DerivedMetricDefinition.
 
-        The last time when the derived metric query was run, in epoch millis  # noqa: E501
+        Number of hosts checked by the query  # noqa: E501
 
-        :param last_processed_millis: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+        :param hosts_used: The hosts_used of this DerivedMetricDefinition.  # noqa: E501
+        :type: list[str]
         """
 
-        self._last_processed_millis = last_processed_millis
+        self._hosts_used = hosts_used
 
     @property
-    def update_user_id(self):
-        """Gets the update_user_id of this DerivedMetricDefinition.  # noqa: E501
+    def id(self):
+        """Gets the id of this DerivedMetricDefinition.  # noqa: E501
 
-        The user that last updated this derived metric definition  # noqa: E501
 
-        :return: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
+        :return: The id of this DerivedMetricDefinition.  # noqa: E501
         :rtype: str
         """
-        return self._update_user_id
+        return self._id
 
-    @update_user_id.setter
-    def update_user_id(self, update_user_id):
-        """Sets the update_user_id of this DerivedMetricDefinition.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DerivedMetricDefinition.
 
-        The user that last updated this derived metric definition  # noqa: E501
 
-        :param update_user_id: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
+        :param id: The id of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
 
-        self._update_user_id = update_user_id
+        self._id = id
 
     @property
-    def query(self):
-        """Gets the query of this DerivedMetricDefinition.  # noqa: E501
+    def in_trash(self):
+        """Gets the in_trash of this DerivedMetricDefinition.  # noqa: E501
 
-        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
 
-        :return: The query of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
+        :return: The in_trash of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
         """
-        return self._query
+        return self._in_trash
 
-    @query.setter
-    def query(self, query):
-        """Sets the query of this DerivedMetricDefinition.
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this DerivedMetricDefinition.
 
-        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
 
-        :param query: The query of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
+        :param in_trash: The in_trash of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
         """
-        if query is None:
-            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
-        self._query = query
+        self._in_trash = in_trash
 
     @property
     def include_obsolete_metrics(self):
@@ -419,138 +405,167 @@ def include_obsolete_metrics(self, include_obsolete_metrics):
         self._include_obsolete_metrics = include_obsolete_metrics
 
     @property
-    def additional_information(self):
-        """Gets the additional_information of this DerivedMetricDefinition.  # noqa: E501
+    def last_error_message(self):
+        """Gets the last_error_message of this DerivedMetricDefinition.  # noqa: E501
 
-        User-supplied additional explanatory information for the derived metric  # noqa: E501
+        The last error encountered when running the query  # noqa: E501
 
-        :return: The additional_information of this DerivedMetricDefinition.  # noqa: E501
+        :return: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
         :rtype: str
         """
-        return self._additional_information
+        return self._last_error_message
 
-    @additional_information.setter
-    def additional_information(self, additional_information):
-        """Sets the additional_information of this DerivedMetricDefinition.
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this DerivedMetricDefinition.
 
-        User-supplied additional explanatory information for the derived metric  # noqa: E501
+        The last error encountered when running the query  # noqa: E501
 
-        :param additional_information: The additional_information of this DerivedMetricDefinition.  # noqa: E501
+        :param last_error_message: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
 
-        self._additional_information = additional_information
+        self._last_error_message = last_error_message
 
     @property
-    def last_query_time(self):
-        """Gets the last_query_time of this DerivedMetricDefinition.  # noqa: E501
+    def last_failed_time(self):
+        """Gets the last_failed_time of this DerivedMetricDefinition.  # noqa: E501
 
-        Time for the query execute, averaged on hourly basis  # noqa: E501
+        The time of the last error encountered when running the query, in epoch millis  # noqa: E501
 
-        :return: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
+        :return: The last_failed_time of this DerivedMetricDefinition.  # noqa: E501
         :rtype: int
         """
-        return self._last_query_time
+        return self._last_failed_time
 
-    @last_query_time.setter
-    def last_query_time(self, last_query_time):
-        """Sets the last_query_time of this DerivedMetricDefinition.
+    @last_failed_time.setter
+    def last_failed_time(self, last_failed_time):
+        """Sets the last_failed_time of this DerivedMetricDefinition.
 
-        Time for the query execute, averaged on hourly basis  # noqa: E501
+        The time of the last error encountered when running the query, in epoch millis  # noqa: E501
 
-        :param last_query_time: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
+        :param last_failed_time: The last_failed_time of this DerivedMetricDefinition.  # noqa: E501
         :type: int
         """
 
-        self._last_query_time = last_query_time
+        self._last_failed_time = last_failed_time
 
     @property
-    def in_trash(self):
-        """Gets the in_trash of this DerivedMetricDefinition.  # noqa: E501
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
 
+        The last time when the derived metric query was run, in epoch millis  # noqa: E501
 
-        :return: The in_trash of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
+        :return: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
         """
-        return self._in_trash
+        return self._last_processed_millis
 
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this DerivedMetricDefinition.
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this DerivedMetricDefinition.
 
+        The last time when the derived metric query was run, in epoch millis  # noqa: E501
 
-        :param in_trash: The in_trash of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
+        :param last_processed_millis: The last_processed_millis of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
         """
 
-        self._in_trash = in_trash
+        self._last_processed_millis = last_processed_millis
 
     @property
-    def query_failing(self):
-        """Gets the query_failing of this DerivedMetricDefinition.  # noqa: E501
+    def last_query_time(self):
+        """Gets the last_query_time of this DerivedMetricDefinition.  # noqa: E501
 
-        Whether there was an exception when the query last ran  # noqa: E501
+        Time for the query execute, averaged on hourly basis  # noqa: E501
 
-        :return: The query_failing of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
+        :return: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
         """
-        return self._query_failing
+        return self._last_query_time
 
-    @query_failing.setter
-    def query_failing(self, query_failing):
-        """Sets the query_failing of this DerivedMetricDefinition.
+    @last_query_time.setter
+    def last_query_time(self, last_query_time):
+        """Sets the last_query_time of this DerivedMetricDefinition.
 
-        Whether there was an exception when the query last ran  # noqa: E501
+        Time for the query execute, averaged on hourly basis  # noqa: E501
 
-        :param query_failing: The query_failing of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
+        :param last_query_time: The last_query_time of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
         """
 
-        self._query_failing = query_failing
+        self._last_query_time = last_query_time
 
     @property
-    def create_user_id(self):
-        """Gets the create_user_id of this DerivedMetricDefinition.  # noqa: E501
+    def metrics_used(self):
+        """Gets the metrics_used of this DerivedMetricDefinition.  # noqa: E501
 
+        Number of metrics checked by the query  # noqa: E501
 
-        :return: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
+        :return: The metrics_used of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._create_user_id
+        return self._metrics_used
 
-    @create_user_id.setter
-    def create_user_id(self, create_user_id):
-        """Sets the create_user_id of this DerivedMetricDefinition.
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this DerivedMetricDefinition.
 
+        Number of metrics checked by the query  # noqa: E501
 
-        :param create_user_id: The create_user_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
+        :param metrics_used: The metrics_used of this DerivedMetricDefinition.  # noqa: E501
+        :type: list[str]
         """
 
-        self._create_user_id = create_user_id
+        self._metrics_used = metrics_used
 
     @property
-    def last_failed_time(self):
-        """Gets the last_failed_time of this DerivedMetricDefinition.  # noqa: E501
+    def minutes(self):
+        """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
 
-        The time of the last error encountered when running the query, in epoch millis  # noqa: E501
+        How frequently the query generating the derived metric is run  # noqa: E501
 
-        :return: The last_failed_time of this DerivedMetricDefinition.  # noqa: E501
+        :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
         :rtype: int
         """
-        return self._last_failed_time
+        return self._minutes
 
-    @last_failed_time.setter
-    def last_failed_time(self, last_failed_time):
-        """Sets the last_failed_time of this DerivedMetricDefinition.
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this DerivedMetricDefinition.
+
+        How frequently the query generating the derived metric is run  # noqa: E501
+
+        :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+        if minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
+
+        self._minutes = minutes
+
+    @property
+    def name(self):
+        """Gets the name of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The name of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
 
-        The time of the last error encountered when running the query, in epoch millis  # noqa: E501
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DerivedMetricDefinition.
 
-        :param last_failed_time: The last_failed_time of this DerivedMetricDefinition.  # noqa: E501
-        :type: int
+
+        :param name: The name of this DerivedMetricDefinition.  # noqa: E501
+        :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._last_failed_time = last_failed_time
+        self._name = name
 
     @property
     def points_scanned_at_last_query(self):
@@ -576,113 +591,75 @@ def points_scanned_at_last_query(self, points_scanned_at_last_query):
         self._points_scanned_at_last_query = points_scanned_at_last_query
 
     @property
-    def metrics_used(self):
-        """Gets the metrics_used of this DerivedMetricDefinition.  # noqa: E501
-
-        Number of metrics checked by the query  # noqa: E501
-
-        :return: The metrics_used of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._metrics_used
-
-    @metrics_used.setter
-    def metrics_used(self, metrics_used):
-        """Sets the metrics_used of this DerivedMetricDefinition.
-
-        Number of metrics checked by the query  # noqa: E501
-
-        :param metrics_used: The metrics_used of this DerivedMetricDefinition.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._metrics_used = metrics_used
-
-    @property
-    def hosts_used(self):
-        """Gets the hosts_used of this DerivedMetricDefinition.  # noqa: E501
-
-        Number of hosts checked by the query  # noqa: E501
-
-        :return: The hosts_used of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._hosts_used
-
-    @hosts_used.setter
-    def hosts_used(self, hosts_used):
-        """Sets the hosts_used of this DerivedMetricDefinition.
-
-        Number of hosts checked by the query  # noqa: E501
-
-        :param hosts_used: The hosts_used of this DerivedMetricDefinition.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._hosts_used = hosts_used
-
-    @property
-    def creator_id(self):
-        """Gets the creator_id of this DerivedMetricDefinition.  # noqa: E501
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
 
+        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :return: The creator_id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
+        :return: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: int
         """
-        return self._creator_id
+        return self._process_rate_minutes
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this DerivedMetricDefinition.
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this DerivedMetricDefinition.
 
+        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
 
-        :param creator_id: The creator_id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
+        :param process_rate_minutes: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
+        :type: int
         """
 
-        self._creator_id = creator_id
+        self._process_rate_minutes = process_rate_minutes
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this DerivedMetricDefinition.  # noqa: E501
+    def query(self):
+        """Gets the query of this DerivedMetricDefinition.  # noqa: E501
 
+        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
 
-        :return: The updater_id of this DerivedMetricDefinition.  # noqa: E501
+        :return: The query of this DerivedMetricDefinition.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._query
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this DerivedMetricDefinition.
+    @query.setter
+    def query(self, query):
+        """Sets the query of this DerivedMetricDefinition.
 
+        A Wavefront query that is evaluated at regular intervals (default 1m).  # noqa: E501
 
-        :param updater_id: The updater_id of this DerivedMetricDefinition.  # noqa: E501
+        :param query: The query of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
+        if query is None:
+            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
-        self._updater_id = updater_id
+        self._query = query
 
     @property
-    def id(self):
-        """Gets the id of this DerivedMetricDefinition.  # noqa: E501
+    def query_failing(self):
+        """Gets the query_failing of this DerivedMetricDefinition.  # noqa: E501
 
+        Whether there was an exception when the query last ran  # noqa: E501
 
-        :return: The id of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: str
+        :return: The query_failing of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: bool
         """
-        return self._id
+        return self._query_failing
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this DerivedMetricDefinition.
+    @query_failing.setter
+    def query_failing(self, query_failing):
+        """Sets the query_failing of this DerivedMetricDefinition.
 
+        Whether there was an exception when the query last ran  # noqa: E501
 
-        :param id: The id of this DerivedMetricDefinition.  # noqa: E501
-        :type: str
+        :param query_failing: The query_failing of this DerivedMetricDefinition.  # noqa: E501
+        :type: bool
         """
 
-        self._id = id
+        self._query_failing = query_failing
 
     @property
     def query_qb_enabled(self):
@@ -731,48 +708,94 @@ def query_qb_serialization(self, query_qb_serialization):
         self._query_qb_serialization = query_qb_serialization
 
     @property
-    def last_error_message(self):
-        """Gets the last_error_message of this DerivedMetricDefinition.  # noqa: E501
+    def status(self):
+        """Gets the status of this DerivedMetricDefinition.  # noqa: E501
 
-        The last error encountered when running the query  # noqa: E501
+        Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA  # noqa: E501
 
-        :return: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
+        :return: The status of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this DerivedMetricDefinition.
+
+        Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA  # noqa: E501
+
+        :param status: The status of this DerivedMetricDefinition.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._status = status
+
+    @property
+    def tags(self):
+        """Gets the tags of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The tags of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: WFTags
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this DerivedMetricDefinition.
+
+
+        :param tags: The tags of this DerivedMetricDefinition.  # noqa: E501
+        :type: WFTags
+        """
+
+        self._tags = tags
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this DerivedMetricDefinition.  # noqa: E501
+
+        The user that last updated this derived metric definition  # noqa: E501
+
+        :return: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
         :rtype: str
         """
-        return self._last_error_message
+        return self._update_user_id
 
-    @last_error_message.setter
-    def last_error_message(self, last_error_message):
-        """Sets the last_error_message of this DerivedMetricDefinition.
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this DerivedMetricDefinition.
 
-        The last error encountered when running the query  # noqa: E501
+        The user that last updated this derived metric definition  # noqa: E501
 
-        :param last_error_message: The last_error_message of this DerivedMetricDefinition.  # noqa: E501
+        :param update_user_id: The update_user_id of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
 
-        self._last_error_message = last_error_message
+        self._update_user_id = update_user_id
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
+    def updated(self):
+        """Gets the updated of this DerivedMetricDefinition.  # noqa: E501
 
+        When the derived metric definition was last updated, in epoch millis  # noqa: E501
 
-        :return: The created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
+        :return: The updated of this DerivedMetricDefinition.  # noqa: E501
         :rtype: int
         """
-        return self._created_epoch_millis
+        return self._updated
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this DerivedMetricDefinition.
+    @updated.setter
+    def updated(self, updated):
+        """Sets the updated of this DerivedMetricDefinition.
 
+        When the derived metric definition was last updated, in epoch millis  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this DerivedMetricDefinition.  # noqa: E501
+        :param updated: The updated of this DerivedMetricDefinition.  # noqa: E501
         :type: int
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._updated = updated
 
     @property
     def updated_epoch_millis(self):
@@ -796,48 +819,25 @@ def updated_epoch_millis(self, updated_epoch_millis):
         self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def deleted(self):
-        """Gets the deleted of this DerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The deleted of this DerivedMetricDefinition.  # noqa: E501
-        :rtype: bool
-        """
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this DerivedMetricDefinition.
-
-
-        :param deleted: The deleted of this DerivedMetricDefinition.  # noqa: E501
-        :type: bool
-        """
-
-        self._deleted = deleted
-
-    @property
-    def name(self):
-        """Gets the name of this DerivedMetricDefinition.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this DerivedMetricDefinition.  # noqa: E501
 
 
-        :return: The name of this DerivedMetricDefinition.  # noqa: E501
+        :return: The updater_id of this DerivedMetricDefinition.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._updater_id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this DerivedMetricDefinition.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this DerivedMetricDefinition.
 
 
-        :param name: The name of this DerivedMetricDefinition.  # noqa: E501
+        :param updater_id: The updater_id of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 4458b24..e4582cf 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -31,210 +31,143 @@ class Event(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'end_time': 'int',
-        'start_time': 'int',
-        'table': 'str',
-        'can_delete': 'bool',
-        'can_close': 'bool',
-        'creator_type': 'list[str]',
-        'tags': 'list[str]',
         'annotations': 'dict(str, str)',
+        'can_close': 'bool',
+        'can_delete': 'bool',
         'created_at': 'int',
-        'is_user_event': 'bool',
-        'summarized_events': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'creator_type': 'list[str]',
+        'end_time': 'int',
         'hosts': 'list[str]',
+        'id': 'str',
         'is_ephemeral': 'bool',
-        'creator_id': 'str',
-        'updater_id': 'str',
+        'is_user_event': 'bool',
+        'name': 'str',
+        'running_state': 'str',
+        'start_time': 'int',
+        'summarized_events': 'int',
+        'table': 'str',
+        'tags': 'list[str]',
         'updated_at': 'int',
-        'id': 'str',
-        'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'running_state': 'str',
-        'name': 'str'
+        'updater_id': 'str'
     }
 
     attribute_map = {
-        'end_time': 'endTime',
-        'start_time': 'startTime',
-        'table': 'table',
-        'can_delete': 'canDelete',
-        'can_close': 'canClose',
-        'creator_type': 'creatorType',
-        'tags': 'tags',
         'annotations': 'annotations',
+        'can_close': 'canClose',
+        'can_delete': 'canDelete',
         'created_at': 'createdAt',
-        'is_user_event': 'isUserEvent',
-        'summarized_events': 'summarizedEvents',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'creator_type': 'creatorType',
+        'end_time': 'endTime',
         'hosts': 'hosts',
+        'id': 'id',
         'is_ephemeral': 'isEphemeral',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
+        'is_user_event': 'isUserEvent',
+        'name': 'name',
+        'running_state': 'runningState',
+        'start_time': 'startTime',
+        'summarized_events': 'summarizedEvents',
+        'table': 'table',
+        'tags': 'tags',
         'updated_at': 'updatedAt',
-        'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'running_state': 'runningState',
-        'name': 'name'
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, end_time=None, start_time=None, table=None, can_delete=None, can_close=None, creator_type=None, tags=None, annotations=None, created_at=None, is_user_event=None, summarized_events=None, hosts=None, is_ephemeral=None, creator_id=None, updater_id=None, updated_at=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, running_state=None, name=None):  # noqa: E501
+    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
-        self._end_time = None
-        self._start_time = None
-        self._table = None
-        self._can_delete = None
-        self._can_close = None
-        self._creator_type = None
-        self._tags = None
         self._annotations = None
+        self._can_close = None
+        self._can_delete = None
         self._created_at = None
-        self._is_user_event = None
-        self._summarized_events = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._creator_type = None
+        self._end_time = None
         self._hosts = None
+        self._id = None
         self._is_ephemeral = None
-        self._creator_id = None
-        self._updater_id = None
+        self._is_user_event = None
+        self._name = None
+        self._running_state = None
+        self._start_time = None
+        self._summarized_events = None
+        self._table = None
+        self._tags = None
         self._updated_at = None
-        self._id = None
-        self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._running_state = None
-        self._name = None
+        self._updater_id = None
         self.discriminator = None
 
-        if end_time is not None:
-            self.end_time = end_time
-        self.start_time = start_time
-        if table is not None:
-            self.table = table
-        if can_delete is not None:
-            self.can_delete = can_delete
+        self.annotations = annotations
         if can_close is not None:
             self.can_close = can_close
-        if creator_type is not None:
-            self.creator_type = creator_type
-        if tags is not None:
-            self.tags = tags
-        self.annotations = annotations
+        if can_delete is not None:
+            self.can_delete = can_delete
         if created_at is not None:
             self.created_at = created_at
-        if is_user_event is not None:
-            self.is_user_event = is_user_event
-        if summarized_events is not None:
-            self.summarized_events = summarized_events
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if creator_type is not None:
+            self.creator_type = creator_type
+        if end_time is not None:
+            self.end_time = end_time
         if hosts is not None:
             self.hosts = hosts
+        if id is not None:
+            self.id = id
         if is_ephemeral is not None:
             self.is_ephemeral = is_ephemeral
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
+        if is_user_event is not None:
+            self.is_user_event = is_user_event
+        self.name = name
+        if running_state is not None:
+            self.running_state = running_state
+        self.start_time = start_time
+        if summarized_events is not None:
+            self.summarized_events = summarized_events
+        if table is not None:
+            self.table = table
+        if tags is not None:
+            self.tags = tags
         if updated_at is not None:
             self.updated_at = updated_at
-        if id is not None:
-            self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if running_state is not None:
-            self.running_state = running_state
-        self.name = name
-
-    @property
-    def end_time(self):
-        """Gets the end_time of this Event.  # noqa: E501
-
-        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
-
-        :return: The end_time of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._end_time
-
-    @end_time.setter
-    def end_time(self, end_time):
-        """Sets the end_time of this Event.
-
-        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
-
-        :param end_time: The end_time of this Event.  # noqa: E501
-        :type: int
-        """
-
-        self._end_time = end_time
-
-    @property
-    def start_time(self):
-        """Gets the start_time of this Event.  # noqa: E501
-
-        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
-
-        :return: The start_time of this Event.  # noqa: E501
-        :rtype: int
-        """
-        return self._start_time
-
-    @start_time.setter
-    def start_time(self, start_time):
-        """Sets the start_time of this Event.
-
-        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
-
-        :param start_time: The start_time of this Event.  # noqa: E501
-        :type: int
-        """
-        if start_time is None:
-            raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
-
-        self._start_time = start_time
-
-    @property
-    def table(self):
-        """Gets the table of this Event.  # noqa: E501
-
-        The customer to which the event belongs  # noqa: E501
-
-        :return: The table of this Event.  # noqa: E501
-        :rtype: str
-        """
-        return self._table
-
-    @table.setter
-    def table(self, table):
-        """Sets the table of this Event.
-
-        The customer to which the event belongs  # noqa: E501
-
-        :param table: The table of this Event.  # noqa: E501
-        :type: str
-        """
-
-        self._table = table
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def can_delete(self):
-        """Gets the can_delete of this Event.  # noqa: E501
+    def annotations(self):
+        """Gets the annotations of this Event.  # noqa: E501
 
+        A string->string map of additional annotations on the event  # noqa: E501
 
-        :return: The can_delete of this Event.  # noqa: E501
-        :rtype: bool
+        :return: The annotations of this Event.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._can_delete
+        return self._annotations
 
-    @can_delete.setter
-    def can_delete(self, can_delete):
-        """Sets the can_delete of this Event.
+    @annotations.setter
+    def annotations(self, annotations):
+        """Sets the annotations of this Event.
 
+        A string->string map of additional annotations on the event  # noqa: E501
 
-        :param can_delete: The can_delete of this Event.  # noqa: E501
-        :type: bool
+        :param annotations: The annotations of this Event.  # noqa: E501
+        :type: dict(str, str)
         """
+        if annotations is None:
+            raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
 
-        self._can_delete = can_delete
+        self._annotations = annotations
 
     @property
     def can_close(self):
@@ -258,147 +191,139 @@ def can_close(self, can_close):
         self._can_close = can_close
 
     @property
-    def creator_type(self):
-        """Gets the creator_type of this Event.  # noqa: E501
+    def can_delete(self):
+        """Gets the can_delete of this Event.  # noqa: E501
 
 
-        :return: The creator_type of this Event.  # noqa: E501
-        :rtype: list[str]
+        :return: The can_delete of this Event.  # noqa: E501
+        :rtype: bool
         """
-        return self._creator_type
+        return self._can_delete
 
-    @creator_type.setter
-    def creator_type(self, creator_type):
-        """Sets the creator_type of this Event.
+    @can_delete.setter
+    def can_delete(self, can_delete):
+        """Sets the can_delete of this Event.
 
 
-        :param creator_type: The creator_type of this Event.  # noqa: E501
-        :type: list[str]
+        :param can_delete: The can_delete of this Event.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
-        if not set(creator_type).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
 
-        self._creator_type = creator_type
+        self._can_delete = can_delete
 
     @property
-    def tags(self):
-        """Gets the tags of this Event.  # noqa: E501
+    def created_at(self):
+        """Gets the created_at of this Event.  # noqa: E501
 
-        A list of event tags  # noqa: E501
 
-        :return: The tags of this Event.  # noqa: E501
-        :rtype: list[str]
+        :return: The created_at of this Event.  # noqa: E501
+        :rtype: int
         """
-        return self._tags
+        return self._created_at
 
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this Event.
+    @created_at.setter
+    def created_at(self, created_at):
+        """Sets the created_at of this Event.
 
-        A list of event tags  # noqa: E501
 
-        :param tags: The tags of this Event.  # noqa: E501
-        :type: list[str]
+        :param created_at: The created_at of this Event.  # noqa: E501
+        :type: int
         """
 
-        self._tags = tags
+        self._created_at = created_at
 
     @property
-    def annotations(self):
-        """Gets the annotations of this Event.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Event.  # noqa: E501
 
-        A string->string map of additional annotations on the event  # noqa: E501
 
-        :return: The annotations of this Event.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The created_epoch_millis of this Event.  # noqa: E501
+        :rtype: int
         """
-        return self._annotations
+        return self._created_epoch_millis
 
-    @annotations.setter
-    def annotations(self, annotations):
-        """Sets the annotations of this Event.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Event.
 
-        A string->string map of additional annotations on the event  # noqa: E501
 
-        :param annotations: The annotations of this Event.  # noqa: E501
-        :type: dict(str, str)
+        :param created_epoch_millis: The created_epoch_millis of this Event.  # noqa: E501
+        :type: int
         """
-        if annotations is None:
-            raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
 
-        self._annotations = annotations
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def created_at(self):
-        """Gets the created_at of this Event.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this Event.  # noqa: E501
 
 
-        :return: The created_at of this Event.  # noqa: E501
-        :rtype: int
+        :return: The creator_id of this Event.  # noqa: E501
+        :rtype: str
         """
-        return self._created_at
+        return self._creator_id
 
-    @created_at.setter
-    def created_at(self, created_at):
-        """Sets the created_at of this Event.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Event.
 
 
-        :param created_at: The created_at of this Event.  # noqa: E501
-        :type: int
+        :param creator_id: The creator_id of this Event.  # noqa: E501
+        :type: str
         """
 
-        self._created_at = created_at
+        self._creator_id = creator_id
 
     @property
-    def is_user_event(self):
-        """Gets the is_user_event of this Event.  # noqa: E501
+    def creator_type(self):
+        """Gets the creator_type of this Event.  # noqa: E501
 
-        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
 
-        :return: The is_user_event of this Event.  # noqa: E501
-        :rtype: bool
+        :return: The creator_type of this Event.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._is_user_event
+        return self._creator_type
 
-    @is_user_event.setter
-    def is_user_event(self, is_user_event):
-        """Sets the is_user_event of this Event.
+    @creator_type.setter
+    def creator_type(self, creator_type):
+        """Sets the creator_type of this Event.
 
-        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
 
-        :param is_user_event: The is_user_event of this Event.  # noqa: E501
-        :type: bool
+        :param creator_type: The creator_type of this Event.  # noqa: E501
+        :type: list[str]
         """
+        allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
+        if not set(creator_type).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
 
-        self._is_user_event = is_user_event
+        self._creator_type = creator_type
 
     @property
-    def summarized_events(self):
-        """Gets the summarized_events of this Event.  # noqa: E501
+    def end_time(self):
+        """Gets the end_time of this Event.  # noqa: E501
 
-        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
 
-        :return: The summarized_events of this Event.  # noqa: E501
+        :return: The end_time of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._summarized_events
-
-    @summarized_events.setter
-    def summarized_events(self, summarized_events):
-        """Sets the summarized_events of this Event.
+        return self._end_time
 
-        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
+    @end_time.setter
+    def end_time(self, end_time):
+        """Sets the end_time of this Event.
 
-        :param summarized_events: The summarized_events of this Event.  # noqa: E501
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :param end_time: The end_time of this Event.  # noqa: E501
         :type: int
         """
 
-        self._summarized_events = summarized_events
+        self._end_time = end_time
 
     @property
     def hosts(self):
@@ -423,6 +348,27 @@ def hosts(self, hosts):
 
         self._hosts = hosts
 
+    @property
+    def id(self):
+        """Gets the id of this Event.  # noqa: E501
+
+
+        :return: The id of this Event.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Event.
+
+
+        :param id: The id of this Event.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def is_ephemeral(self):
         """Gets the is_ephemeral of this Event.  # noqa: E501
@@ -447,109 +393,194 @@ def is_ephemeral(self, is_ephemeral):
         self._is_ephemeral = is_ephemeral
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this Event.  # noqa: E501
+    def is_user_event(self):
+        """Gets the is_user_event of this Event.  # noqa: E501
 
+        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
 
-        :return: The creator_id of this Event.  # noqa: E501
+        :return: The is_user_event of this Event.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_user_event
+
+    @is_user_event.setter
+    def is_user_event(self, is_user_event):
+        """Sets the is_user_event of this Event.
+
+        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+
+        :param is_user_event: The is_user_event of this Event.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_user_event = is_user_event
+
+    @property
+    def name(self):
+        """Gets the name of this Event.  # noqa: E501
+
+        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
+
+        :return: The name of this Event.  # noqa: E501
         :rtype: str
         """
-        return self._creator_id
+        return self._name
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Event.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Event.
 
+        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
 
-        :param creator_id: The creator_id of this Event.  # noqa: E501
+        :param name: The name of this Event.  # noqa: E501
         :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._creator_id = creator_id
+        self._name = name
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this Event.  # noqa: E501
+    def running_state(self):
+        """Gets the running_state of this Event.  # noqa: E501
 
 
-        :return: The updater_id of this Event.  # noqa: E501
+        :return: The running_state of this Event.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._running_state
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Event.
+    @running_state.setter
+    def running_state(self, running_state):
+        """Sets the running_state of this Event.
 
 
-        :param updater_id: The updater_id of this Event.  # noqa: E501
+        :param running_state: The running_state of this Event.  # noqa: E501
         :type: str
         """
+        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
+        if running_state not in allowed_values:
+            raise ValueError(
+                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
+                .format(running_state, allowed_values)
+            )
 
-        self._updater_id = updater_id
+        self._running_state = running_state
 
     @property
-    def updated_at(self):
-        """Gets the updated_at of this Event.  # noqa: E501
+    def start_time(self):
+        """Gets the start_time of this Event.  # noqa: E501
 
+        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
 
-        :return: The updated_at of this Event.  # noqa: E501
+        :return: The start_time of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._updated_at
+        return self._start_time
 
-    @updated_at.setter
-    def updated_at(self, updated_at):
-        """Sets the updated_at of this Event.
+    @start_time.setter
+    def start_time(self, start_time):
+        """Sets the start_time of this Event.
 
+        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
 
-        :param updated_at: The updated_at of this Event.  # noqa: E501
+        :param start_time: The start_time of this Event.  # noqa: E501
         :type: int
         """
+        if start_time is None:
+            raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
 
-        self._updated_at = updated_at
+        self._start_time = start_time
 
     @property
-    def id(self):
-        """Gets the id of this Event.  # noqa: E501
+    def summarized_events(self):
+        """Gets the summarized_events of this Event.  # noqa: E501
+
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
 
+        :return: The summarized_events of this Event.  # noqa: E501
+        :rtype: int
+        """
+        return self._summarized_events
 
-        :return: The id of this Event.  # noqa: E501
+    @summarized_events.setter
+    def summarized_events(self, summarized_events):
+        """Sets the summarized_events of this Event.
+
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
+
+        :param summarized_events: The summarized_events of this Event.  # noqa: E501
+        :type: int
+        """
+
+        self._summarized_events = summarized_events
+
+    @property
+    def table(self):
+        """Gets the table of this Event.  # noqa: E501
+
+        The customer to which the event belongs  # noqa: E501
+
+        :return: The table of this Event.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._table
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Event.
+    @table.setter
+    def table(self, table):
+        """Sets the table of this Event.
 
+        The customer to which the event belongs  # noqa: E501
 
-        :param id: The id of this Event.  # noqa: E501
+        :param table: The table of this Event.  # noqa: E501
         :type: str
         """
 
-        self._id = id
+        self._table = table
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Event.  # noqa: E501
+    def tags(self):
+        """Gets the tags of this Event.  # noqa: E501
 
+        A list of event tags  # noqa: E501
 
-        :return: The created_epoch_millis of this Event.  # noqa: E501
+        :return: The tags of this Event.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this Event.
+
+        A list of event tags  # noqa: E501
+
+        :param tags: The tags of this Event.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tags = tags
+
+    @property
+    def updated_at(self):
+        """Gets the updated_at of this Event.  # noqa: E501
+
+
+        :return: The updated_at of this Event.  # noqa: E501
         :rtype: int
         """
-        return self._created_epoch_millis
+        return self._updated_at
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Event.
+    @updated_at.setter
+    def updated_at(self, updated_at):
+        """Sets the updated_at of this Event.
 
 
-        :param created_epoch_millis: The created_epoch_millis of this Event.  # noqa: E501
+        :param updated_at: The updated_at of this Event.  # noqa: E501
         :type: int
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._updated_at = updated_at
 
     @property
     def updated_epoch_millis(self):
@@ -573,56 +604,25 @@ def updated_epoch_millis(self, updated_epoch_millis):
         self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def running_state(self):
-        """Gets the running_state of this Event.  # noqa: E501
-
-
-        :return: The running_state of this Event.  # noqa: E501
-        :rtype: str
-        """
-        return self._running_state
-
-    @running_state.setter
-    def running_state(self, running_state):
-        """Sets the running_state of this Event.
-
-
-        :param running_state: The running_state of this Event.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
-            raise ValueError(
-                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
-                .format(running_state, allowed_values)
-            )
-
-        self._running_state = running_state
-
-    @property
-    def name(self):
-        """Gets the name of this Event.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Event.  # noqa: E501
 
-        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
 
-        :return: The name of this Event.  # noqa: E501
+        :return: The updater_id of this Event.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._updater_id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Event.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Event.
 
-        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
 
-        :param name: The name of this Event.  # noqa: E501
+        :param updater_id: The updater_id of this Event.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 30c28ca..76ed460 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -37,26 +37,26 @@ class EventSearchRequest(object):
         'cursor': 'str',
         'limit': 'int',
         'query': 'list[SearchQuery]',
-        'time_range': 'EventTimeRange',
-        'sort_time_ascending': 'bool'
+        'sort_time_ascending': 'bool',
+        'time_range': 'EventTimeRange'
     }
 
     attribute_map = {
         'cursor': 'cursor',
         'limit': 'limit',
         'query': 'query',
-        'time_range': 'timeRange',
-        'sort_time_ascending': 'sortTimeAscending'
+        'sort_time_ascending': 'sortTimeAscending',
+        'time_range': 'timeRange'
     }
 
-    def __init__(self, cursor=None, limit=None, query=None, time_range=None, sort_time_ascending=None):  # noqa: E501
+    def __init__(self, cursor=None, limit=None, query=None, sort_time_ascending=None, time_range=None):  # noqa: E501
         """EventSearchRequest - a model defined in Swagger"""  # noqa: E501
 
         self._cursor = None
         self._limit = None
         self._query = None
-        self._time_range = None
         self._sort_time_ascending = None
+        self._time_range = None
         self.discriminator = None
 
         if cursor is not None:
@@ -65,10 +65,10 @@ def __init__(self, cursor=None, limit=None, query=None, time_range=None, sort_ti
             self.limit = limit
         if query is not None:
             self.query = query
-        if time_range is not None:
-            self.time_range = time_range
         if sort_time_ascending is not None:
             self.sort_time_ascending = sort_time_ascending
+        if time_range is not None:
+            self.time_range = time_range
 
     @property
     def cursor(self):
@@ -139,27 +139,6 @@ def query(self, query):
 
         self._query = query
 
-    @property
-    def time_range(self):
-        """Gets the time_range of this EventSearchRequest.  # noqa: E501
-
-
-        :return: The time_range of this EventSearchRequest.  # noqa: E501
-        :rtype: EventTimeRange
-        """
-        return self._time_range
-
-    @time_range.setter
-    def time_range(self, time_range):
-        """Sets the time_range of this EventSearchRequest.
-
-
-        :param time_range: The time_range of this EventSearchRequest.  # noqa: E501
-        :type: EventTimeRange
-        """
-
-        self._time_range = time_range
-
     @property
     def sort_time_ascending(self):
         """Gets the sort_time_ascending of this EventSearchRequest.  # noqa: E501
@@ -183,6 +162,27 @@ def sort_time_ascending(self, sort_time_ascending):
 
         self._sort_time_ascending = sort_time_ascending
 
+    @property
+    def time_range(self):
+        """Gets the time_range of this EventSearchRequest.  # noqa: E501
+
+
+        :return: The time_range of this EventSearchRequest.  # noqa: E501
+        :rtype: EventTimeRange
+        """
+        return self._time_range
+
+    @time_range.setter
+    def time_range(self, time_range):
+        """Sets the time_range of this EventSearchRequest.
+
+
+        :param time_range: The time_range of this EventSearchRequest.  # noqa: E501
+        :type: EventTimeRange
+        """
+
+        self._time_range = time_range
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index 0be4dc7..c3aa4c2 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -31,93 +31,89 @@ class ExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'description': 'str',
+        'created_epoch_millis': 'int',
         'creator_id': 'str',
-        'updater_id': 'str',
+        'description': 'str',
         'id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
-        'template': 'str',
         'metric_filter_regex': 'str',
-        'source_filter_regex': 'str',
+        'name': 'str',
         'point_tag_filter_regexes': 'dict(str, str)',
-        'name': 'str'
+        'source_filter_regex': 'str',
+        'template': 'str',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
     }
 
     attribute_map = {
-        'description': 'description',
+        'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
+        'description': 'description',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'template': 'template',
         'metric_filter_regex': 'metricFilterRegex',
-        'source_filter_regex': 'sourceFilterRegex',
+        'name': 'name',
         'point_tag_filter_regexes': 'pointTagFilterRegexes',
-        'name': 'name'
+        'source_filter_regex': 'sourceFilterRegex',
+        'template': 'template',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, description=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, metric_filter_regex=None, source_filter_regex=None, point_tag_filter_regexes=None, name=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, id=None, metric_filter_regex=None, name=None, point_tag_filter_regexes=None, source_filter_regex=None, template=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """ExternalLink - a model defined in Swagger"""  # noqa: E501
 
-        self._description = None
+        self._created_epoch_millis = None
         self._creator_id = None
-        self._updater_id = None
+        self._description = None
         self._id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._template = None
         self._metric_filter_regex = None
-        self._source_filter_regex = None
-        self._point_tag_filter_regexes = None
         self._name = None
+        self._point_tag_filter_regexes = None
+        self._source_filter_regex = None
+        self._template = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
         self.discriminator = None
 
-        self.description = description
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
         if creator_id is not None:
             self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
+        self.description = description
         if id is not None:
             self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        self.template = template
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
-        if source_filter_regex is not None:
-            self.source_filter_regex = source_filter_regex
+        self.name = name
         if point_tag_filter_regexes is not None:
             self.point_tag_filter_regexes = point_tag_filter_regexes
-        self.name = name
+        if source_filter_regex is not None:
+            self.source_filter_regex = source_filter_regex
+        self.template = template
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def description(self):
-        """Gets the description of this ExternalLink.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
 
-        Human-readable description for this external link  # noqa: E501
 
-        :return: The description of this ExternalLink.  # noqa: E501
-        :rtype: str
+        :return: The created_epoch_millis of this ExternalLink.  # noqa: E501
+        :rtype: int
         """
-        return self._description
+        return self._created_epoch_millis
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this ExternalLink.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this ExternalLink.
 
-        Human-readable description for this external link  # noqa: E501
 
-        :param description: The description of this ExternalLink.  # noqa: E501
-        :type: str
+        :param created_epoch_millis: The created_epoch_millis of this ExternalLink.  # noqa: E501
+        :type: int
         """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._description = description
+        self._created_epoch_millis = created_epoch_millis
 
     @property
     def creator_id(self):
@@ -141,25 +137,29 @@ def creator_id(self, creator_id):
         self._creator_id = creator_id
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this ExternalLink.  # noqa: E501
+    def description(self):
+        """Gets the description of this ExternalLink.  # noqa: E501
 
+        Human-readable description for this external link  # noqa: E501
 
-        :return: The updater_id of this ExternalLink.  # noqa: E501
+        :return: The description of this ExternalLink.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._description
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this ExternalLink.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ExternalLink.
 
+        Human-readable description for this external link  # noqa: E501
 
-        :param updater_id: The updater_id of this ExternalLink.  # noqa: E501
+        :param description: The description of this ExternalLink.  # noqa: E501
         :type: str
         """
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._updater_id = updater_id
+        self._description = description
 
     @property
     def id(self):
@@ -183,94 +183,75 @@ def id(self, id):
         self._id = id
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this ExternalLink.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this ExternalLink.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this ExternalLink.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this ExternalLink.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this ExternalLink.  # noqa: E501
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this ExternalLink.  # noqa: E501
 
+        Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed  # noqa: E501
 
-        :return: The updated_epoch_millis of this ExternalLink.  # noqa: E501
-        :rtype: int
+        :return: The metric_filter_regex of this ExternalLink.  # noqa: E501
+        :rtype: str
         """
-        return self._updated_epoch_millis
+        return self._metric_filter_regex
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this ExternalLink.
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this ExternalLink.
 
+        Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this ExternalLink.  # noqa: E501
-        :type: int
+        :param metric_filter_regex: The metric_filter_regex of this ExternalLink.  # noqa: E501
+        :type: str
         """
 
-        self._updated_epoch_millis = updated_epoch_millis
+        self._metric_filter_regex = metric_filter_regex
 
     @property
-    def template(self):
-        """Gets the template of this ExternalLink.  # noqa: E501
+    def name(self):
+        """Gets the name of this ExternalLink.  # noqa: E501
 
-        The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc  # noqa: E501
+        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :return: The template of this ExternalLink.  # noqa: E501
+        :return: The name of this ExternalLink.  # noqa: E501
         :rtype: str
         """
-        return self._template
+        return self._name
 
-    @template.setter
-    def template(self, template):
-        """Sets the template of this ExternalLink.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ExternalLink.
 
-        The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc  # noqa: E501
+        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :param template: The template of this ExternalLink.  # noqa: E501
+        :param name: The name of this ExternalLink.  # noqa: E501
         :type: str
         """
-        if template is None:
-            raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._template = template
+        self._name = name
 
     @property
-    def metric_filter_regex(self):
-        """Gets the metric_filter_regex of this ExternalLink.  # noqa: E501
+    def point_tag_filter_regexes(self):
+        """Gets the point_tag_filter_regexes of this ExternalLink.  # noqa: E501
 
-        Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed  # noqa: E501
+        Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed  # noqa: E501
 
-        :return: The metric_filter_regex of this ExternalLink.  # noqa: E501
-        :rtype: str
+        :return: The point_tag_filter_regexes of this ExternalLink.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._metric_filter_regex
+        return self._point_tag_filter_regexes
 
-    @metric_filter_regex.setter
-    def metric_filter_regex(self, metric_filter_regex):
-        """Sets the metric_filter_regex of this ExternalLink.
+    @point_tag_filter_regexes.setter
+    def point_tag_filter_regexes(self, point_tag_filter_regexes):
+        """Sets the point_tag_filter_regexes of this ExternalLink.
 
-        Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed  # noqa: E501
+        Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed  # noqa: E501
 
-        :param metric_filter_regex: The metric_filter_regex of this ExternalLink.  # noqa: E501
-        :type: str
+        :param point_tag_filter_regexes: The point_tag_filter_regexes of this ExternalLink.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._metric_filter_regex = metric_filter_regex
+        self._point_tag_filter_regexes = point_tag_filter_regexes
 
     @property
     def source_filter_regex(self):
@@ -296,52 +277,71 @@ def source_filter_regex(self, source_filter_regex):
         self._source_filter_regex = source_filter_regex
 
     @property
-    def point_tag_filter_regexes(self):
-        """Gets the point_tag_filter_regexes of this ExternalLink.  # noqa: E501
+    def template(self):
+        """Gets the template of this ExternalLink.  # noqa: E501
 
-        Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed  # noqa: E501
+        The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc  # noqa: E501
 
-        :return: The point_tag_filter_regexes of this ExternalLink.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The template of this ExternalLink.  # noqa: E501
+        :rtype: str
         """
-        return self._point_tag_filter_regexes
+        return self._template
 
-    @point_tag_filter_regexes.setter
-    def point_tag_filter_regexes(self, point_tag_filter_regexes):
-        """Sets the point_tag_filter_regexes of this ExternalLink.
+    @template.setter
+    def template(self, template):
+        """Sets the template of this ExternalLink.
 
-        Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed  # noqa: E501
+        The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc  # noqa: E501
 
-        :param point_tag_filter_regexes: The point_tag_filter_regexes of this ExternalLink.  # noqa: E501
-        :type: dict(str, str)
+        :param template: The template of this ExternalLink.  # noqa: E501
+        :type: str
         """
+        if template is None:
+            raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
 
-        self._point_tag_filter_regexes = point_tag_filter_regexes
+        self._template = template
 
     @property
-    def name(self):
-        """Gets the name of this ExternalLink.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this ExternalLink.  # noqa: E501
 
-        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :return: The name of this ExternalLink.  # noqa: E501
+        :return: The updated_epoch_millis of this ExternalLink.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this ExternalLink.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this ExternalLink.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this ExternalLink.  # noqa: E501
+
+
+        :return: The updater_id of this ExternalLink.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._updater_id
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ExternalLink.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this ExternalLink.
 
-        Name of the external link.  Will be displayed in context (right-click) menus on charts  # noqa: E501
 
-        :param name: The name of this ExternalLink.  # noqa: E501
+        :param updater_id: The updater_id of this ExternalLink.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index 8214b49..af4bda4 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -33,51 +33,74 @@ class FacetResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[str]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """FacetResponse - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this FacetResponse.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this FacetResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this FacetResponse.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this FacetResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -102,27 +125,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this FacetResponse.  # noqa: E501
-
-
-        :return: The offset of this FacetResponse.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this FacetResponse.
-
-
-        :param offset: The offset of this FacetResponse.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this FacetResponse.  # noqa: E501
@@ -144,52 +146,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this FacetResponse.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this FacetResponse.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this FacetResponse.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this FacetResponse.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this FacetResponse.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this FacetResponse.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this FacetResponse.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this FacetResponse.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this FacetResponse.  # noqa: E501
@@ -213,6 +169,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this FacetResponse.  # noqa: E501
+
+
+        :return: The offset of this FacetResponse.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this FacetResponse.
+
+
+        :param offset: The offset of this FacetResponse.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this FacetResponse.  # noqa: E501
@@ -234,6 +211,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this FacetResponse.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this FacetResponse.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this FacetResponse.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this FacetResponse.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 6997297..17633fd 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -33,41 +33,93 @@ class FacetSearchRequestContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'facet_query': 'str',
+        'facet_query_matching_method': 'str',
         'limit': 'int',
         'offset': 'int',
-        'query': 'list[SearchQuery]',
-        'facet_query': 'str',
-        'facet_query_matching_method': 'str'
+        'query': 'list[SearchQuery]'
     }
 
     attribute_map = {
+        'facet_query': 'facetQuery',
+        'facet_query_matching_method': 'facetQueryMatchingMethod',
         'limit': 'limit',
         'offset': 'offset',
-        'query': 'query',
-        'facet_query': 'facetQuery',
-        'facet_query_matching_method': 'facetQueryMatchingMethod'
+        'query': 'query'
     }
 
-    def __init__(self, limit=None, offset=None, query=None, facet_query=None, facet_query_matching_method=None):  # noqa: E501
+    def __init__(self, facet_query=None, facet_query_matching_method=None, limit=None, offset=None, query=None):  # noqa: E501
         """FacetSearchRequestContainer - a model defined in Swagger"""  # noqa: E501
 
+        self._facet_query = None
+        self._facet_query_matching_method = None
         self._limit = None
         self._offset = None
         self._query = None
-        self._facet_query = None
-        self._facet_query_matching_method = None
         self.discriminator = None
 
+        if facet_query is not None:
+            self.facet_query = facet_query
+        if facet_query_matching_method is not None:
+            self.facet_query_matching_method = facet_query_matching_method
         if limit is not None:
             self.limit = limit
         if offset is not None:
             self.offset = offset
         if query is not None:
             self.query = query
-        if facet_query is not None:
-            self.facet_query = facet_query
-        if facet_query_matching_method is not None:
-            self.facet_query_matching_method = facet_query_matching_method
+
+    @property
+    def facet_query(self):
+        """Gets the facet_query of this FacetSearchRequestContainer.  # noqa: E501
+
+        A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned.  # noqa: E501
+
+        :return: The facet_query of this FacetSearchRequestContainer.  # noqa: E501
+        :rtype: str
+        """
+        return self._facet_query
+
+    @facet_query.setter
+    def facet_query(self, facet_query):
+        """Sets the facet_query of this FacetSearchRequestContainer.
+
+        A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned.  # noqa: E501
+
+        :param facet_query: The facet_query of this FacetSearchRequestContainer.  # noqa: E501
+        :type: str
+        """
+
+        self._facet_query = facet_query
+
+    @property
+    def facet_query_matching_method(self):
+        """Gets the facet_query_matching_method of this FacetSearchRequestContainer.  # noqa: E501
+
+        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
+
+        :return: The facet_query_matching_method of this FacetSearchRequestContainer.  # noqa: E501
+        :rtype: str
+        """
+        return self._facet_query_matching_method
+
+    @facet_query_matching_method.setter
+    def facet_query_matching_method(self, facet_query_matching_method):
+        """Sets the facet_query_matching_method of this FacetSearchRequestContainer.
+
+        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
+
+        :param facet_query_matching_method: The facet_query_matching_method of this FacetSearchRequestContainer.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
+        if facet_query_matching_method not in allowed_values:
+            raise ValueError(
+                "Invalid value for `facet_query_matching_method` ({0}), must be one of {1}"  # noqa: E501
+                .format(facet_query_matching_method, allowed_values)
+            )
+
+        self._facet_query_matching_method = facet_query_matching_method
 
     @property
     def limit(self):
@@ -138,58 +190,6 @@ def query(self, query):
 
         self._query = query
 
-    @property
-    def facet_query(self):
-        """Gets the facet_query of this FacetSearchRequestContainer.  # noqa: E501
-
-        A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned.  # noqa: E501
-
-        :return: The facet_query of this FacetSearchRequestContainer.  # noqa: E501
-        :rtype: str
-        """
-        return self._facet_query
-
-    @facet_query.setter
-    def facet_query(self, facet_query):
-        """Sets the facet_query of this FacetSearchRequestContainer.
-
-        A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned.  # noqa: E501
-
-        :param facet_query: The facet_query of this FacetSearchRequestContainer.  # noqa: E501
-        :type: str
-        """
-
-        self._facet_query = facet_query
-
-    @property
-    def facet_query_matching_method(self):
-        """Gets the facet_query_matching_method of this FacetSearchRequestContainer.  # noqa: E501
-
-        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
-
-        :return: The facet_query_matching_method of this FacetSearchRequestContainer.  # noqa: E501
-        :rtype: str
-        """
-        return self._facet_query_matching_method
-
-    @facet_query_matching_method.setter
-    def facet_query_matching_method(self, facet_query_matching_method):
-        """Sets the facet_query_matching_method of this FacetSearchRequestContainer.
-
-        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
-
-        :param facet_query_matching_method: The facet_query_matching_method of this FacetSearchRequestContainer.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
-        if facet_query_matching_method not in allowed_values:
-            raise ValueError(
-                "Invalid value for `facet_query_matching_method` ({0}), must be one of {1}"  # noqa: E501
-                .format(facet_query_matching_method, allowed_values)
-            )
-
-        self._facet_query_matching_method = facet_query_matching_method
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index cc50719..4a460d9 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -31,49 +31,26 @@ class FacetsResponseContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'limit': 'int',
-        'facets': 'dict(str, list[str])'
+        'facets': 'dict(str, list[str])',
+        'limit': 'int'
     }
 
     attribute_map = {
-        'limit': 'limit',
-        'facets': 'facets'
+        'facets': 'facets',
+        'limit': 'limit'
     }
 
-    def __init__(self, limit=None, facets=None):  # noqa: E501
+    def __init__(self, facets=None, limit=None):  # noqa: E501
         """FacetsResponseContainer - a model defined in Swagger"""  # noqa: E501
 
-        self._limit = None
         self._facets = None
+        self._limit = None
         self.discriminator = None
 
-        if limit is not None:
-            self.limit = limit
         if facets is not None:
             self.facets = facets
-
-    @property
-    def limit(self):
-        """Gets the limit of this FacetsResponseContainer.  # noqa: E501
-
-        The requested limit  # noqa: E501
-
-        :return: The limit of this FacetsResponseContainer.  # noqa: E501
-        :rtype: int
-        """
-        return self._limit
-
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this FacetsResponseContainer.
-
-        The requested limit  # noqa: E501
-
-        :param limit: The limit of this FacetsResponseContainer.  # noqa: E501
-        :type: int
-        """
-
-        self._limit = limit
+        if limit is not None:
+            self.limit = limit
 
     @property
     def facets(self):
@@ -98,6 +75,29 @@ def facets(self, facets):
 
         self._facets = facets
 
+    @property
+    def limit(self):
+        """Gets the limit of this FacetsResponseContainer.  # noqa: E501
+
+        The requested limit  # noqa: E501
+
+        :return: The limit of this FacetsResponseContainer.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this FacetsResponseContainer.
+
+        The requested limit  # noqa: E501
+
+        :param limit: The limit of this FacetsResponseContainer.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index 96c6cae..b2b3a91 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -33,86 +33,92 @@ class FacetsSearchRequestContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'query': 'list[SearchQuery]',
-        'limit': 'int',
-        'facets': 'list[str]',
         'facet_query': 'str',
-        'facet_query_matching_method': 'str'
+        'facet_query_matching_method': 'str',
+        'facets': 'list[str]',
+        'limit': 'int',
+        'query': 'list[SearchQuery]'
     }
 
     attribute_map = {
-        'query': 'query',
-        'limit': 'limit',
-        'facets': 'facets',
         'facet_query': 'facetQuery',
-        'facet_query_matching_method': 'facetQueryMatchingMethod'
+        'facet_query_matching_method': 'facetQueryMatchingMethod',
+        'facets': 'facets',
+        'limit': 'limit',
+        'query': 'query'
     }
 
-    def __init__(self, query=None, limit=None, facets=None, facet_query=None, facet_query_matching_method=None):  # noqa: E501
+    def __init__(self, facet_query=None, facet_query_matching_method=None, facets=None, limit=None, query=None):  # noqa: E501
         """FacetsSearchRequestContainer - a model defined in Swagger"""  # noqa: E501
 
-        self._query = None
-        self._limit = None
-        self._facets = None
         self._facet_query = None
         self._facet_query_matching_method = None
+        self._facets = None
+        self._limit = None
+        self._query = None
         self.discriminator = None
 
-        if query is not None:
-            self.query = query
-        if limit is not None:
-            self.limit = limit
-        self.facets = facets
         if facet_query is not None:
             self.facet_query = facet_query
         if facet_query_matching_method is not None:
             self.facet_query_matching_method = facet_query_matching_method
+        self.facets = facets
+        if limit is not None:
+            self.limit = limit
+        if query is not None:
+            self.query = query
 
     @property
-    def query(self):
-        """Gets the query of this FacetsSearchRequestContainer.  # noqa: E501
+    def facet_query(self):
+        """Gets the facet_query of this FacetsSearchRequestContainer.  # noqa: E501
 
-        A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of 'entity search results'.  All facets listed in the 'facets' search parameter of all entities within 'entity search results' are scanned to produce the search results (of facet values).  # noqa: E501
+        A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned  # noqa: E501
 
-        :return: The query of this FacetsSearchRequestContainer.  # noqa: E501
-        :rtype: list[SearchQuery]
+        :return: The facet_query of this FacetsSearchRequestContainer.  # noqa: E501
+        :rtype: str
         """
-        return self._query
+        return self._facet_query
 
-    @query.setter
-    def query(self, query):
-        """Sets the query of this FacetsSearchRequestContainer.
+    @facet_query.setter
+    def facet_query(self, facet_query):
+        """Sets the facet_query of this FacetsSearchRequestContainer.
 
-        A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of 'entity search results'.  All facets listed in the 'facets' search parameter of all entities within 'entity search results' are scanned to produce the search results (of facet values).  # noqa: E501
+        A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned  # noqa: E501
 
-        :param query: The query of this FacetsSearchRequestContainer.  # noqa: E501
-        :type: list[SearchQuery]
+        :param facet_query: The facet_query of this FacetsSearchRequestContainer.  # noqa: E501
+        :type: str
         """
 
-        self._query = query
+        self._facet_query = facet_query
 
     @property
-    def limit(self):
-        """Gets the limit of this FacetsSearchRequestContainer.  # noqa: E501
+    def facet_query_matching_method(self):
+        """Gets the facet_query_matching_method of this FacetsSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default 100  # noqa: E501
+        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
 
-        :return: The limit of this FacetsSearchRequestContainer.  # noqa: E501
-        :rtype: int
+        :return: The facet_query_matching_method of this FacetsSearchRequestContainer.  # noqa: E501
+        :rtype: str
         """
-        return self._limit
+        return self._facet_query_matching_method
 
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this FacetsSearchRequestContainer.
+    @facet_query_matching_method.setter
+    def facet_query_matching_method(self, facet_query_matching_method):
+        """Sets the facet_query_matching_method of this FacetsSearchRequestContainer.
 
-        The number of results to return.  Default 100  # noqa: E501
+        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
 
-        :param limit: The limit of this FacetsSearchRequestContainer.  # noqa: E501
-        :type: int
+        :param facet_query_matching_method: The facet_query_matching_method of this FacetsSearchRequestContainer.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
+        if facet_query_matching_method not in allowed_values:
+            raise ValueError(
+                "Invalid value for `facet_query_matching_method` ({0}), must be one of {1}"  # noqa: E501
+                .format(facet_query_matching_method, allowed_values)
+            )
 
-        self._limit = limit
+        self._facet_query_matching_method = facet_query_matching_method
 
     @property
     def facets(self):
@@ -140,56 +146,50 @@ def facets(self, facets):
         self._facets = facets
 
     @property
-    def facet_query(self):
-        """Gets the facet_query of this FacetsSearchRequestContainer.  # noqa: E501
+    def limit(self):
+        """Gets the limit of this FacetsSearchRequestContainer.  # noqa: E501
 
-        A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned  # noqa: E501
+        The number of results to return.  Default 100  # noqa: E501
 
-        :return: The facet_query of this FacetsSearchRequestContainer.  # noqa: E501
-        :rtype: str
+        :return: The limit of this FacetsSearchRequestContainer.  # noqa: E501
+        :rtype: int
         """
-        return self._facet_query
+        return self._limit
 
-    @facet_query.setter
-    def facet_query(self, facet_query):
-        """Sets the facet_query of this FacetsSearchRequestContainer.
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this FacetsSearchRequestContainer.
 
-        A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned  # noqa: E501
+        The number of results to return.  Default 100  # noqa: E501
 
-        :param facet_query: The facet_query of this FacetsSearchRequestContainer.  # noqa: E501
-        :type: str
+        :param limit: The limit of this FacetsSearchRequestContainer.  # noqa: E501
+        :type: int
         """
 
-        self._facet_query = facet_query
+        self._limit = limit
 
     @property
-    def facet_query_matching_method(self):
-        """Gets the facet_query_matching_method of this FacetsSearchRequestContainer.  # noqa: E501
+    def query(self):
+        """Gets the query of this FacetsSearchRequestContainer.  # noqa: E501
 
-        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
+        A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of 'entity search results'.  All facets listed in the 'facets' search parameter of all entities within 'entity search results' are scanned to produce the search results (of facet values).  # noqa: E501
 
-        :return: The facet_query_matching_method of this FacetsSearchRequestContainer.  # noqa: E501
-        :rtype: str
+        :return: The query of this FacetsSearchRequestContainer.  # noqa: E501
+        :rtype: list[SearchQuery]
         """
-        return self._facet_query_matching_method
+        return self._query
 
-    @facet_query_matching_method.setter
-    def facet_query_matching_method(self, facet_query_matching_method):
-        """Sets the facet_query_matching_method of this FacetsSearchRequestContainer.
+    @query.setter
+    def query(self, query):
+        """Sets the query of this FacetsSearchRequestContainer.
 
-        The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.  # noqa: E501
+        A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of 'entity search results'.  All facets listed in the 'facets' search parameter of all entities within 'entity search results' are scanned to produce the search results (of facet values).  # noqa: E501
 
-        :param facet_query_matching_method: The facet_query_matching_method of this FacetsSearchRequestContainer.  # noqa: E501
-        :type: str
+        :param query: The query of this FacetsSearchRequestContainer.  # noqa: E501
+        :type: list[SearchQuery]
         """
-        allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
-        if facet_query_matching_method not in allowed_values:
-            raise ValueError(
-                "Invalid value for `facet_query_matching_method` ({0}), must be one of {1}"  # noqa: E501
-                .format(facet_query_matching_method, allowed_values)
-            )
 
-        self._facet_query_matching_method = facet_query_matching_method
+        self._query = query
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index db452be..40b028a 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -31,53 +31,28 @@ class GCPBillingConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'project_id': 'str',
         'gcp_api_key': 'str',
-        'gcp_json_key': 'str'
+        'gcp_json_key': 'str',
+        'project_id': 'str'
     }
 
     attribute_map = {
-        'project_id': 'projectId',
         'gcp_api_key': 'gcpApiKey',
-        'gcp_json_key': 'gcpJsonKey'
+        'gcp_json_key': 'gcpJsonKey',
+        'project_id': 'projectId'
     }
 
-    def __init__(self, project_id=None, gcp_api_key=None, gcp_json_key=None):  # noqa: E501
+    def __init__(self, gcp_api_key=None, gcp_json_key=None, project_id=None):  # noqa: E501
         """GCPBillingConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._project_id = None
         self._gcp_api_key = None
         self._gcp_json_key = None
+        self._project_id = None
         self.discriminator = None
 
-        self.project_id = project_id
         self.gcp_api_key = gcp_api_key
         self.gcp_json_key = gcp_json_key
-
-    @property
-    def project_id(self):
-        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
-
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
-
-        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._project_id
-
-    @project_id.setter
-    def project_id(self, project_id):
-        """Sets the project_id of this GCPBillingConfiguration.
-
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
-
-        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
-        :type: str
-        """
-        if project_id is None:
-            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
-
-        self._project_id = project_id
+        self.project_id = project_id
 
     @property
     def gcp_api_key(self):
@@ -129,6 +104,31 @@ def gcp_json_key(self, gcp_json_key):
 
         self._gcp_json_key = gcp_json_key
 
+    @property
+    def project_id(self):
+        """Gets the project_id of this GCPBillingConfiguration.  # noqa: E501
+
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
+
+        :return: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_id
+
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPBillingConfiguration.
+
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
+
+        :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
+        :type: str
+        """
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
+
+        self._project_id = project_id
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 5d23956..75ccbe9 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -31,59 +31,89 @@ class GCPConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'project_id': 'str',
-        'metric_filter_regex': 'str',
+        'categories_to_fetch': 'list[str]',
         'gcp_json_key': 'str',
-        'categories_to_fetch': 'list[str]'
+        'metric_filter_regex': 'str',
+        'project_id': 'str'
     }
 
     attribute_map = {
-        'project_id': 'projectId',
-        'metric_filter_regex': 'metricFilterRegex',
+        'categories_to_fetch': 'categoriesToFetch',
         'gcp_json_key': 'gcpJsonKey',
-        'categories_to_fetch': 'categoriesToFetch'
+        'metric_filter_regex': 'metricFilterRegex',
+        'project_id': 'projectId'
     }
 
-    def __init__(self, project_id=None, metric_filter_regex=None, gcp_json_key=None, categories_to_fetch=None):  # noqa: E501
+    def __init__(self, categories_to_fetch=None, gcp_json_key=None, metric_filter_regex=None, project_id=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
 
-        self._project_id = None
-        self._metric_filter_regex = None
-        self._gcp_json_key = None
         self._categories_to_fetch = None
+        self._gcp_json_key = None
+        self._metric_filter_regex = None
+        self._project_id = None
         self.discriminator = None
 
-        self.project_id = project_id
-        if metric_filter_regex is not None:
-            self.metric_filter_regex = metric_filter_regex
-        self.gcp_json_key = gcp_json_key
         if categories_to_fetch is not None:
             self.categories_to_fetch = categories_to_fetch
+        self.gcp_json_key = gcp_json_key
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
+        self.project_id = project_id
 
     @property
-    def project_id(self):
-        """Gets the project_id of this GCPConfiguration.  # noqa: E501
+    def categories_to_fetch(self):
+        """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
 
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
 
-        :return: The project_id of this GCPConfiguration.  # noqa: E501
+        :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._categories_to_fetch
+
+    @categories_to_fetch.setter
+    def categories_to_fetch(self, categories_to_fetch):
+        """Sets the categories_to_fetch of this GCPConfiguration.
+
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+
+        :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
+        if not set(categories_to_fetch).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._categories_to_fetch = categories_to_fetch
+
+    @property
+    def gcp_json_key(self):
+        """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
+
+        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
+
+        :return: The gcp_json_key of this GCPConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._project_id
+        return self._gcp_json_key
 
-    @project_id.setter
-    def project_id(self, project_id):
-        """Sets the project_id of this GCPConfiguration.
+    @gcp_json_key.setter
+    def gcp_json_key(self, gcp_json_key):
+        """Sets the gcp_json_key of this GCPConfiguration.
 
-        The Google Cloud Platform (GCP) project id.  # noqa: E501
+        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
 
-        :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
+        :param gcp_json_key: The gcp_json_key of this GCPConfiguration.  # noqa: E501
         :type: str
         """
-        if project_id is None:
-            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
+        if gcp_json_key is None:
+            raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
 
-        self._project_id = project_id
+        self._gcp_json_key = gcp_json_key
 
     @property
     def metric_filter_regex(self):
@@ -109,59 +139,29 @@ def metric_filter_regex(self, metric_filter_regex):
         self._metric_filter_regex = metric_filter_regex
 
     @property
-    def gcp_json_key(self):
-        """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
+    def project_id(self):
+        """Gets the project_id of this GCPConfiguration.  # noqa: E501
 
-        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :return: The gcp_json_key of this GCPConfiguration.  # noqa: E501
+        :return: The project_id of this GCPConfiguration.  # noqa: E501
         :rtype: str
         """
-        return self._gcp_json_key
+        return self._project_id
 
-    @gcp_json_key.setter
-    def gcp_json_key(self, gcp_json_key):
-        """Sets the gcp_json_key of this GCPConfiguration.
+    @project_id.setter
+    def project_id(self, project_id):
+        """Sets the project_id of this GCPConfiguration.
 
-        Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.  # noqa: E501
+        The Google Cloud Platform (GCP) project id.  # noqa: E501
 
-        :param gcp_json_key: The gcp_json_key of this GCPConfiguration.  # noqa: E501
+        :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
         :type: str
         """
-        if gcp_json_key is None:
-            raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
-
-        self._gcp_json_key = gcp_json_key
-
-    @property
-    def categories_to_fetch(self):
-        """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
-
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
-
-        :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._categories_to_fetch
-
-    @categories_to_fetch.setter
-    def categories_to_fetch(self, categories_to_fetch):
-        """Sets the categories_to_fetch of this GCPConfiguration.
-
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
-
-        :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
-        :type: list[str]
-        """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
-        if not set(categories_to_fetch).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
+        if project_id is None:
+            raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
 
-        self._categories_to_fetch = categories_to_fetch
+        self._project_id = project_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index bc80a5f..205ed42 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -31,46 +31,67 @@ class HistoryEntry(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'change_description': 'list[str]',
         'id': 'str',
         'in_trash': 'bool',
-        'version': 'int',
-        'update_user': 'str',
         'update_time': 'int',
-        'change_description': 'list[str]'
+        'update_user': 'str',
+        'version': 'int'
     }
 
     attribute_map = {
+        'change_description': 'changeDescription',
         'id': 'id',
         'in_trash': 'inTrash',
-        'version': 'version',
-        'update_user': 'updateUser',
         'update_time': 'updateTime',
-        'change_description': 'changeDescription'
+        'update_user': 'updateUser',
+        'version': 'version'
     }
 
-    def __init__(self, id=None, in_trash=None, version=None, update_user=None, update_time=None, change_description=None):  # noqa: E501
+    def __init__(self, change_description=None, id=None, in_trash=None, update_time=None, update_user=None, version=None):  # noqa: E501
         """HistoryEntry - a model defined in Swagger"""  # noqa: E501
 
+        self._change_description = None
         self._id = None
         self._in_trash = None
-        self._version = None
-        self._update_user = None
         self._update_time = None
-        self._change_description = None
+        self._update_user = None
+        self._version = None
         self.discriminator = None
 
+        if change_description is not None:
+            self.change_description = change_description
         if id is not None:
             self.id = id
         if in_trash is not None:
             self.in_trash = in_trash
-        if version is not None:
-            self.version = version
-        if update_user is not None:
-            self.update_user = update_user
         if update_time is not None:
             self.update_time = update_time
-        if change_description is not None:
-            self.change_description = change_description
+        if update_user is not None:
+            self.update_user = update_user
+        if version is not None:
+            self.version = version
+
+    @property
+    def change_description(self):
+        """Gets the change_description of this HistoryEntry.  # noqa: E501
+
+
+        :return: The change_description of this HistoryEntry.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._change_description
+
+    @change_description.setter
+    def change_description(self, change_description):
+        """Sets the change_description of this HistoryEntry.
+
+
+        :param change_description: The change_description of this HistoryEntry.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._change_description = change_description
 
     @property
     def id(self):
@@ -115,25 +136,25 @@ def in_trash(self, in_trash):
         self._in_trash = in_trash
 
     @property
-    def version(self):
-        """Gets the version of this HistoryEntry.  # noqa: E501
+    def update_time(self):
+        """Gets the update_time of this HistoryEntry.  # noqa: E501
 
 
-        :return: The version of this HistoryEntry.  # noqa: E501
+        :return: The update_time of this HistoryEntry.  # noqa: E501
         :rtype: int
         """
-        return self._version
+        return self._update_time
 
-    @version.setter
-    def version(self, version):
-        """Sets the version of this HistoryEntry.
+    @update_time.setter
+    def update_time(self, update_time):
+        """Sets the update_time of this HistoryEntry.
 
 
-        :param version: The version of this HistoryEntry.  # noqa: E501
+        :param update_time: The update_time of this HistoryEntry.  # noqa: E501
         :type: int
         """
 
-        self._version = version
+        self._update_time = update_time
 
     @property
     def update_user(self):
@@ -157,46 +178,25 @@ def update_user(self, update_user):
         self._update_user = update_user
 
     @property
-    def update_time(self):
-        """Gets the update_time of this HistoryEntry.  # noqa: E501
+    def version(self):
+        """Gets the version of this HistoryEntry.  # noqa: E501
 
 
-        :return: The update_time of this HistoryEntry.  # noqa: E501
+        :return: The version of this HistoryEntry.  # noqa: E501
         :rtype: int
         """
-        return self._update_time
+        return self._version
 
-    @update_time.setter
-    def update_time(self, update_time):
-        """Sets the update_time of this HistoryEntry.
+    @version.setter
+    def version(self, version):
+        """Sets the version of this HistoryEntry.
 
 
-        :param update_time: The update_time of this HistoryEntry.  # noqa: E501
+        :param version: The version of this HistoryEntry.  # noqa: E501
         :type: int
         """
 
-        self._update_time = update_time
-
-    @property
-    def change_description(self):
-        """Gets the change_description of this HistoryEntry.  # noqa: E501
-
-
-        :return: The change_description of this HistoryEntry.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._change_description
-
-    @change_description.setter
-    def change_description(self, change_description):
-        """Sets the change_description of this HistoryEntry.
-
-
-        :param change_description: The change_description of this HistoryEntry.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._change_description = change_description
+        self._version = version
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index ea413c7..358f2da 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -34,51 +34,74 @@ class HistoryResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[HistoryEntry]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """HistoryResponse - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this HistoryResponse.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this HistoryResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this HistoryResponse.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this HistoryResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this HistoryResponse.  # noqa: E501
-
-
-        :return: The offset of this HistoryResponse.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this HistoryResponse.
-
-
-        :param offset: The offset of this HistoryResponse.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this HistoryResponse.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this HistoryResponse.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this HistoryResponse.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this HistoryResponse.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this HistoryResponse.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this HistoryResponse.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this HistoryResponse.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this HistoryResponse.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this HistoryResponse.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this HistoryResponse.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this HistoryResponse.  # noqa: E501
+
+
+        :return: The offset of this HistoryResponse.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this HistoryResponse.
+
+
+        :param offset: The offset of this HistoryResponse.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this HistoryResponse.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this HistoryResponse.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this HistoryResponse.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this HistoryResponse.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this HistoryResponse.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index bcd0cfb..f8971de 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -37,312 +37,335 @@ class Integration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'description': 'str',
-        'version': 'str',
-        'icon': 'str',
-        'metrics': 'IntegrationMetrics',
-        'base_url': 'str',
-        'status': 'IntegrationStatus',
         'alerts': 'list[IntegrationAlert]',
-        'creator_id': 'str',
-        'updater_id': 'str',
-        'id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
-        'alias_of': 'str',
         'alias_integrations': 'list[IntegrationAlias]',
+        'alias_of': 'str',
+        'base_url': 'str',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
         'dashboards': 'list[IntegrationDashboard]',
         'deleted': 'bool',
+        'description': 'str',
+        'icon': 'str',
+        'id': 'str',
+        'metrics': 'IntegrationMetrics',
+        'name': 'str',
         'overview': 'str',
         'setup': 'str',
-        'name': 'str'
+        'status': 'IntegrationStatus',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str',
+        'version': 'str'
     }
 
     attribute_map = {
-        'description': 'description',
-        'version': 'version',
-        'icon': 'icon',
-        'metrics': 'metrics',
-        'base_url': 'baseUrl',
-        'status': 'status',
         'alerts': 'alerts',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
-        'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'alias_of': 'aliasOf',
         'alias_integrations': 'aliasIntegrations',
+        'alias_of': 'aliasOf',
+        'base_url': 'baseUrl',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
         'dashboards': 'dashboards',
         'deleted': 'deleted',
+        'description': 'description',
+        'icon': 'icon',
+        'id': 'id',
+        'metrics': 'metrics',
+        'name': 'name',
         'overview': 'overview',
         'setup': 'setup',
-        'name': 'name'
+        'status': 'status',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId',
+        'version': 'version'
     }
 
-    def __init__(self, description=None, version=None, icon=None, metrics=None, base_url=None, status=None, alerts=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, alias_of=None, alias_integrations=None, dashboards=None, deleted=None, overview=None, setup=None, name=None):  # noqa: E501
+    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, icon=None, id=None, metrics=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
 
-        self._description = None
-        self._version = None
-        self._icon = None
-        self._metrics = None
-        self._base_url = None
-        self._status = None
         self._alerts = None
-        self._creator_id = None
-        self._updater_id = None
-        self._id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._alias_of = None
         self._alias_integrations = None
+        self._alias_of = None
+        self._base_url = None
+        self._created_epoch_millis = None
+        self._creator_id = None
         self._dashboards = None
         self._deleted = None
+        self._description = None
+        self._icon = None
+        self._id = None
+        self._metrics = None
+        self._name = None
         self._overview = None
         self._setup = None
-        self._name = None
+        self._status = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self._version = None
         self.discriminator = None
 
-        self.description = description
-        self.version = version
-        self.icon = icon
-        if metrics is not None:
-            self.metrics = metrics
-        if base_url is not None:
-            self.base_url = base_url
-        if status is not None:
-            self.status = status
         if alerts is not None:
             self.alerts = alerts
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if id is not None:
-            self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        if alias_of is not None:
-            self.alias_of = alias_of
         if alias_integrations is not None:
             self.alias_integrations = alias_integrations
+        if alias_of is not None:
+            self.alias_of = alias_of
+        if base_url is not None:
+            self.base_url = base_url
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
         if dashboards is not None:
             self.dashboards = dashboards
         if deleted is not None:
             self.deleted = deleted
+        self.description = description
+        self.icon = icon
+        if id is not None:
+            self.id = id
+        if metrics is not None:
+            self.metrics = metrics
+        self.name = name
         if overview is not None:
             self.overview = overview
         if setup is not None:
             self.setup = setup
-        self.name = name
+        if status is not None:
+            self.status = status
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+        self.version = version
 
     @property
-    def description(self):
-        """Gets the description of this Integration.  # noqa: E501
+    def alerts(self):
+        """Gets the alerts of this Integration.  # noqa: E501
 
-        Integration description  # noqa: E501
+        A list of alerts belonging to this integration  # noqa: E501
 
-        :return: The description of this Integration.  # noqa: E501
-        :rtype: str
+        :return: The alerts of this Integration.  # noqa: E501
+        :rtype: list[IntegrationAlert]
         """
-        return self._description
+        return self._alerts
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Integration.
+    @alerts.setter
+    def alerts(self, alerts):
+        """Sets the alerts of this Integration.
 
-        Integration description  # noqa: E501
+        A list of alerts belonging to this integration  # noqa: E501
 
-        :param description: The description of this Integration.  # noqa: E501
-        :type: str
+        :param alerts: The alerts of this Integration.  # noqa: E501
+        :type: list[IntegrationAlert]
         """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._description = description
+        self._alerts = alerts
 
     @property
-    def version(self):
-        """Gets the version of this Integration.  # noqa: E501
+    def alias_integrations(self):
+        """Gets the alias_integrations of this Integration.  # noqa: E501
 
-        Integration version string  # noqa: E501
+        If set, a list of objects describing integrations that alias this one.  # noqa: E501
 
-        :return: The version of this Integration.  # noqa: E501
+        :return: The alias_integrations of this Integration.  # noqa: E501
+        :rtype: list[IntegrationAlias]
+        """
+        return self._alias_integrations
+
+    @alias_integrations.setter
+    def alias_integrations(self, alias_integrations):
+        """Sets the alias_integrations of this Integration.
+
+        If set, a list of objects describing integrations that alias this one.  # noqa: E501
+
+        :param alias_integrations: The alias_integrations of this Integration.  # noqa: E501
+        :type: list[IntegrationAlias]
+        """
+
+        self._alias_integrations = alias_integrations
+
+    @property
+    def alias_of(self):
+        """Gets the alias_of of this Integration.  # noqa: E501
+
+        If set, designates this integration as an alias integration, of the integration whose id is specified.  # noqa: E501
+
+        :return: The alias_of of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._version
+        return self._alias_of
 
-    @version.setter
-    def version(self, version):
-        """Sets the version of this Integration.
+    @alias_of.setter
+    def alias_of(self, alias_of):
+        """Sets the alias_of of this Integration.
 
-        Integration version string  # noqa: E501
+        If set, designates this integration as an alias integration, of the integration whose id is specified.  # noqa: E501
 
-        :param version: The version of this Integration.  # noqa: E501
+        :param alias_of: The alias_of of this Integration.  # noqa: E501
         :type: str
         """
-        if version is None:
-            raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
 
-        self._version = version
+        self._alias_of = alias_of
 
     @property
-    def icon(self):
-        """Gets the icon of this Integration.  # noqa: E501
+    def base_url(self):
+        """Gets the base_url of this Integration.  # noqa: E501
 
-        URI path to the integration icon  # noqa: E501
+        Base URL for this integration's assets  # noqa: E501
 
-        :return: The icon of this Integration.  # noqa: E501
+        :return: The base_url of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._icon
+        return self._base_url
 
-    @icon.setter
-    def icon(self, icon):
-        """Sets the icon of this Integration.
+    @base_url.setter
+    def base_url(self, base_url):
+        """Sets the base_url of this Integration.
 
-        URI path to the integration icon  # noqa: E501
+        Base URL for this integration's assets  # noqa: E501
 
-        :param icon: The icon of this Integration.  # noqa: E501
+        :param base_url: The base_url of this Integration.  # noqa: E501
         :type: str
         """
-        if icon is None:
-            raise ValueError("Invalid value for `icon`, must not be `None`")  # noqa: E501
 
-        self._icon = icon
+        self._base_url = base_url
 
     @property
-    def metrics(self):
-        """Gets the metrics of this Integration.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Integration.  # noqa: E501
 
 
-        :return: The metrics of this Integration.  # noqa: E501
-        :rtype: IntegrationMetrics
+        :return: The created_epoch_millis of this Integration.  # noqa: E501
+        :rtype: int
         """
-        return self._metrics
+        return self._created_epoch_millis
 
-    @metrics.setter
-    def metrics(self, metrics):
-        """Sets the metrics of this Integration.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Integration.
 
 
-        :param metrics: The metrics of this Integration.  # noqa: E501
-        :type: IntegrationMetrics
+        :param created_epoch_millis: The created_epoch_millis of this Integration.  # noqa: E501
+        :type: int
         """
 
-        self._metrics = metrics
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def base_url(self):
-        """Gets the base_url of this Integration.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this Integration.  # noqa: E501
 
-        Base URL for this integration's assets  # noqa: E501
 
-        :return: The base_url of this Integration.  # noqa: E501
+        :return: The creator_id of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._base_url
+        return self._creator_id
 
-    @base_url.setter
-    def base_url(self, base_url):
-        """Sets the base_url of this Integration.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Integration.
 
-        Base URL for this integration's assets  # noqa: E501
 
-        :param base_url: The base_url of this Integration.  # noqa: E501
+        :param creator_id: The creator_id of this Integration.  # noqa: E501
         :type: str
         """
 
-        self._base_url = base_url
+        self._creator_id = creator_id
 
     @property
-    def status(self):
-        """Gets the status of this Integration.  # noqa: E501
+    def dashboards(self):
+        """Gets the dashboards of this Integration.  # noqa: E501
 
+        A list of dashboards belonging to this integration  # noqa: E501
 
-        :return: The status of this Integration.  # noqa: E501
-        :rtype: IntegrationStatus
+        :return: The dashboards of this Integration.  # noqa: E501
+        :rtype: list[IntegrationDashboard]
         """
-        return self._status
+        return self._dashboards
 
-    @status.setter
-    def status(self, status):
-        """Sets the status of this Integration.
+    @dashboards.setter
+    def dashboards(self, dashboards):
+        """Sets the dashboards of this Integration.
 
+        A list of dashboards belonging to this integration  # noqa: E501
 
-        :param status: The status of this Integration.  # noqa: E501
-        :type: IntegrationStatus
+        :param dashboards: The dashboards of this Integration.  # noqa: E501
+        :type: list[IntegrationDashboard]
         """
 
-        self._status = status
+        self._dashboards = dashboards
 
     @property
-    def alerts(self):
-        """Gets the alerts of this Integration.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this Integration.  # noqa: E501
 
-        A list of alerts belonging to this integration  # noqa: E501
 
-        :return: The alerts of this Integration.  # noqa: E501
-        :rtype: list[IntegrationAlert]
+        :return: The deleted of this Integration.  # noqa: E501
+        :rtype: bool
         """
-        return self._alerts
+        return self._deleted
 
-    @alerts.setter
-    def alerts(self, alerts):
-        """Sets the alerts of this Integration.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this Integration.
 
-        A list of alerts belonging to this integration  # noqa: E501
 
-        :param alerts: The alerts of this Integration.  # noqa: E501
-        :type: list[IntegrationAlert]
+        :param deleted: The deleted of this Integration.  # noqa: E501
+        :type: bool
         """
 
-        self._alerts = alerts
+        self._deleted = deleted
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this Integration.  # noqa: E501
+    def description(self):
+        """Gets the description of this Integration.  # noqa: E501
 
+        Integration description  # noqa: E501
 
-        :return: The creator_id of this Integration.  # noqa: E501
+        :return: The description of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._creator_id
+        return self._description
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Integration.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Integration.
 
+        Integration description  # noqa: E501
 
-        :param creator_id: The creator_id of this Integration.  # noqa: E501
+        :param description: The description of this Integration.  # noqa: E501
         :type: str
         """
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._creator_id = creator_id
+        self._description = description
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this Integration.  # noqa: E501
+    def icon(self):
+        """Gets the icon of this Integration.  # noqa: E501
 
+        URI path to the integration icon  # noqa: E501
 
-        :return: The updater_id of this Integration.  # noqa: E501
+        :return: The icon of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._icon
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Integration.
+    @icon.setter
+    def icon(self, icon):
+        """Sets the icon of this Integration.
 
+        URI path to the integration icon  # noqa: E501
 
-        :param updater_id: The updater_id of this Integration.  # noqa: E501
+        :param icon: The icon of this Integration.  # noqa: E501
         :type: str
         """
+        if icon is None:
+            raise ValueError("Invalid value for `icon`, must not be `None`")  # noqa: E501
 
-        self._updater_id = updater_id
+        self._icon = icon
 
     @property
     def id(self):
@@ -366,207 +389,184 @@ def id(self, id):
         self._id = id
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Integration.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this Integration.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Integration.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this Integration.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this Integration.  # noqa: E501
+    def metrics(self):
+        """Gets the metrics of this Integration.  # noqa: E501
 
 
-        :return: The updated_epoch_millis of this Integration.  # noqa: E501
-        :rtype: int
+        :return: The metrics of this Integration.  # noqa: E501
+        :rtype: IntegrationMetrics
         """
-        return self._updated_epoch_millis
+        return self._metrics
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this Integration.
+    @metrics.setter
+    def metrics(self, metrics):
+        """Sets the metrics of this Integration.
 
 
-        :param updated_epoch_millis: The updated_epoch_millis of this Integration.  # noqa: E501
-        :type: int
+        :param metrics: The metrics of this Integration.  # noqa: E501
+        :type: IntegrationMetrics
         """
 
-        self._updated_epoch_millis = updated_epoch_millis
+        self._metrics = metrics
 
     @property
-    def alias_of(self):
-        """Gets the alias_of of this Integration.  # noqa: E501
+    def name(self):
+        """Gets the name of this Integration.  # noqa: E501
 
-        If set, designates this integration as an alias integration, of the integration whose id is specified.  # noqa: E501
+        Integration name  # noqa: E501
 
-        :return: The alias_of of this Integration.  # noqa: E501
+        :return: The name of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._alias_of
+        return self._name
 
-    @alias_of.setter
-    def alias_of(self, alias_of):
-        """Sets the alias_of of this Integration.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Integration.
 
-        If set, designates this integration as an alias integration, of the integration whose id is specified.  # noqa: E501
+        Integration name  # noqa: E501
 
-        :param alias_of: The alias_of of this Integration.  # noqa: E501
+        :param name: The name of this Integration.  # noqa: E501
         :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._alias_of = alias_of
+        self._name = name
 
     @property
-    def alias_integrations(self):
-        """Gets the alias_integrations of this Integration.  # noqa: E501
+    def overview(self):
+        """Gets the overview of this Integration.  # noqa: E501
 
-        If set, a list of objects describing integrations that alias this one.  # noqa: E501
+        Descriptive text giving an overview of integration functionality  # noqa: E501
 
-        :return: The alias_integrations of this Integration.  # noqa: E501
-        :rtype: list[IntegrationAlias]
+        :return: The overview of this Integration.  # noqa: E501
+        :rtype: str
         """
-        return self._alias_integrations
+        return self._overview
 
-    @alias_integrations.setter
-    def alias_integrations(self, alias_integrations):
-        """Sets the alias_integrations of this Integration.
+    @overview.setter
+    def overview(self, overview):
+        """Sets the overview of this Integration.
 
-        If set, a list of objects describing integrations that alias this one.  # noqa: E501
+        Descriptive text giving an overview of integration functionality  # noqa: E501
 
-        :param alias_integrations: The alias_integrations of this Integration.  # noqa: E501
-        :type: list[IntegrationAlias]
+        :param overview: The overview of this Integration.  # noqa: E501
+        :type: str
         """
 
-        self._alias_integrations = alias_integrations
+        self._overview = overview
 
     @property
-    def dashboards(self):
-        """Gets the dashboards of this Integration.  # noqa: E501
+    def setup(self):
+        """Gets the setup of this Integration.  # noqa: E501
 
-        A list of dashboards belonging to this integration  # noqa: E501
+        How the integration will be set-up  # noqa: E501
 
-        :return: The dashboards of this Integration.  # noqa: E501
-        :rtype: list[IntegrationDashboard]
+        :return: The setup of this Integration.  # noqa: E501
+        :rtype: str
         """
-        return self._dashboards
+        return self._setup
 
-    @dashboards.setter
-    def dashboards(self, dashboards):
-        """Sets the dashboards of this Integration.
+    @setup.setter
+    def setup(self, setup):
+        """Sets the setup of this Integration.
 
-        A list of dashboards belonging to this integration  # noqa: E501
+        How the integration will be set-up  # noqa: E501
 
-        :param dashboards: The dashboards of this Integration.  # noqa: E501
-        :type: list[IntegrationDashboard]
+        :param setup: The setup of this Integration.  # noqa: E501
+        :type: str
         """
 
-        self._dashboards = dashboards
+        self._setup = setup
 
     @property
-    def deleted(self):
-        """Gets the deleted of this Integration.  # noqa: E501
+    def status(self):
+        """Gets the status of this Integration.  # noqa: E501
 
 
-        :return: The deleted of this Integration.  # noqa: E501
-        :rtype: bool
+        :return: The status of this Integration.  # noqa: E501
+        :rtype: IntegrationStatus
         """
-        return self._deleted
+        return self._status
 
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this Integration.
+    @status.setter
+    def status(self, status):
+        """Sets the status of this Integration.
 
 
-        :param deleted: The deleted of this Integration.  # noqa: E501
-        :type: bool
+        :param status: The status of this Integration.  # noqa: E501
+        :type: IntegrationStatus
         """
 
-        self._deleted = deleted
+        self._status = status
 
     @property
-    def overview(self):
-        """Gets the overview of this Integration.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Integration.  # noqa: E501
 
-        Descriptive text giving an overview of integration functionality  # noqa: E501
 
-        :return: The overview of this Integration.  # noqa: E501
-        :rtype: str
+        :return: The updated_epoch_millis of this Integration.  # noqa: E501
+        :rtype: int
         """
-        return self._overview
+        return self._updated_epoch_millis
 
-    @overview.setter
-    def overview(self, overview):
-        """Sets the overview of this Integration.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Integration.
 
-        Descriptive text giving an overview of integration functionality  # noqa: E501
 
-        :param overview: The overview of this Integration.  # noqa: E501
-        :type: str
+        :param updated_epoch_millis: The updated_epoch_millis of this Integration.  # noqa: E501
+        :type: int
         """
 
-        self._overview = overview
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def setup(self):
-        """Gets the setup of this Integration.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Integration.  # noqa: E501
 
-        How the integration will be set-up  # noqa: E501
 
-        :return: The setup of this Integration.  # noqa: E501
+        :return: The updater_id of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._setup
+        return self._updater_id
 
-    @setup.setter
-    def setup(self, setup):
-        """Sets the setup of this Integration.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Integration.
 
-        How the integration will be set-up  # noqa: E501
 
-        :param setup: The setup of this Integration.  # noqa: E501
+        :param updater_id: The updater_id of this Integration.  # noqa: E501
         :type: str
         """
 
-        self._setup = setup
+        self._updater_id = updater_id
 
     @property
-    def name(self):
-        """Gets the name of this Integration.  # noqa: E501
+    def version(self):
+        """Gets the version of this Integration.  # noqa: E501
 
-        Integration name  # noqa: E501
+        Integration version string  # noqa: E501
 
-        :return: The name of this Integration.  # noqa: E501
+        :return: The version of this Integration.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._version
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Integration.
+    @version.setter
+    def version(self, version):
+        """Sets the version of this Integration.
 
-        Integration name  # noqa: E501
+        Integration version string  # noqa: E501
 
-        :param name: The name of this Integration.  # noqa: E501
+        :param version: The version of this Integration.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+        if version is None:
+            raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._version = version
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index f48efd9..be92bf0 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -33,33 +33,54 @@ class IntegrationAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'description': 'str',
-        'url': 'str',
         'alert_obj': 'Alert',
-        'name': 'str'
+        'description': 'str',
+        'name': 'str',
+        'url': 'str'
     }
 
     attribute_map = {
-        'description': 'description',
-        'url': 'url',
         'alert_obj': 'alertObj',
-        'name': 'name'
+        'description': 'description',
+        'name': 'name',
+        'url': 'url'
     }
 
-    def __init__(self, description=None, url=None, alert_obj=None, name=None):  # noqa: E501
+    def __init__(self, alert_obj=None, description=None, name=None, url=None):  # noqa: E501
         """IntegrationAlert - a model defined in Swagger"""  # noqa: E501
 
-        self._description = None
-        self._url = None
         self._alert_obj = None
+        self._description = None
         self._name = None
+        self._url = None
         self.discriminator = None
 
-        self.description = description
-        self.url = url
         if alert_obj is not None:
             self.alert_obj = alert_obj
+        self.description = description
         self.name = name
+        self.url = url
+
+    @property
+    def alert_obj(self):
+        """Gets the alert_obj of this IntegrationAlert.  # noqa: E501
+
+
+        :return: The alert_obj of this IntegrationAlert.  # noqa: E501
+        :rtype: Alert
+        """
+        return self._alert_obj
+
+    @alert_obj.setter
+    def alert_obj(self, alert_obj):
+        """Sets the alert_obj of this IntegrationAlert.
+
+
+        :param alert_obj: The alert_obj of this IntegrationAlert.  # noqa: E501
+        :type: Alert
+        """
+
+        self._alert_obj = alert_obj
 
     @property
     def description(self):
@@ -86,52 +107,6 @@ def description(self, description):
 
         self._description = description
 
-    @property
-    def url(self):
-        """Gets the url of this IntegrationAlert.  # noqa: E501
-
-        URL path to the JSON definition of this alert  # noqa: E501
-
-        :return: The url of this IntegrationAlert.  # noqa: E501
-        :rtype: str
-        """
-        return self._url
-
-    @url.setter
-    def url(self, url):
-        """Sets the url of this IntegrationAlert.
-
-        URL path to the JSON definition of this alert  # noqa: E501
-
-        :param url: The url of this IntegrationAlert.  # noqa: E501
-        :type: str
-        """
-        if url is None:
-            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
-
-        self._url = url
-
-    @property
-    def alert_obj(self):
-        """Gets the alert_obj of this IntegrationAlert.  # noqa: E501
-
-
-        :return: The alert_obj of this IntegrationAlert.  # noqa: E501
-        :rtype: Alert
-        """
-        return self._alert_obj
-
-    @alert_obj.setter
-    def alert_obj(self, alert_obj):
-        """Sets the alert_obj of this IntegrationAlert.
-
-
-        :param alert_obj: The alert_obj of this IntegrationAlert.  # noqa: E501
-        :type: Alert
-        """
-
-        self._alert_obj = alert_obj
-
     @property
     def name(self):
         """Gets the name of this IntegrationAlert.  # noqa: E501
@@ -157,6 +132,31 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def url(self):
+        """Gets the url of this IntegrationAlert.  # noqa: E501
+
+        URL path to the JSON definition of this alert  # noqa: E501
+
+        :return: The url of this IntegrationAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._url
+
+    @url.setter
+    def url(self, url):
+        """Sets the url of this IntegrationAlert.
+
+        URL path to the JSON definition of this alert  # noqa: E501
+
+        :param url: The url of this IntegrationAlert.  # noqa: E501
+        :type: str
+        """
+        if url is None:
+            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
+
+        self._url = url
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index 326e254..afb4a98 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -31,42 +31,65 @@ class IntegrationAlias(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'base_url': 'str',
         'description': 'str',
         'icon': 'str',
-        'base_url': 'str',
         'id': 'str',
         'name': 'str'
     }
 
     attribute_map = {
+        'base_url': 'baseUrl',
         'description': 'description',
         'icon': 'icon',
-        'base_url': 'baseUrl',
         'id': 'id',
         'name': 'name'
     }
 
-    def __init__(self, description=None, icon=None, base_url=None, id=None, name=None):  # noqa: E501
+    def __init__(self, base_url=None, description=None, icon=None, id=None, name=None):  # noqa: E501
         """IntegrationAlias - a model defined in Swagger"""  # noqa: E501
 
+        self._base_url = None
         self._description = None
         self._icon = None
-        self._base_url = None
         self._id = None
         self._name = None
         self.discriminator = None
 
+        if base_url is not None:
+            self.base_url = base_url
         if description is not None:
             self.description = description
         if icon is not None:
             self.icon = icon
-        if base_url is not None:
-            self.base_url = base_url
         if id is not None:
             self.id = id
         if name is not None:
             self.name = name
 
+    @property
+    def base_url(self):
+        """Gets the base_url of this IntegrationAlias.  # noqa: E501
+
+        Base URL of this alias Integration  # noqa: E501
+
+        :return: The base_url of this IntegrationAlias.  # noqa: E501
+        :rtype: str
+        """
+        return self._base_url
+
+    @base_url.setter
+    def base_url(self, base_url):
+        """Sets the base_url of this IntegrationAlias.
+
+        Base URL of this alias Integration  # noqa: E501
+
+        :param base_url: The base_url of this IntegrationAlias.  # noqa: E501
+        :type: str
+        """
+
+        self._base_url = base_url
+
     @property
     def description(self):
         """Gets the description of this IntegrationAlias.  # noqa: E501
@@ -113,29 +136,6 @@ def icon(self, icon):
 
         self._icon = icon
 
-    @property
-    def base_url(self):
-        """Gets the base_url of this IntegrationAlias.  # noqa: E501
-
-        Base URL of this alias Integration  # noqa: E501
-
-        :return: The base_url of this IntegrationAlias.  # noqa: E501
-        :rtype: str
-        """
-        return self._base_url
-
-    @base_url.setter
-    def base_url(self, base_url):
-        """Sets the base_url of this IntegrationAlias.
-
-        Base URL of this alias Integration  # noqa: E501
-
-        :param base_url: The base_url of this IntegrationAlias.  # noqa: E501
-        :type: str
-        """
-
-        self._base_url = base_url
-
     @property
     def id(self):
         """Gets the id of this IntegrationAlias.  # noqa: E501
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 6ff85ff..7f1287b 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -33,33 +33,54 @@ class IntegrationDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'description': 'str',
-        'url': 'str',
         'dashboard_obj': 'Dashboard',
-        'name': 'str'
+        'description': 'str',
+        'name': 'str',
+        'url': 'str'
     }
 
     attribute_map = {
-        'description': 'description',
-        'url': 'url',
         'dashboard_obj': 'dashboardObj',
-        'name': 'name'
+        'description': 'description',
+        'name': 'name',
+        'url': 'url'
     }
 
-    def __init__(self, description=None, url=None, dashboard_obj=None, name=None):  # noqa: E501
+    def __init__(self, dashboard_obj=None, description=None, name=None, url=None):  # noqa: E501
         """IntegrationDashboard - a model defined in Swagger"""  # noqa: E501
 
-        self._description = None
-        self._url = None
         self._dashboard_obj = None
+        self._description = None
         self._name = None
+        self._url = None
         self.discriminator = None
 
-        self.description = description
-        self.url = url
         if dashboard_obj is not None:
             self.dashboard_obj = dashboard_obj
+        self.description = description
         self.name = name
+        self.url = url
+
+    @property
+    def dashboard_obj(self):
+        """Gets the dashboard_obj of this IntegrationDashboard.  # noqa: E501
+
+
+        :return: The dashboard_obj of this IntegrationDashboard.  # noqa: E501
+        :rtype: Dashboard
+        """
+        return self._dashboard_obj
+
+    @dashboard_obj.setter
+    def dashboard_obj(self, dashboard_obj):
+        """Sets the dashboard_obj of this IntegrationDashboard.
+
+
+        :param dashboard_obj: The dashboard_obj of this IntegrationDashboard.  # noqa: E501
+        :type: Dashboard
+        """
+
+        self._dashboard_obj = dashboard_obj
 
     @property
     def description(self):
@@ -86,52 +107,6 @@ def description(self, description):
 
         self._description = description
 
-    @property
-    def url(self):
-        """Gets the url of this IntegrationDashboard.  # noqa: E501
-
-        URL path to the JSON definition of this dashboard  # noqa: E501
-
-        :return: The url of this IntegrationDashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._url
-
-    @url.setter
-    def url(self, url):
-        """Sets the url of this IntegrationDashboard.
-
-        URL path to the JSON definition of this dashboard  # noqa: E501
-
-        :param url: The url of this IntegrationDashboard.  # noqa: E501
-        :type: str
-        """
-        if url is None:
-            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
-
-        self._url = url
-
-    @property
-    def dashboard_obj(self):
-        """Gets the dashboard_obj of this IntegrationDashboard.  # noqa: E501
-
-
-        :return: The dashboard_obj of this IntegrationDashboard.  # noqa: E501
-        :rtype: Dashboard
-        """
-        return self._dashboard_obj
-
-    @dashboard_obj.setter
-    def dashboard_obj(self, dashboard_obj):
-        """Sets the dashboard_obj of this IntegrationDashboard.
-
-
-        :param dashboard_obj: The dashboard_obj of this IntegrationDashboard.  # noqa: E501
-        :type: Dashboard
-        """
-
-        self._dashboard_obj = dashboard_obj
-
     @property
     def name(self):
         """Gets the name of this IntegrationDashboard.  # noqa: E501
@@ -157,6 +132,31 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def url(self):
+        """Gets the url of this IntegrationDashboard.  # noqa: E501
+
+        URL path to the JSON definition of this dashboard  # noqa: E501
+
+        :return: The url of this IntegrationDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._url
+
+    @url.setter
+    def url(self, url):
+        """Sets the url of this IntegrationDashboard.
+
+        URL path to the JSON definition of this dashboard  # noqa: E501
+
+        :param url: The url of this IntegrationDashboard.  # noqa: E501
+        :type: str
+        """
+        if url is None:
+            raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
+
+        self._url = url
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index adbba3a..20ea82a 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -33,33 +33,56 @@ class IntegrationManifestGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'integrations': 'list[str]',
         'integration_objs': 'list[Integration]',
-        'title': 'str',
-        'subtitle': 'str'
+        'integrations': 'list[str]',
+        'subtitle': 'str',
+        'title': 'str'
     }
 
     attribute_map = {
-        'integrations': 'integrations',
         'integration_objs': 'integrationObjs',
-        'title': 'title',
-        'subtitle': 'subtitle'
+        'integrations': 'integrations',
+        'subtitle': 'subtitle',
+        'title': 'title'
     }
 
-    def __init__(self, integrations=None, integration_objs=None, title=None, subtitle=None):  # noqa: E501
+    def __init__(self, integration_objs=None, integrations=None, subtitle=None, title=None):  # noqa: E501
         """IntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._integrations = None
         self._integration_objs = None
-        self._title = None
+        self._integrations = None
         self._subtitle = None
+        self._title = None
         self.discriminator = None
 
-        self.integrations = integrations
         if integration_objs is not None:
             self.integration_objs = integration_objs
-        self.title = title
+        self.integrations = integrations
         self.subtitle = subtitle
+        self.title = title
+
+    @property
+    def integration_objs(self):
+        """Gets the integration_objs of this IntegrationManifestGroup.  # noqa: E501
+
+        Materialized JSONs for integrations belonging to this group, as referenced by `integrations`  # noqa: E501
+
+        :return: The integration_objs of this IntegrationManifestGroup.  # noqa: E501
+        :rtype: list[Integration]
+        """
+        return self._integration_objs
+
+    @integration_objs.setter
+    def integration_objs(self, integration_objs):
+        """Sets the integration_objs of this IntegrationManifestGroup.
+
+        Materialized JSONs for integrations belonging to this group, as referenced by `integrations`  # noqa: E501
+
+        :param integration_objs: The integration_objs of this IntegrationManifestGroup.  # noqa: E501
+        :type: list[Integration]
+        """
+
+        self._integration_objs = integration_objs
 
     @property
     def integrations(self):
@@ -87,27 +110,29 @@ def integrations(self, integrations):
         self._integrations = integrations
 
     @property
-    def integration_objs(self):
-        """Gets the integration_objs of this IntegrationManifestGroup.  # noqa: E501
+    def subtitle(self):
+        """Gets the subtitle of this IntegrationManifestGroup.  # noqa: E501
 
-        Materialized JSONs for integrations belonging to this group, as referenced by `integrations`  # noqa: E501
+        Subtitle of this integration group  # noqa: E501
 
-        :return: The integration_objs of this IntegrationManifestGroup.  # noqa: E501
-        :rtype: list[Integration]
+        :return: The subtitle of this IntegrationManifestGroup.  # noqa: E501
+        :rtype: str
         """
-        return self._integration_objs
+        return self._subtitle
 
-    @integration_objs.setter
-    def integration_objs(self, integration_objs):
-        """Sets the integration_objs of this IntegrationManifestGroup.
+    @subtitle.setter
+    def subtitle(self, subtitle):
+        """Sets the subtitle of this IntegrationManifestGroup.
 
-        Materialized JSONs for integrations belonging to this group, as referenced by `integrations`  # noqa: E501
+        Subtitle of this integration group  # noqa: E501
 
-        :param integration_objs: The integration_objs of this IntegrationManifestGroup.  # noqa: E501
-        :type: list[Integration]
+        :param subtitle: The subtitle of this IntegrationManifestGroup.  # noqa: E501
+        :type: str
         """
+        if subtitle is None:
+            raise ValueError("Invalid value for `subtitle`, must not be `None`")  # noqa: E501
 
-        self._integration_objs = integration_objs
+        self._subtitle = subtitle
 
     @property
     def title(self):
@@ -134,31 +159,6 @@ def title(self, title):
 
         self._title = title
 
-    @property
-    def subtitle(self):
-        """Gets the subtitle of this IntegrationManifestGroup.  # noqa: E501
-
-        Subtitle of this integration group  # noqa: E501
-
-        :return: The subtitle of this IntegrationManifestGroup.  # noqa: E501
-        :rtype: str
-        """
-        return self._subtitle
-
-    @subtitle.setter
-    def subtitle(self, subtitle):
-        """Sets the subtitle of this IntegrationManifestGroup.
-
-        Subtitle of this integration group  # noqa: E501
-
-        :param subtitle: The subtitle of this IntegrationManifestGroup.  # noqa: E501
-        :type: str
-        """
-        if subtitle is None:
-            raise ValueError("Invalid value for `subtitle`, must not be `None`")  # noqa: E501
-
-        self._subtitle = subtitle
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index e5522b6..0c53344 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -33,92 +33,65 @@ class IntegrationMetrics(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'prefixes': 'list[str]',
-        'required': 'list[str]',
+        'chart_objs': 'list[Chart]',
         'charts': 'list[str]',
-        'pps_dimensions': 'list[str]',
         'display': 'list[str]',
-        'chart_objs': 'list[Chart]'
+        'pps_dimensions': 'list[str]',
+        'prefixes': 'list[str]',
+        'required': 'list[str]'
     }
 
     attribute_map = {
-        'prefixes': 'prefixes',
-        'required': 'required',
+        'chart_objs': 'chartObjs',
         'charts': 'charts',
-        'pps_dimensions': 'ppsDimensions',
         'display': 'display',
-        'chart_objs': 'chartObjs'
+        'pps_dimensions': 'ppsDimensions',
+        'prefixes': 'prefixes',
+        'required': 'required'
     }
 
-    def __init__(self, prefixes=None, required=None, charts=None, pps_dimensions=None, display=None, chart_objs=None):  # noqa: E501
+    def __init__(self, chart_objs=None, charts=None, display=None, pps_dimensions=None, prefixes=None, required=None):  # noqa: E501
         """IntegrationMetrics - a model defined in Swagger"""  # noqa: E501
 
-        self._prefixes = None
-        self._required = None
+        self._chart_objs = None
         self._charts = None
-        self._pps_dimensions = None
         self._display = None
-        self._chart_objs = None
+        self._pps_dimensions = None
+        self._prefixes = None
+        self._required = None
         self.discriminator = None
 
-        self.prefixes = prefixes
-        self.required = required
+        if chart_objs is not None:
+            self.chart_objs = chart_objs
         self.charts = charts
+        self.display = display
         if pps_dimensions is not None:
             self.pps_dimensions = pps_dimensions
-        self.display = display
-        if chart_objs is not None:
-            self.chart_objs = chart_objs
-
-    @property
-    def prefixes(self):
-        """Gets the prefixes of this IntegrationMetrics.  # noqa: E501
-
-        Set of metric prefix namespaces belonging to this integration  # noqa: E501
-
-        :return: The prefixes of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._prefixes
-
-    @prefixes.setter
-    def prefixes(self, prefixes):
-        """Sets the prefixes of this IntegrationMetrics.
-
-        Set of metric prefix namespaces belonging to this integration  # noqa: E501
-
-        :param prefixes: The prefixes of this IntegrationMetrics.  # noqa: E501
-        :type: list[str]
-        """
-        if prefixes is None:
-            raise ValueError("Invalid value for `prefixes`, must not be `None`")  # noqa: E501
-
-        self._prefixes = prefixes
+        self.prefixes = prefixes
+        self.required = required
 
     @property
-    def required(self):
-        """Gets the required of this IntegrationMetrics.  # noqa: E501
+    def chart_objs(self):
+        """Gets the chart_objs of this IntegrationMetrics.  # noqa: E501
 
-        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
+        Chart JSONs materialized from the links in `charts`  # noqa: E501
 
-        :return: The required of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[str]
+        :return: The chart_objs of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[Chart]
         """
-        return self._required
+        return self._chart_objs
 
-    @required.setter
-    def required(self, required):
-        """Sets the required of this IntegrationMetrics.
+    @chart_objs.setter
+    def chart_objs(self, chart_objs):
+        """Sets the chart_objs of this IntegrationMetrics.
 
-        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
+        Chart JSONs materialized from the links in `charts`  # noqa: E501
 
-        :param required: The required of this IntegrationMetrics.  # noqa: E501
-        :type: list[str]
+        :param chart_objs: The chart_objs of this IntegrationMetrics.  # noqa: E501
+        :type: list[Chart]
         """
-        if required is None:
-            raise ValueError("Invalid value for `required`, must not be `None`")  # noqa: E501
 
-        self._required = required
+        self._chart_objs = chart_objs
 
     @property
     def charts(self):
@@ -145,6 +118,31 @@ def charts(self, charts):
 
         self._charts = charts
 
+    @property
+    def display(self):
+        """Gets the display of this IntegrationMetrics.  # noqa: E501
+
+        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
+
+        :return: The display of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._display
+
+    @display.setter
+    def display(self, display):
+        """Sets the display of this IntegrationMetrics.
+
+        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
+
+        :param display: The display of this IntegrationMetrics.  # noqa: E501
+        :type: list[str]
+        """
+        if display is None:
+            raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
+
+        self._display = display
+
     @property
     def pps_dimensions(self):
         """Gets the pps_dimensions of this IntegrationMetrics.  # noqa: E501
@@ -169,52 +167,54 @@ def pps_dimensions(self, pps_dimensions):
         self._pps_dimensions = pps_dimensions
 
     @property
-    def display(self):
-        """Gets the display of this IntegrationMetrics.  # noqa: E501
+    def prefixes(self):
+        """Gets the prefixes of this IntegrationMetrics.  # noqa: E501
 
-        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
+        Set of metric prefix namespaces belonging to this integration  # noqa: E501
 
-        :return: The display of this IntegrationMetrics.  # noqa: E501
+        :return: The prefixes of this IntegrationMetrics.  # noqa: E501
         :rtype: list[str]
         """
-        return self._display
+        return self._prefixes
 
-    @display.setter
-    def display(self, display):
-        """Sets the display of this IntegrationMetrics.
+    @prefixes.setter
+    def prefixes(self, prefixes):
+        """Sets the prefixes of this IntegrationMetrics.
 
-        Set of metrics that are displayed in the metric panel during integration setup  # noqa: E501
+        Set of metric prefix namespaces belonging to this integration  # noqa: E501
 
-        :param display: The display of this IntegrationMetrics.  # noqa: E501
+        :param prefixes: The prefixes of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if display is None:
-            raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
+        if prefixes is None:
+            raise ValueError("Invalid value for `prefixes`, must not be `None`")  # noqa: E501
 
-        self._display = display
+        self._prefixes = prefixes
 
     @property
-    def chart_objs(self):
-        """Gets the chart_objs of this IntegrationMetrics.  # noqa: E501
+    def required(self):
+        """Gets the required of this IntegrationMetrics.  # noqa: E501
 
-        Chart JSONs materialized from the links in `charts`  # noqa: E501
+        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
 
-        :return: The chart_objs of this IntegrationMetrics.  # noqa: E501
-        :rtype: list[Chart]
+        :return: The required of this IntegrationMetrics.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._chart_objs
+        return self._required
 
-    @chart_objs.setter
-    def chart_objs(self, chart_objs):
-        """Sets the chart_objs of this IntegrationMetrics.
+    @required.setter
+    def required(self, required):
+        """Sets the required of this IntegrationMetrics.
 
-        Chart JSONs materialized from the links in `charts`  # noqa: E501
+        Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion  # noqa: E501
 
-        :param chart_objs: The chart_objs of this IntegrationMetrics.  # noqa: E501
-        :type: list[Chart]
+        :param required: The required of this IntegrationMetrics.  # noqa: E501
+        :type: list[str]
         """
+        if required is None:
+            raise ValueError("Invalid value for `required`, must not be `None`")  # noqa: E501
 
-        self._chart_objs = chart_objs
+        self._required = required
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index ca178aa..c80d2b4 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -33,32 +33,64 @@ class IntegrationStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'alert_statuses': 'dict(str, str)',
         'content_status': 'str',
         'install_status': 'str',
-        'metric_statuses': 'dict(str, MetricStatus)',
-        'alert_statuses': 'dict(str, str)'
+        'metric_statuses': 'dict(str, MetricStatus)'
     }
 
     attribute_map = {
+        'alert_statuses': 'alertStatuses',
         'content_status': 'contentStatus',
         'install_status': 'installStatus',
-        'metric_statuses': 'metricStatuses',
-        'alert_statuses': 'alertStatuses'
+        'metric_statuses': 'metricStatuses'
     }
 
-    def __init__(self, content_status=None, install_status=None, metric_statuses=None, alert_statuses=None):  # noqa: E501
+    def __init__(self, alert_statuses=None, content_status=None, install_status=None, metric_statuses=None):  # noqa: E501
         """IntegrationStatus - a model defined in Swagger"""  # noqa: E501
 
+        self._alert_statuses = None
         self._content_status = None
         self._install_status = None
         self._metric_statuses = None
-        self._alert_statuses = None
         self.discriminator = None
 
+        self.alert_statuses = alert_statuses
         self.content_status = content_status
         self.install_status = install_status
         self.metric_statuses = metric_statuses
-        self.alert_statuses = alert_statuses
+
+    @property
+    def alert_statuses(self):
+        """Gets the alert_statuses of this IntegrationStatus.  # noqa: E501
+
+        A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`  # noqa: E501
+
+        :return: The alert_statuses of this IntegrationStatus.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._alert_statuses
+
+    @alert_statuses.setter
+    def alert_statuses(self, alert_statuses):
+        """Sets the alert_statuses of this IntegrationStatus.
+
+        A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`  # noqa: E501
+
+        :param alert_statuses: The alert_statuses of this IntegrationStatus.  # noqa: E501
+        :type: dict(str, str)
+        """
+        if alert_statuses is None:
+            raise ValueError("Invalid value for `alert_statuses`, must not be `None`")  # noqa: E501
+        allowed_values = ["VISIBLE", "HIDDEN", "NOT_LOADED"]  # noqa: E501
+        if not set(alert_statuses.keys()).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid keys in `alert_statuses` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(alert_statuses.keys()) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._alert_statuses = alert_statuses
 
     @property
     def content_status(self):
@@ -147,38 +179,6 @@ def metric_statuses(self, metric_statuses):
 
         self._metric_statuses = metric_statuses
 
-    @property
-    def alert_statuses(self):
-        """Gets the alert_statuses of this IntegrationStatus.  # noqa: E501
-
-        A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`  # noqa: E501
-
-        :return: The alert_statuses of this IntegrationStatus.  # noqa: E501
-        :rtype: dict(str, str)
-        """
-        return self._alert_statuses
-
-    @alert_statuses.setter
-    def alert_statuses(self, alert_statuses):
-        """Sets the alert_statuses of this IntegrationStatus.
-
-        A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`  # noqa: E501
-
-        :param alert_statuses: The alert_statuses of this IntegrationStatus.  # noqa: E501
-        :type: dict(str, str)
-        """
-        if alert_statuses is None:
-            raise ValueError("Invalid value for `alert_statuses`, must not be `None`")  # noqa: E501
-        allowed_values = ["VISIBLE", "HIDDEN", "NOT_LOADED"]  # noqa: E501
-        if not set(alert_statuses.keys()).issubset(set(allowed_values)):
-            raise ValueError(
-                "Invalid keys in `alert_statuses` [{0}], must be a subset of [{1}]"  # noqa: E501
-                .format(", ".join(map(str, set(alert_statuses.keys()) - set(allowed_values))),  # noqa: E501
-                        ", ".join(map(str, allowed_values)))
-            )
-
-        self._alert_statuses = alert_statuses
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index 6359432..d14f34b 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -31,126 +31,143 @@ class MaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'reason': 'str',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
         'customer_id': 'str',
-        'relevant_customer_tags': 'list[str]',
-        'title': 'str',
-        'start_time_in_seconds': 'int',
         'end_time_in_seconds': 'int',
-        'relevant_host_tags': 'list[str]',
-        'relevant_host_names': 'list[str]',
-        'creator_id': 'str',
-        'updater_id': 'str',
+        'event_name': 'str',
+        'host_tag_group_host_names_group_anded': 'bool',
         'id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
+        'reason': 'str',
+        'relevant_customer_tags': 'list[str]',
+        'relevant_host_names': 'list[str]',
+        'relevant_host_tags': 'list[str]',
         'relevant_host_tags_anded': 'bool',
-        'host_tag_group_host_names_group_anded': 'bool',
-        'event_name': 'str',
+        'running_state': 'str',
         'sort_attr': 'int',
-        'running_state': 'str'
+        'start_time_in_seconds': 'int',
+        'title': 'str',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
     }
 
     attribute_map = {
-        'reason': 'reason',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
         'customer_id': 'customerId',
-        'relevant_customer_tags': 'relevantCustomerTags',
-        'title': 'title',
-        'start_time_in_seconds': 'startTimeInSeconds',
         'end_time_in_seconds': 'endTimeInSeconds',
-        'relevant_host_tags': 'relevantHostTags',
-        'relevant_host_names': 'relevantHostNames',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
+        'event_name': 'eventName',
+        'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
+        'reason': 'reason',
+        'relevant_customer_tags': 'relevantCustomerTags',
+        'relevant_host_names': 'relevantHostNames',
+        'relevant_host_tags': 'relevantHostTags',
         'relevant_host_tags_anded': 'relevantHostTagsAnded',
-        'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
-        'event_name': 'eventName',
+        'running_state': 'runningState',
         'sort_attr': 'sortAttr',
-        'running_state': 'runningState'
+        'start_time_in_seconds': 'startTimeInSeconds',
+        'title': 'title',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, reason=None, customer_id=None, relevant_customer_tags=None, title=None, start_time_in_seconds=None, end_time_in_seconds=None, relevant_host_tags=None, relevant_host_names=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, relevant_host_tags_anded=None, host_tag_group_host_names_group_anded=None, event_name=None, sort_attr=None, running_state=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, reason=None, relevant_customer_tags=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, title=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
-        self._reason = None
+        self._created_epoch_millis = None
+        self._creator_id = None
         self._customer_id = None
-        self._relevant_customer_tags = None
-        self._title = None
-        self._start_time_in_seconds = None
         self._end_time_in_seconds = None
-        self._relevant_host_tags = None
-        self._relevant_host_names = None
-        self._creator_id = None
-        self._updater_id = None
+        self._event_name = None
+        self._host_tag_group_host_names_group_anded = None
         self._id = None
-        self._created_epoch_millis = None
-        self._updated_epoch_millis = None
+        self._reason = None
+        self._relevant_customer_tags = None
+        self._relevant_host_names = None
+        self._relevant_host_tags = None
         self._relevant_host_tags_anded = None
-        self._host_tag_group_host_names_group_anded = None
-        self._event_name = None
-        self._sort_attr = None
         self._running_state = None
+        self._sort_attr = None
+        self._start_time_in_seconds = None
+        self._title = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
         self.discriminator = None
 
-        self.reason = reason
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
         if customer_id is not None:
             self.customer_id = customer_id
-        self.relevant_customer_tags = relevant_customer_tags
-        self.title = title
-        self.start_time_in_seconds = start_time_in_seconds
         self.end_time_in_seconds = end_time_in_seconds
-        if relevant_host_tags is not None:
-            self.relevant_host_tags = relevant_host_tags
-        if relevant_host_names is not None:
-            self.relevant_host_names = relevant_host_names
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
+        if event_name is not None:
+            self.event_name = event_name
+        if host_tag_group_host_names_group_anded is not None:
+            self.host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
         if id is not None:
             self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
+        self.reason = reason
+        self.relevant_customer_tags = relevant_customer_tags
+        if relevant_host_names is not None:
+            self.relevant_host_names = relevant_host_names
+        if relevant_host_tags is not None:
+            self.relevant_host_tags = relevant_host_tags
         if relevant_host_tags_anded is not None:
             self.relevant_host_tags_anded = relevant_host_tags_anded
-        if host_tag_group_host_names_group_anded is not None:
-            self.host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
-        if event_name is not None:
-            self.event_name = event_name
-        if sort_attr is not None:
-            self.sort_attr = sort_attr
         if running_state is not None:
             self.running_state = running_state
+        if sort_attr is not None:
+            self.sort_attr = sort_attr
+        self.start_time_in_seconds = start_time_in_seconds
+        self.title = title
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def reason(self):
-        """Gets the reason of this MaintenanceWindow.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this MaintenanceWindow.  # noqa: E501
 
-        The purpose of this maintenance window  # noqa: E501
 
-        :return: The reason of this MaintenanceWindow.  # noqa: E501
+        :return: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this MaintenanceWindow.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this MaintenanceWindow.  # noqa: E501
+
+
+        :return: The creator_id of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._reason
+        return self._creator_id
 
-    @reason.setter
-    def reason(self, reason):
-        """Sets the reason of this MaintenanceWindow.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this MaintenanceWindow.
 
-        The purpose of this maintenance window  # noqa: E501
 
-        :param reason: The reason of this MaintenanceWindow.  # noqa: E501
+        :param creator_id: The creator_id of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
-        if reason is None:
-            raise ValueError("Invalid value for `reason`, must not be `None`")  # noqa: E501
 
-        self._reason = reason
+        self._creator_id = creator_id
 
     @property
     def customer_id(self):
@@ -174,127 +191,146 @@ def customer_id(self, customer_id):
         self._customer_id = customer_id
 
     @property
-    def relevant_customer_tags(self):
-        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
+    def end_time_in_seconds(self):
+        """Gets the end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
 
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
+        The time in epoch seconds when this maintenance window will end  # noqa: E501
 
-        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :rtype: list[str]
+        :return: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
+        :rtype: int
         """
-        return self._relevant_customer_tags
+        return self._end_time_in_seconds
 
-    @relevant_customer_tags.setter
-    def relevant_customer_tags(self, relevant_customer_tags):
-        """Sets the relevant_customer_tags of this MaintenanceWindow.
+    @end_time_in_seconds.setter
+    def end_time_in_seconds(self, end_time_in_seconds):
+        """Sets the end_time_in_seconds of this MaintenanceWindow.
 
-        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
+        The time in epoch seconds when this maintenance window will end  # noqa: E501
 
-        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
-        :type: list[str]
+        :param end_time_in_seconds: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
+        :type: int
         """
-        if relevant_customer_tags is None:
-            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
+        if end_time_in_seconds is None:
+            raise ValueError("Invalid value for `end_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._relevant_customer_tags = relevant_customer_tags
+        self._end_time_in_seconds = end_time_in_seconds
 
     @property
-    def title(self):
-        """Gets the title of this MaintenanceWindow.  # noqa: E501
+    def event_name(self):
+        """Gets the event_name of this MaintenanceWindow.  # noqa: E501
 
-        Title of this maintenance window  # noqa: E501
+        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
 
-        :return: The title of this MaintenanceWindow.  # noqa: E501
+        :return: The event_name of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._title
+        return self._event_name
 
-    @title.setter
-    def title(self, title):
-        """Sets the title of this MaintenanceWindow.
+    @event_name.setter
+    def event_name(self, event_name):
+        """Sets the event_name of this MaintenanceWindow.
 
-        Title of this maintenance window  # noqa: E501
+        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
 
-        :param title: The title of this MaintenanceWindow.  # noqa: E501
+        :param event_name: The event_name of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._title = title
+        self._event_name = event_name
 
     @property
-    def start_time_in_seconds(self):
-        """Gets the start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
+    def host_tag_group_host_names_group_anded(self):
+        """Gets the host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
 
-        The time in epoch seconds when this maintenance window will start  # noqa: E501
+        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
 
-        :return: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :rtype: int
+        :return: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
+        :rtype: bool
         """
-        return self._start_time_in_seconds
+        return self._host_tag_group_host_names_group_anded
 
-    @start_time_in_seconds.setter
-    def start_time_in_seconds(self, start_time_in_seconds):
-        """Sets the start_time_in_seconds of this MaintenanceWindow.
+    @host_tag_group_host_names_group_anded.setter
+    def host_tag_group_host_names_group_anded(self, host_tag_group_host_names_group_anded):
+        """Sets the host_tag_group_host_names_group_anded of this MaintenanceWindow.
 
-        The time in epoch seconds when this maintenance window will start  # noqa: E501
+        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
 
-        :param start_time_in_seconds: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :type: int
+        :param host_tag_group_host_names_group_anded: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
+        :type: bool
         """
-        if start_time_in_seconds is None:
-            raise ValueError("Invalid value for `start_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._start_time_in_seconds = start_time_in_seconds
+        self._host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
 
     @property
-    def end_time_in_seconds(self):
-        """Gets the end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
+    def id(self):
+        """Gets the id of this MaintenanceWindow.  # noqa: E501
 
-        The time in epoch seconds when this maintenance window will end  # noqa: E501
 
-        :return: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :rtype: int
+        :return: The id of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
         """
-        return self._end_time_in_seconds
+        return self._id
 
-    @end_time_in_seconds.setter
-    def end_time_in_seconds(self, end_time_in_seconds):
-        """Sets the end_time_in_seconds of this MaintenanceWindow.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this MaintenanceWindow.
 
-        The time in epoch seconds when this maintenance window will end  # noqa: E501
 
-        :param end_time_in_seconds: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
-        :type: int
+        :param id: The id of this MaintenanceWindow.  # noqa: E501
+        :type: str
         """
-        if end_time_in_seconds is None:
-            raise ValueError("Invalid value for `end_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._end_time_in_seconds = end_time_in_seconds
+        self._id = id
+
+    @property
+    def reason(self):
+        """Gets the reason of this MaintenanceWindow.  # noqa: E501
+
+        The purpose of this maintenance window  # noqa: E501
+
+        :return: The reason of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this MaintenanceWindow.
+
+        The purpose of this maintenance window  # noqa: E501
+
+        :param reason: The reason of this MaintenanceWindow.  # noqa: E501
+        :type: str
+        """
+        if reason is None:
+            raise ValueError("Invalid value for `reason`, must not be `None`")  # noqa: E501
+
+        self._reason = reason
 
     @property
-    def relevant_host_tags(self):
-        """Gets the relevant_host_tags of this MaintenanceWindow.  # noqa: E501
+    def relevant_customer_tags(self):
+        """Gets the relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
 
-        List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window  # noqa: E501
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :return: The relevant_host_tags of this MaintenanceWindow.  # noqa: E501
+        :return: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
         :rtype: list[str]
         """
-        return self._relevant_host_tags
+        return self._relevant_customer_tags
 
-    @relevant_host_tags.setter
-    def relevant_host_tags(self, relevant_host_tags):
-        """Sets the relevant_host_tags of this MaintenanceWindow.
+    @relevant_customer_tags.setter
+    def relevant_customer_tags(self, relevant_customer_tags):
+        """Sets the relevant_customer_tags of this MaintenanceWindow.
 
-        List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window  # noqa: E501
+        List of alert tags whose matching alerts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :param relevant_host_tags: The relevant_host_tags of this MaintenanceWindow.  # noqa: E501
+        :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
         :type: list[str]
         """
+        if relevant_customer_tags is None:
+            raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
 
-        self._relevant_host_tags = relevant_host_tags
+        self._relevant_customer_tags = relevant_customer_tags
 
     @property
     def relevant_host_names(self):
@@ -320,228 +356,192 @@ def relevant_host_names(self, relevant_host_names):
         self._relevant_host_names = relevant_host_names
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this MaintenanceWindow.  # noqa: E501
+    def relevant_host_tags(self):
+        """Gets the relevant_host_tags of this MaintenanceWindow.  # noqa: E501
 
+        List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :return: The creator_id of this MaintenanceWindow.  # noqa: E501
-        :rtype: str
+        :return: The relevant_host_tags of this MaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._creator_id
+        return self._relevant_host_tags
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this MaintenanceWindow.
+    @relevant_host_tags.setter
+    def relevant_host_tags(self, relevant_host_tags):
+        """Sets the relevant_host_tags of this MaintenanceWindow.
 
+        List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window  # noqa: E501
 
-        :param creator_id: The creator_id of this MaintenanceWindow.  # noqa: E501
-        :type: str
+        :param relevant_host_tags: The relevant_host_tags of this MaintenanceWindow.  # noqa: E501
+        :type: list[str]
         """
 
-        self._creator_id = creator_id
+        self._relevant_host_tags = relevant_host_tags
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this MaintenanceWindow.  # noqa: E501
+    def relevant_host_tags_anded(self):
+        """Gets the relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
 
+        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
 
-        :return: The updater_id of this MaintenanceWindow.  # noqa: E501
-        :rtype: str
+        :return: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
+        :rtype: bool
         """
-        return self._updater_id
+        return self._relevant_host_tags_anded
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this MaintenanceWindow.
+    @relevant_host_tags_anded.setter
+    def relevant_host_tags_anded(self, relevant_host_tags_anded):
+        """Sets the relevant_host_tags_anded of this MaintenanceWindow.
 
+        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
 
-        :param updater_id: The updater_id of this MaintenanceWindow.  # noqa: E501
-        :type: str
+        :param relevant_host_tags_anded: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
+        :type: bool
         """
 
-        self._updater_id = updater_id
+        self._relevant_host_tags_anded = relevant_host_tags_anded
 
     @property
-    def id(self):
-        """Gets the id of this MaintenanceWindow.  # noqa: E501
+    def running_state(self):
+        """Gets the running_state of this MaintenanceWindow.  # noqa: E501
 
 
-        :return: The id of this MaintenanceWindow.  # noqa: E501
+        :return: The running_state of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._running_state
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this MaintenanceWindow.
+    @running_state.setter
+    def running_state(self, running_state):
+        """Sets the running_state of this MaintenanceWindow.
 
 
-        :param id: The id of this MaintenanceWindow.  # noqa: E501
+        :param running_state: The running_state of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
+        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
+        if running_state not in allowed_values:
+            raise ValueError(
+                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
+                .format(running_state, allowed_values)
+            )
 
-        self._id = id
+        self._running_state = running_state
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+    def sort_attr(self):
+        """Gets the sort_attr of this MaintenanceWindow.  # noqa: E501
 
+        Numeric value used in default sorting  # noqa: E501
 
-        :return: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :return: The sort_attr of this MaintenanceWindow.  # noqa: E501
         :rtype: int
         """
-        return self._created_epoch_millis
+        return self._sort_attr
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this MaintenanceWindow.
+    @sort_attr.setter
+    def sort_attr(self, sort_attr):
+        """Sets the sort_attr of this MaintenanceWindow.
 
+        Numeric value used in default sorting  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :param sort_attr: The sort_attr of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._sort_attr = sort_attr
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+    def start_time_in_seconds(self):
+        """Gets the start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
 
+        The time in epoch seconds when this maintenance window will start  # noqa: E501
 
-        :return: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :return: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :rtype: int
         """
-        return self._updated_epoch_millis
+        return self._start_time_in_seconds
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this MaintenanceWindow.
+    @start_time_in_seconds.setter
+    def start_time_in_seconds(self, start_time_in_seconds):
+        """Sets the start_time_in_seconds of this MaintenanceWindow.
 
+        The time in epoch seconds when this maintenance window will start  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
+        :param start_time_in_seconds: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
+        if start_time_in_seconds is None:
+            raise ValueError("Invalid value for `start_time_in_seconds`, must not be `None`")  # noqa: E501
 
-        self._updated_epoch_millis = updated_epoch_millis
-
-    @property
-    def relevant_host_tags_anded(self):
-        """Gets the relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
-
-        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
-
-        :return: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
-        :rtype: bool
-        """
-        return self._relevant_host_tags_anded
-
-    @relevant_host_tags_anded.setter
-    def relevant_host_tags_anded(self, relevant_host_tags_anded):
-        """Sets the relevant_host_tags_anded of this MaintenanceWindow.
-
-        Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false  # noqa: E501
-
-        :param relevant_host_tags_anded: The relevant_host_tags_anded of this MaintenanceWindow.  # noqa: E501
-        :type: bool
-        """
-
-        self._relevant_host_tags_anded = relevant_host_tags_anded
-
-    @property
-    def host_tag_group_host_names_group_anded(self):
-        """Gets the host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
-
-        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
-
-        :return: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
-        :rtype: bool
-        """
-        return self._host_tag_group_host_names_group_anded
-
-    @host_tag_group_host_names_group_anded.setter
-    def host_tag_group_host_names_group_anded(self, host_tag_group_host_names_group_anded):
-        """Sets the host_tag_group_host_names_group_anded of this MaintenanceWindow.
-
-        If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false  # noqa: E501
-
-        :param host_tag_group_host_names_group_anded: The host_tag_group_host_names_group_anded of this MaintenanceWindow.  # noqa: E501
-        :type: bool
-        """
-
-        self._host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
+        self._start_time_in_seconds = start_time_in_seconds
 
     @property
-    def event_name(self):
-        """Gets the event_name of this MaintenanceWindow.  # noqa: E501
+    def title(self):
+        """Gets the title of this MaintenanceWindow.  # noqa: E501
 
-        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
+        Title of this maintenance window  # noqa: E501
 
-        :return: The event_name of this MaintenanceWindow.  # noqa: E501
+        :return: The title of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._event_name
+        return self._title
 
-    @event_name.setter
-    def event_name(self, event_name):
-        """Sets the event_name of this MaintenanceWindow.
+    @title.setter
+    def title(self, title):
+        """Sets the title of this MaintenanceWindow.
 
-        The name of an event associated with the creation/update of this maintenance window  # noqa: E501
+        Title of this maintenance window  # noqa: E501
 
-        :param event_name: The event_name of this MaintenanceWindow.  # noqa: E501
+        :param title: The title of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._event_name = event_name
+        self._title = title
 
     @property
-    def sort_attr(self):
-        """Gets the sort_attr of this MaintenanceWindow.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
 
-        Numeric value used in default sorting  # noqa: E501
 
-        :return: The sort_attr of this MaintenanceWindow.  # noqa: E501
+        :return: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
         :rtype: int
         """
-        return self._sort_attr
+        return self._updated_epoch_millis
 
-    @sort_attr.setter
-    def sort_attr(self, sort_attr):
-        """Sets the sort_attr of this MaintenanceWindow.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this MaintenanceWindow.
 
-        Numeric value used in default sorting  # noqa: E501
 
-        :param sort_attr: The sort_attr of this MaintenanceWindow.  # noqa: E501
+        :param updated_epoch_millis: The updated_epoch_millis of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
 
-        self._sort_attr = sort_attr
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def running_state(self):
-        """Gets the running_state of this MaintenanceWindow.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this MaintenanceWindow.  # noqa: E501
 
 
-        :return: The running_state of this MaintenanceWindow.  # noqa: E501
+        :return: The updater_id of this MaintenanceWindow.  # noqa: E501
         :rtype: str
         """
-        return self._running_state
+        return self._updater_id
 
-    @running_state.setter
-    def running_state(self, running_state):
-        """Sets the running_state of this MaintenanceWindow.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this MaintenanceWindow.
 
 
-        :param running_state: The running_state of this MaintenanceWindow.  # noqa: E501
+        :param updater_id: The updater_id of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
-        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
-            raise ValueError(
-                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
-                .format(running_state, allowed_values)
-            )
 
-        self._running_state = running_state
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index e5e87a0..4723e92 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -32,67 +32,67 @@ class Message(object):
     """
     swagger_types = {
         'attributes': 'dict(str, str)',
-        'source': 'str',
+        'content': 'str',
+        'display': 'str',
+        'end_epoch_millis': 'int',
+        'id': 'str',
+        'read': 'bool',
         'scope': 'str',
         'severity': 'str',
-        'read': 'bool',
-        'title': 'str',
-        'id': 'str',
-        'content': 'str',
+        'source': 'str',
         'start_epoch_millis': 'int',
-        'end_epoch_millis': 'int',
-        'display': 'str',
-        'target': 'str'
+        'target': 'str',
+        'title': 'str'
     }
 
     attribute_map = {
         'attributes': 'attributes',
-        'source': 'source',
+        'content': 'content',
+        'display': 'display',
+        'end_epoch_millis': 'endEpochMillis',
+        'id': 'id',
+        'read': 'read',
         'scope': 'scope',
         'severity': 'severity',
-        'read': 'read',
-        'title': 'title',
-        'id': 'id',
-        'content': 'content',
+        'source': 'source',
         'start_epoch_millis': 'startEpochMillis',
-        'end_epoch_millis': 'endEpochMillis',
-        'display': 'display',
-        'target': 'target'
+        'target': 'target',
+        'title': 'title'
     }
 
-    def __init__(self, attributes=None, source=None, scope=None, severity=None, read=None, title=None, id=None, content=None, start_epoch_millis=None, end_epoch_millis=None, display=None, target=None):  # noqa: E501
+    def __init__(self, attributes=None, content=None, display=None, end_epoch_millis=None, id=None, read=None, scope=None, severity=None, source=None, start_epoch_millis=None, target=None, title=None):  # noqa: E501
         """Message - a model defined in Swagger"""  # noqa: E501
 
         self._attributes = None
-        self._source = None
+        self._content = None
+        self._display = None
+        self._end_epoch_millis = None
+        self._id = None
+        self._read = None
         self._scope = None
         self._severity = None
-        self._read = None
-        self._title = None
-        self._id = None
-        self._content = None
+        self._source = None
         self._start_epoch_millis = None
-        self._end_epoch_millis = None
-        self._display = None
         self._target = None
+        self._title = None
         self.discriminator = None
 
         if attributes is not None:
             self.attributes = attributes
-        self.source = source
-        self.scope = scope
-        self.severity = severity
-        if read is not None:
-            self.read = read
-        self.title = title
+        self.content = content
+        self.display = display
+        self.end_epoch_millis = end_epoch_millis
         if id is not None:
             self.id = id
-        self.content = content
+        if read is not None:
+            self.read = read
+        self.scope = scope
+        self.severity = severity
+        self.source = source
         self.start_epoch_millis = start_epoch_millis
-        self.end_epoch_millis = end_epoch_millis
-        self.display = display
         if target is not None:
             self.target = target
+        self.title = title
 
     @property
     def attributes(self):
@@ -118,91 +118,106 @@ def attributes(self, attributes):
         self._attributes = attributes
 
     @property
-    def source(self):
-        """Gets the source of this Message.  # noqa: E501
+    def content(self):
+        """Gets the content of this Message.  # noqa: E501
 
-        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+        Message content  # noqa: E501
 
-        :return: The source of this Message.  # noqa: E501
+        :return: The content of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._source
+        return self._content
 
-    @source.setter
-    def source(self, source):
-        """Sets the source of this Message.
+    @content.setter
+    def content(self, content):
+        """Sets the content of this Message.
 
-        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
+        Message content  # noqa: E501
 
-        :param source: The source of this Message.  # noqa: E501
+        :param content: The content of this Message.  # noqa: E501
         :type: str
         """
-        if source is None:
-            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
+        if content is None:
+            raise ValueError("Invalid value for `content`, must not be `None`")  # noqa: E501
 
-        self._source = source
+        self._content = content
 
     @property
-    def scope(self):
-        """Gets the scope of this Message.  # noqa: E501
+    def display(self):
+        """Gets the display of this Message.  # noqa: E501
 
-        The audience scope that this message should reach  # noqa: E501
+        The form of display for this message  # noqa: E501
 
-        :return: The scope of this Message.  # noqa: E501
+        :return: The display of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._scope
+        return self._display
 
-    @scope.setter
-    def scope(self, scope):
-        """Sets the scope of this Message.
+    @display.setter
+    def display(self, display):
+        """Sets the display of this Message.
 
-        The audience scope that this message should reach  # noqa: E501
+        The form of display for this message  # noqa: E501
 
-        :param scope: The scope of this Message.  # noqa: E501
+        :param display: The display of this Message.  # noqa: E501
         :type: str
         """
-        if scope is None:
-            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
-        if scope not in allowed_values:
+        if display is None:
+            raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
+        allowed_values = ["BANNER", "TOASTER"]  # noqa: E501
+        if display not in allowed_values:
             raise ValueError(
-                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
-                .format(scope, allowed_values)
+                "Invalid value for `display` ({0}), must be one of {1}"  # noqa: E501
+                .format(display, allowed_values)
             )
 
-        self._scope = scope
+        self._display = display
 
     @property
-    def severity(self):
-        """Gets the severity of this Message.  # noqa: E501
+    def end_epoch_millis(self):
+        """Gets the end_epoch_millis of this Message.  # noqa: E501
 
-        Message severity  # noqa: E501
+        When this message will stop being displayed, in epoch millis  # noqa: E501
 
-        :return: The severity of this Message.  # noqa: E501
+        :return: The end_epoch_millis of this Message.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_epoch_millis
+
+    @end_epoch_millis.setter
+    def end_epoch_millis(self, end_epoch_millis):
+        """Sets the end_epoch_millis of this Message.
+
+        When this message will stop being displayed, in epoch millis  # noqa: E501
+
+        :param end_epoch_millis: The end_epoch_millis of this Message.  # noqa: E501
+        :type: int
+        """
+        if end_epoch_millis is None:
+            raise ValueError("Invalid value for `end_epoch_millis`, must not be `None`")  # noqa: E501
+
+        self._end_epoch_millis = end_epoch_millis
+
+    @property
+    def id(self):
+        """Gets the id of this Message.  # noqa: E501
+
+
+        :return: The id of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._severity
+        return self._id
 
-    @severity.setter
-    def severity(self, severity):
-        """Sets the severity of this Message.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Message.
 
-        Message severity  # noqa: E501
 
-        :param severity: The severity of this Message.  # noqa: E501
+        :param id: The id of this Message.  # noqa: E501
         :type: str
         """
-        if severity is None:
-            raise ValueError("Invalid value for `severity`, must not be `None`")  # noqa: E501
-        allowed_values = ["MARKETING", "INFO", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
-            raise ValueError(
-                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
-                .format(severity, allowed_values)
-            )
 
-        self._severity = severity
+        self._id = id
 
     @property
     def read(self):
@@ -228,75 +243,91 @@ def read(self, read):
         self._read = read
 
     @property
-    def title(self):
-        """Gets the title of this Message.  # noqa: E501
+    def scope(self):
+        """Gets the scope of this Message.  # noqa: E501
 
-        Title of this message  # noqa: E501
+        The audience scope that this message should reach  # noqa: E501
 
-        :return: The title of this Message.  # noqa: E501
+        :return: The scope of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._title
+        return self._scope
 
-    @title.setter
-    def title(self, title):
-        """Sets the title of this Message.
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this Message.
 
-        Title of this message  # noqa: E501
+        The audience scope that this message should reach  # noqa: E501
 
-        :param title: The title of this Message.  # noqa: E501
+        :param scope: The scope of this Message.  # noqa: E501
         :type: str
         """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+        if scope is None:
+            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
+        allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
+        if scope not in allowed_values:
+            raise ValueError(
+                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
+                .format(scope, allowed_values)
+            )
 
-        self._title = title
+        self._scope = scope
 
     @property
-    def id(self):
-        """Gets the id of this Message.  # noqa: E501
+    def severity(self):
+        """Gets the severity of this Message.  # noqa: E501
 
+        Message severity  # noqa: E501
 
-        :return: The id of this Message.  # noqa: E501
+        :return: The severity of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._id
+        return self._severity
 
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Message.
+    @severity.setter
+    def severity(self, severity):
+        """Sets the severity of this Message.
 
+        Message severity  # noqa: E501
 
-        :param id: The id of this Message.  # noqa: E501
+        :param severity: The severity of this Message.  # noqa: E501
         :type: str
         """
+        if severity is None:
+            raise ValueError("Invalid value for `severity`, must not be `None`")  # noqa: E501
+        allowed_values = ["MARKETING", "INFO", "WARN", "SEVERE"]  # noqa: E501
+        if severity not in allowed_values:
+            raise ValueError(
+                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(severity, allowed_values)
+            )
 
-        self._id = id
+        self._severity = severity
 
     @property
-    def content(self):
-        """Gets the content of this Message.  # noqa: E501
+    def source(self):
+        """Gets the source of this Message.  # noqa: E501
 
-        Message content  # noqa: E501
+        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
 
-        :return: The content of this Message.  # noqa: E501
+        :return: The source of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._content
+        return self._source
 
-    @content.setter
-    def content(self, content):
-        """Sets the content of this Message.
+    @source.setter
+    def source(self, source):
+        """Sets the source of this Message.
 
-        Message content  # noqa: E501
+        Message source.  System messages will com from 'system@wavefront.com'  # noqa: E501
 
-        :param content: The content of this Message.  # noqa: E501
+        :param source: The source of this Message.  # noqa: E501
         :type: str
         """
-        if content is None:
-            raise ValueError("Invalid value for `content`, must not be `None`")  # noqa: E501
+        if source is None:
+            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
 
-        self._content = content
+        self._source = source
 
     @property
     def start_epoch_millis(self):
@@ -324,83 +355,52 @@ def start_epoch_millis(self, start_epoch_millis):
         self._start_epoch_millis = start_epoch_millis
 
     @property
-    def end_epoch_millis(self):
-        """Gets the end_epoch_millis of this Message.  # noqa: E501
-
-        When this message will stop being displayed, in epoch millis  # noqa: E501
-
-        :return: The end_epoch_millis of this Message.  # noqa: E501
-        :rtype: int
-        """
-        return self._end_epoch_millis
-
-    @end_epoch_millis.setter
-    def end_epoch_millis(self, end_epoch_millis):
-        """Sets the end_epoch_millis of this Message.
-
-        When this message will stop being displayed, in epoch millis  # noqa: E501
-
-        :param end_epoch_millis: The end_epoch_millis of this Message.  # noqa: E501
-        :type: int
-        """
-        if end_epoch_millis is None:
-            raise ValueError("Invalid value for `end_epoch_millis`, must not be `None`")  # noqa: E501
-
-        self._end_epoch_millis = end_epoch_millis
-
-    @property
-    def display(self):
-        """Gets the display of this Message.  # noqa: E501
+    def target(self):
+        """Gets the target of this Message.  # noqa: E501
 
-        The form of display for this message  # noqa: E501
+        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
 
-        :return: The display of this Message.  # noqa: E501
+        :return: The target of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._display
+        return self._target
 
-    @display.setter
-    def display(self, display):
-        """Sets the display of this Message.
+    @target.setter
+    def target(self, target):
+        """Sets the target of this Message.
 
-        The form of display for this message  # noqa: E501
+        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
 
-        :param display: The display of this Message.  # noqa: E501
+        :param target: The target of this Message.  # noqa: E501
         :type: str
         """
-        if display is None:
-            raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
-        allowed_values = ["BANNER", "TOASTER"]  # noqa: E501
-        if display not in allowed_values:
-            raise ValueError(
-                "Invalid value for `display` ({0}), must be one of {1}"  # noqa: E501
-                .format(display, allowed_values)
-            )
 
-        self._display = display
+        self._target = target
 
     @property
-    def target(self):
-        """Gets the target of this Message.  # noqa: E501
+    def title(self):
+        """Gets the title of this Message.  # noqa: E501
 
-        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
+        Title of this message  # noqa: E501
 
-        :return: The target of this Message.  # noqa: E501
+        :return: The title of this Message.  # noqa: E501
         :rtype: str
         """
-        return self._target
+        return self._title
 
-    @target.setter
-    def target(self, target):
-        """Sets the target of this Message.
+    @title.setter
+    def title(self, title):
+        """Sets the title of this Message.
 
-        For scope=CUSTOMER or scope=USER, the individual customer or user id  # noqa: E501
+        Title of this message  # noqa: E501
 
-        :param target: The target of this Message.  # noqa: E501
+        :param title: The title of this Message.  # noqa: E501
         :type: str
         """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._target = target
+        self._title = title
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index b665442..ed39379 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -31,84 +31,78 @@ class MetricStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'str',
         'ever': 'bool',
+        'now': 'bool',
         'recent_except_now': 'bool',
-        'now': 'bool'
+        'status': 'str'
     }
 
     attribute_map = {
-        'status': 'status',
         'ever': 'ever',
+        'now': 'now',
         'recent_except_now': 'recentExceptNow',
-        'now': 'now'
+        'status': 'status'
     }
 
-    def __init__(self, status=None, ever=None, recent_except_now=None, now=None):  # noqa: E501
+    def __init__(self, ever=None, now=None, recent_except_now=None, status=None):  # noqa: E501
         """MetricStatus - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._ever = None
-        self._recent_except_now = None
         self._now = None
+        self._recent_except_now = None
+        self._status = None
         self.discriminator = None
 
-        if status is not None:
-            self.status = status
         if ever is not None:
             self.ever = ever
-        if recent_except_now is not None:
-            self.recent_except_now = recent_except_now
         if now is not None:
             self.now = now
+        if recent_except_now is not None:
+            self.recent_except_now = recent_except_now
+        if status is not None:
+            self.status = status
 
     @property
-    def status(self):
-        """Gets the status of this MetricStatus.  # noqa: E501
+    def ever(self):
+        """Gets the ever of this MetricStatus.  # noqa: E501
 
 
-        :return: The status of this MetricStatus.  # noqa: E501
-        :rtype: str
+        :return: The ever of this MetricStatus.  # noqa: E501
+        :rtype: bool
         """
-        return self._status
+        return self._ever
 
-    @status.setter
-    def status(self, status):
-        """Sets the status of this MetricStatus.
+    @ever.setter
+    def ever(self, ever):
+        """Sets the ever of this MetricStatus.
 
 
-        :param status: The status of this MetricStatus.  # noqa: E501
-        :type: str
+        :param ever: The ever of this MetricStatus.  # noqa: E501
+        :type: bool
         """
-        allowed_values = ["OK", "PENDING"]  # noqa: E501
-        if status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
-                .format(status, allowed_values)
-            )
 
-        self._status = status
+        self._ever = ever
 
     @property
-    def ever(self):
-        """Gets the ever of this MetricStatus.  # noqa: E501
+    def now(self):
+        """Gets the now of this MetricStatus.  # noqa: E501
 
 
-        :return: The ever of this MetricStatus.  # noqa: E501
+        :return: The now of this MetricStatus.  # noqa: E501
         :rtype: bool
         """
-        return self._ever
+        return self._now
 
-    @ever.setter
-    def ever(self, ever):
-        """Sets the ever of this MetricStatus.
+    @now.setter
+    def now(self, now):
+        """Sets the now of this MetricStatus.
 
 
-        :param ever: The ever of this MetricStatus.  # noqa: E501
+        :param now: The now of this MetricStatus.  # noqa: E501
         :type: bool
         """
 
-        self._ever = ever
+        self._now = now
 
     @property
     def recent_except_now(self):
@@ -132,25 +126,31 @@ def recent_except_now(self, recent_except_now):
         self._recent_except_now = recent_except_now
 
     @property
-    def now(self):
-        """Gets the now of this MetricStatus.  # noqa: E501
+    def status(self):
+        """Gets the status of this MetricStatus.  # noqa: E501
 
 
-        :return: The now of this MetricStatus.  # noqa: E501
-        :rtype: bool
+        :return: The status of this MetricStatus.  # noqa: E501
+        :rtype: str
         """
-        return self._now
+        return self._status
 
-    @now.setter
-    def now(self, now):
-        """Sets the now of this MetricStatus.
+    @status.setter
+    def status(self, status):
+        """Sets the status of this MetricStatus.
 
 
-        :param now: The now of this MetricStatus.  # noqa: E501
-        :type: bool
+        :param status: The status of this MetricStatus.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["OK", "PENDING"]  # noqa: E501
+        if status not in allowed_values:
+            raise ValueError(
+                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
+                .format(status, allowed_values)
+            )
 
-        self._now = now
+        self._status = status
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index 7523905..ba9a7aa 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -33,35 +33,60 @@ class NewRelicConfiguration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'api_key': 'str',
         'app_filter_regex': 'str',
         'host_filter_regex': 'str',
-        'new_relic_metric_filters': 'list[NewRelicMetricFilters]',
-        'api_key': 'str'
+        'new_relic_metric_filters': 'list[NewRelicMetricFilters]'
     }
 
     attribute_map = {
+        'api_key': 'apiKey',
         'app_filter_regex': 'appFilterRegex',
         'host_filter_regex': 'hostFilterRegex',
-        'new_relic_metric_filters': 'newRelicMetricFilters',
-        'api_key': 'apiKey'
+        'new_relic_metric_filters': 'newRelicMetricFilters'
     }
 
-    def __init__(self, app_filter_regex=None, host_filter_regex=None, new_relic_metric_filters=None, api_key=None):  # noqa: E501
+    def __init__(self, api_key=None, app_filter_regex=None, host_filter_regex=None, new_relic_metric_filters=None):  # noqa: E501
         """NewRelicConfiguration - a model defined in Swagger"""  # noqa: E501
 
+        self._api_key = None
         self._app_filter_regex = None
         self._host_filter_regex = None
         self._new_relic_metric_filters = None
-        self._api_key = None
         self.discriminator = None
 
+        self.api_key = api_key
         if app_filter_regex is not None:
             self.app_filter_regex = app_filter_regex
         if host_filter_regex is not None:
             self.host_filter_regex = host_filter_regex
         if new_relic_metric_filters is not None:
             self.new_relic_metric_filters = new_relic_metric_filters
-        self.api_key = api_key
+
+    @property
+    def api_key(self):
+        """Gets the api_key of this NewRelicConfiguration.  # noqa: E501
+
+        New Relic REST API Key.  # noqa: E501
+
+        :return: The api_key of this NewRelicConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._api_key
+
+    @api_key.setter
+    def api_key(self, api_key):
+        """Sets the api_key of this NewRelicConfiguration.
+
+        New Relic REST API Key.  # noqa: E501
+
+        :param api_key: The api_key of this NewRelicConfiguration.  # noqa: E501
+        :type: str
+        """
+        if api_key is None:
+            raise ValueError("Invalid value for `api_key`, must not be `None`")  # noqa: E501
+
+        self._api_key = api_key
 
     @property
     def app_filter_regex(self):
@@ -132,31 +157,6 @@ def new_relic_metric_filters(self, new_relic_metric_filters):
 
         self._new_relic_metric_filters = new_relic_metric_filters
 
-    @property
-    def api_key(self):
-        """Gets the api_key of this NewRelicConfiguration.  # noqa: E501
-
-        New Relic REST API Key.  # noqa: E501
-
-        :return: The api_key of this NewRelicConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._api_key
-
-    @api_key.setter
-    def api_key(self, api_key):
-        """Sets the api_key of this NewRelicConfiguration.
-
-        New Relic REST API Key.  # noqa: E501
-
-        :param api_key: The api_key of this NewRelicConfiguration.  # noqa: E501
-        :type: str
-        """
-        if api_key is None:
-            raise ValueError("Invalid value for `api_key`, must not be `None`")  # noqa: E501
-
-        self._api_key = api_key
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index c811dc3..eb39840 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -31,263 +31,253 @@ class Notificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'description': 'str',
-        'method': 'str',
         'content_type': 'str',
-        'customer_id': 'str',
-        'title': 'str',
+        'created_epoch_millis': 'int',
         'creator_id': 'str',
-        'updater_id': 'str',
+        'custom_http_headers': 'dict(str, str)',
+        'customer_id': 'str',
+        'description': 'str',
+        'email_subject': 'str',
         'id': 'str',
-        'created_epoch_millis': 'int',
-        'updated_epoch_millis': 'int',
+        'is_html_content': 'bool',
+        'method': 'str',
+        'recipient': 'str',
         'template': 'str',
+        'title': 'str',
         'triggers': 'list[str]',
-        'recipient': 'str',
-        'custom_http_headers': 'dict(str, str)',
-        'email_subject': 'str',
-        'is_html_content': 'bool'
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
     }
 
     attribute_map = {
-        'description': 'description',
-        'method': 'method',
         'content_type': 'contentType',
-        'customer_id': 'customerId',
-        'title': 'title',
+        'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
+        'custom_http_headers': 'customHttpHeaders',
+        'customer_id': 'customerId',
+        'description': 'description',
+        'email_subject': 'emailSubject',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
-        'updated_epoch_millis': 'updatedEpochMillis',
+        'is_html_content': 'isHtmlContent',
+        'method': 'method',
+        'recipient': 'recipient',
         'template': 'template',
+        'title': 'title',
         'triggers': 'triggers',
-        'recipient': 'recipient',
-        'custom_http_headers': 'customHttpHeaders',
-        'email_subject': 'emailSubject',
-        'is_html_content': 'isHtmlContent'
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, description=None, method=None, content_type=None, customer_id=None, title=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, template=None, triggers=None, recipient=None, custom_http_headers=None, email_subject=None, is_html_content=None):  # noqa: E501
+    def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None, custom_http_headers=None, customer_id=None, description=None, email_subject=None, id=None, is_html_content=None, method=None, recipient=None, template=None, title=None, triggers=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Notificant - a model defined in Swagger"""  # noqa: E501
 
-        self._description = None
-        self._method = None
         self._content_type = None
-        self._customer_id = None
-        self._title = None
-        self._creator_id = None
-        self._updater_id = None
-        self._id = None
         self._created_epoch_millis = None
-        self._updated_epoch_millis = None
-        self._template = None
-        self._triggers = None
-        self._recipient = None
+        self._creator_id = None
         self._custom_http_headers = None
+        self._customer_id = None
+        self._description = None
         self._email_subject = None
+        self._id = None
         self._is_html_content = None
+        self._method = None
+        self._recipient = None
+        self._template = None
+        self._title = None
+        self._triggers = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
         self.discriminator = None
 
-        self.description = description
-        self.method = method
         if content_type is not None:
             self.content_type = content_type
-        if customer_id is not None:
-            self.customer_id = customer_id
-        self.title = title
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
-        if id is not None:
-            self.id = id
         if created_epoch_millis is not None:
             self.created_epoch_millis = created_epoch_millis
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        self.template = template
-        self.triggers = triggers
-        self.recipient = recipient
+        if creator_id is not None:
+            self.creator_id = creator_id
         if custom_http_headers is not None:
             self.custom_http_headers = custom_http_headers
+        if customer_id is not None:
+            self.customer_id = customer_id
+        self.description = description
         if email_subject is not None:
             self.email_subject = email_subject
+        if id is not None:
+            self.id = id
         if is_html_content is not None:
             self.is_html_content = is_html_content
+        self.method = method
+        self.recipient = recipient
+        self.template = template
+        self.title = title
+        self.triggers = triggers
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
 
     @property
-    def description(self):
-        """Gets the description of this Notificant.  # noqa: E501
+    def content_type(self):
+        """Gets the content_type of this Notificant.  # noqa: E501
 
-        Description  # noqa: E501
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :return: The description of this Notificant.  # noqa: E501
+        :return: The content_type of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._description
+        return self._content_type
 
-    @description.setter
-    def description(self, description):
-        """Sets the description of this Notificant.
+    @content_type.setter
+    def content_type(self, content_type):
+        """Sets the content_type of this Notificant.
 
-        Description  # noqa: E501
+        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :param description: The description of this Notificant.  # noqa: E501
+        :param content_type: The content_type of this Notificant.  # noqa: E501
         :type: str
         """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
+        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
+        if content_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(content_type, allowed_values)
+            )
 
-        self._description = description
+        self._content_type = content_type
 
     @property
-    def method(self):
-        """Gets the method of this Notificant.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Notificant.  # noqa: E501
 
-        The notification method used for notification target.  # noqa: E501
 
-        :return: The method of this Notificant.  # noqa: E501
-        :rtype: str
+        :return: The created_epoch_millis of this Notificant.  # noqa: E501
+        :rtype: int
         """
-        return self._method
+        return self._created_epoch_millis
 
-    @method.setter
-    def method(self, method):
-        """Sets the method of this Notificant.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Notificant.
 
-        The notification method used for notification target.  # noqa: E501
 
-        :param method: The method of this Notificant.  # noqa: E501
-        :type: str
+        :param created_epoch_millis: The created_epoch_millis of this Notificant.  # noqa: E501
+        :type: int
         """
-        if method is None:
-            raise ValueError("Invalid value for `method`, must not be `None`")  # noqa: E501
-        allowed_values = ["WEBHOOK", "EMAIL", "PAGERDUTY"]  # noqa: E501
-        if method not in allowed_values:
-            raise ValueError(
-                "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
-                .format(method, allowed_values)
-            )
 
-        self._method = method
+        self._created_epoch_millis = created_epoch_millis
 
     @property
-    def content_type(self):
-        """Gets the content_type of this Notificant.  # noqa: E501
+    def creator_id(self):
+        """Gets the creator_id of this Notificant.  # noqa: E501
 
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :return: The content_type of this Notificant.  # noqa: E501
+        :return: The creator_id of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._content_type
+        return self._creator_id
 
-    @content_type.setter
-    def content_type(self, content_type):
-        """Sets the content_type of this Notificant.
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Notificant.
 
-        The value of the Content-Type header of the webhook POST request.  # noqa: E501
 
-        :param content_type: The content_type of this Notificant.  # noqa: E501
+        :param creator_id: The creator_id of this Notificant.  # noqa: E501
         :type: str
         """
-        allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
-        if content_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(content_type, allowed_values)
-            )
 
-        self._content_type = content_type
+        self._creator_id = creator_id
 
     @property
-    def customer_id(self):
-        """Gets the customer_id of this Notificant.  # noqa: E501
+    def custom_http_headers(self):
+        """Gets the custom_http_headers of this Notificant.  # noqa: E501
 
+        A string->string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook  # noqa: E501
 
-        :return: The customer_id of this Notificant.  # noqa: E501
-        :rtype: str
+        :return: The custom_http_headers of this Notificant.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._customer_id
+        return self._custom_http_headers
 
-    @customer_id.setter
-    def customer_id(self, customer_id):
-        """Sets the customer_id of this Notificant.
+    @custom_http_headers.setter
+    def custom_http_headers(self, custom_http_headers):
+        """Sets the custom_http_headers of this Notificant.
 
+        A string->string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook  # noqa: E501
 
-        :param customer_id: The customer_id of this Notificant.  # noqa: E501
-        :type: str
+        :param custom_http_headers: The custom_http_headers of this Notificant.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._customer_id = customer_id
+        self._custom_http_headers = custom_http_headers
 
     @property
-    def title(self):
-        """Gets the title of this Notificant.  # noqa: E501
+    def customer_id(self):
+        """Gets the customer_id of this Notificant.  # noqa: E501
 
-        Title  # noqa: E501
 
-        :return: The title of this Notificant.  # noqa: E501
+        :return: The customer_id of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._title
+        return self._customer_id
 
-    @title.setter
-    def title(self, title):
-        """Sets the title of this Notificant.
+    @customer_id.setter
+    def customer_id(self, customer_id):
+        """Sets the customer_id of this Notificant.
 
-        Title  # noqa: E501
 
-        :param title: The title of this Notificant.  # noqa: E501
+        :param customer_id: The customer_id of this Notificant.  # noqa: E501
         :type: str
         """
-        if title is None:
-            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
-        self._title = title
+        self._customer_id = customer_id
 
     @property
-    def creator_id(self):
-        """Gets the creator_id of this Notificant.  # noqa: E501
+    def description(self):
+        """Gets the description of this Notificant.  # noqa: E501
 
+        Description  # noqa: E501
 
-        :return: The creator_id of this Notificant.  # noqa: E501
+        :return: The description of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._creator_id
+        return self._description
 
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Notificant.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Notificant.
 
+        Description  # noqa: E501
 
-        :param creator_id: The creator_id of this Notificant.  # noqa: E501
+        :param description: The description of this Notificant.  # noqa: E501
         :type: str
         """
+        if description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
-        self._creator_id = creator_id
+        self._description = description
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this Notificant.  # noqa: E501
+    def email_subject(self):
+        """Gets the email_subject of this Notificant.  # noqa: E501
 
+        The subject title of an email notification target  # noqa: E501
 
-        :return: The updater_id of this Notificant.  # noqa: E501
+        :return: The email_subject of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._email_subject
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Notificant.
+    @email_subject.setter
+    def email_subject(self, email_subject):
+        """Sets the email_subject of this Notificant.
 
+        The subject title of an email notification target  # noqa: E501
 
-        :param updater_id: The updater_id of this Notificant.  # noqa: E501
+        :param email_subject: The email_subject of this Notificant.  # noqa: E501
         :type: str
         """
 
-        self._updater_id = updater_id
+        self._email_subject = email_subject
 
     @property
     def id(self):
@@ -311,46 +301,83 @@ def id(self, id):
         self._id = id
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Notificant.  # noqa: E501
+    def is_html_content(self):
+        """Gets the is_html_content of this Notificant.  # noqa: E501
 
+        Determine whether the email alert target content is sent as html or text.  # noqa: E501
 
-        :return: The created_epoch_millis of this Notificant.  # noqa: E501
-        :rtype: int
+        :return: The is_html_content of this Notificant.  # noqa: E501
+        :rtype: bool
         """
-        return self._created_epoch_millis
+        return self._is_html_content
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Notificant.
+    @is_html_content.setter
+    def is_html_content(self, is_html_content):
+        """Sets the is_html_content of this Notificant.
 
+        Determine whether the email alert target content is sent as html or text.  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this Notificant.  # noqa: E501
-        :type: int
+        :param is_html_content: The is_html_content of this Notificant.  # noqa: E501
+        :type: bool
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._is_html_content = is_html_content
 
     @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this Notificant.  # noqa: E501
+    def method(self):
+        """Gets the method of this Notificant.  # noqa: E501
 
+        The notification method used for notification target.  # noqa: E501
 
-        :return: The updated_epoch_millis of this Notificant.  # noqa: E501
-        :rtype: int
+        :return: The method of this Notificant.  # noqa: E501
+        :rtype: str
         """
-        return self._updated_epoch_millis
+        return self._method
 
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this Notificant.
+    @method.setter
+    def method(self, method):
+        """Sets the method of this Notificant.
 
+        The notification method used for notification target.  # noqa: E501
 
-        :param updated_epoch_millis: The updated_epoch_millis of this Notificant.  # noqa: E501
-        :type: int
+        :param method: The method of this Notificant.  # noqa: E501
+        :type: str
+        """
+        if method is None:
+            raise ValueError("Invalid value for `method`, must not be `None`")  # noqa: E501
+        allowed_values = ["WEBHOOK", "EMAIL", "PAGERDUTY"]  # noqa: E501
+        if method not in allowed_values:
+            raise ValueError(
+                "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
+                .format(method, allowed_values)
+            )
+
+        self._method = method
+
+    @property
+    def recipient(self):
+        """Gets the recipient of this Notificant.  # noqa: E501
+
+        The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
+
+        :return: The recipient of this Notificant.  # noqa: E501
+        :rtype: str
         """
+        return self._recipient
 
-        self._updated_epoch_millis = updated_epoch_millis
+    @recipient.setter
+    def recipient(self, recipient):
+        """Sets the recipient of this Notificant.
+
+        The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
+
+        :param recipient: The recipient of this Notificant.  # noqa: E501
+        :type: str
+        """
+        if recipient is None:
+            raise ValueError("Invalid value for `recipient`, must not be `None`")  # noqa: E501
+
+        self._recipient = recipient
 
     @property
     def template(self):
@@ -377,6 +404,31 @@ def template(self, template):
 
         self._template = template
 
+    @property
+    def title(self):
+        """Gets the title of this Notificant.  # noqa: E501
+
+        Title  # noqa: E501
+
+        :return: The title of this Notificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this Notificant.
+
+        Title  # noqa: E501
+
+        :param title: The title of this Notificant.  # noqa: E501
+        :type: str
+        """
+        if title is None:
+            raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
+
+        self._title = title
+
     @property
     def triggers(self):
         """Gets the triggers of this Notificant.  # noqa: E501
@@ -410,98 +462,46 @@ def triggers(self, triggers):
         self._triggers = triggers
 
     @property
-    def recipient(self):
-        """Gets the recipient of this Notificant.  # noqa: E501
-
-        The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
-
-        :return: The recipient of this Notificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._recipient
-
-    @recipient.setter
-    def recipient(self, recipient):
-        """Sets the recipient of this Notificant.
-
-        The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
-
-        :param recipient: The recipient of this Notificant.  # noqa: E501
-        :type: str
-        """
-        if recipient is None:
-            raise ValueError("Invalid value for `recipient`, must not be `None`")  # noqa: E501
-
-        self._recipient = recipient
-
-    @property
-    def custom_http_headers(self):
-        """Gets the custom_http_headers of this Notificant.  # noqa: E501
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Notificant.  # noqa: E501
 
-        A string->string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook  # noqa: E501
 
-        :return: The custom_http_headers of this Notificant.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The updated_epoch_millis of this Notificant.  # noqa: E501
+        :rtype: int
         """
-        return self._custom_http_headers
+        return self._updated_epoch_millis
 
-    @custom_http_headers.setter
-    def custom_http_headers(self, custom_http_headers):
-        """Sets the custom_http_headers of this Notificant.
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Notificant.
 
-        A string->string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook  # noqa: E501
 
-        :param custom_http_headers: The custom_http_headers of this Notificant.  # noqa: E501
-        :type: dict(str, str)
+        :param updated_epoch_millis: The updated_epoch_millis of this Notificant.  # noqa: E501
+        :type: int
         """
 
-        self._custom_http_headers = custom_http_headers
+        self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def email_subject(self):
-        """Gets the email_subject of this Notificant.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Notificant.  # noqa: E501
 
-        The subject title of an email notification target  # noqa: E501
 
-        :return: The email_subject of this Notificant.  # noqa: E501
+        :return: The updater_id of this Notificant.  # noqa: E501
         :rtype: str
         """
-        return self._email_subject
+        return self._updater_id
 
-    @email_subject.setter
-    def email_subject(self, email_subject):
-        """Sets the email_subject of this Notificant.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Notificant.
 
-        The subject title of an email notification target  # noqa: E501
 
-        :param email_subject: The email_subject of this Notificant.  # noqa: E501
+        :param updater_id: The updater_id of this Notificant.  # noqa: E501
         :type: str
         """
 
-        self._email_subject = email_subject
-
-    @property
-    def is_html_content(self):
-        """Gets the is_html_content of this Notificant.  # noqa: E501
-
-        Determine whether the email alert target content is sent as html or text.  # noqa: E501
-
-        :return: The is_html_content of this Notificant.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_html_content
-
-    @is_html_content.setter
-    def is_html_content(self, is_html_content):
-        """Sets the is_html_content of this Notificant.
-
-        Determine whether the email alert target content is sent as html or text.  # noqa: E501
-
-        :param is_html_content: The is_html_content of this Notificant.  # noqa: E501
-        :type: bool
-        """
-
-        self._is_html_content = is_html_content
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index 2c8e7bb..f5eb375 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -34,51 +34,74 @@ class PagedAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Alert]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedAlert - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedAlert.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedAlert.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedAlert.  # noqa: E501
-
-
-        :return: The offset of this PagedAlert.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedAlert.
-
-
-        :param offset: The offset of this PagedAlert.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedAlert.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedAlert.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedAlert.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedAlert.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedAlert.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedAlert.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedAlert.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedAlert.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedAlert.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedAlert.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedAlert.  # noqa: E501
+
+
+        :return: The offset of this PagedAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedAlert.
+
+
+        :param offset: The offset of this PagedAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedAlert.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedAlert.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedAlert.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index ca3fa78..0a18b0d 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -34,121 +34,79 @@ class PagedAlertWithStats(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'alert_counts': 'dict(str, int)',
+        'cursor': 'str',
         'items': 'list[Alert]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
+        'offset': 'int',
         'sort': 'Sorting',
-        'alert_counts': 'dict(str, int)'
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'alert_counts': 'alertCounts',
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
+        'offset': 'offset',
         'sort': 'sort',
-        'alert_counts': 'alertCounts'
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None, alert_counts=None):  # noqa: E501
+    def __init__(self, alert_counts=None, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedAlertWithStats - a model defined in Swagger"""  # noqa: E501
 
+        self._alert_counts = None
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
-        self._alert_counts = None
+        self._total_items = None
         self.discriminator = None
 
+        if alert_counts is not None:
+            self.alert_counts = alert_counts
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
-        if alert_counts is not None:
-            self.alert_counts = alert_counts
-
-    @property
-    def items(self):
-        """Gets the items of this PagedAlertWithStats.  # noqa: E501
-
-        List of requested items  # noqa: E501
-
-        :return: The items of this PagedAlertWithStats.  # noqa: E501
-        :rtype: list[Alert]
-        """
-        return self._items
-
-    @items.setter
-    def items(self, items):
-        """Sets the items of this PagedAlertWithStats.
-
-        List of requested items  # noqa: E501
-
-        :param items: The items of this PagedAlertWithStats.  # noqa: E501
-        :type: list[Alert]
-        """
-
-        self._items = items
-
-    @property
-    def offset(self):
-        """Gets the offset of this PagedAlertWithStats.  # noqa: E501
-
-
-        :return: The offset of this PagedAlertWithStats.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedAlertWithStats.
-
-
-        :param offset: The offset of this PagedAlertWithStats.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
+        if total_items is not None:
+            self.total_items = total_items
 
     @property
-    def limit(self):
-        """Gets the limit of this PagedAlertWithStats.  # noqa: E501
+    def alert_counts(self):
+        """Gets the alert_counts of this PagedAlertWithStats.  # noqa: E501
 
+        A map from alert state to the number of alerts in that state within the search results  # noqa: E501
 
-        :return: The limit of this PagedAlertWithStats.  # noqa: E501
-        :rtype: int
+        :return: The alert_counts of this PagedAlertWithStats.  # noqa: E501
+        :rtype: dict(str, int)
         """
-        return self._limit
+        return self._alert_counts
 
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this PagedAlertWithStats.
+    @alert_counts.setter
+    def alert_counts(self, alert_counts):
+        """Sets the alert_counts of this PagedAlertWithStats.
 
+        A map from alert state to the number of alerts in that state within the search results  # noqa: E501
 
-        :param limit: The limit of this PagedAlertWithStats.  # noqa: E501
-        :type: int
+        :param alert_counts: The alert_counts of this PagedAlertWithStats.  # noqa: E501
+        :type: dict(str, int)
         """
 
-        self._limit = limit
+        self._alert_counts = alert_counts
 
     @property
     def cursor(self):
@@ -174,27 +132,48 @@ def cursor(self, cursor):
         self._cursor = cursor
 
     @property
-    def total_items(self):
-        """Gets the total_items of this PagedAlertWithStats.  # noqa: E501
+    def items(self):
+        """Gets the items of this PagedAlertWithStats.  # noqa: E501
 
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+        List of requested items  # noqa: E501
 
-        :return: The total_items of this PagedAlertWithStats.  # noqa: E501
+        :return: The items of this PagedAlertWithStats.  # noqa: E501
+        :rtype: list[Alert]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedAlertWithStats.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedAlertWithStats.  # noqa: E501
+        :type: list[Alert]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedAlertWithStats.  # noqa: E501
+
+
+        :return: The limit of this PagedAlertWithStats.  # noqa: E501
         :rtype: int
         """
-        return self._total_items
+        return self._limit
 
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedAlertWithStats.
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedAlertWithStats.
 
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
 
-        :param total_items: The total_items of this PagedAlertWithStats.  # noqa: E501
+        :param limit: The limit of this PagedAlertWithStats.  # noqa: E501
         :type: int
         """
 
-        self._total_items = total_items
+        self._limit = limit
 
     @property
     def more_items(self):
@@ -219,6 +198,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedAlertWithStats.  # noqa: E501
+
+
+        :return: The offset of this PagedAlertWithStats.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedAlertWithStats.
+
+
+        :param offset: The offset of this PagedAlertWithStats.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedAlertWithStats.  # noqa: E501
@@ -241,27 +241,27 @@ def sort(self, sort):
         self._sort = sort
 
     @property
-    def alert_counts(self):
-        """Gets the alert_counts of this PagedAlertWithStats.  # noqa: E501
+    def total_items(self):
+        """Gets the total_items of this PagedAlertWithStats.  # noqa: E501
 
-        A map from alert state to the number of alerts in that state within the search results  # noqa: E501
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
 
-        :return: The alert_counts of this PagedAlertWithStats.  # noqa: E501
-        :rtype: dict(str, int)
+        :return: The total_items of this PagedAlertWithStats.  # noqa: E501
+        :rtype: int
         """
-        return self._alert_counts
+        return self._total_items
 
-    @alert_counts.setter
-    def alert_counts(self, alert_counts):
-        """Sets the alert_counts of this PagedAlertWithStats.
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedAlertWithStats.
 
-        A map from alert state to the number of alerts in that state within the search results  # noqa: E501
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
 
-        :param alert_counts: The alert_counts of this PagedAlertWithStats.  # noqa: E501
-        :type: dict(str, int)
+        :param total_items: The total_items of this PagedAlertWithStats.  # noqa: E501
+        :type: int
         """
 
-        self._alert_counts = alert_counts
+        self._total_items = total_items
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index 14c1210..edaaed5 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -34,51 +34,74 @@ class PagedCloudIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[CloudIntegration]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedCloudIntegration - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedCloudIntegration.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedCloudIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedCloudIntegration.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedCloudIntegration.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedCloudIntegration.  # noqa: E501
-
-
-        :return: The offset of this PagedCloudIntegration.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedCloudIntegration.
-
-
-        :param offset: The offset of this PagedCloudIntegration.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedCloudIntegration.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedCloudIntegration.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedCloudIntegration.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedCloudIntegration.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedCloudIntegration.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedCloudIntegration.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedCloudIntegration.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedCloudIntegration.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedCloudIntegration.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedCloudIntegration.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedCloudIntegration.  # noqa: E501
+
+
+        :return: The offset of this PagedCloudIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedCloudIntegration.
+
+
+        :param offset: The offset of this PagedCloudIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedCloudIntegration.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedCloudIntegration.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedCloudIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedCloudIntegration.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedCloudIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index e0301e1..6c9f1e3 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -34,51 +34,74 @@ class PagedCustomerFacingUserObject(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[CustomerFacingUserObject]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedCustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedCustomerFacingUserObject.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedCustomerFacingUserObject.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedCustomerFacingUserObject.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedCustomerFacingUserObject.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedCustomerFacingUserObject.  # noqa: E501
-
-
-        :return: The offset of this PagedCustomerFacingUserObject.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedCustomerFacingUserObject.
-
-
-        :param offset: The offset of this PagedCustomerFacingUserObject.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedCustomerFacingUserObject.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedCustomerFacingUserObject.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedCustomerFacingUserObject.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedCustomerFacingUserObject.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedCustomerFacingUserObject.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedCustomerFacingUserObject.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedCustomerFacingUserObject.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedCustomerFacingUserObject.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedCustomerFacingUserObject.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedCustomerFacingUserObject.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedCustomerFacingUserObject.  # noqa: E501
+
+
+        :return: The offset of this PagedCustomerFacingUserObject.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedCustomerFacingUserObject.
+
+
+        :param offset: The offset of this PagedCustomerFacingUserObject.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedCustomerFacingUserObject.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedCustomerFacingUserObject.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedCustomerFacingUserObject.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedCustomerFacingUserObject.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedCustomerFacingUserObject.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index 5cae16e..edd4fd5 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -34,51 +34,74 @@ class PagedDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Dashboard]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedDashboard - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedDashboard.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedDashboard.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedDashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedDashboard.  # noqa: E501
-
-
-        :return: The offset of this PagedDashboard.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedDashboard.
-
-
-        :param offset: The offset of this PagedDashboard.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedDashboard.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedDashboard.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedDashboard.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedDashboard.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedDashboard.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedDashboard.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedDashboard.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedDashboard.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedDashboard.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedDashboard.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedDashboard.  # noqa: E501
+
+
+        :return: The offset of this PagedDashboard.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedDashboard.
+
+
+        :param offset: The offset of this PagedDashboard.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedDashboard.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedDashboard.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedDashboard.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedDashboard.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedDashboard.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index ab19513..660ced1 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -34,51 +34,74 @@ class PagedDerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[DerivedMetricDefinition]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedDerivedMetricDefinition.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedDerivedMetricDefinition.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedDerivedMetricDefinition.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedDerivedMetricDefinition.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedDerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The offset of this PagedDerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedDerivedMetricDefinition.
-
-
-        :param offset: The offset of this PagedDerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedDerivedMetricDefinition.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedDerivedMetricDefinition.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedDerivedMetricDefinition.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedDerivedMetricDefinition.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedDerivedMetricDefinition.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedDerivedMetricDefinition.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedDerivedMetricDefinition.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedDerivedMetricDefinition.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedDerivedMetricDefinition.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedDerivedMetricDefinition.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedDerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The offset of this PagedDerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedDerivedMetricDefinition.
+
+
+        :param offset: The offset of this PagedDerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedDerivedMetricDefinition.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedDerivedMetricDefinition.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedDerivedMetricDefinition.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedDerivedMetricDefinition.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedDerivedMetricDefinition.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index 68d0d76..41d3c4c 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -34,121 +34,79 @@ class PagedDerivedMetricDefinitionWithStats(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'counts': 'dict(str, int)',
+        'cursor': 'str',
         'items': 'list[DerivedMetricDefinition]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
+        'offset': 'int',
         'sort': 'Sorting',
-        'counts': 'dict(str, int)'
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'counts': 'counts',
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
+        'offset': 'offset',
         'sort': 'sort',
-        'counts': 'counts'
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None, counts=None):  # noqa: E501
+    def __init__(self, counts=None, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedDerivedMetricDefinitionWithStats - a model defined in Swagger"""  # noqa: E501
 
+        self._counts = None
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
-        self._counts = None
+        self._total_items = None
         self.discriminator = None
 
+        if counts is not None:
+            self.counts = counts
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
-        if counts is not None:
-            self.counts = counts
-
-    @property
-    def items(self):
-        """Gets the items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-
-        List of requested items  # noqa: E501
-
-        :return: The items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :rtype: list[DerivedMetricDefinition]
-        """
-        return self._items
-
-    @items.setter
-    def items(self, items):
-        """Sets the items of this PagedDerivedMetricDefinitionWithStats.
-
-        List of requested items  # noqa: E501
-
-        :param items: The items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :type: list[DerivedMetricDefinition]
-        """
-
-        self._items = items
-
-    @property
-    def offset(self):
-        """Gets the offset of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-
-
-        :return: The offset of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedDerivedMetricDefinitionWithStats.
-
-
-        :param offset: The offset of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
+        if total_items is not None:
+            self.total_items = total_items
 
     @property
-    def limit(self):
-        """Gets the limit of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+    def counts(self):
+        """Gets the counts of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
 
+        A map from the state of the derived metric definition to the number of entities in that state within the search results  # noqa: E501
 
-        :return: The limit of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :rtype: int
+        :return: The counts of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :rtype: dict(str, int)
         """
-        return self._limit
+        return self._counts
 
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this PagedDerivedMetricDefinitionWithStats.
+    @counts.setter
+    def counts(self, counts):
+        """Sets the counts of this PagedDerivedMetricDefinitionWithStats.
 
+        A map from the state of the derived metric definition to the number of entities in that state within the search results  # noqa: E501
 
-        :param limit: The limit of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :type: int
+        :param counts: The counts of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :type: dict(str, int)
         """
 
-        self._limit = limit
+        self._counts = counts
 
     @property
     def cursor(self):
@@ -174,27 +132,48 @@ def cursor(self, cursor):
         self._cursor = cursor
 
     @property
-    def total_items(self):
-        """Gets the total_items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+    def items(self):
+        """Gets the items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
 
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+        List of requested items  # noqa: E501
 
-        :return: The total_items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :return: The items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :rtype: list[DerivedMetricDefinition]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedDerivedMetricDefinitionWithStats.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :type: list[DerivedMetricDefinition]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+
+
+        :return: The limit of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
         :rtype: int
         """
-        return self._total_items
+        return self._limit
 
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedDerivedMetricDefinitionWithStats.
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedDerivedMetricDefinitionWithStats.
 
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
 
-        :param total_items: The total_items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :param limit: The limit of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
         :type: int
         """
 
-        self._total_items = total_items
+        self._limit = limit
 
     @property
     def more_items(self):
@@ -219,6 +198,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+
+
+        :return: The offset of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedDerivedMetricDefinitionWithStats.
+
+
+        :param offset: The offset of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
@@ -241,27 +241,27 @@ def sort(self, sort):
         self._sort = sort
 
     @property
-    def counts(self):
-        """Gets the counts of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+    def total_items(self):
+        """Gets the total_items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
 
-        A map from the state of the derived metric definition to the number of entities in that state within the search results  # noqa: E501
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
 
-        :return: The counts of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :rtype: dict(str, int)
+        :return: The total_items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :rtype: int
         """
-        return self._counts
+        return self._total_items
 
-    @counts.setter
-    def counts(self, counts):
-        """Sets the counts of this PagedDerivedMetricDefinitionWithStats.
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedDerivedMetricDefinitionWithStats.
 
-        A map from the state of the derived metric definition to the number of entities in that state within the search results  # noqa: E501
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
 
-        :param counts: The counts of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :type: dict(str, int)
+        :param total_items: The total_items of this PagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :type: int
         """
 
-        self._counts = counts
+        self._total_items = total_items
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index f3d1db8..93156c3 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -34,51 +34,74 @@ class PagedEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Event]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedEvent - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedEvent.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedEvent.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedEvent.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedEvent.  # noqa: E501
-
-
-        :return: The offset of this PagedEvent.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedEvent.
-
-
-        :param offset: The offset of this PagedEvent.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedEvent.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedEvent.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedEvent.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedEvent.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedEvent.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedEvent.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedEvent.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedEvent.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedEvent.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedEvent.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedEvent.  # noqa: E501
+
+
+        :return: The offset of this PagedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedEvent.
+
+
+        :param offset: The offset of this PagedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedEvent.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedEvent.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedEvent.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index c5dd274..8d26d38 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -34,51 +34,74 @@ class PagedExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[ExternalLink]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedExternalLink - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedExternalLink.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedExternalLink.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedExternalLink.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedExternalLink.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedExternalLink.  # noqa: E501
-
-
-        :return: The offset of this PagedExternalLink.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedExternalLink.
-
-
-        :param offset: The offset of this PagedExternalLink.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedExternalLink.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedExternalLink.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedExternalLink.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedExternalLink.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedExternalLink.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedExternalLink.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedExternalLink.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedExternalLink.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedExternalLink.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedExternalLink.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedExternalLink.  # noqa: E501
+
+
+        :return: The offset of this PagedExternalLink.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedExternalLink.
+
+
+        :param offset: The offset of this PagedExternalLink.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedExternalLink.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedExternalLink.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedExternalLink.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedExternalLink.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedExternalLink.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index 554968c..49aad88 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -34,51 +34,74 @@ class PagedIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Integration]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedIntegration - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedIntegration.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedIntegration.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedIntegration.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedIntegration.  # noqa: E501
-
-
-        :return: The offset of this PagedIntegration.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedIntegration.
-
-
-        :param offset: The offset of this PagedIntegration.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedIntegration.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedIntegration.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedIntegration.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedIntegration.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedIntegration.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedIntegration.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedIntegration.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedIntegration.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedIntegration.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedIntegration.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedIntegration.  # noqa: E501
+
+
+        :return: The offset of this PagedIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedIntegration.
+
+
+        :param offset: The offset of this PagedIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedIntegration.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedIntegration.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedIntegration.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedIntegration.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedIntegration.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index 939c22e..8bcd05d 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -34,51 +34,74 @@ class PagedMaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[MaintenanceWindow]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedMaintenanceWindow.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedMaintenanceWindow.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedMaintenanceWindow.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedMaintenanceWindow.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedMaintenanceWindow.  # noqa: E501
-
-
-        :return: The offset of this PagedMaintenanceWindow.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedMaintenanceWindow.
-
-
-        :param offset: The offset of this PagedMaintenanceWindow.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedMaintenanceWindow.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedMaintenanceWindow.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedMaintenanceWindow.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedMaintenanceWindow.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedMaintenanceWindow.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedMaintenanceWindow.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedMaintenanceWindow.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedMaintenanceWindow.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedMaintenanceWindow.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedMaintenanceWindow.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedMaintenanceWindow.  # noqa: E501
+
+
+        :return: The offset of this PagedMaintenanceWindow.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedMaintenanceWindow.
+
+
+        :param offset: The offset of this PagedMaintenanceWindow.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedMaintenanceWindow.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedMaintenanceWindow.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedMaintenanceWindow.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedMaintenanceWindow.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedMaintenanceWindow.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index 8779485..cef1f7c 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -34,51 +34,74 @@ class PagedMessage(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Message]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedMessage - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedMessage.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedMessage.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedMessage.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedMessage.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedMessage.  # noqa: E501
-
-
-        :return: The offset of this PagedMessage.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedMessage.
-
-
-        :param offset: The offset of this PagedMessage.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedMessage.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedMessage.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedMessage.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedMessage.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedMessage.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedMessage.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedMessage.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedMessage.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedMessage.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedMessage.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedMessage.  # noqa: E501
+
+
+        :return: The offset of this PagedMessage.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedMessage.
+
+
+        :param offset: The offset of this PagedMessage.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedMessage.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedMessage.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedMessage.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedMessage.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedMessage.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 620c6e4..0b07c5a 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -34,51 +34,74 @@ class PagedNotificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Notificant]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedNotificant - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedNotificant.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedNotificant.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedNotificant.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedNotificant.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedNotificant.  # noqa: E501
-
-
-        :return: The offset of this PagedNotificant.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedNotificant.
-
-
-        :param offset: The offset of this PagedNotificant.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedNotificant.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedNotificant.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedNotificant.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedNotificant.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedNotificant.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedNotificant.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedNotificant.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedNotificant.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedNotificant.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedNotificant.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedNotificant.  # noqa: E501
+
+
+        :return: The offset of this PagedNotificant.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedNotificant.
+
+
+        :param offset: The offset of this PagedNotificant.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedNotificant.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedNotificant.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedNotificant.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedNotificant.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedNotificant.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index c9ade15..7e50d08 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -34,51 +34,74 @@ class PagedProxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Proxy]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedProxy - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedProxy.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedProxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedProxy.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedProxy.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedProxy.  # noqa: E501
-
-
-        :return: The offset of this PagedProxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedProxy.
-
-
-        :param offset: The offset of this PagedProxy.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedProxy.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedProxy.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedProxy.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedProxy.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedProxy.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedProxy.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedProxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedProxy.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedProxy.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedProxy.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedProxy.  # noqa: E501
+
+
+        :return: The offset of this PagedProxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedProxy.
+
+
+        :param offset: The offset of this PagedProxy.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedProxy.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedProxy.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedProxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedProxy.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedProxy.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index a9f5295..6cf16fd 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -34,51 +34,74 @@ class PagedSavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[SavedSearch]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedSavedSearch - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSavedSearch.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSavedSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSavedSearch.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSavedSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedSavedSearch.  # noqa: E501
-
-
-        :return: The offset of this PagedSavedSearch.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedSavedSearch.
-
-
-        :param offset: The offset of this PagedSavedSearch.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedSavedSearch.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedSavedSearch.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedSavedSearch.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedSavedSearch.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedSavedSearch.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedSavedSearch.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedSavedSearch.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedSavedSearch.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedSavedSearch.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedSavedSearch.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSavedSearch.  # noqa: E501
+
+
+        :return: The offset of this PagedSavedSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSavedSearch.
+
+
+        :param offset: The offset of this PagedSavedSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedSavedSearch.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSavedSearch.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSavedSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSavedSearch.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSavedSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index 9904d26..7141abb 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -34,51 +34,74 @@ class PagedSource(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[Source]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedSource - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSource.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSource.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSource.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedSource.  # noqa: E501
-
-
-        :return: The offset of this PagedSource.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedSource.
-
-
-        :param offset: The offset of this PagedSource.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedSource.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedSource.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedSource.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedSource.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedSource.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedSource.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedSource.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedSource.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedSource.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedSource.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSource.  # noqa: E501
+
+
+        :return: The offset of this PagedSource.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSource.
+
+
+        :param offset: The offset of this PagedSource.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedSource.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSource.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSource.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSource.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSource.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/paged_user_group.py b/wavefront_api_client/models/paged_user_group.py
index 52bebf1..d23137e 100644
--- a/wavefront_api_client/models/paged_user_group.py
+++ b/wavefront_api_client/models/paged_user_group.py
@@ -34,51 +34,74 @@ class PagedUserGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[UserGroup]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """PagedUserGroup - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedUserGroup.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedUserGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedUserGroup.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedUserGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -103,27 +126,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this PagedUserGroup.  # noqa: E501
-
-
-        :return: The offset of this PagedUserGroup.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedUserGroup.
-
-
-        :param offset: The offset of this PagedUserGroup.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this PagedUserGroup.  # noqa: E501
@@ -145,52 +147,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedUserGroup.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedUserGroup.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedUserGroup.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedUserGroup.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedUserGroup.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedUserGroup.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedUserGroup.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedUserGroup.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this PagedUserGroup.  # noqa: E501
@@ -214,6 +170,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this PagedUserGroup.  # noqa: E501
+
+
+        :return: The offset of this PagedUserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedUserGroup.
+
+
+        :param offset: The offset of this PagedUserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this PagedUserGroup.  # noqa: E501
@@ -235,6 +212,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedUserGroup.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedUserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedUserGroup.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedUserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index ec3025b..35d2f65 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -31,47 +31,24 @@ class Point(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'value': 'float',
-        'timestamp': 'int'
+        'timestamp': 'int',
+        'value': 'float'
     }
 
     attribute_map = {
-        'value': 'value',
-        'timestamp': 'timestamp'
+        'timestamp': 'timestamp',
+        'value': 'value'
     }
 
-    def __init__(self, value=None, timestamp=None):  # noqa: E501
+    def __init__(self, timestamp=None, value=None):  # noqa: E501
         """Point - a model defined in Swagger"""  # noqa: E501
 
-        self._value = None
         self._timestamp = None
+        self._value = None
         self.discriminator = None
 
-        self.value = value
         self.timestamp = timestamp
-
-    @property
-    def value(self):
-        """Gets the value of this Point.  # noqa: E501
-
-
-        :return: The value of this Point.  # noqa: E501
-        :rtype: float
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Point.
-
-
-        :param value: The value of this Point.  # noqa: E501
-        :type: float
-        """
-        if value is None:
-            raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
-
-        self._value = value
+        self.value = value
 
     @property
     def timestamp(self):
@@ -98,6 +75,29 @@ def timestamp(self, timestamp):
 
         self._timestamp = timestamp
 
+    @property
+    def value(self):
+        """Gets the value of this Point.  # noqa: E501
+
+
+        :return: The value of this Point.  # noqa: E501
+        :rtype: float
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Point.
+
+
+        :param value: The value of this Point.  # noqa: E501
+        :type: float
+        """
+        if value is None:
+            raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index c34507b..58ccf31 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -33,160 +33,156 @@ class Proxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'version': 'str',
-        'status': 'str',
+        'bytes_left_for_buffer': 'int',
+        'bytes_per_minute_for_buffer': 'int',
         'customer_id': 'str',
-        'in_trash': 'bool',
+        'deleted': 'bool',
+        'ephemeral': 'bool',
         'hostname': 'str',
         'id': 'str',
-        'last_error_event': 'Event',
-        'time_drift': 'int',
-        'bytes_left_for_buffer': 'int',
-        'bytes_per_minute_for_buffer': 'int',
-        'local_queue_size': 'int',
+        'in_trash': 'bool',
         'last_check_in_time': 'int',
-        'last_known_error': 'str',
+        'last_error_event': 'Event',
         'last_error_time': 'int',
+        'last_known_error': 'str',
+        'local_queue_size': 'int',
+        'name': 'str',
         'ssh_agent': 'bool',
-        'ephemeral': 'bool',
-        'deleted': 'bool',
+        'status': 'str',
         'status_cause': 'str',
-        'name': 'str'
+        'time_drift': 'int',
+        'version': 'str'
     }
 
     attribute_map = {
-        'version': 'version',
-        'status': 'status',
+        'bytes_left_for_buffer': 'bytesLeftForBuffer',
+        'bytes_per_minute_for_buffer': 'bytesPerMinuteForBuffer',
         'customer_id': 'customerId',
-        'in_trash': 'inTrash',
+        'deleted': 'deleted',
+        'ephemeral': 'ephemeral',
         'hostname': 'hostname',
         'id': 'id',
-        'last_error_event': 'lastErrorEvent',
-        'time_drift': 'timeDrift',
-        'bytes_left_for_buffer': 'bytesLeftForBuffer',
-        'bytes_per_minute_for_buffer': 'bytesPerMinuteForBuffer',
-        'local_queue_size': 'localQueueSize',
+        'in_trash': 'inTrash',
         'last_check_in_time': 'lastCheckInTime',
-        'last_known_error': 'lastKnownError',
+        'last_error_event': 'lastErrorEvent',
         'last_error_time': 'lastErrorTime',
+        'last_known_error': 'lastKnownError',
+        'local_queue_size': 'localQueueSize',
+        'name': 'name',
         'ssh_agent': 'sshAgent',
-        'ephemeral': 'ephemeral',
-        'deleted': 'deleted',
+        'status': 'status',
         'status_cause': 'statusCause',
-        'name': 'name'
+        'time_drift': 'timeDrift',
+        'version': 'version'
     }
 
-    def __init__(self, version=None, status=None, customer_id=None, in_trash=None, hostname=None, id=None, last_error_event=None, time_drift=None, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, local_queue_size=None, last_check_in_time=None, last_known_error=None, last_error_time=None, ssh_agent=None, ephemeral=None, deleted=None, status_cause=None, name=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, version=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
-        self._version = None
-        self._status = None
+        self._bytes_left_for_buffer = None
+        self._bytes_per_minute_for_buffer = None
         self._customer_id = None
-        self._in_trash = None
+        self._deleted = None
+        self._ephemeral = None
         self._hostname = None
         self._id = None
-        self._last_error_event = None
-        self._time_drift = None
-        self._bytes_left_for_buffer = None
-        self._bytes_per_minute_for_buffer = None
-        self._local_queue_size = None
+        self._in_trash = None
         self._last_check_in_time = None
-        self._last_known_error = None
+        self._last_error_event = None
         self._last_error_time = None
+        self._last_known_error = None
+        self._local_queue_size = None
+        self._name = None
         self._ssh_agent = None
-        self._ephemeral = None
-        self._deleted = None
+        self._status = None
         self._status_cause = None
-        self._name = None
+        self._time_drift = None
+        self._version = None
         self.discriminator = None
 
-        if version is not None:
-            self.version = version
-        if status is not None:
-            self.status = status
+        if bytes_left_for_buffer is not None:
+            self.bytes_left_for_buffer = bytes_left_for_buffer
+        if bytes_per_minute_for_buffer is not None:
+            self.bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
         if customer_id is not None:
             self.customer_id = customer_id
-        if in_trash is not None:
-            self.in_trash = in_trash
+        if deleted is not None:
+            self.deleted = deleted
+        if ephemeral is not None:
+            self.ephemeral = ephemeral
         if hostname is not None:
             self.hostname = hostname
         if id is not None:
             self.id = id
-        if last_error_event is not None:
-            self.last_error_event = last_error_event
-        if time_drift is not None:
-            self.time_drift = time_drift
-        if bytes_left_for_buffer is not None:
-            self.bytes_left_for_buffer = bytes_left_for_buffer
-        if bytes_per_minute_for_buffer is not None:
-            self.bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
-        if local_queue_size is not None:
-            self.local_queue_size = local_queue_size
+        if in_trash is not None:
+            self.in_trash = in_trash
         if last_check_in_time is not None:
             self.last_check_in_time = last_check_in_time
-        if last_known_error is not None:
-            self.last_known_error = last_known_error
+        if last_error_event is not None:
+            self.last_error_event = last_error_event
         if last_error_time is not None:
             self.last_error_time = last_error_time
+        if last_known_error is not None:
+            self.last_known_error = last_known_error
+        if local_queue_size is not None:
+            self.local_queue_size = local_queue_size
+        self.name = name
         if ssh_agent is not None:
             self.ssh_agent = ssh_agent
-        if ephemeral is not None:
-            self.ephemeral = ephemeral
-        if deleted is not None:
-            self.deleted = deleted
+        if status is not None:
+            self.status = status
         if status_cause is not None:
             self.status_cause = status_cause
-        self.name = name
+        if time_drift is not None:
+            self.time_drift = time_drift
+        if version is not None:
+            self.version = version
 
     @property
-    def version(self):
-        """Gets the version of this Proxy.  # noqa: E501
+    def bytes_left_for_buffer(self):
+        """Gets the bytes_left_for_buffer of this Proxy.  # noqa: E501
 
+        Number of bytes of space remaining in the persistent disk queue of this proxy  # noqa: E501
 
-        :return: The version of this Proxy.  # noqa: E501
-        :rtype: str
+        :return: The bytes_left_for_buffer of this Proxy.  # noqa: E501
+        :rtype: int
         """
-        return self._version
+        return self._bytes_left_for_buffer
 
-    @version.setter
-    def version(self, version):
-        """Sets the version of this Proxy.
+    @bytes_left_for_buffer.setter
+    def bytes_left_for_buffer(self, bytes_left_for_buffer):
+        """Sets the bytes_left_for_buffer of this Proxy.
 
+        Number of bytes of space remaining in the persistent disk queue of this proxy  # noqa: E501
 
-        :param version: The version of this Proxy.  # noqa: E501
-        :type: str
+        :param bytes_left_for_buffer: The bytes_left_for_buffer of this Proxy.  # noqa: E501
+        :type: int
         """
 
-        self._version = version
+        self._bytes_left_for_buffer = bytes_left_for_buffer
 
     @property
-    def status(self):
-        """Gets the status of this Proxy.  # noqa: E501
+    def bytes_per_minute_for_buffer(self):
+        """Gets the bytes_per_minute_for_buffer of this Proxy.  # noqa: E501
 
-        the proxy's status  # noqa: E501
+        Bytes used per minute by the persistent disk queue of this proxy  # noqa: E501
 
-        :return: The status of this Proxy.  # noqa: E501
-        :rtype: str
+        :return: The bytes_per_minute_for_buffer of this Proxy.  # noqa: E501
+        :rtype: int
         """
-        return self._status
+        return self._bytes_per_minute_for_buffer
 
-    @status.setter
-    def status(self, status):
-        """Sets the status of this Proxy.
+    @bytes_per_minute_for_buffer.setter
+    def bytes_per_minute_for_buffer(self, bytes_per_minute_for_buffer):
+        """Sets the bytes_per_minute_for_buffer of this Proxy.
 
-        the proxy's status  # noqa: E501
+        Bytes used per minute by the persistent disk queue of this proxy  # noqa: E501
 
-        :param status: The status of this Proxy.  # noqa: E501
-        :type: str
+        :param bytes_per_minute_for_buffer: The bytes_per_minute_for_buffer of this Proxy.  # noqa: E501
+        :type: int
         """
-        allowed_values = ["ACTIVE", "STOPPED_UNKNOWN", "STOPPED_BY_SERVER"]  # noqa: E501
-        if status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
-                .format(status, allowed_values)
-            )
 
-        self._status = status
+        self._bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
 
     @property
     def customer_id(self):
@@ -210,25 +206,48 @@ def customer_id(self, customer_id):
         self._customer_id = customer_id
 
     @property
-    def in_trash(self):
-        """Gets the in_trash of this Proxy.  # noqa: E501
+    def deleted(self):
+        """Gets the deleted of this Proxy.  # noqa: E501
 
 
-        :return: The in_trash of this Proxy.  # noqa: E501
+        :return: The deleted of this Proxy.  # noqa: E501
         :rtype: bool
         """
-        return self._in_trash
+        return self._deleted
 
-    @in_trash.setter
-    def in_trash(self, in_trash):
-        """Sets the in_trash of this Proxy.
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this Proxy.
 
 
-        :param in_trash: The in_trash of this Proxy.  # noqa: E501
+        :param deleted: The deleted of this Proxy.  # noqa: E501
         :type: bool
         """
 
-        self._in_trash = in_trash
+        self._deleted = deleted
+
+    @property
+    def ephemeral(self):
+        """Gets the ephemeral of this Proxy.  # noqa: E501
+
+        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
+
+        :return: The ephemeral of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._ephemeral
+
+    @ephemeral.setter
+    def ephemeral(self, ephemeral):
+        """Sets the ephemeral of this Proxy.
+
+        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
+
+        :param ephemeral: The ephemeral of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._ephemeral = ephemeral
 
     @property
     def hostname(self):
@@ -275,140 +294,92 @@ def id(self, id):
         self._id = id
 
     @property
-    def last_error_event(self):
-        """Gets the last_error_event of this Proxy.  # noqa: E501
-
-
-        :return: The last_error_event of this Proxy.  # noqa: E501
-        :rtype: Event
-        """
-        return self._last_error_event
-
-    @last_error_event.setter
-    def last_error_event(self, last_error_event):
-        """Sets the last_error_event of this Proxy.
-
-
-        :param last_error_event: The last_error_event of this Proxy.  # noqa: E501
-        :type: Event
-        """
-
-        self._last_error_event = last_error_event
-
-    @property
-    def time_drift(self):
-        """Gets the time_drift of this Proxy.  # noqa: E501
-
-        Time drift of the proxy's clock compared to Wavefront servers  # noqa: E501
-
-        :return: The time_drift of this Proxy.  # noqa: E501
-        :rtype: int
-        """
-        return self._time_drift
-
-    @time_drift.setter
-    def time_drift(self, time_drift):
-        """Sets the time_drift of this Proxy.
-
-        Time drift of the proxy's clock compared to Wavefront servers  # noqa: E501
-
-        :param time_drift: The time_drift of this Proxy.  # noqa: E501
-        :type: int
-        """
-
-        self._time_drift = time_drift
-
-    @property
-    def bytes_left_for_buffer(self):
-        """Gets the bytes_left_for_buffer of this Proxy.  # noqa: E501
+    def in_trash(self):
+        """Gets the in_trash of this Proxy.  # noqa: E501
 
-        Number of bytes of space remaining in the persistent disk queue of this proxy  # noqa: E501
 
-        :return: The bytes_left_for_buffer of this Proxy.  # noqa: E501
-        :rtype: int
+        :return: The in_trash of this Proxy.  # noqa: E501
+        :rtype: bool
         """
-        return self._bytes_left_for_buffer
+        return self._in_trash
 
-    @bytes_left_for_buffer.setter
-    def bytes_left_for_buffer(self, bytes_left_for_buffer):
-        """Sets the bytes_left_for_buffer of this Proxy.
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this Proxy.
 
-        Number of bytes of space remaining in the persistent disk queue of this proxy  # noqa: E501
 
-        :param bytes_left_for_buffer: The bytes_left_for_buffer of this Proxy.  # noqa: E501
-        :type: int
+        :param in_trash: The in_trash of this Proxy.  # noqa: E501
+        :type: bool
         """
 
-        self._bytes_left_for_buffer = bytes_left_for_buffer
+        self._in_trash = in_trash
 
     @property
-    def bytes_per_minute_for_buffer(self):
-        """Gets the bytes_per_minute_for_buffer of this Proxy.  # noqa: E501
+    def last_check_in_time(self):
+        """Gets the last_check_in_time of this Proxy.  # noqa: E501
 
-        Bytes used per minute by the persistent disk queue of this proxy  # noqa: E501
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
 
-        :return: The bytes_per_minute_for_buffer of this Proxy.  # noqa: E501
+        :return: The last_check_in_time of this Proxy.  # noqa: E501
         :rtype: int
         """
-        return self._bytes_per_minute_for_buffer
+        return self._last_check_in_time
 
-    @bytes_per_minute_for_buffer.setter
-    def bytes_per_minute_for_buffer(self, bytes_per_minute_for_buffer):
-        """Sets the bytes_per_minute_for_buffer of this Proxy.
+    @last_check_in_time.setter
+    def last_check_in_time(self, last_check_in_time):
+        """Sets the last_check_in_time of this Proxy.
 
-        Bytes used per minute by the persistent disk queue of this proxy  # noqa: E501
+        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
 
-        :param bytes_per_minute_for_buffer: The bytes_per_minute_for_buffer of this Proxy.  # noqa: E501
+        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
         :type: int
         """
 
-        self._bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
+        self._last_check_in_time = last_check_in_time
 
     @property
-    def local_queue_size(self):
-        """Gets the local_queue_size of this Proxy.  # noqa: E501
+    def last_error_event(self):
+        """Gets the last_error_event of this Proxy.  # noqa: E501
 
-        Number of items in the persistent disk queue of this proxy  # noqa: E501
 
-        :return: The local_queue_size of this Proxy.  # noqa: E501
-        :rtype: int
+        :return: The last_error_event of this Proxy.  # noqa: E501
+        :rtype: Event
         """
-        return self._local_queue_size
+        return self._last_error_event
 
-    @local_queue_size.setter
-    def local_queue_size(self, local_queue_size):
-        """Sets the local_queue_size of this Proxy.
+    @last_error_event.setter
+    def last_error_event(self, last_error_event):
+        """Sets the last_error_event of this Proxy.
 
-        Number of items in the persistent disk queue of this proxy  # noqa: E501
 
-        :param local_queue_size: The local_queue_size of this Proxy.  # noqa: E501
-        :type: int
+        :param last_error_event: The last_error_event of this Proxy.  # noqa: E501
+        :type: Event
         """
 
-        self._local_queue_size = local_queue_size
+        self._last_error_event = last_error_event
 
     @property
-    def last_check_in_time(self):
-        """Gets the last_check_in_time of this Proxy.  # noqa: E501
+    def last_error_time(self):
+        """Gets the last_error_time of this Proxy.  # noqa: E501
 
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+        deprecated  # noqa: E501
 
-        :return: The last_check_in_time of this Proxy.  # noqa: E501
+        :return: The last_error_time of this Proxy.  # noqa: E501
         :rtype: int
         """
-        return self._last_check_in_time
+        return self._last_error_time
 
-    @last_check_in_time.setter
-    def last_check_in_time(self, last_check_in_time):
-        """Sets the last_check_in_time of this Proxy.
+    @last_error_time.setter
+    def last_error_time(self, last_error_time):
+        """Sets the last_error_time of this Proxy.
 
-        Last time when this proxy checked in (in milliseconds since the unix epoch)  # noqa: E501
+        deprecated  # noqa: E501
 
-        :param last_check_in_time: The last_check_in_time of this Proxy.  # noqa: E501
+        :param last_error_time: The last_error_time of this Proxy.  # noqa: E501
         :type: int
         """
 
-        self._last_check_in_time = last_check_in_time
+        self._last_error_time = last_error_time
 
     @property
     def last_known_error(self):
@@ -434,27 +405,52 @@ def last_known_error(self, last_known_error):
         self._last_known_error = last_known_error
 
     @property
-    def last_error_time(self):
-        """Gets the last_error_time of this Proxy.  # noqa: E501
+    def local_queue_size(self):
+        """Gets the local_queue_size of this Proxy.  # noqa: E501
 
-        deprecated  # noqa: E501
+        Number of items in the persistent disk queue of this proxy  # noqa: E501
 
-        :return: The last_error_time of this Proxy.  # noqa: E501
+        :return: The local_queue_size of this Proxy.  # noqa: E501
         :rtype: int
         """
-        return self._last_error_time
+        return self._local_queue_size
 
-    @last_error_time.setter
-    def last_error_time(self, last_error_time):
-        """Sets the last_error_time of this Proxy.
+    @local_queue_size.setter
+    def local_queue_size(self, local_queue_size):
+        """Sets the local_queue_size of this Proxy.
 
-        deprecated  # noqa: E501
+        Number of items in the persistent disk queue of this proxy  # noqa: E501
 
-        :param last_error_time: The last_error_time of this Proxy.  # noqa: E501
+        :param local_queue_size: The local_queue_size of this Proxy.  # noqa: E501
         :type: int
         """
 
-        self._last_error_time = last_error_time
+        self._local_queue_size = local_queue_size
+
+    @property
+    def name(self):
+        """Gets the name of this Proxy.  # noqa: E501
+
+        Proxy name (modifiable)  # noqa: E501
+
+        :return: The name of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Proxy.
+
+        Proxy name (modifiable)  # noqa: E501
+
+        :param name: The name of this Proxy.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
 
     @property
     def ssh_agent(self):
@@ -480,48 +476,33 @@ def ssh_agent(self, ssh_agent):
         self._ssh_agent = ssh_agent
 
     @property
-    def ephemeral(self):
-        """Gets the ephemeral of this Proxy.  # noqa: E501
-
-        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
-
-        :return: The ephemeral of this Proxy.  # noqa: E501
-        :rtype: bool
-        """
-        return self._ephemeral
-
-    @ephemeral.setter
-    def ephemeral(self, ephemeral):
-        """Sets the ephemeral of this Proxy.
-
-        When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)  # noqa: E501
-
-        :param ephemeral: The ephemeral of this Proxy.  # noqa: E501
-        :type: bool
-        """
-
-        self._ephemeral = ephemeral
-
-    @property
-    def deleted(self):
-        """Gets the deleted of this Proxy.  # noqa: E501
+    def status(self):
+        """Gets the status of this Proxy.  # noqa: E501
 
+        the proxy's status  # noqa: E501
 
-        :return: The deleted of this Proxy.  # noqa: E501
-        :rtype: bool
+        :return: The status of this Proxy.  # noqa: E501
+        :rtype: str
         """
-        return self._deleted
+        return self._status
 
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this Proxy.
+    @status.setter
+    def status(self, status):
+        """Sets the status of this Proxy.
 
+        the proxy's status  # noqa: E501
 
-        :param deleted: The deleted of this Proxy.  # noqa: E501
-        :type: bool
+        :param status: The status of this Proxy.  # noqa: E501
+        :type: str
         """
+        allowed_values = ["ACTIVE", "STOPPED_UNKNOWN", "STOPPED_BY_SERVER"]  # noqa: E501
+        if status not in allowed_values:
+            raise ValueError(
+                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
+                .format(status, allowed_values)
+            )
 
-        self._deleted = deleted
+        self._status = status
 
     @property
     def status_cause(self):
@@ -547,29 +528,48 @@ def status_cause(self, status_cause):
         self._status_cause = status_cause
 
     @property
-    def name(self):
-        """Gets the name of this Proxy.  # noqa: E501
+    def time_drift(self):
+        """Gets the time_drift of this Proxy.  # noqa: E501
 
-        Proxy name (modifiable)  # noqa: E501
+        Time drift of the proxy's clock compared to Wavefront servers  # noqa: E501
 
-        :return: The name of this Proxy.  # noqa: E501
+        :return: The time_drift of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._time_drift
+
+    @time_drift.setter
+    def time_drift(self, time_drift):
+        """Sets the time_drift of this Proxy.
+
+        Time drift of the proxy's clock compared to Wavefront servers  # noqa: E501
+
+        :param time_drift: The time_drift of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._time_drift = time_drift
+
+    @property
+    def version(self):
+        """Gets the version of this Proxy.  # noqa: E501
+
+
+        :return: The version of this Proxy.  # noqa: E501
         :rtype: str
         """
-        return self._name
+        return self._version
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this Proxy.
+    @version.setter
+    def version(self, version):
+        """Sets the version of this Proxy.
 
-        Proxy name (modifiable)  # noqa: E501
 
-        :param name: The name of this Proxy.  # noqa: E501
+        :param version: The version of this Proxy.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._name = name
+        self._version = version
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index 6840d58..1595bd7 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -31,166 +31,166 @@ class QueryEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'name': 'str',
-        'start': 'int',
         'end': 'int',
-        'tags': 'dict(str, str)',
         'hosts': 'list[str]',
+        'is_ephemeral': 'bool',
+        'name': 'str',
+        'start': 'int',
         'summarized': 'int',
-        'is_ephemeral': 'bool'
+        'tags': 'dict(str, str)'
     }
 
     attribute_map = {
-        'name': 'name',
-        'start': 'start',
         'end': 'end',
-        'tags': 'tags',
         'hosts': 'hosts',
+        'is_ephemeral': 'isEphemeral',
+        'name': 'name',
+        'start': 'start',
         'summarized': 'summarized',
-        'is_ephemeral': 'isEphemeral'
+        'tags': 'tags'
     }
 
-    def __init__(self, name=None, start=None, end=None, tags=None, hosts=None, summarized=None, is_ephemeral=None):  # noqa: E501
+    def __init__(self, end=None, hosts=None, is_ephemeral=None, name=None, start=None, summarized=None, tags=None):  # noqa: E501
         """QueryEvent - a model defined in Swagger"""  # noqa: E501
 
-        self._name = None
-        self._start = None
         self._end = None
-        self._tags = None
         self._hosts = None
-        self._summarized = None
         self._is_ephemeral = None
+        self._name = None
+        self._start = None
+        self._summarized = None
+        self._tags = None
         self.discriminator = None
 
-        if name is not None:
-            self.name = name
-        if start is not None:
-            self.start = start
         if end is not None:
             self.end = end
-        if tags is not None:
-            self.tags = tags
         if hosts is not None:
             self.hosts = hosts
-        if summarized is not None:
-            self.summarized = summarized
         if is_ephemeral is not None:
             self.is_ephemeral = is_ephemeral
+        if name is not None:
+            self.name = name
+        if start is not None:
+            self.start = start
+        if summarized is not None:
+            self.summarized = summarized
+        if tags is not None:
+            self.tags = tags
 
     @property
-    def name(self):
-        """Gets the name of this QueryEvent.  # noqa: E501
+    def end(self):
+        """Gets the end of this QueryEvent.  # noqa: E501
 
-        Event name  # noqa: E501
+        End time of event, in epoch millis  # noqa: E501
 
-        :return: The name of this QueryEvent.  # noqa: E501
-        :rtype: str
+        :return: The end of this QueryEvent.  # noqa: E501
+        :rtype: int
         """
-        return self._name
+        return self._end
 
-    @name.setter
-    def name(self, name):
-        """Sets the name of this QueryEvent.
+    @end.setter
+    def end(self, end):
+        """Sets the end of this QueryEvent.
 
-        Event name  # noqa: E501
+        End time of event, in epoch millis  # noqa: E501
 
-        :param name: The name of this QueryEvent.  # noqa: E501
-        :type: str
+        :param end: The end of this QueryEvent.  # noqa: E501
+        :type: int
         """
 
-        self._name = name
+        self._end = end
 
     @property
-    def start(self):
-        """Gets the start of this QueryEvent.  # noqa: E501
+    def hosts(self):
+        """Gets the hosts of this QueryEvent.  # noqa: E501
 
-        Start time of event, in epoch millis  # noqa: E501
+        Sources (hosts) to which the event pertains  # noqa: E501
 
-        :return: The start of this QueryEvent.  # noqa: E501
-        :rtype: int
+        :return: The hosts of this QueryEvent.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._start
+        return self._hosts
 
-    @start.setter
-    def start(self, start):
-        """Sets the start of this QueryEvent.
+    @hosts.setter
+    def hosts(self, hosts):
+        """Sets the hosts of this QueryEvent.
 
-        Start time of event, in epoch millis  # noqa: E501
+        Sources (hosts) to which the event pertains  # noqa: E501
 
-        :param start: The start of this QueryEvent.  # noqa: E501
-        :type: int
+        :param hosts: The hosts of this QueryEvent.  # noqa: E501
+        :type: list[str]
         """
 
-        self._start = start
+        self._hosts = hosts
 
     @property
-    def end(self):
-        """Gets the end of this QueryEvent.  # noqa: E501
+    def is_ephemeral(self):
+        """Gets the is_ephemeral of this QueryEvent.  # noqa: E501
 
-        End time of event, in epoch millis  # noqa: E501
+        Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend  # noqa: E501
 
-        :return: The end of this QueryEvent.  # noqa: E501
-        :rtype: int
+        :return: The is_ephemeral of this QueryEvent.  # noqa: E501
+        :rtype: bool
         """
-        return self._end
+        return self._is_ephemeral
 
-    @end.setter
-    def end(self, end):
-        """Sets the end of this QueryEvent.
+    @is_ephemeral.setter
+    def is_ephemeral(self, is_ephemeral):
+        """Sets the is_ephemeral of this QueryEvent.
 
-        End time of event, in epoch millis  # noqa: E501
+        Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend  # noqa: E501
 
-        :param end: The end of this QueryEvent.  # noqa: E501
-        :type: int
+        :param is_ephemeral: The is_ephemeral of this QueryEvent.  # noqa: E501
+        :type: bool
         """
 
-        self._end = end
+        self._is_ephemeral = is_ephemeral
 
     @property
-    def tags(self):
-        """Gets the tags of this QueryEvent.  # noqa: E501
+    def name(self):
+        """Gets the name of this QueryEvent.  # noqa: E501
 
-        Tags (annotations) on the event  # noqa: E501
+        Event name  # noqa: E501
 
-        :return: The tags of this QueryEvent.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The name of this QueryEvent.  # noqa: E501
+        :rtype: str
         """
-        return self._tags
+        return self._name
 
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this QueryEvent.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this QueryEvent.
 
-        Tags (annotations) on the event  # noqa: E501
+        Event name  # noqa: E501
 
-        :param tags: The tags of this QueryEvent.  # noqa: E501
-        :type: dict(str, str)
+        :param name: The name of this QueryEvent.  # noqa: E501
+        :type: str
         """
 
-        self._tags = tags
+        self._name = name
 
     @property
-    def hosts(self):
-        """Gets the hosts of this QueryEvent.  # noqa: E501
+    def start(self):
+        """Gets the start of this QueryEvent.  # noqa: E501
 
-        Sources (hosts) to which the event pertains  # noqa: E501
+        Start time of event, in epoch millis  # noqa: E501
 
-        :return: The hosts of this QueryEvent.  # noqa: E501
-        :rtype: list[str]
+        :return: The start of this QueryEvent.  # noqa: E501
+        :rtype: int
         """
-        return self._hosts
+        return self._start
 
-    @hosts.setter
-    def hosts(self, hosts):
-        """Sets the hosts of this QueryEvent.
+    @start.setter
+    def start(self, start):
+        """Sets the start of this QueryEvent.
 
-        Sources (hosts) to which the event pertains  # noqa: E501
+        Start time of event, in epoch millis  # noqa: E501
 
-        :param hosts: The hosts of this QueryEvent.  # noqa: E501
-        :type: list[str]
+        :param start: The start of this QueryEvent.  # noqa: E501
+        :type: int
         """
 
-        self._hosts = hosts
+        self._start = start
 
     @property
     def summarized(self):
@@ -216,27 +216,27 @@ def summarized(self, summarized):
         self._summarized = summarized
 
     @property
-    def is_ephemeral(self):
-        """Gets the is_ephemeral of this QueryEvent.  # noqa: E501
+    def tags(self):
+        """Gets the tags of this QueryEvent.  # noqa: E501
 
-        Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend  # noqa: E501
+        Tags (annotations) on the event  # noqa: E501
 
-        :return: The is_ephemeral of this QueryEvent.  # noqa: E501
-        :rtype: bool
+        :return: The tags of this QueryEvent.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._is_ephemeral
+        return self._tags
 
-    @is_ephemeral.setter
-    def is_ephemeral(self, is_ephemeral):
-        """Sets the is_ephemeral of this QueryEvent.
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this QueryEvent.
 
-        Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend  # noqa: E501
+        Tags (annotations) on the event  # noqa: E501
 
-        :param is_ephemeral: The is_ephemeral of this QueryEvent.  # noqa: E501
-        :type: bool
+        :param tags: The tags of this QueryEvent.  # noqa: E501
+        :type: dict(str, str)
         """
 
-        self._is_ephemeral = is_ephemeral
+        self._tags = tags
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index ac5ef02..59067c1 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -35,43 +35,37 @@ class QueryResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'warnings': 'str',
-        'timeseries': 'list[Timeseries]',
-        'stats': 'StatsModel',
         'events': 'list[QueryEvent]',
         'granularity': 'int',
         'name': 'str',
-        'query': 'str'
+        'query': 'str',
+        'stats': 'StatsModel',
+        'timeseries': 'list[Timeseries]',
+        'warnings': 'str'
     }
 
     attribute_map = {
-        'warnings': 'warnings',
-        'timeseries': 'timeseries',
-        'stats': 'stats',
         'events': 'events',
         'granularity': 'granularity',
         'name': 'name',
-        'query': 'query'
+        'query': 'query',
+        'stats': 'stats',
+        'timeseries': 'timeseries',
+        'warnings': 'warnings'
     }
 
-    def __init__(self, warnings=None, timeseries=None, stats=None, events=None, granularity=None, name=None, query=None):  # noqa: E501
+    def __init__(self, events=None, granularity=None, name=None, query=None, stats=None, timeseries=None, warnings=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
 
-        self._warnings = None
-        self._timeseries = None
-        self._stats = None
         self._events = None
         self._granularity = None
         self._name = None
         self._query = None
+        self._stats = None
+        self._timeseries = None
+        self._warnings = None
         self.discriminator = None
 
-        if warnings is not None:
-            self.warnings = warnings
-        if timeseries is not None:
-            self.timeseries = timeseries
-        if stats is not None:
-            self.stats = stats
         if events is not None:
             self.events = events
         if granularity is not None:
@@ -80,71 +74,12 @@ def __init__(self, warnings=None, timeseries=None, stats=None, events=None, gran
             self.name = name
         if query is not None:
             self.query = query
-
-    @property
-    def warnings(self):
-        """Gets the warnings of this QueryResult.  # noqa: E501
-
-        The warnings incurred by this query  # noqa: E501
-
-        :return: The warnings of this QueryResult.  # noqa: E501
-        :rtype: str
-        """
-        return self._warnings
-
-    @warnings.setter
-    def warnings(self, warnings):
-        """Sets the warnings of this QueryResult.
-
-        The warnings incurred by this query  # noqa: E501
-
-        :param warnings: The warnings of this QueryResult.  # noqa: E501
-        :type: str
-        """
-
-        self._warnings = warnings
-
-    @property
-    def timeseries(self):
-        """Gets the timeseries of this QueryResult.  # noqa: E501
-
-
-        :return: The timeseries of this QueryResult.  # noqa: E501
-        :rtype: list[Timeseries]
-        """
-        return self._timeseries
-
-    @timeseries.setter
-    def timeseries(self, timeseries):
-        """Sets the timeseries of this QueryResult.
-
-
-        :param timeseries: The timeseries of this QueryResult.  # noqa: E501
-        :type: list[Timeseries]
-        """
-
-        self._timeseries = timeseries
-
-    @property
-    def stats(self):
-        """Gets the stats of this QueryResult.  # noqa: E501
-
-
-        :return: The stats of this QueryResult.  # noqa: E501
-        :rtype: StatsModel
-        """
-        return self._stats
-
-    @stats.setter
-    def stats(self, stats):
-        """Sets the stats of this QueryResult.
-
-
-        :param stats: The stats of this QueryResult.  # noqa: E501
-        :type: StatsModel
-        """
-
-        self._stats = stats
+        if stats is not None:
+            self.stats = stats
+        if timeseries is not None:
+            self.timeseries = timeseries
+        if warnings is not None:
+            self.warnings = warnings
 
     @property
     def events(self):
@@ -236,6 +171,71 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def stats(self):
+        """Gets the stats of this QueryResult.  # noqa: E501
+
+
+        :return: The stats of this QueryResult.  # noqa: E501
+        :rtype: StatsModel
+        """
+        return self._stats
+
+    @stats.setter
+    def stats(self, stats):
+        """Sets the stats of this QueryResult.
+
+
+        :param stats: The stats of this QueryResult.  # noqa: E501
+        :type: StatsModel
+        """
+
+        self._stats = stats
+
+    @property
+    def timeseries(self):
+        """Gets the timeseries of this QueryResult.  # noqa: E501
+
+
+        :return: The timeseries of this QueryResult.  # noqa: E501
+        :rtype: list[Timeseries]
+        """
+        return self._timeseries
+
+    @timeseries.setter
+    def timeseries(self, timeseries):
+        """Sets the timeseries of this QueryResult.
+
+
+        :param timeseries: The timeseries of this QueryResult.  # noqa: E501
+        :type: list[Timeseries]
+        """
+
+        self._timeseries = timeseries
+
+    @property
+    def warnings(self):
+        """Gets the warnings of this QueryResult.  # noqa: E501
+
+        The warnings incurred by this query  # noqa: E501
+
+        :return: The warnings of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._warnings
+
+    @warnings.setter
+    def warnings(self, warnings):
+        """Sets the warnings of this QueryResult.
+
+        The warnings incurred by this query  # noqa: E501
+
+        :param warnings: The warnings of this QueryResult.  # noqa: E501
+        :type: str
+        """
+
+        self._warnings = warnings
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index 261ed96..7e3bdf5 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -33,48 +33,25 @@ class RawTimeseries(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'tags': 'dict(str, str)',
-        'points': 'list[Point]'
+        'points': 'list[Point]',
+        'tags': 'dict(str, str)'
     }
 
     attribute_map = {
-        'tags': 'tags',
-        'points': 'points'
+        'points': 'points',
+        'tags': 'tags'
     }
 
-    def __init__(self, tags=None, points=None):  # noqa: E501
+    def __init__(self, points=None, tags=None):  # noqa: E501
         """RawTimeseries - a model defined in Swagger"""  # noqa: E501
 
-        self._tags = None
         self._points = None
+        self._tags = None
         self.discriminator = None
 
+        self.points = points
         if tags is not None:
             self.tags = tags
-        self.points = points
-
-    @property
-    def tags(self):
-        """Gets the tags of this RawTimeseries.  # noqa: E501
-
-        Associated tags of the time series  # noqa: E501
-
-        :return: The tags of this RawTimeseries.  # noqa: E501
-        :rtype: dict(str, str)
-        """
-        return self._tags
-
-    @tags.setter
-    def tags(self, tags):
-        """Sets the tags of this RawTimeseries.
-
-        Associated tags of the time series  # noqa: E501
-
-        :param tags: The tags of this RawTimeseries.  # noqa: E501
-        :type: dict(str, str)
-        """
-
-        self._tags = tags
 
     @property
     def points(self):
@@ -99,6 +76,29 @@ def points(self, points):
 
         self._points = points
 
+    @property
+    def tags(self):
+        """Gets the tags of this RawTimeseries.  # noqa: E501
+
+        Associated tags of the time series  # noqa: E501
+
+        :return: The tags of this RawTimeseries.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this RawTimeseries.
+
+        Associated tags of the time series  # noqa: E501
+
+        :param tags: The tags of this RawTimeseries.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._tags = tags
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index f383661..f644c3f 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -33,25 +33,46 @@ class ResponseContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'object'
+        'response': 'object',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainer - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainer.  # noqa: E501
+
+
+        :return: The response of this ResponseContainer.  # noqa: E501
+        :rtype: object
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainer.
+
+
+        :param response: The response of this ResponseContainer.  # noqa: E501
+        :type: object
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -76,27 +97,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainer.  # noqa: E501
-
-
-        :return: The response of this ResponseContainer.  # noqa: E501
-        :rtype: object
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainer.
-
-
-        :param response: The response of this ResponseContainer.  # noqa: E501
-        :type: object
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index 8701d0d..c69f084 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -34,25 +34,46 @@ class ResponseContainerAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Alert'
+        'response': 'Alert',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerAlert - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerAlert.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerAlert.  # noqa: E501
+        :rtype: Alert
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerAlert.
+
+
+        :param response: The response of this ResponseContainerAlert.  # noqa: E501
+        :type: Alert
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerAlert.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerAlert.  # noqa: E501
-        :rtype: Alert
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerAlert.
-
-
-        :param response: The response of this ResponseContainerAlert.  # noqa: E501
-        :type: Alert
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index b111cfa..e436ea4 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -34,25 +34,46 @@ class ResponseContainerCloudIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'CloudIntegration'
+        'response': 'CloudIntegration',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerCloudIntegration - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerCloudIntegration.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerCloudIntegration.  # noqa: E501
+        :rtype: CloudIntegration
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerCloudIntegration.
+
+
+        :param response: The response of this ResponseContainerCloudIntegration.  # noqa: E501
+        :type: CloudIntegration
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerCloudIntegration.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerCloudIntegration.  # noqa: E501
-        :rtype: CloudIntegration
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerCloudIntegration.
-
-
-        :param response: The response of this ResponseContainerCloudIntegration.  # noqa: E501
-        :type: CloudIntegration
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index 94a9bab..ecf5ce6 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -34,25 +34,46 @@ class ResponseContainerDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Dashboard'
+        'response': 'Dashboard',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerDashboard - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerDashboard.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerDashboard.  # noqa: E501
+        :rtype: Dashboard
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerDashboard.
+
+
+        :param response: The response of this ResponseContainerDashboard.  # noqa: E501
+        :type: Dashboard
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerDashboard.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerDashboard.  # noqa: E501
-        :rtype: Dashboard
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerDashboard.
-
-
-        :param response: The response of this ResponseContainerDashboard.  # noqa: E501
-        :type: Dashboard
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index efdc4ae..621b99d 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -34,25 +34,46 @@ class ResponseContainerDerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'DerivedMetricDefinition'
+        'response': 'DerivedMetricDefinition',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
+        :rtype: DerivedMetricDefinition
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerDerivedMetricDefinition.
+
+
+        :param response: The response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
+        :type: DerivedMetricDefinition
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
-        :rtype: DerivedMetricDefinition
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerDerivedMetricDefinition.
-
-
-        :param response: The response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
-        :type: DerivedMetricDefinition
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 1deb38e..8682267 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -34,25 +34,46 @@ class ResponseContainerEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Event'
+        'response': 'Event',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerEvent - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerEvent.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerEvent.  # noqa: E501
+        :rtype: Event
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerEvent.
+
+
+        :param response: The response of this ResponseContainerEvent.  # noqa: E501
+        :type: Event
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerEvent.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerEvent.  # noqa: E501
-        :rtype: Event
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerEvent.
-
-
-        :param response: The response of this ResponseContainerEvent.  # noqa: E501
-        :type: Event
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index 52c67ce..eef085c 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -34,25 +34,46 @@ class ResponseContainerExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'ExternalLink'
+        'response': 'ExternalLink',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerExternalLink - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerExternalLink.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerExternalLink.  # noqa: E501
+        :rtype: ExternalLink
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerExternalLink.
+
+
+        :param response: The response of this ResponseContainerExternalLink.  # noqa: E501
+        :type: ExternalLink
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerExternalLink.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerExternalLink.  # noqa: E501
-        :rtype: ExternalLink
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerExternalLink.
-
-
-        :param response: The response of this ResponseContainerExternalLink.  # noqa: E501
-        :type: ExternalLink
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index e4b5238..36a9426 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -34,25 +34,46 @@ class ResponseContainerFacetResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'FacetResponse'
+        'response': 'FacetResponse',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerFacetResponse - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerFacetResponse.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerFacetResponse.  # noqa: E501
+        :rtype: FacetResponse
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerFacetResponse.
+
+
+        :param response: The response of this ResponseContainerFacetResponse.  # noqa: E501
+        :type: FacetResponse
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerFacetResponse.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerFacetResponse.  # noqa: E501
-        :rtype: FacetResponse
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerFacetResponse.
-
-
-        :param response: The response of this ResponseContainerFacetResponse.  # noqa: E501
-        :type: FacetResponse
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 2e17d82..40e4b14 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -34,25 +34,46 @@ class ResponseContainerFacetsResponseContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'FacetsResponseContainer'
+        'response': 'FacetsResponseContainer',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerFacetsResponseContainer - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
+        :rtype: FacetsResponseContainer
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerFacetsResponseContainer.
+
+
+        :param response: The response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
+        :type: FacetsResponseContainer
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
-        :rtype: FacetsResponseContainer
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerFacetsResponseContainer.
-
-
-        :param response: The response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
-        :type: FacetsResponseContainer
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 454c98d..9bb9177 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -34,25 +34,46 @@ class ResponseContainerHistoryResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'HistoryResponse'
+        'response': 'HistoryResponse',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerHistoryResponse - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerHistoryResponse.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerHistoryResponse.  # noqa: E501
+        :rtype: HistoryResponse
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerHistoryResponse.
+
+
+        :param response: The response of this ResponseContainerHistoryResponse.  # noqa: E501
+        :type: HistoryResponse
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerHistoryResponse.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerHistoryResponse.  # noqa: E501
-        :rtype: HistoryResponse
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerHistoryResponse.
-
-
-        :param response: The response of this ResponseContainerHistoryResponse.  # noqa: E501
-        :type: HistoryResponse
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index fdf0eb6..3043af5 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -34,25 +34,46 @@ class ResponseContainerIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Integration'
+        'response': 'Integration',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerIntegration - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerIntegration.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerIntegration.  # noqa: E501
+        :rtype: Integration
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerIntegration.
+
+
+        :param response: The response of this ResponseContainerIntegration.  # noqa: E501
+        :type: Integration
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerIntegration.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerIntegration.  # noqa: E501
-        :rtype: Integration
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerIntegration.
-
-
-        :param response: The response of this ResponseContainerIntegration.  # noqa: E501
-        :type: Integration
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index b6c203e..a533d01 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -34,25 +34,46 @@ class ResponseContainerIntegrationStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'IntegrationStatus'
+        'response': 'IntegrationStatus',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerIntegrationStatus - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerIntegrationStatus.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerIntegrationStatus.  # noqa: E501
+        :rtype: IntegrationStatus
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerIntegrationStatus.
+
+
+        :param response: The response of this ResponseContainerIntegrationStatus.  # noqa: E501
+        :type: IntegrationStatus
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerIntegrationStatus.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerIntegrationStatus.  # noqa: E501
-        :rtype: IntegrationStatus
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerIntegrationStatus.
-
-
-        :param response: The response of this ResponseContainerIntegrationStatus.  # noqa: E501
-        :type: IntegrationStatus
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_list_acl.py b/wavefront_api_client/models/response_container_list_acl.py
index 7b3e752..886d6f3 100644
--- a/wavefront_api_client/models/response_container_list_acl.py
+++ b/wavefront_api_client/models/response_container_list_acl.py
@@ -34,25 +34,46 @@ class ResponseContainerListACL(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'list[ACL]'
+        'response': 'list[ACL]',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerListACL - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListACL.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListACL.  # noqa: E501
+        :rtype: list[ACL]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListACL.
+
+
+        :param response: The response of this ResponseContainerListACL.  # noqa: E501
+        :type: list[ACL]
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListACL.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListACL.  # noqa: E501
-        :rtype: list[ACL]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListACL.
-
-
-        :param response: The response of this ResponseContainerListACL.  # noqa: E501
-        :type: list[ACL]
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index f794d22..dfd2c35 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -34,25 +34,46 @@ class ResponseContainerListIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'list[Integration]'
+        'response': 'list[Integration]',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerListIntegration - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListIntegration.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListIntegration.  # noqa: E501
+        :rtype: list[Integration]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListIntegration.
+
+
+        :param response: The response of this ResponseContainerListIntegration.  # noqa: E501
+        :type: list[Integration]
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListIntegration.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListIntegration.  # noqa: E501
-        :rtype: list[Integration]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListIntegration.
-
-
-        :param response: The response of this ResponseContainerListIntegration.  # noqa: E501
-        :type: list[Integration]
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index 324feb3..dc8fb08 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -34,25 +34,46 @@ class ResponseContainerListIntegrationManifestGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'list[IntegrationManifestGroup]'
+        'response': 'list[IntegrationManifestGroup]',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerListIntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
+        :rtype: list[IntegrationManifestGroup]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListIntegrationManifestGroup.
+
+
+        :param response: The response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
+        :type: list[IntegrationManifestGroup]
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
-        :rtype: list[IntegrationManifestGroup]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListIntegrationManifestGroup.
-
-
-        :param response: The response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
-        :type: list[IntegrationManifestGroup]
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index 0989f67..1c4316d 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -33,25 +33,46 @@ class ResponseContainerListString(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'list[str]'
+        'response': 'list[str]',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerListString - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListString.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListString.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListString.
+
+
+        :param response: The response of this ResponseContainerListString.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -76,27 +97,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListString.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListString.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListString.
-
-
-        :param response: The response of this ResponseContainerListString.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_list_user_group.py b/wavefront_api_client/models/response_container_list_user_group.py
index 7aac359..ba8169b 100644
--- a/wavefront_api_client/models/response_container_list_user_group.py
+++ b/wavefront_api_client/models/response_container_list_user_group.py
@@ -34,25 +34,46 @@ class ResponseContainerListUserGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'list[UserGroup]'
+        'response': 'list[UserGroup]',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerListUserGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListUserGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListUserGroup.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListUserGroup.
+
+
+        :param response: The response of this ResponseContainerListUserGroup.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListUserGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListUserGroup.  # noqa: E501
-        :rtype: list[UserGroup]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListUserGroup.
-
-
-        :param response: The response of this ResponseContainerListUserGroup.  # noqa: E501
-        :type: list[UserGroup]
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index 9f363b4..b19f62c 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -34,25 +34,46 @@ class ResponseContainerMaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'MaintenanceWindow'
+        'response': 'MaintenanceWindow',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMaintenanceWindow.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMaintenanceWindow.  # noqa: E501
+        :rtype: MaintenanceWindow
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMaintenanceWindow.
+
+
+        :param response: The response of this ResponseContainerMaintenanceWindow.  # noqa: E501
+        :type: MaintenanceWindow
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerMaintenanceWindow.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerMaintenanceWindow.  # noqa: E501
-        :rtype: MaintenanceWindow
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerMaintenanceWindow.
-
-
-        :param response: The response of this ResponseContainerMaintenanceWindow.  # noqa: E501
-        :type: MaintenanceWindow
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 1bbd2f7..99ddd28 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -33,25 +33,46 @@ class ResponseContainerMapStringInteger(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'dict(str, int)'
+        'response': 'dict(str, int)',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerMapStringInteger - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMapStringInteger.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMapStringInteger.  # noqa: E501
+        :rtype: dict(str, int)
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMapStringInteger.
+
+
+        :param response: The response of this ResponseContainerMapStringInteger.  # noqa: E501
+        :type: dict(str, int)
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -76,27 +97,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerMapStringInteger.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerMapStringInteger.  # noqa: E501
-        :rtype: dict(str, int)
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerMapStringInteger.
-
-
-        :param response: The response of this ResponseContainerMapStringInteger.  # noqa: E501
-        :type: dict(str, int)
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index bd6eeee..d8724ce 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -34,25 +34,46 @@ class ResponseContainerMapStringIntegrationStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'dict(str, IntegrationStatus)'
+        'response': 'dict(str, IntegrationStatus)',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerMapStringIntegrationStatus - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
+        :rtype: dict(str, IntegrationStatus)
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMapStringIntegrationStatus.
+
+
+        :param response: The response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
+        :type: dict(str, IntegrationStatus)
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
-        :rtype: dict(str, IntegrationStatus)
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerMapStringIntegrationStatus.
-
-
-        :param response: The response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
-        :type: dict(str, IntegrationStatus)
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index 109ba03..cb06095 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -34,25 +34,46 @@ class ResponseContainerMessage(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Message'
+        'response': 'Message',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerMessage - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMessage.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMessage.  # noqa: E501
+        :rtype: Message
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMessage.
+
+
+        :param response: The response of this ResponseContainerMessage.  # noqa: E501
+        :type: Message
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerMessage.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerMessage.  # noqa: E501
-        :rtype: Message
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerMessage.
-
-
-        :param response: The response of this ResponseContainerMessage.  # noqa: E501
-        :type: Message
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index 0b3df14..2e831fc 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -34,25 +34,46 @@ class ResponseContainerNotificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Notificant'
+        'response': 'Notificant',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerNotificant - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerNotificant.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerNotificant.  # noqa: E501
+        :rtype: Notificant
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerNotificant.
+
+
+        :param response: The response of this ResponseContainerNotificant.  # noqa: E501
+        :type: Notificant
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerNotificant.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerNotificant.  # noqa: E501
-        :rtype: Notificant
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerNotificant.
-
-
-        :param response: The response of this ResponseContainerNotificant.  # noqa: E501
-        :type: Notificant
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index 7c7589a..42932ee 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedAlert'
+        'response': 'PagedAlert',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedAlert - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedAlert.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedAlert.  # noqa: E501
+        :rtype: PagedAlert
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedAlert.
+
+
+        :param response: The response of this ResponseContainerPagedAlert.  # noqa: E501
+        :type: PagedAlert
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedAlert.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedAlert.  # noqa: E501
-        :rtype: PagedAlert
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedAlert.
-
-
-        :param response: The response of this ResponseContainerPagedAlert.  # noqa: E501
-        :type: PagedAlert
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index eff57e7..cd55ab9 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedAlertWithStats(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedAlertWithStats'
+        'response': 'PagedAlertWithStats',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedAlertWithStats - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
+        :rtype: PagedAlertWithStats
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedAlertWithStats.
+
+
+        :param response: The response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
+        :type: PagedAlertWithStats
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
-        :rtype: PagedAlertWithStats
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedAlertWithStats.
-
-
-        :param response: The response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
-        :type: PagedAlertWithStats
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index d969f9a..10b5c47 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedCloudIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedCloudIntegration'
+        'response': 'PagedCloudIntegration',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedCloudIntegration - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
+        :rtype: PagedCloudIntegration
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedCloudIntegration.
+
+
+        :param response: The response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
+        :type: PagedCloudIntegration
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
-        :rtype: PagedCloudIntegration
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedCloudIntegration.
-
-
-        :param response: The response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
-        :type: PagedCloudIntegration
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 5f4319e..df6a5e7 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedCustomerFacingUserObject(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedCustomerFacingUserObject'
+        'response': 'PagedCustomerFacingUserObject',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedCustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
+        :rtype: PagedCustomerFacingUserObject
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedCustomerFacingUserObject.
+
+
+        :param response: The response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
+        :type: PagedCustomerFacingUserObject
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
-        :rtype: PagedCustomerFacingUserObject
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedCustomerFacingUserObject.
-
-
-        :param response: The response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
-        :type: PagedCustomerFacingUserObject
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index 3f31910..ddfa55a 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedDashboard'
+        'response': 'PagedDashboard',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedDashboard - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedDashboard.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedDashboard.  # noqa: E501
+        :rtype: PagedDashboard
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedDashboard.
+
+
+        :param response: The response of this ResponseContainerPagedDashboard.  # noqa: E501
+        :type: PagedDashboard
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedDashboard.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedDashboard.  # noqa: E501
-        :rtype: PagedDashboard
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedDashboard.
-
-
-        :param response: The response of this ResponseContainerPagedDashboard.  # noqa: E501
-        :type: PagedDashboard
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index d02d754..05c50c8 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedDerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedDerivedMetricDefinition'
+        'response': 'PagedDerivedMetricDefinition',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
+        :rtype: PagedDerivedMetricDefinition
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedDerivedMetricDefinition.
+
+
+        :param response: The response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
+        :type: PagedDerivedMetricDefinition
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
-        :rtype: PagedDerivedMetricDefinition
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedDerivedMetricDefinition.
-
-
-        :param response: The response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
-        :type: PagedDerivedMetricDefinition
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index d11469f..57202cc 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedDerivedMetricDefinitionWithStats(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedDerivedMetricDefinitionWithStats'
+        'response': 'PagedDerivedMetricDefinitionWithStats',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedDerivedMetricDefinitionWithStats - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :rtype: PagedDerivedMetricDefinitionWithStats
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.
+
+
+        :param response: The response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :type: PagedDerivedMetricDefinitionWithStats
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :rtype: PagedDerivedMetricDefinitionWithStats
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.
-
-
-        :param response: The response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
-        :type: PagedDerivedMetricDefinitionWithStats
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index be8882b..61edb35 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedEvent'
+        'response': 'PagedEvent',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedEvent - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedEvent.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedEvent.  # noqa: E501
+        :rtype: PagedEvent
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedEvent.
+
+
+        :param response: The response of this ResponseContainerPagedEvent.  # noqa: E501
+        :type: PagedEvent
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedEvent.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedEvent.  # noqa: E501
-        :rtype: PagedEvent
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedEvent.
-
-
-        :param response: The response of this ResponseContainerPagedEvent.  # noqa: E501
-        :type: PagedEvent
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index a8c1ccb..85a2053 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedExternalLink'
+        'response': 'PagedExternalLink',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedExternalLink - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedExternalLink.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedExternalLink.  # noqa: E501
+        :rtype: PagedExternalLink
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedExternalLink.
+
+
+        :param response: The response of this ResponseContainerPagedExternalLink.  # noqa: E501
+        :type: PagedExternalLink
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedExternalLink.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedExternalLink.  # noqa: E501
-        :rtype: PagedExternalLink
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedExternalLink.
-
-
-        :param response: The response of this ResponseContainerPagedExternalLink.  # noqa: E501
-        :type: PagedExternalLink
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 9baeb45..cbe7b70 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedIntegration'
+        'response': 'PagedIntegration',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedIntegration - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedIntegration.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedIntegration.  # noqa: E501
+        :rtype: PagedIntegration
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedIntegration.
+
+
+        :param response: The response of this ResponseContainerPagedIntegration.  # noqa: E501
+        :type: PagedIntegration
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedIntegration.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedIntegration.  # noqa: E501
-        :rtype: PagedIntegration
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedIntegration.
-
-
-        :param response: The response of this ResponseContainerPagedIntegration.  # noqa: E501
-        :type: PagedIntegration
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index 40e3771..24b54df 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedMaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedMaintenanceWindow'
+        'response': 'PagedMaintenanceWindow',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
+        :rtype: PagedMaintenanceWindow
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedMaintenanceWindow.
+
+
+        :param response: The response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
+        :type: PagedMaintenanceWindow
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
-        :rtype: PagedMaintenanceWindow
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedMaintenanceWindow.
-
-
-        :param response: The response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
-        :type: PagedMaintenanceWindow
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index a5d379d..e8b56f1 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedMessage(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedMessage'
+        'response': 'PagedMessage',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedMessage - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedMessage.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedMessage.  # noqa: E501
+        :rtype: PagedMessage
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedMessage.
+
+
+        :param response: The response of this ResponseContainerPagedMessage.  # noqa: E501
+        :type: PagedMessage
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedMessage.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedMessage.  # noqa: E501
-        :rtype: PagedMessage
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedMessage.
-
-
-        :param response: The response of this ResponseContainerPagedMessage.  # noqa: E501
-        :type: PagedMessage
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index 7f7e29e..134ec15 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedNotificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedNotificant'
+        'response': 'PagedNotificant',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedNotificant - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedNotificant.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedNotificant.  # noqa: E501
+        :rtype: PagedNotificant
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedNotificant.
+
+
+        :param response: The response of this ResponseContainerPagedNotificant.  # noqa: E501
+        :type: PagedNotificant
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedNotificant.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedNotificant.  # noqa: E501
-        :rtype: PagedNotificant
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedNotificant.
-
-
-        :param response: The response of this ResponseContainerPagedNotificant.  # noqa: E501
-        :type: PagedNotificant
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index dad48ef..b134ac2 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedProxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedProxy'
+        'response': 'PagedProxy',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedProxy - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedProxy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedProxy.  # noqa: E501
+        :rtype: PagedProxy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedProxy.
+
+
+        :param response: The response of this ResponseContainerPagedProxy.  # noqa: E501
+        :type: PagedProxy
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedProxy.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedProxy.  # noqa: E501
-        :rtype: PagedProxy
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedProxy.
-
-
-        :param response: The response of this ResponseContainerPagedProxy.  # noqa: E501
-        :type: PagedProxy
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 94db44c..76de3bf 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedSavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedSavedSearch'
+        'response': 'PagedSavedSearch',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedSavedSearch - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSavedSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSavedSearch.  # noqa: E501
+        :rtype: PagedSavedSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSavedSearch.
+
+
+        :param response: The response of this ResponseContainerPagedSavedSearch.  # noqa: E501
+        :type: PagedSavedSearch
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedSavedSearch.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedSavedSearch.  # noqa: E501
-        :rtype: PagedSavedSearch
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedSavedSearch.
-
-
-        :param response: The response of this ResponseContainerPagedSavedSearch.  # noqa: E501
-        :type: PagedSavedSearch
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 285ffe1..15893a7 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedSource(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedSource'
+        'response': 'PagedSource',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedSource - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSource.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSource.  # noqa: E501
+        :rtype: PagedSource
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSource.
+
+
+        :param response: The response of this ResponseContainerPagedSource.  # noqa: E501
+        :type: PagedSource
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedSource.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedSource.  # noqa: E501
-        :rtype: PagedSource
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedSource.
-
-
-        :param response: The response of this ResponseContainerPagedSource.  # noqa: E501
-        :type: PagedSource
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_paged_user_group.py b/wavefront_api_client/models/response_container_paged_user_group.py
index e2264c0..c39821b 100644
--- a/wavefront_api_client/models/response_container_paged_user_group.py
+++ b/wavefront_api_client/models/response_container_paged_user_group.py
@@ -34,25 +34,46 @@ class ResponseContainerPagedUserGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'PagedUserGroup'
+        'response': 'PagedUserGroup',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerPagedUserGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedUserGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
+        :rtype: PagedUserGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedUserGroup.
+
+
+        :param response: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
+        :type: PagedUserGroup
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedUserGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
-        :rtype: PagedUserGroup
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedUserGroup.
-
-
-        :param response: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
-        :type: PagedUserGroup
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index eaa70bd..5d1335c 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -34,25 +34,46 @@ class ResponseContainerProxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Proxy'
+        'response': 'Proxy',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerProxy - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerProxy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerProxy.  # noqa: E501
+        :rtype: Proxy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerProxy.
+
+
+        :param response: The response of this ResponseContainerProxy.  # noqa: E501
+        :type: Proxy
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerProxy.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerProxy.  # noqa: E501
-        :rtype: Proxy
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerProxy.
-
-
-        :param response: The response of this ResponseContainerProxy.  # noqa: E501
-        :type: Proxy
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index b128247..aa3a65b 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -34,25 +34,46 @@ class ResponseContainerSavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'SavedSearch'
+        'response': 'SavedSearch',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerSavedSearch - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSavedSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSavedSearch.  # noqa: E501
+        :rtype: SavedSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSavedSearch.
+
+
+        :param response: The response of this ResponseContainerSavedSearch.  # noqa: E501
+        :type: SavedSearch
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerSavedSearch.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerSavedSearch.  # noqa: E501
-        :rtype: SavedSearch
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerSavedSearch.
-
-
-        :param response: The response of this ResponseContainerSavedSearch.  # noqa: E501
-        :type: SavedSearch
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 2aa4804..5fa807c 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -34,25 +34,46 @@ class ResponseContainerSource(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'Source'
+        'response': 'Source',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerSource - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSource.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSource.  # noqa: E501
+        :rtype: Source
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSource.
+
+
+        :param response: The response of this ResponseContainerSource.  # noqa: E501
+        :type: Source
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerSource.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerSource.  # noqa: E501
-        :rtype: Source
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerSource.
-
-
-        :param response: The response of this ResponseContainerSource.  # noqa: E501
-        :type: Source
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index c888346..ca37e13 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -34,25 +34,46 @@ class ResponseContainerTagsResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'TagsResponse'
+        'response': 'TagsResponse',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerTagsResponse - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerTagsResponse.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerTagsResponse.  # noqa: E501
+        :rtype: TagsResponse
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerTagsResponse.
+
+
+        :param response: The response of this ResponseContainerTagsResponse.  # noqa: E501
+        :type: TagsResponse
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerTagsResponse.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerTagsResponse.  # noqa: E501
-        :rtype: TagsResponse
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerTagsResponse.
-
-
-        :param response: The response of this ResponseContainerTagsResponse.  # noqa: E501
-        :type: TagsResponse
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_container_user_group.py b/wavefront_api_client/models/response_container_user_group.py
index 160978e..05721a1 100644
--- a/wavefront_api_client/models/response_container_user_group.py
+++ b/wavefront_api_client/models/response_container_user_group.py
@@ -34,25 +34,46 @@ class ResponseContainerUserGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'status': 'ResponseStatus',
-        'response': 'UserGroup'
+        'response': 'UserGroup',
+        'status': 'ResponseStatus'
     }
 
     attribute_map = {
-        'status': 'status',
-        'response': 'response'
+        'response': 'response',
+        'status': 'status'
     }
 
-    def __init__(self, status=None, response=None):  # noqa: E501
+    def __init__(self, response=None, status=None):  # noqa: E501
         """ResponseContainerUserGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._status = None
         self._response = None
+        self._status = None
         self.discriminator = None
 
-        self.status = status
         if response is not None:
             self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerUserGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerUserGroup.  # noqa: E501
+        :rtype: UserGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerUserGroup.
+
+
+        :param response: The response of this ResponseContainerUserGroup.  # noqa: E501
+        :type: UserGroup
+        """
+
+        self._response = response
 
     @property
     def status(self):
@@ -77,27 +98,6 @@ def status(self, status):
 
         self._status = status
 
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerUserGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerUserGroup.  # noqa: E501
-        :rtype: UserGroup
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerUserGroup.
-
-
-        :param response: The response of this ResponseContainerUserGroup.  # noqa: E501
-        :type: UserGroup
-        """
-
-        self._response = response
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index ce8ddc9..51ee770 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -31,58 +31,54 @@ class ResponseStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'result': 'str',
+        'code': 'int',
         'message': 'str',
-        'code': 'int'
+        'result': 'str'
     }
 
     attribute_map = {
-        'result': 'result',
+        'code': 'code',
         'message': 'message',
-        'code': 'code'
+        'result': 'result'
     }
 
-    def __init__(self, result=None, message=None, code=None):  # noqa: E501
+    def __init__(self, code=None, message=None, result=None):  # noqa: E501
         """ResponseStatus - a model defined in Swagger"""  # noqa: E501
 
-        self._result = None
-        self._message = None
         self._code = None
+        self._message = None
+        self._result = None
         self.discriminator = None
 
-        self.result = result
+        self.code = code
         if message is not None:
             self.message = message
-        self.code = code
+        self.result = result
 
     @property
-    def result(self):
-        """Gets the result of this ResponseStatus.  # noqa: E501
+    def code(self):
+        """Gets the code of this ResponseStatus.  # noqa: E501
 
+        HTTP Response code corresponding to this response  # noqa: E501
 
-        :return: The result of this ResponseStatus.  # noqa: E501
-        :rtype: str
+        :return: The code of this ResponseStatus.  # noqa: E501
+        :rtype: int
         """
-        return self._result
+        return self._code
 
-    @result.setter
-    def result(self, result):
-        """Sets the result of this ResponseStatus.
+    @code.setter
+    def code(self, code):
+        """Sets the code of this ResponseStatus.
 
+        HTTP Response code corresponding to this response  # noqa: E501
 
-        :param result: The result of this ResponseStatus.  # noqa: E501
-        :type: str
+        :param code: The code of this ResponseStatus.  # noqa: E501
+        :type: int
         """
-        if result is None:
-            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
-        allowed_values = ["OK", "ERROR"]  # noqa: E501
-        if result not in allowed_values:
-            raise ValueError(
-                "Invalid value for `result` ({0}), must be one of {1}"  # noqa: E501
-                .format(result, allowed_values)
-            )
+        if code is None:
+            raise ValueError("Invalid value for `code`, must not be `None`")  # noqa: E501
 
-        self._result = result
+        self._code = code
 
     @property
     def message(self):
@@ -108,29 +104,33 @@ def message(self, message):
         self._message = message
 
     @property
-    def code(self):
-        """Gets the code of this ResponseStatus.  # noqa: E501
+    def result(self):
+        """Gets the result of this ResponseStatus.  # noqa: E501
 
-        HTTP Response code corresponding to this response  # noqa: E501
 
-        :return: The code of this ResponseStatus.  # noqa: E501
-        :rtype: int
+        :return: The result of this ResponseStatus.  # noqa: E501
+        :rtype: str
         """
-        return self._code
+        return self._result
 
-    @code.setter
-    def code(self, code):
-        """Sets the code of this ResponseStatus.
+    @result.setter
+    def result(self, result):
+        """Sets the result of this ResponseStatus.
 
-        HTTP Response code corresponding to this response  # noqa: E501
 
-        :param code: The code of this ResponseStatus.  # noqa: E501
-        :type: int
+        :param result: The result of this ResponseStatus.  # noqa: E501
+        :type: str
         """
-        if code is None:
-            raise ValueError("Invalid value for `code`, must not be `None`")  # noqa: E501
+        if result is None:
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+        allowed_values = ["OK", "ERROR"]  # noqa: E501
+        if result not in allowed_values:
+            raise ValueError(
+                "Invalid value for `result` ({0}), must be one of {1}"  # noqa: E501
+                .format(result, allowed_values)
+            )
 
-        self._code = code
+        self._result = result
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 440d62a..979dd62 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -31,110 +31,75 @@ class SavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'entity_type': 'str',
-        'query': 'dict(str, str)',
+        'created_epoch_millis': 'int',
         'creator_id': 'str',
-        'updater_id': 'str',
+        'entity_type': 'str',
         'id': 'str',
-        'created_epoch_millis': 'int',
+        'query': 'dict(str, str)',
         'updated_epoch_millis': 'int',
+        'updater_id': 'str',
         'user_id': 'str'
     }
 
     attribute_map = {
-        'entity_type': 'entityType',
-        'query': 'query',
+        'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
+        'entity_type': 'entityType',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
+        'query': 'query',
         'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId',
         'user_id': 'userId'
     }
 
-    def __init__(self, entity_type=None, query=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, user_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, entity_type=None, id=None, query=None, updated_epoch_millis=None, updater_id=None, user_id=None):  # noqa: E501
         """SavedSearch - a model defined in Swagger"""  # noqa: E501
 
-        self._entity_type = None
-        self._query = None
+        self._created_epoch_millis = None
         self._creator_id = None
-        self._updater_id = None
+        self._entity_type = None
         self._id = None
-        self._created_epoch_millis = None
+        self._query = None
         self._updated_epoch_millis = None
+        self._updater_id = None
         self._user_id = None
         self.discriminator = None
 
-        self.entity_type = entity_type
-        self.query = query
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
         if creator_id is not None:
             self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
+        self.entity_type = entity_type
         if id is not None:
             self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
+        self.query = query
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
         if user_id is not None:
             self.user_id = user_id
 
     @property
-    def entity_type(self):
-        """Gets the entity_type of this SavedSearch.  # noqa: E501
-
-        The Wavefront entity type over which to search  # noqa: E501
-
-        :return: The entity_type of this SavedSearch.  # noqa: E501
-        :rtype: str
-        """
-        return self._entity_type
-
-    @entity_type.setter
-    def entity_type(self, entity_type):
-        """Sets the entity_type of this SavedSearch.
-
-        The Wavefront entity type over which to search  # noqa: E501
-
-        :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
-        :type: str
-        """
-        if entity_type is None:
-            raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP"]  # noqa: E501
-        if entity_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(entity_type, allowed_values)
-            )
-
-        self._entity_type = entity_type
-
-    @property
-    def query(self):
-        """Gets the query of this SavedSearch.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this SavedSearch.  # noqa: E501
 
-        The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query  # noqa: E501
 
-        :return: The query of this SavedSearch.  # noqa: E501
-        :rtype: dict(str, str)
+        :return: The created_epoch_millis of this SavedSearch.  # noqa: E501
+        :rtype: int
         """
-        return self._query
+        return self._created_epoch_millis
 
-    @query.setter
-    def query(self, query):
-        """Sets the query of this SavedSearch.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this SavedSearch.
 
-        The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query  # noqa: E501
 
-        :param query: The query of this SavedSearch.  # noqa: E501
-        :type: dict(str, str)
+        :param created_epoch_millis: The created_epoch_millis of this SavedSearch.  # noqa: E501
+        :type: int
         """
-        if query is None:
-            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
-        self._query = query
+        self._created_epoch_millis = created_epoch_millis
 
     @property
     def creator_id(self):
@@ -158,25 +123,35 @@ def creator_id(self, creator_id):
         self._creator_id = creator_id
 
     @property
-    def updater_id(self):
-        """Gets the updater_id of this SavedSearch.  # noqa: E501
+    def entity_type(self):
+        """Gets the entity_type of this SavedSearch.  # noqa: E501
 
+        The Wavefront entity type over which to search  # noqa: E501
 
-        :return: The updater_id of this SavedSearch.  # noqa: E501
+        :return: The entity_type of this SavedSearch.  # noqa: E501
         :rtype: str
         """
-        return self._updater_id
+        return self._entity_type
 
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this SavedSearch.
+    @entity_type.setter
+    def entity_type(self, entity_type):
+        """Sets the entity_type of this SavedSearch.
 
+        The Wavefront entity type over which to search  # noqa: E501
 
-        :param updater_id: The updater_id of this SavedSearch.  # noqa: E501
+        :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
         :type: str
         """
+        if entity_type is None:
+            raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP"]  # noqa: E501
+        if entity_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(entity_type, allowed_values)
+            )
 
-        self._updater_id = updater_id
+        self._entity_type = entity_type
 
     @property
     def id(self):
@@ -200,25 +175,29 @@ def id(self, id):
         self._id = id
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this SavedSearch.  # noqa: E501
+    def query(self):
+        """Gets the query of this SavedSearch.  # noqa: E501
 
+        The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query  # noqa: E501
 
-        :return: The created_epoch_millis of this SavedSearch.  # noqa: E501
-        :rtype: int
+        :return: The query of this SavedSearch.  # noqa: E501
+        :rtype: dict(str, str)
         """
-        return self._created_epoch_millis
+        return self._query
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this SavedSearch.
+    @query.setter
+    def query(self, query):
+        """Sets the query of this SavedSearch.
 
+        The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this SavedSearch.  # noqa: E501
-        :type: int
+        :param query: The query of this SavedSearch.  # noqa: E501
+        :type: dict(str, str)
         """
+        if query is None:
+            raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
-        self._created_epoch_millis = created_epoch_millis
+        self._query = query
 
     @property
     def updated_epoch_millis(self):
@@ -241,6 +220,27 @@ def updated_epoch_millis(self, updated_epoch_millis):
 
         self._updated_epoch_millis = updated_epoch_millis
 
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SavedSearch.  # noqa: E501
+
+
+        :return: The updater_id of this SavedSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SavedSearch.
+
+
+        :param updater_id: The updater_id of this SavedSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
     @property
     def user_id(self):
         """Gets the user_id of this SavedSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 6b93697..e6f10c9 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -32,28 +32,28 @@ class SearchQuery(object):
     """
     swagger_types = {
         'key': 'str',
-        'value': 'str',
-        'matching_method': 'str'
+        'matching_method': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
         'key': 'key',
-        'value': 'value',
-        'matching_method': 'matchingMethod'
+        'matching_method': 'matchingMethod',
+        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None, matching_method=None):  # noqa: E501
+    def __init__(self, key=None, matching_method=None, value=None):  # noqa: E501
         """SearchQuery - a model defined in Swagger"""  # noqa: E501
 
         self._key = None
-        self._value = None
         self._matching_method = None
+        self._value = None
         self.discriminator = None
 
         self.key = key
-        self.value = value
         if matching_method is not None:
             self.matching_method = matching_method
+        self.value = value
 
     @property
     def key(self):
@@ -80,31 +80,6 @@ def key(self, key):
 
         self._key = key
 
-    @property
-    def value(self):
-        """Gets the value of this SearchQuery.  # noqa: E501
-
-        The entity facet value for which to search  # noqa: E501
-
-        :return: The value of this SearchQuery.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this SearchQuery.
-
-        The entity facet value for which to search  # noqa: E501
-
-        :param value: The value of this SearchQuery.  # noqa: E501
-        :type: str
-        """
-        if value is None:
-            raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
-
-        self._value = value
-
     @property
     def matching_method(self):
         """Gets the matching_method of this SearchQuery.  # noqa: E501
@@ -134,6 +109,31 @@ def matching_method(self, matching_method):
 
         self._matching_method = matching_method
 
+    @property
+    def value(self):
+        """Gets the value of this SearchQuery.  # noqa: E501
+
+        The entity facet value for which to search  # noqa: E501
+
+        :return: The value of this SearchQuery.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this SearchQuery.
+
+        The entity facet value for which to search  # noqa: E501
+
+        :param value: The value of this SearchQuery.  # noqa: E501
+        :type: str
+        """
+        if value is None:
+            raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index 624e6c1..908c753 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -32,28 +32,28 @@ class Sorting(object):
     """
     swagger_types = {
         'ascending': 'bool',
-        'field': 'str',
-        'default': 'bool'
+        'default': 'bool',
+        'field': 'str'
     }
 
     attribute_map = {
         'ascending': 'ascending',
-        'field': 'field',
-        'default': 'default'
+        'default': 'default',
+        'field': 'field'
     }
 
-    def __init__(self, ascending=None, field=None, default=None):  # noqa: E501
+    def __init__(self, ascending=None, default=None, field=None):  # noqa: E501
         """Sorting - a model defined in Swagger"""  # noqa: E501
 
         self._ascending = None
-        self._field = None
         self._default = None
+        self._field = None
         self.discriminator = None
 
         self.ascending = ascending
-        self.field = field
         if default is not None:
             self.default = default
+        self.field = field
 
     @property
     def ascending(self):
@@ -80,6 +80,29 @@ def ascending(self, ascending):
 
         self._ascending = ascending
 
+    @property
+    def default(self):
+        """Gets the default of this Sorting.  # noqa: E501
+
+        Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true.  # noqa: E501
+
+        :return: The default of this Sorting.  # noqa: E501
+        :rtype: bool
+        """
+        return self._default
+
+    @default.setter
+    def default(self, default):
+        """Sets the default of this Sorting.
+
+        Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true.  # noqa: E501
+
+        :param default: The default of this Sorting.  # noqa: E501
+        :type: bool
+        """
+
+        self._default = default
+
     @property
     def field(self):
         """Gets the field of this Sorting.  # noqa: E501
@@ -105,29 +128,6 @@ def field(self, field):
 
         self._field = field
 
-    @property
-    def default(self):
-        """Gets the default of this Sorting.  # noqa: E501
-
-        Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true.  # noqa: E501
-
-        :return: The default of this Sorting.  # noqa: E501
-        :rtype: bool
-        """
-        return self._default
-
-    @default.setter
-    def default(self, default):
-        """Sets the default of this Sorting.
-
-        Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true.  # noqa: E501
-
-        :param default: The default of this Sorting.  # noqa: E501
-        :type: bool
-        """
-
-        self._default = default
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 3786090..435138d 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -31,64 +31,106 @@ class Source(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
         'description': 'str',
         'hidden': 'bool',
+        'id': 'str',
+        'marked_new_epoch_millis': 'int',
         'source_name': 'str',
         'tags': 'dict(str, bool)',
-        'creator_id': 'str',
-        'updater_id': 'str',
-        'id': 'str',
-        'created_epoch_millis': 'int',
         'updated_epoch_millis': 'int',
-        'marked_new_epoch_millis': 'int'
+        'updater_id': 'str'
     }
 
     attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
         'description': 'description',
         'hidden': 'hidden',
+        'id': 'id',
+        'marked_new_epoch_millis': 'markedNewEpochMillis',
         'source_name': 'sourceName',
         'tags': 'tags',
-        'creator_id': 'creatorId',
-        'updater_id': 'updaterId',
-        'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'marked_new_epoch_millis': 'markedNewEpochMillis'
+        'updater_id': 'updaterId'
     }
 
-    def __init__(self, description=None, hidden=None, source_name=None, tags=None, creator_id=None, updater_id=None, id=None, created_epoch_millis=None, updated_epoch_millis=None, marked_new_epoch_millis=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, hidden=None, id=None, marked_new_epoch_millis=None, source_name=None, tags=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Source - a model defined in Swagger"""  # noqa: E501
 
+        self._created_epoch_millis = None
+        self._creator_id = None
         self._description = None
         self._hidden = None
+        self._id = None
+        self._marked_new_epoch_millis = None
         self._source_name = None
         self._tags = None
-        self._creator_id = None
-        self._updater_id = None
-        self._id = None
-        self._created_epoch_millis = None
         self._updated_epoch_millis = None
-        self._marked_new_epoch_millis = None
+        self._updater_id = None
         self.discriminator = None
 
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
         if description is not None:
             self.description = description
         if hidden is not None:
             self.hidden = hidden
+        self.id = id
+        if marked_new_epoch_millis is not None:
+            self.marked_new_epoch_millis = marked_new_epoch_millis
         self.source_name = source_name
         if tags is not None:
             self.tags = tags
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if updater_id is not None:
-            self.updater_id = updater_id
-        self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
-        if marked_new_epoch_millis is not None:
-            self.marked_new_epoch_millis = marked_new_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Source.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this Source.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Source.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this Source.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this Source.  # noqa: E501
+
+
+        :return: The creator_id of this Source.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Source.
+
+
+        :param creator_id: The creator_id of this Source.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
 
     @property
     def description(self):
@@ -136,6 +178,54 @@ def hidden(self, hidden):
 
         self._hidden = hidden
 
+    @property
+    def id(self):
+        """Gets the id of this Source.  # noqa: E501
+
+        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
+
+        :return: The id of this Source.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Source.
+
+        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
+
+        :param id: The id of this Source.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
+    @property
+    def marked_new_epoch_millis(self):
+        """Gets the marked_new_epoch_millis of this Source.  # noqa: E501
+
+        Epoch Millis when this source was marked as ~status.new  # noqa: E501
+
+        :return: The marked_new_epoch_millis of this Source.  # noqa: E501
+        :rtype: int
+        """
+        return self._marked_new_epoch_millis
+
+    @marked_new_epoch_millis.setter
+    def marked_new_epoch_millis(self, marked_new_epoch_millis):
+        """Sets the marked_new_epoch_millis of this Source.
+
+        Epoch Millis when this source was marked as ~status.new  # noqa: E501
+
+        :param marked_new_epoch_millis: The marked_new_epoch_millis of this Source.  # noqa: E501
+        :type: int
+        """
+
+        self._marked_new_epoch_millis = marked_new_epoch_millis
+
     @property
     def source_name(self):
         """Gets the source_name of this Source.  # noqa: E501
@@ -184,94 +274,6 @@ def tags(self, tags):
 
         self._tags = tags
 
-    @property
-    def creator_id(self):
-        """Gets the creator_id of this Source.  # noqa: E501
-
-
-        :return: The creator_id of this Source.  # noqa: E501
-        :rtype: str
-        """
-        return self._creator_id
-
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this Source.
-
-
-        :param creator_id: The creator_id of this Source.  # noqa: E501
-        :type: str
-        """
-
-        self._creator_id = creator_id
-
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this Source.  # noqa: E501
-
-
-        :return: The updater_id of this Source.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this Source.
-
-
-        :param updater_id: The updater_id of this Source.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    @property
-    def id(self):
-        """Gets the id of this Source.  # noqa: E501
-
-        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
-
-        :return: The id of this Source.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this Source.
-
-        id of this source, must be exactly equivalent to 'sourceName'  # noqa: E501
-
-        :param id: The id of this Source.  # noqa: E501
-        :type: str
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this Source.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this Source.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this Source.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this Source.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this Source.  # noqa: E501
@@ -294,27 +296,25 @@ def updated_epoch_millis(self, updated_epoch_millis):
         self._updated_epoch_millis = updated_epoch_millis
 
     @property
-    def marked_new_epoch_millis(self):
-        """Gets the marked_new_epoch_millis of this Source.  # noqa: E501
+    def updater_id(self):
+        """Gets the updater_id of this Source.  # noqa: E501
 
-        Epoch Millis when this source was marked as ~status.new  # noqa: E501
 
-        :return: The marked_new_epoch_millis of this Source.  # noqa: E501
-        :rtype: int
+        :return: The updater_id of this Source.  # noqa: E501
+        :rtype: str
         """
-        return self._marked_new_epoch_millis
+        return self._updater_id
 
-    @marked_new_epoch_millis.setter
-    def marked_new_epoch_millis(self, marked_new_epoch_millis):
-        """Sets the marked_new_epoch_millis of this Source.
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Source.
 
-        Epoch Millis when this source was marked as ~status.new  # noqa: E501
 
-        :param marked_new_epoch_millis: The marked_new_epoch_millis of this Source.  # noqa: E501
-        :type: int
+        :param updater_id: The updater_id of this Source.  # noqa: E501
+        :type: str
         """
 
-        self._marked_new_epoch_millis = marked_new_epoch_millis
+        self._updater_id = updater_id
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 96dbb21..07c3262 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -31,46 +31,90 @@ class SourceLabelPair(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'firing': 'int',
+        'host': 'str',
         'label': 'str',
+        'observed': 'int',
         'severity': 'str',
-        'host': 'str',
-        'tags': 'dict(str, str)',
-        'firing': 'int',
-        'observed': 'int'
+        'tags': 'dict(str, str)'
     }
 
     attribute_map = {
+        'firing': 'firing',
+        'host': 'host',
         'label': 'label',
+        'observed': 'observed',
         'severity': 'severity',
-        'host': 'host',
-        'tags': 'tags',
-        'firing': 'firing',
-        'observed': 'observed'
+        'tags': 'tags'
     }
 
-    def __init__(self, label=None, severity=None, host=None, tags=None, firing=None, observed=None):  # noqa: E501
+    def __init__(self, firing=None, host=None, label=None, observed=None, severity=None, tags=None):  # noqa: E501
         """SourceLabelPair - a model defined in Swagger"""  # noqa: E501
 
+        self._firing = None
+        self._host = None
         self._label = None
+        self._observed = None
         self._severity = None
-        self._host = None
         self._tags = None
-        self._firing = None
-        self._observed = None
         self.discriminator = None
 
+        if firing is not None:
+            self.firing = firing
+        if host is not None:
+            self.host = host
         if label is not None:
             self.label = label
+        if observed is not None:
+            self.observed = observed
         if severity is not None:
             self.severity = severity
-        if host is not None:
-            self.host = host
         if tags is not None:
             self.tags = tags
-        if firing is not None:
-            self.firing = firing
-        if observed is not None:
-            self.observed = observed
+
+    @property
+    def firing(self):
+        """Gets the firing of this SourceLabelPair.  # noqa: E501
+
+
+        :return: The firing of this SourceLabelPair.  # noqa: E501
+        :rtype: int
+        """
+        return self._firing
+
+    @firing.setter
+    def firing(self, firing):
+        """Sets the firing of this SourceLabelPair.
+
+
+        :param firing: The firing of this SourceLabelPair.  # noqa: E501
+        :type: int
+        """
+
+        self._firing = firing
+
+    @property
+    def host(self):
+        """Gets the host of this SourceLabelPair.  # noqa: E501
+
+        Source (or host).  \"Source\" and \"host\" are synonyms in current versions of wavefront, but the host terminology is deprecated  # noqa: E501
+
+        :return: The host of this SourceLabelPair.  # noqa: E501
+        :rtype: str
+        """
+        return self._host
+
+    @host.setter
+    def host(self, host):
+        """Sets the host of this SourceLabelPair.
+
+        Source (or host).  \"Source\" and \"host\" are synonyms in current versions of wavefront, but the host terminology is deprecated  # noqa: E501
+
+        :param host: The host of this SourceLabelPair.  # noqa: E501
+        :type: str
+        """
+
+        self._host = host
 
     @property
     def label(self):
@@ -93,6 +137,27 @@ def label(self, label):
 
         self._label = label
 
+    @property
+    def observed(self):
+        """Gets the observed of this SourceLabelPair.  # noqa: E501
+
+
+        :return: The observed of this SourceLabelPair.  # noqa: E501
+        :rtype: int
+        """
+        return self._observed
+
+    @observed.setter
+    def observed(self, observed):
+        """Sets the observed of this SourceLabelPair.
+
+
+        :param observed: The observed of this SourceLabelPair.  # noqa: E501
+        :type: int
+        """
+
+        self._observed = observed
+
     @property
     def severity(self):
         """Gets the severity of this SourceLabelPair.  # noqa: E501
@@ -120,29 +185,6 @@ def severity(self, severity):
 
         self._severity = severity
 
-    @property
-    def host(self):
-        """Gets the host of this SourceLabelPair.  # noqa: E501
-
-        Source (or host).  \"Source\" and \"host\" are synonyms in current versions of wavefront, but the host terminology is deprecated  # noqa: E501
-
-        :return: The host of this SourceLabelPair.  # noqa: E501
-        :rtype: str
-        """
-        return self._host
-
-    @host.setter
-    def host(self, host):
-        """Sets the host of this SourceLabelPair.
-
-        Source (or host).  \"Source\" and \"host\" are synonyms in current versions of wavefront, but the host terminology is deprecated  # noqa: E501
-
-        :param host: The host of this SourceLabelPair.  # noqa: E501
-        :type: str
-        """
-
-        self._host = host
-
     @property
     def tags(self):
         """Gets the tags of this SourceLabelPair.  # noqa: E501
@@ -164,48 +206,6 @@ def tags(self, tags):
 
         self._tags = tags
 
-    @property
-    def firing(self):
-        """Gets the firing of this SourceLabelPair.  # noqa: E501
-
-
-        :return: The firing of this SourceLabelPair.  # noqa: E501
-        :rtype: int
-        """
-        return self._firing
-
-    @firing.setter
-    def firing(self, firing):
-        """Sets the firing of this SourceLabelPair.
-
-
-        :param firing: The firing of this SourceLabelPair.  # noqa: E501
-        :type: int
-        """
-
-        self._firing = firing
-
-    @property
-    def observed(self):
-        """Gets the observed of this SourceLabelPair.  # noqa: E501
-
-
-        :return: The observed of this SourceLabelPair.  # noqa: E501
-        :rtype: int
-        """
-        return self._observed
-
-    @observed.setter
-    def observed(self, observed):
-        """Sets the observed of this SourceLabelPair.
-
-
-        :param observed: The observed of this SourceLabelPair.  # noqa: E501
-        :type: int
-        """
-
-        self._observed = observed
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/stats_model.py b/wavefront_api_client/models/stats_model.py
index f5acbf6..9759ec2 100644
--- a/wavefront_api_client/models/stats_model.py
+++ b/wavefront_api_client/models/stats_model.py
@@ -31,406 +31,406 @@ class StatsModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'keys': 'int',
-        'points': 'int',
-        'summaries': 'int',
-        'queries': 'int',
         'buffer_keys': 'int',
+        'cached_compacted_keys': 'int',
         'compacted_keys': 'int',
-        'skipped_compacted_keys': 'int',
         'compacted_points': 'int',
-        'cached_compacted_keys': 'int',
-        'latency': 'int',
-        's3_keys': 'int',
         'cpu_ns': 'int',
-        'metrics_used': 'int',
         'hosts_used': 'int',
-        'query_tasks': 'int'
+        'keys': 'int',
+        'latency': 'int',
+        'metrics_used': 'int',
+        'points': 'int',
+        'queries': 'int',
+        'query_tasks': 'int',
+        's3_keys': 'int',
+        'skipped_compacted_keys': 'int',
+        'summaries': 'int'
     }
 
     attribute_map = {
-        'keys': 'keys',
-        'points': 'points',
-        'summaries': 'summaries',
-        'queries': 'queries',
         'buffer_keys': 'buffer_keys',
+        'cached_compacted_keys': 'cached_compacted_keys',
         'compacted_keys': 'compacted_keys',
-        'skipped_compacted_keys': 'skipped_compacted_keys',
         'compacted_points': 'compacted_points',
-        'cached_compacted_keys': 'cached_compacted_keys',
-        'latency': 'latency',
-        's3_keys': 's3_keys',
         'cpu_ns': 'cpu_ns',
-        'metrics_used': 'metrics_used',
         'hosts_used': 'hosts_used',
-        'query_tasks': 'query_tasks'
+        'keys': 'keys',
+        'latency': 'latency',
+        'metrics_used': 'metrics_used',
+        'points': 'points',
+        'queries': 'queries',
+        'query_tasks': 'query_tasks',
+        's3_keys': 's3_keys',
+        'skipped_compacted_keys': 'skipped_compacted_keys',
+        'summaries': 'summaries'
     }
 
-    def __init__(self, keys=None, points=None, summaries=None, queries=None, buffer_keys=None, compacted_keys=None, skipped_compacted_keys=None, compacted_points=None, cached_compacted_keys=None, latency=None, s3_keys=None, cpu_ns=None, metrics_used=None, hosts_used=None, query_tasks=None):  # noqa: E501
+    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, hosts_used=None, keys=None, latency=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, summaries=None):  # noqa: E501
         """StatsModel - a model defined in Swagger"""  # noqa: E501
 
-        self._keys = None
-        self._points = None
-        self._summaries = None
-        self._queries = None
         self._buffer_keys = None
+        self._cached_compacted_keys = None
         self._compacted_keys = None
-        self._skipped_compacted_keys = None
         self._compacted_points = None
-        self._cached_compacted_keys = None
-        self._latency = None
-        self._s3_keys = None
         self._cpu_ns = None
-        self._metrics_used = None
         self._hosts_used = None
+        self._keys = None
+        self._latency = None
+        self._metrics_used = None
+        self._points = None
+        self._queries = None
         self._query_tasks = None
+        self._s3_keys = None
+        self._skipped_compacted_keys = None
+        self._summaries = None
         self.discriminator = None
 
-        if keys is not None:
-            self.keys = keys
-        if points is not None:
-            self.points = points
-        if summaries is not None:
-            self.summaries = summaries
-        if queries is not None:
-            self.queries = queries
         if buffer_keys is not None:
             self.buffer_keys = buffer_keys
+        if cached_compacted_keys is not None:
+            self.cached_compacted_keys = cached_compacted_keys
         if compacted_keys is not None:
             self.compacted_keys = compacted_keys
-        if skipped_compacted_keys is not None:
-            self.skipped_compacted_keys = skipped_compacted_keys
         if compacted_points is not None:
             self.compacted_points = compacted_points
-        if cached_compacted_keys is not None:
-            self.cached_compacted_keys = cached_compacted_keys
-        if latency is not None:
-            self.latency = latency
-        if s3_keys is not None:
-            self.s3_keys = s3_keys
         if cpu_ns is not None:
             self.cpu_ns = cpu_ns
-        if metrics_used is not None:
-            self.metrics_used = metrics_used
         if hosts_used is not None:
             self.hosts_used = hosts_used
+        if keys is not None:
+            self.keys = keys
+        if latency is not None:
+            self.latency = latency
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        if points is not None:
+            self.points = points
+        if queries is not None:
+            self.queries = queries
         if query_tasks is not None:
             self.query_tasks = query_tasks
+        if s3_keys is not None:
+            self.s3_keys = s3_keys
+        if skipped_compacted_keys is not None:
+            self.skipped_compacted_keys = skipped_compacted_keys
+        if summaries is not None:
+            self.summaries = summaries
 
     @property
-    def keys(self):
-        """Gets the keys of this StatsModel.  # noqa: E501
+    def buffer_keys(self):
+        """Gets the buffer_keys of this StatsModel.  # noqa: E501
 
 
-        :return: The keys of this StatsModel.  # noqa: E501
+        :return: The buffer_keys of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._keys
+        return self._buffer_keys
 
-    @keys.setter
-    def keys(self, keys):
-        """Sets the keys of this StatsModel.
+    @buffer_keys.setter
+    def buffer_keys(self, buffer_keys):
+        """Sets the buffer_keys of this StatsModel.
 
 
-        :param keys: The keys of this StatsModel.  # noqa: E501
+        :param buffer_keys: The buffer_keys of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._keys = keys
+        self._buffer_keys = buffer_keys
 
     @property
-    def points(self):
-        """Gets the points of this StatsModel.  # noqa: E501
+    def cached_compacted_keys(self):
+        """Gets the cached_compacted_keys of this StatsModel.  # noqa: E501
 
 
-        :return: The points of this StatsModel.  # noqa: E501
+        :return: The cached_compacted_keys of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._points
+        return self._cached_compacted_keys
 
-    @points.setter
-    def points(self, points):
-        """Sets the points of this StatsModel.
+    @cached_compacted_keys.setter
+    def cached_compacted_keys(self, cached_compacted_keys):
+        """Sets the cached_compacted_keys of this StatsModel.
 
 
-        :param points: The points of this StatsModel.  # noqa: E501
+        :param cached_compacted_keys: The cached_compacted_keys of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._points = points
+        self._cached_compacted_keys = cached_compacted_keys
 
     @property
-    def summaries(self):
-        """Gets the summaries of this StatsModel.  # noqa: E501
+    def compacted_keys(self):
+        """Gets the compacted_keys of this StatsModel.  # noqa: E501
 
 
-        :return: The summaries of this StatsModel.  # noqa: E501
+        :return: The compacted_keys of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._summaries
+        return self._compacted_keys
 
-    @summaries.setter
-    def summaries(self, summaries):
-        """Sets the summaries of this StatsModel.
+    @compacted_keys.setter
+    def compacted_keys(self, compacted_keys):
+        """Sets the compacted_keys of this StatsModel.
 
 
-        :param summaries: The summaries of this StatsModel.  # noqa: E501
+        :param compacted_keys: The compacted_keys of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._summaries = summaries
+        self._compacted_keys = compacted_keys
 
     @property
-    def queries(self):
-        """Gets the queries of this StatsModel.  # noqa: E501
+    def compacted_points(self):
+        """Gets the compacted_points of this StatsModel.  # noqa: E501
 
 
-        :return: The queries of this StatsModel.  # noqa: E501
+        :return: The compacted_points of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._queries
+        return self._compacted_points
 
-    @queries.setter
-    def queries(self, queries):
-        """Sets the queries of this StatsModel.
+    @compacted_points.setter
+    def compacted_points(self, compacted_points):
+        """Sets the compacted_points of this StatsModel.
 
 
-        :param queries: The queries of this StatsModel.  # noqa: E501
+        :param compacted_points: The compacted_points of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._queries = queries
+        self._compacted_points = compacted_points
 
     @property
-    def buffer_keys(self):
-        """Gets the buffer_keys of this StatsModel.  # noqa: E501
+    def cpu_ns(self):
+        """Gets the cpu_ns of this StatsModel.  # noqa: E501
 
 
-        :return: The buffer_keys of this StatsModel.  # noqa: E501
+        :return: The cpu_ns of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._buffer_keys
+        return self._cpu_ns
 
-    @buffer_keys.setter
-    def buffer_keys(self, buffer_keys):
-        """Sets the buffer_keys of this StatsModel.
+    @cpu_ns.setter
+    def cpu_ns(self, cpu_ns):
+        """Sets the cpu_ns of this StatsModel.
 
 
-        :param buffer_keys: The buffer_keys of this StatsModel.  # noqa: E501
+        :param cpu_ns: The cpu_ns of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._buffer_keys = buffer_keys
+        self._cpu_ns = cpu_ns
 
     @property
-    def compacted_keys(self):
-        """Gets the compacted_keys of this StatsModel.  # noqa: E501
+    def hosts_used(self):
+        """Gets the hosts_used of this StatsModel.  # noqa: E501
 
 
-        :return: The compacted_keys of this StatsModel.  # noqa: E501
+        :return: The hosts_used of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._compacted_keys
+        return self._hosts_used
 
-    @compacted_keys.setter
-    def compacted_keys(self, compacted_keys):
-        """Sets the compacted_keys of this StatsModel.
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this StatsModel.
 
 
-        :param compacted_keys: The compacted_keys of this StatsModel.  # noqa: E501
+        :param hosts_used: The hosts_used of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._compacted_keys = compacted_keys
+        self._hosts_used = hosts_used
 
     @property
-    def skipped_compacted_keys(self):
-        """Gets the skipped_compacted_keys of this StatsModel.  # noqa: E501
+    def keys(self):
+        """Gets the keys of this StatsModel.  # noqa: E501
 
 
-        :return: The skipped_compacted_keys of this StatsModel.  # noqa: E501
+        :return: The keys of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._skipped_compacted_keys
+        return self._keys
 
-    @skipped_compacted_keys.setter
-    def skipped_compacted_keys(self, skipped_compacted_keys):
-        """Sets the skipped_compacted_keys of this StatsModel.
+    @keys.setter
+    def keys(self, keys):
+        """Sets the keys of this StatsModel.
 
 
-        :param skipped_compacted_keys: The skipped_compacted_keys of this StatsModel.  # noqa: E501
+        :param keys: The keys of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._skipped_compacted_keys = skipped_compacted_keys
+        self._keys = keys
 
     @property
-    def compacted_points(self):
-        """Gets the compacted_points of this StatsModel.  # noqa: E501
+    def latency(self):
+        """Gets the latency of this StatsModel.  # noqa: E501
 
 
-        :return: The compacted_points of this StatsModel.  # noqa: E501
+        :return: The latency of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._compacted_points
+        return self._latency
 
-    @compacted_points.setter
-    def compacted_points(self, compacted_points):
-        """Sets the compacted_points of this StatsModel.
+    @latency.setter
+    def latency(self, latency):
+        """Sets the latency of this StatsModel.
 
 
-        :param compacted_points: The compacted_points of this StatsModel.  # noqa: E501
+        :param latency: The latency of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._compacted_points = compacted_points
+        self._latency = latency
 
     @property
-    def cached_compacted_keys(self):
-        """Gets the cached_compacted_keys of this StatsModel.  # noqa: E501
+    def metrics_used(self):
+        """Gets the metrics_used of this StatsModel.  # noqa: E501
 
 
-        :return: The cached_compacted_keys of this StatsModel.  # noqa: E501
+        :return: The metrics_used of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._cached_compacted_keys
+        return self._metrics_used
 
-    @cached_compacted_keys.setter
-    def cached_compacted_keys(self, cached_compacted_keys):
-        """Sets the cached_compacted_keys of this StatsModel.
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this StatsModel.
 
 
-        :param cached_compacted_keys: The cached_compacted_keys of this StatsModel.  # noqa: E501
+        :param metrics_used: The metrics_used of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._cached_compacted_keys = cached_compacted_keys
+        self._metrics_used = metrics_used
 
     @property
-    def latency(self):
-        """Gets the latency of this StatsModel.  # noqa: E501
+    def points(self):
+        """Gets the points of this StatsModel.  # noqa: E501
 
 
-        :return: The latency of this StatsModel.  # noqa: E501
+        :return: The points of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._latency
+        return self._points
 
-    @latency.setter
-    def latency(self, latency):
-        """Sets the latency of this StatsModel.
+    @points.setter
+    def points(self, points):
+        """Sets the points of this StatsModel.
 
 
-        :param latency: The latency of this StatsModel.  # noqa: E501
+        :param points: The points of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._latency = latency
+        self._points = points
 
     @property
-    def s3_keys(self):
-        """Gets the s3_keys of this StatsModel.  # noqa: E501
+    def queries(self):
+        """Gets the queries of this StatsModel.  # noqa: E501
 
 
-        :return: The s3_keys of this StatsModel.  # noqa: E501
+        :return: The queries of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._s3_keys
+        return self._queries
 
-    @s3_keys.setter
-    def s3_keys(self, s3_keys):
-        """Sets the s3_keys of this StatsModel.
+    @queries.setter
+    def queries(self, queries):
+        """Sets the queries of this StatsModel.
 
 
-        :param s3_keys: The s3_keys of this StatsModel.  # noqa: E501
+        :param queries: The queries of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._s3_keys = s3_keys
+        self._queries = queries
 
     @property
-    def cpu_ns(self):
-        """Gets the cpu_ns of this StatsModel.  # noqa: E501
+    def query_tasks(self):
+        """Gets the query_tasks of this StatsModel.  # noqa: E501
 
 
-        :return: The cpu_ns of this StatsModel.  # noqa: E501
+        :return: The query_tasks of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._cpu_ns
+        return self._query_tasks
 
-    @cpu_ns.setter
-    def cpu_ns(self, cpu_ns):
-        """Sets the cpu_ns of this StatsModel.
+    @query_tasks.setter
+    def query_tasks(self, query_tasks):
+        """Sets the query_tasks of this StatsModel.
 
 
-        :param cpu_ns: The cpu_ns of this StatsModel.  # noqa: E501
+        :param query_tasks: The query_tasks of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._cpu_ns = cpu_ns
+        self._query_tasks = query_tasks
 
     @property
-    def metrics_used(self):
-        """Gets the metrics_used of this StatsModel.  # noqa: E501
+    def s3_keys(self):
+        """Gets the s3_keys of this StatsModel.  # noqa: E501
 
 
-        :return: The metrics_used of this StatsModel.  # noqa: E501
+        :return: The s3_keys of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._metrics_used
+        return self._s3_keys
 
-    @metrics_used.setter
-    def metrics_used(self, metrics_used):
-        """Sets the metrics_used of this StatsModel.
+    @s3_keys.setter
+    def s3_keys(self, s3_keys):
+        """Sets the s3_keys of this StatsModel.
 
 
-        :param metrics_used: The metrics_used of this StatsModel.  # noqa: E501
+        :param s3_keys: The s3_keys of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._metrics_used = metrics_used
+        self._s3_keys = s3_keys
 
     @property
-    def hosts_used(self):
-        """Gets the hosts_used of this StatsModel.  # noqa: E501
+    def skipped_compacted_keys(self):
+        """Gets the skipped_compacted_keys of this StatsModel.  # noqa: E501
 
 
-        :return: The hosts_used of this StatsModel.  # noqa: E501
+        :return: The skipped_compacted_keys of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._hosts_used
+        return self._skipped_compacted_keys
 
-    @hosts_used.setter
-    def hosts_used(self, hosts_used):
-        """Sets the hosts_used of this StatsModel.
+    @skipped_compacted_keys.setter
+    def skipped_compacted_keys(self, skipped_compacted_keys):
+        """Sets the skipped_compacted_keys of this StatsModel.
 
 
-        :param hosts_used: The hosts_used of this StatsModel.  # noqa: E501
+        :param skipped_compacted_keys: The skipped_compacted_keys of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._hosts_used = hosts_used
+        self._skipped_compacted_keys = skipped_compacted_keys
 
     @property
-    def query_tasks(self):
-        """Gets the query_tasks of this StatsModel.  # noqa: E501
+    def summaries(self):
+        """Gets the summaries of this StatsModel.  # noqa: E501
 
 
-        :return: The query_tasks of this StatsModel.  # noqa: E501
+        :return: The summaries of this StatsModel.  # noqa: E501
         :rtype: int
         """
-        return self._query_tasks
+        return self._summaries
 
-    @query_tasks.setter
-    def query_tasks(self, query_tasks):
-        """Sets the query_tasks of this StatsModel.
+    @summaries.setter
+    def summaries(self, summaries):
+        """Sets the summaries of this StatsModel.
 
 
-        :param query_tasks: The query_tasks of this StatsModel.  # noqa: E501
+        :param summaries: The summaries of this StatsModel.  # noqa: E501
         :type: int
         """
 
-        self._query_tasks = query_tasks
+        self._summaries = summaries
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 5698174..857bd97 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -33,51 +33,74 @@ class TagsResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'cursor': 'str',
         'items': 'list[str]',
-        'offset': 'int',
         'limit': 'int',
-        'cursor': 'str',
-        'total_items': 'int',
         'more_items': 'bool',
-        'sort': 'Sorting'
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
     }
 
     attribute_map = {
+        'cursor': 'cursor',
         'items': 'items',
-        'offset': 'offset',
         'limit': 'limit',
-        'cursor': 'cursor',
-        'total_items': 'totalItems',
         'more_items': 'moreItems',
-        'sort': 'sort'
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
     }
 
-    def __init__(self, items=None, offset=None, limit=None, cursor=None, total_items=None, more_items=None, sort=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
         """TagsResponse - a model defined in Swagger"""  # noqa: E501
 
+        self._cursor = None
         self._items = None
-        self._offset = None
         self._limit = None
-        self._cursor = None
-        self._total_items = None
         self._more_items = None
+        self._offset = None
         self._sort = None
+        self._total_items = None
         self.discriminator = None
 
+        if cursor is not None:
+            self.cursor = cursor
         if items is not None:
             self.items = items
-        if offset is not None:
-            self.offset = offset
         if limit is not None:
             self.limit = limit
-        if cursor is not None:
-            self.cursor = cursor
-        if total_items is not None:
-            self.total_items = total_items
         if more_items is not None:
             self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
         if sort is not None:
             self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this TagsResponse.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this TagsResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this TagsResponse.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this TagsResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
 
     @property
     def items(self):
@@ -102,27 +125,6 @@ def items(self, items):
 
         self._items = items
 
-    @property
-    def offset(self):
-        """Gets the offset of this TagsResponse.  # noqa: E501
-
-
-        :return: The offset of this TagsResponse.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this TagsResponse.
-
-
-        :param offset: The offset of this TagsResponse.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
     @property
     def limit(self):
         """Gets the limit of this TagsResponse.  # noqa: E501
@@ -144,52 +146,6 @@ def limit(self, limit):
 
         self._limit = limit
 
-    @property
-    def cursor(self):
-        """Gets the cursor of this TagsResponse.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this TagsResponse.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this TagsResponse.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this TagsResponse.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this TagsResponse.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this TagsResponse.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this TagsResponse.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this TagsResponse.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
     @property
     def more_items(self):
         """Gets the more_items of this TagsResponse.  # noqa: E501
@@ -213,6 +169,27 @@ def more_items(self, more_items):
 
         self._more_items = more_items
 
+    @property
+    def offset(self):
+        """Gets the offset of this TagsResponse.  # noqa: E501
+
+
+        :return: The offset of this TagsResponse.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this TagsResponse.
+
+
+        :param offset: The offset of this TagsResponse.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
     @property
     def sort(self):
         """Gets the sort of this TagsResponse.  # noqa: E501
@@ -234,6 +211,29 @@ def sort(self, sort):
 
         self._sort = sort
 
+    @property
+    def total_items(self):
+        """Gets the total_items of this TagsResponse.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this TagsResponse.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this TagsResponse.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this TagsResponse.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index e4314f4..907a455 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -31,32 +31,55 @@ class TargetInfo(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'method': 'str',
         'id': 'str',
+        'method': 'str',
         'name': 'str'
     }
 
     attribute_map = {
-        'method': 'method',
         'id': 'id',
+        'method': 'method',
         'name': 'name'
     }
 
-    def __init__(self, method=None, id=None, name=None):  # noqa: E501
+    def __init__(self, id=None, method=None, name=None):  # noqa: E501
         """TargetInfo - a model defined in Swagger"""  # noqa: E501
 
-        self._method = None
         self._id = None
+        self._method = None
         self._name = None
         self.discriminator = None
 
-        if method is not None:
-            self.method = method
         if id is not None:
             self.id = id
+        if method is not None:
+            self.method = method
         if name is not None:
             self.name = name
 
+    @property
+    def id(self):
+        """Gets the id of this TargetInfo.  # noqa: E501
+
+        ID of the alert target  # noqa: E501
+
+        :return: The id of this TargetInfo.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this TargetInfo.
+
+        ID of the alert target  # noqa: E501
+
+        :param id: The id of this TargetInfo.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def method(self):
         """Gets the method of this TargetInfo.  # noqa: E501
@@ -86,29 +109,6 @@ def method(self, method):
 
         self._method = method
 
-    @property
-    def id(self):
-        """Gets the id of this TargetInfo.  # noqa: E501
-
-        ID of the alert target  # noqa: E501
-
-        :return: The id of this TargetInfo.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this TargetInfo.
-
-        ID of the alert target  # noqa: E501
-
-        :param id: The id of this TargetInfo.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
     @property
     def name(self):
         """Gets the name of this TargetInfo.  # noqa: E501
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index 88e9f56..efa7e3f 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -31,59 +31,59 @@ class Timeseries(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'label': 'str',
+        'data': 'list[list[float]]',
         'host': 'str',
-        'tags': 'dict(str, str)',
-        'data': 'list[list[float]]'
+        'label': 'str',
+        'tags': 'dict(str, str)'
     }
 
     attribute_map = {
-        'label': 'label',
+        'data': 'data',
         'host': 'host',
-        'tags': 'tags',
-        'data': 'data'
+        'label': 'label',
+        'tags': 'tags'
     }
 
-    def __init__(self, label=None, host=None, tags=None, data=None):  # noqa: E501
+    def __init__(self, data=None, host=None, label=None, tags=None):  # noqa: E501
         """Timeseries - a model defined in Swagger"""  # noqa: E501
 
-        self._label = None
+        self._data = None
         self._host = None
+        self._label = None
         self._tags = None
-        self._data = None
         self.discriminator = None
 
-        if label is not None:
-            self.label = label
+        if data is not None:
+            self.data = data
         if host is not None:
             self.host = host
+        if label is not None:
+            self.label = label
         if tags is not None:
             self.tags = tags
-        if data is not None:
-            self.data = data
 
     @property
-    def label(self):
-        """Gets the label of this Timeseries.  # noqa: E501
+    def data(self):
+        """Gets the data of this Timeseries.  # noqa: E501
 
-        Label of this timeseries  # noqa: E501
+        Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp  # noqa: E501
 
-        :return: The label of this Timeseries.  # noqa: E501
-        :rtype: str
+        :return: The data of this Timeseries.  # noqa: E501
+        :rtype: list[list[float]]
         """
-        return self._label
+        return self._data
 
-    @label.setter
-    def label(self, label):
-        """Sets the label of this Timeseries.
+    @data.setter
+    def data(self, data):
+        """Sets the data of this Timeseries.
 
-        Label of this timeseries  # noqa: E501
+        Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp  # noqa: E501
 
-        :param label: The label of this Timeseries.  # noqa: E501
-        :type: str
+        :param data: The data of this Timeseries.  # noqa: E501
+        :type: list[list[float]]
         """
 
-        self._label = label
+        self._data = data
 
     @property
     def host(self):
@@ -108,6 +108,29 @@ def host(self, host):
 
         self._host = host
 
+    @property
+    def label(self):
+        """Gets the label of this Timeseries.  # noqa: E501
+
+        Label of this timeseries  # noqa: E501
+
+        :return: The label of this Timeseries.  # noqa: E501
+        :rtype: str
+        """
+        return self._label
+
+    @label.setter
+    def label(self, label):
+        """Sets the label of this Timeseries.
+
+        Label of this timeseries  # noqa: E501
+
+        :param label: The label of this Timeseries.  # noqa: E501
+        :type: str
+        """
+
+        self._label = label
+
     @property
     def tags(self):
         """Gets the tags of this Timeseries.  # noqa: E501
@@ -131,29 +154,6 @@ def tags(self, tags):
 
         self._tags = tags
 
-    @property
-    def data(self):
-        """Gets the data of this Timeseries.  # noqa: E501
-
-        Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp  # noqa: E501
-
-        :return: The data of this Timeseries.  # noqa: E501
-        :rtype: list[list[float]]
-        """
-        return self._data
-
-    @data.setter
-    def data(self, data):
-        """Sets the data of this Timeseries.
-
-        Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp  # noqa: E501
-
-        :param data: The data of this Timeseries.  # noqa: E501
-        :type: list[list[float]]
-        """
-
-        self._data = data
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
index 54908e8..4319359 100644
--- a/wavefront_api_client/models/user.py
+++ b/wavefront_api_client/models/user.py
@@ -33,143 +33,143 @@ class User(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'identifier': 'str',
-        'customer': 'str',
-        'credential': 'str',
-        'provider': 'str',
-        'groups': 'list[str]',
-        'user_groups': 'list[str]',
-        'reset_token': 'str',
         'api_token': 'str',
         'api_token2': 'str',
-        'reset_token_creation_millis': 'int',
+        'credential': 'str',
+        'customer': 'str',
+        'groups': 'list[str]',
+        'identifier': 'str',
         'invalid_password_attempts': 'int',
+        'last_logout': 'int',
         'last_successful_login': 'int',
-        'settings': 'UserSettings',
         'onboarding_state': 'str',
-        'last_logout': 'int',
+        'provider': 'str',
+        'reset_token': 'str',
+        'reset_token_creation_millis': 'int',
+        'settings': 'UserSettings',
         'sso_id': 'str',
-        'super_admin': 'bool'
+        'super_admin': 'bool',
+        'user_groups': 'list[str]'
     }
 
     attribute_map = {
-        'identifier': 'identifier',
-        'customer': 'customer',
-        'credential': 'credential',
-        'provider': 'provider',
-        'groups': 'groups',
-        'user_groups': 'userGroups',
-        'reset_token': 'resetToken',
         'api_token': 'apiToken',
         'api_token2': 'apiToken2',
-        'reset_token_creation_millis': 'resetTokenCreationMillis',
+        'credential': 'credential',
+        'customer': 'customer',
+        'groups': 'groups',
+        'identifier': 'identifier',
         'invalid_password_attempts': 'invalidPasswordAttempts',
+        'last_logout': 'lastLogout',
         'last_successful_login': 'lastSuccessfulLogin',
-        'settings': 'settings',
         'onboarding_state': 'onboardingState',
-        'last_logout': 'lastLogout',
+        'provider': 'provider',
+        'reset_token': 'resetToken',
+        'reset_token_creation_millis': 'resetTokenCreationMillis',
+        'settings': 'settings',
         'sso_id': 'ssoId',
-        'super_admin': 'superAdmin'
+        'super_admin': 'superAdmin',
+        'user_groups': 'userGroups'
     }
 
-    def __init__(self, identifier=None, customer=None, credential=None, provider=None, groups=None, user_groups=None, reset_token=None, api_token=None, api_token2=None, reset_token_creation_millis=None, invalid_password_attempts=None, last_successful_login=None, settings=None, onboarding_state=None, last_logout=None, sso_id=None, super_admin=None):  # noqa: E501
+    def __init__(self, api_token=None, api_token2=None, credential=None, customer=None, groups=None, identifier=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
         """User - a model defined in Swagger"""  # noqa: E501
 
-        self._identifier = None
-        self._customer = None
-        self._credential = None
-        self._provider = None
-        self._groups = None
-        self._user_groups = None
-        self._reset_token = None
         self._api_token = None
         self._api_token2 = None
-        self._reset_token_creation_millis = None
+        self._credential = None
+        self._customer = None
+        self._groups = None
+        self._identifier = None
         self._invalid_password_attempts = None
+        self._last_logout = None
         self._last_successful_login = None
-        self._settings = None
         self._onboarding_state = None
-        self._last_logout = None
+        self._provider = None
+        self._reset_token = None
+        self._reset_token_creation_millis = None
+        self._settings = None
         self._sso_id = None
         self._super_admin = None
+        self._user_groups = None
         self.discriminator = None
 
-        if identifier is not None:
-            self.identifier = identifier
-        if customer is not None:
-            self.customer = customer
-        if credential is not None:
-            self.credential = credential
-        if provider is not None:
-            self.provider = provider
-        if groups is not None:
-            self.groups = groups
-        if user_groups is not None:
-            self.user_groups = user_groups
-        if reset_token is not None:
-            self.reset_token = reset_token
         if api_token is not None:
             self.api_token = api_token
         if api_token2 is not None:
             self.api_token2 = api_token2
-        if reset_token_creation_millis is not None:
-            self.reset_token_creation_millis = reset_token_creation_millis
+        if credential is not None:
+            self.credential = credential
+        if customer is not None:
+            self.customer = customer
+        if groups is not None:
+            self.groups = groups
+        if identifier is not None:
+            self.identifier = identifier
         if invalid_password_attempts is not None:
             self.invalid_password_attempts = invalid_password_attempts
+        if last_logout is not None:
+            self.last_logout = last_logout
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
-        if settings is not None:
-            self.settings = settings
         if onboarding_state is not None:
             self.onboarding_state = onboarding_state
-        if last_logout is not None:
-            self.last_logout = last_logout
+        if provider is not None:
+            self.provider = provider
+        if reset_token is not None:
+            self.reset_token = reset_token
+        if reset_token_creation_millis is not None:
+            self.reset_token_creation_millis = reset_token_creation_millis
+        if settings is not None:
+            self.settings = settings
         if sso_id is not None:
             self.sso_id = sso_id
         if super_admin is not None:
             self.super_admin = super_admin
+        if user_groups is not None:
+            self.user_groups = user_groups
 
     @property
-    def identifier(self):
-        """Gets the identifier of this User.  # noqa: E501
+    def api_token(self):
+        """Gets the api_token of this User.  # noqa: E501
 
 
-        :return: The identifier of this User.  # noqa: E501
+        :return: The api_token of this User.  # noqa: E501
         :rtype: str
         """
-        return self._identifier
+        return self._api_token
 
-    @identifier.setter
-    def identifier(self, identifier):
-        """Sets the identifier of this User.
+    @api_token.setter
+    def api_token(self, api_token):
+        """Sets the api_token of this User.
 
 
-        :param identifier: The identifier of this User.  # noqa: E501
+        :param api_token: The api_token of this User.  # noqa: E501
         :type: str
         """
 
-        self._identifier = identifier
+        self._api_token = api_token
 
     @property
-    def customer(self):
-        """Gets the customer of this User.  # noqa: E501
+    def api_token2(self):
+        """Gets the api_token2 of this User.  # noqa: E501
 
 
-        :return: The customer of this User.  # noqa: E501
+        :return: The api_token2 of this User.  # noqa: E501
         :rtype: str
         """
-        return self._customer
+        return self._api_token2
 
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this User.
+    @api_token2.setter
+    def api_token2(self, api_token2):
+        """Sets the api_token2 of this User.
 
 
-        :param customer: The customer of this User.  # noqa: E501
+        :param api_token2: The api_token2 of this User.  # noqa: E501
         :type: str
         """
 
-        self._customer = customer
+        self._api_token2 = api_token2
 
     @property
     def credential(self):
@@ -193,25 +193,25 @@ def credential(self, credential):
         self._credential = credential
 
     @property
-    def provider(self):
-        """Gets the provider of this User.  # noqa: E501
+    def customer(self):
+        """Gets the customer of this User.  # noqa: E501
 
 
-        :return: The provider of this User.  # noqa: E501
+        :return: The customer of this User.  # noqa: E501
         :rtype: str
         """
-        return self._provider
+        return self._customer
 
-    @provider.setter
-    def provider(self, provider):
-        """Sets the provider of this User.
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this User.
 
 
-        :param provider: The provider of this User.  # noqa: E501
+        :param customer: The customer of this User.  # noqa: E501
         :type: str
         """
 
-        self._provider = provider
+        self._customer = customer
 
     @property
     def groups(self):
@@ -235,151 +235,172 @@ def groups(self, groups):
         self._groups = groups
 
     @property
-    def user_groups(self):
-        """Gets the user_groups of this User.  # noqa: E501
+    def identifier(self):
+        """Gets the identifier of this User.  # noqa: E501
 
 
-        :return: The user_groups of this User.  # noqa: E501
-        :rtype: list[str]
+        :return: The identifier of this User.  # noqa: E501
+        :rtype: str
         """
-        return self._user_groups
+        return self._identifier
 
-    @user_groups.setter
-    def user_groups(self, user_groups):
-        """Sets the user_groups of this User.
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this User.
 
 
-        :param user_groups: The user_groups of this User.  # noqa: E501
-        :type: list[str]
+        :param identifier: The identifier of this User.  # noqa: E501
+        :type: str
         """
 
-        self._user_groups = user_groups
+        self._identifier = identifier
 
     @property
-    def reset_token(self):
-        """Gets the reset_token of this User.  # noqa: E501
+    def invalid_password_attempts(self):
+        """Gets the invalid_password_attempts of this User.  # noqa: E501
 
 
-        :return: The reset_token of this User.  # noqa: E501
-        :rtype: str
+        :return: The invalid_password_attempts of this User.  # noqa: E501
+        :rtype: int
         """
-        return self._reset_token
+        return self._invalid_password_attempts
 
-    @reset_token.setter
-    def reset_token(self, reset_token):
-        """Sets the reset_token of this User.
+    @invalid_password_attempts.setter
+    def invalid_password_attempts(self, invalid_password_attempts):
+        """Sets the invalid_password_attempts of this User.
 
 
-        :param reset_token: The reset_token of this User.  # noqa: E501
-        :type: str
+        :param invalid_password_attempts: The invalid_password_attempts of this User.  # noqa: E501
+        :type: int
         """
 
-        self._reset_token = reset_token
+        self._invalid_password_attempts = invalid_password_attempts
 
     @property
-    def api_token(self):
-        """Gets the api_token of this User.  # noqa: E501
+    def last_logout(self):
+        """Gets the last_logout of this User.  # noqa: E501
 
 
-        :return: The api_token of this User.  # noqa: E501
-        :rtype: str
+        :return: The last_logout of this User.  # noqa: E501
+        :rtype: int
         """
-        return self._api_token
+        return self._last_logout
 
-    @api_token.setter
-    def api_token(self, api_token):
-        """Sets the api_token of this User.
+    @last_logout.setter
+    def last_logout(self, last_logout):
+        """Sets the last_logout of this User.
 
 
-        :param api_token: The api_token of this User.  # noqa: E501
-        :type: str
+        :param last_logout: The last_logout of this User.  # noqa: E501
+        :type: int
         """
 
-        self._api_token = api_token
+        self._last_logout = last_logout
 
     @property
-    def api_token2(self):
-        """Gets the api_token2 of this User.  # noqa: E501
+    def last_successful_login(self):
+        """Gets the last_successful_login of this User.  # noqa: E501
 
 
-        :return: The api_token2 of this User.  # noqa: E501
+        :return: The last_successful_login of this User.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_successful_login
+
+    @last_successful_login.setter
+    def last_successful_login(self, last_successful_login):
+        """Sets the last_successful_login of this User.
+
+
+        :param last_successful_login: The last_successful_login of this User.  # noqa: E501
+        :type: int
+        """
+
+        self._last_successful_login = last_successful_login
+
+    @property
+    def onboarding_state(self):
+        """Gets the onboarding_state of this User.  # noqa: E501
+
+
+        :return: The onboarding_state of this User.  # noqa: E501
         :rtype: str
         """
-        return self._api_token2
+        return self._onboarding_state
 
-    @api_token2.setter
-    def api_token2(self, api_token2):
-        """Sets the api_token2 of this User.
+    @onboarding_state.setter
+    def onboarding_state(self, onboarding_state):
+        """Sets the onboarding_state of this User.
 
 
-        :param api_token2: The api_token2 of this User.  # noqa: E501
+        :param onboarding_state: The onboarding_state of this User.  # noqa: E501
         :type: str
         """
 
-        self._api_token2 = api_token2
+        self._onboarding_state = onboarding_state
 
     @property
-    def reset_token_creation_millis(self):
-        """Gets the reset_token_creation_millis of this User.  # noqa: E501
+    def provider(self):
+        """Gets the provider of this User.  # noqa: E501
 
 
-        :return: The reset_token_creation_millis of this User.  # noqa: E501
-        :rtype: int
+        :return: The provider of this User.  # noqa: E501
+        :rtype: str
         """
-        return self._reset_token_creation_millis
+        return self._provider
 
-    @reset_token_creation_millis.setter
-    def reset_token_creation_millis(self, reset_token_creation_millis):
-        """Sets the reset_token_creation_millis of this User.
+    @provider.setter
+    def provider(self, provider):
+        """Sets the provider of this User.
 
 
-        :param reset_token_creation_millis: The reset_token_creation_millis of this User.  # noqa: E501
-        :type: int
+        :param provider: The provider of this User.  # noqa: E501
+        :type: str
         """
 
-        self._reset_token_creation_millis = reset_token_creation_millis
+        self._provider = provider
 
     @property
-    def invalid_password_attempts(self):
-        """Gets the invalid_password_attempts of this User.  # noqa: E501
+    def reset_token(self):
+        """Gets the reset_token of this User.  # noqa: E501
 
 
-        :return: The invalid_password_attempts of this User.  # noqa: E501
-        :rtype: int
+        :return: The reset_token of this User.  # noqa: E501
+        :rtype: str
         """
-        return self._invalid_password_attempts
+        return self._reset_token
 
-    @invalid_password_attempts.setter
-    def invalid_password_attempts(self, invalid_password_attempts):
-        """Sets the invalid_password_attempts of this User.
+    @reset_token.setter
+    def reset_token(self, reset_token):
+        """Sets the reset_token of this User.
 
 
-        :param invalid_password_attempts: The invalid_password_attempts of this User.  # noqa: E501
-        :type: int
+        :param reset_token: The reset_token of this User.  # noqa: E501
+        :type: str
         """
 
-        self._invalid_password_attempts = invalid_password_attempts
+        self._reset_token = reset_token
 
     @property
-    def last_successful_login(self):
-        """Gets the last_successful_login of this User.  # noqa: E501
+    def reset_token_creation_millis(self):
+        """Gets the reset_token_creation_millis of this User.  # noqa: E501
 
 
-        :return: The last_successful_login of this User.  # noqa: E501
+        :return: The reset_token_creation_millis of this User.  # noqa: E501
         :rtype: int
         """
-        return self._last_successful_login
+        return self._reset_token_creation_millis
 
-    @last_successful_login.setter
-    def last_successful_login(self, last_successful_login):
-        """Sets the last_successful_login of this User.
+    @reset_token_creation_millis.setter
+    def reset_token_creation_millis(self, reset_token_creation_millis):
+        """Sets the reset_token_creation_millis of this User.
 
 
-        :param last_successful_login: The last_successful_login of this User.  # noqa: E501
+        :param reset_token_creation_millis: The reset_token_creation_millis of this User.  # noqa: E501
         :type: int
         """
 
-        self._last_successful_login = last_successful_login
+        self._reset_token_creation_millis = reset_token_creation_millis
 
     @property
     def settings(self):
@@ -402,48 +423,6 @@ def settings(self, settings):
 
         self._settings = settings
 
-    @property
-    def onboarding_state(self):
-        """Gets the onboarding_state of this User.  # noqa: E501
-
-
-        :return: The onboarding_state of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._onboarding_state
-
-    @onboarding_state.setter
-    def onboarding_state(self, onboarding_state):
-        """Sets the onboarding_state of this User.
-
-
-        :param onboarding_state: The onboarding_state of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._onboarding_state = onboarding_state
-
-    @property
-    def last_logout(self):
-        """Gets the last_logout of this User.  # noqa: E501
-
-
-        :return: The last_logout of this User.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_logout
-
-    @last_logout.setter
-    def last_logout(self, last_logout):
-        """Sets the last_logout of this User.
-
-
-        :param last_logout: The last_logout of this User.  # noqa: E501
-        :type: int
-        """
-
-        self._last_logout = last_logout
-
     @property
     def sso_id(self):
         """Gets the sso_id of this User.  # noqa: E501
@@ -486,6 +465,27 @@ def super_admin(self, super_admin):
 
         self._super_admin = super_admin
 
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this User.  # noqa: E501
+
+
+        :return: The user_groups of this User.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this User.
+
+
+        :param user_groups: The user_groups of this User.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index fbf61b7..13537d7 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -33,55 +33,104 @@ class UserGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'created_epoch_millis': 'int',
+        'customer': 'str',
         'id': 'str',
         'name': 'str',
         'permissions': 'list[str]',
-        'customer': 'str',
-        'users': 'list[str]',
+        'properties': 'UserGroupPropertiesDTO',
         'user_count': 'int',
-        'properties': 'UserGroupPropertiesDTO'
+        'users': 'list[str]'
     }
 
     attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'customer': 'customer',
         'id': 'id',
         'name': 'name',
         'permissions': 'permissions',
-        'customer': 'customer',
-        'users': 'users',
+        'properties': 'properties',
         'user_count': 'userCount',
-        'properties': 'properties'
+        'users': 'users'
     }
 
-    def __init__(self, id=None, name=None, permissions=None, customer=None, users=None, user_count=None, properties=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None, permissions=None, properties=None, user_count=None, users=None):  # noqa: E501
         """UserGroup - a model defined in Swagger"""  # noqa: E501
 
+        self._created_epoch_millis = None
+        self._customer = None
         self._id = None
         self._name = None
         self._permissions = None
-        self._customer = None
-        self._users = None
-        self._user_count = None
         self._properties = None
+        self._user_count = None
+        self._users = None
         self.discriminator = None
 
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if customer is not None:
+            self.customer = customer
         if id is not None:
             self.id = id
         self.name = name
         self.permissions = permissions
-        if customer is not None:
-            self.customer = customer
-        if users is not None:
-            self.users = users
-        if user_count is not None:
-            self.user_count = user_count
         if properties is not None:
             self.properties = properties
+        if user_count is not None:
+            self.user_count = user_count
+        if users is not None:
+            self.users = users
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this UserGroup.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this UserGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this UserGroup.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this UserGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def customer(self):
+        """Gets the customer of this UserGroup.  # noqa: E501
+
+        The id of the customer to which the user group belongs  # noqa: E501
+
+        :return: The customer of this UserGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserGroup.
+
+        The id of the customer to which the user group belongs  # noqa: E501
+
+        :param customer: The customer of this UserGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
 
     @property
     def id(self):
         """Gets the id of this UserGroup.  # noqa: E501
 
-        Unique ID for the user group  # noqa: E501
+        The unique identifier of the user group  # noqa: E501
 
         :return: The id of this UserGroup.  # noqa: E501
         :rtype: str
@@ -92,7 +141,7 @@ def id(self):
     def id(self, id):
         """Sets the id of this UserGroup.
 
-        Unique ID for the user group  # noqa: E501
+        The unique identifier of the user group  # noqa: E501
 
         :param id: The id of this UserGroup.  # noqa: E501
         :type: str
@@ -104,7 +153,7 @@ def id(self, id):
     def name(self):
         """Gets the name of this UserGroup.  # noqa: E501
 
-        Name of the user group  # noqa: E501
+        The name of the user group  # noqa: E501
 
         :return: The name of this UserGroup.  # noqa: E501
         :rtype: str
@@ -115,7 +164,7 @@ def name(self):
     def name(self, name):
         """Sets the name of this UserGroup.
 
-        Name of the user group  # noqa: E501
+        The name of the user group  # noqa: E501
 
         :param name: The name of this UserGroup.  # noqa: E501
         :type: str
@@ -129,7 +178,7 @@ def name(self, name):
     def permissions(self):
         """Gets the permissions of this UserGroup.  # noqa: E501
 
-        Permission assigned to the user group  # noqa: E501
+        List of permissions the user group has been granted access to  # noqa: E501
 
         :return: The permissions of this UserGroup.  # noqa: E501
         :rtype: list[str]
@@ -140,7 +189,7 @@ def permissions(self):
     def permissions(self, permissions):
         """Sets the permissions of this UserGroup.
 
-        Permission assigned to the user group  # noqa: E501
+        List of permissions the user group has been granted access to  # noqa: E501
 
         :param permissions: The permissions of this UserGroup.  # noqa: E501
         :type: list[str]
@@ -151,50 +200,27 @@ def permissions(self, permissions):
         self._permissions = permissions
 
     @property
-    def customer(self):
-        """Gets the customer of this UserGroup.  # noqa: E501
-
-        ID of the customer to which the user group belongs  # noqa: E501
-
-        :return: The customer of this UserGroup.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer
-
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this UserGroup.
-
-        ID of the customer to which the user group belongs  # noqa: E501
-
-        :param customer: The customer of this UserGroup.  # noqa: E501
-        :type: str
-        """
-
-        self._customer = customer
-
-    @property
-    def users(self):
-        """Gets the users of this UserGroup.  # noqa: E501
+    def properties(self):
+        """Gets the properties of this UserGroup.  # noqa: E501
 
-        List of Users that are members of the user group. Maybe incomplete.  # noqa: E501
+        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
 
-        :return: The users of this UserGroup.  # noqa: E501
-        :rtype: list[str]
+        :return: The properties of this UserGroup.  # noqa: E501
+        :rtype: UserGroupPropertiesDTO
         """
-        return self._users
+        return self._properties
 
-    @users.setter
-    def users(self, users):
-        """Sets the users of this UserGroup.
+    @properties.setter
+    def properties(self, properties):
+        """Sets the properties of this UserGroup.
 
-        List of Users that are members of the user group. Maybe incomplete.  # noqa: E501
+        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
 
-        :param users: The users of this UserGroup.  # noqa: E501
-        :type: list[str]
+        :param properties: The properties of this UserGroup.  # noqa: E501
+        :type: UserGroupPropertiesDTO
         """
 
-        self._users = users
+        self._properties = properties
 
     @property
     def user_count(self):
@@ -220,27 +246,27 @@ def user_count(self, user_count):
         self._user_count = user_count
 
     @property
-    def properties(self):
-        """Gets the properties of this UserGroup.  # noqa: E501
+    def users(self):
+        """Gets the users of this UserGroup.  # noqa: E501
 
-        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
+        List(may be incomplete) of users that are members of the user group.  # noqa: E501
 
-        :return: The properties of this UserGroup.  # noqa: E501
-        :rtype: UserGroupPropertiesDTO
+        :return: The users of this UserGroup.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._properties
+        return self._users
 
-    @properties.setter
-    def properties(self, properties):
-        """Sets the properties of this UserGroup.
+    @users.setter
+    def users(self, users):
+        """Sets the users of this UserGroup.
 
-        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
+        List(may be incomplete) of users that are members of the user group.  # noqa: E501
 
-        :param properties: The properties of this UserGroup.  # noqa: E501
-        :type: UserGroupPropertiesDTO
+        :param users: The users of this UserGroup.  # noqa: E501
+        :type: list[str]
         """
 
-        self._properties = properties
+        self._users = users
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index dad99ba..cc89ebc 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -31,64 +31,60 @@ class UserGroupWrite(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'permissions': 'list[str]',
+        'created_epoch_millis': 'int',
         'customer': 'str',
         'id': 'str',
-        'created_epoch_millis': 'int',
-        'name': 'str'
+        'name': 'str',
+        'permissions': 'list[str]'
     }
 
     attribute_map = {
-        'permissions': 'permissions',
+        'created_epoch_millis': 'createdEpochMillis',
         'customer': 'customer',
         'id': 'id',
-        'created_epoch_millis': 'createdEpochMillis',
-        'name': 'name'
+        'name': 'name',
+        'permissions': 'permissions'
     }
 
-    def __init__(self, permissions=None, customer=None, id=None, created_epoch_millis=None, name=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None, permissions=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
 
-        self._permissions = None
+        self._created_epoch_millis = None
         self._customer = None
         self._id = None
-        self._created_epoch_millis = None
         self._name = None
+        self._permissions = None
         self.discriminator = None
 
-        self.permissions = permissions
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
         if customer is not None:
             self.customer = customer
         if id is not None:
             self.id = id
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
         self.name = name
+        self.permissions = permissions
 
     @property
-    def permissions(self):
-        """Gets the permissions of this UserGroupWrite.  # noqa: E501
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this UserGroupWrite.  # noqa: E501
 
-        List of permissions the user group has been granted access to  # noqa: E501
 
-        :return: The permissions of this UserGroupWrite.  # noqa: E501
-        :rtype: list[str]
+        :return: The created_epoch_millis of this UserGroupWrite.  # noqa: E501
+        :rtype: int
         """
-        return self._permissions
+        return self._created_epoch_millis
 
-    @permissions.setter
-    def permissions(self, permissions):
-        """Sets the permissions of this UserGroupWrite.
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this UserGroupWrite.
 
-        List of permissions the user group has been granted access to  # noqa: E501
 
-        :param permissions: The permissions of this UserGroupWrite.  # noqa: E501
-        :type: list[str]
+        :param created_epoch_millis: The created_epoch_millis of this UserGroupWrite.  # noqa: E501
+        :type: int
         """
-        if permissions is None:
-            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
 
-        self._permissions = permissions
+        self._created_epoch_millis = created_epoch_millis
 
     @property
     def customer(self):
@@ -136,27 +132,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this UserGroupWrite.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this UserGroupWrite.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this UserGroupWrite.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this UserGroupWrite.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
     @property
     def name(self):
         """Gets the name of this UserGroupWrite.  # noqa: E501
@@ -182,6 +157,31 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def permissions(self):
+        """Gets the permissions of this UserGroupWrite.  # noqa: E501
+
+        List of permissions the user group has been granted access to  # noqa: E501
+
+        :return: The permissions of this UserGroupWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this UserGroupWrite.
+
+        List of permissions the user group has been granted access to  # noqa: E501
+
+        :param permissions: The permissions of this UserGroupWrite.  # noqa: E501
+        :type: list[str]
+        """
+        if permissions is None:
+            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
+
+        self._permissions = permissions
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 37ebf89..581483c 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -33,68 +33,43 @@ class UserModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'identifier': 'str',
         'customer': 'str',
-        'sso_id': 'str',
-        'last_successful_login': 'int',
         'groups': 'list[str]',
+        'identifier': 'str',
+        'last_successful_login': 'int',
+        'sso_id': 'str',
         'user_groups': 'list[UserGroup]'
     }
 
     attribute_map = {
-        'identifier': 'identifier',
         'customer': 'customer',
-        'sso_id': 'ssoId',
-        'last_successful_login': 'lastSuccessfulLogin',
         'groups': 'groups',
+        'identifier': 'identifier',
+        'last_successful_login': 'lastSuccessfulLogin',
+        'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, identifier=None, customer=None, sso_id=None, last_successful_login=None, groups=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
 
-        self._identifier = None
         self._customer = None
-        self._sso_id = None
-        self._last_successful_login = None
         self._groups = None
+        self._identifier = None
+        self._last_successful_login = None
+        self._sso_id = None
         self._user_groups = None
         self.discriminator = None
 
-        self.identifier = identifier
         self.customer = customer
-        if sso_id is not None:
-            self.sso_id = sso_id
+        self.groups = groups
+        self.identifier = identifier
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
-        self.groups = groups
+        if sso_id is not None:
+            self.sso_id = sso_id
         self.user_groups = user_groups
 
-    @property
-    def identifier(self):
-        """Gets the identifier of this UserModel.  # noqa: E501
-
-        The unique identifier of this user, which must be their valid email address  # noqa: E501
-
-        :return: The identifier of this UserModel.  # noqa: E501
-        :rtype: str
-        """
-        return self._identifier
-
-    @identifier.setter
-    def identifier(self, identifier):
-        """Sets the identifier of this UserModel.
-
-        The unique identifier of this user, which must be their valid email address  # noqa: E501
-
-        :param identifier: The identifier of this UserModel.  # noqa: E501
-        :type: str
-        """
-        if identifier is None:
-            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
-
-        self._identifier = identifier
-
     @property
     def customer(self):
         """Gets the customer of this UserModel.  # noqa: E501
@@ -121,25 +96,54 @@ def customer(self, customer):
         self._customer = customer
 
     @property
-    def sso_id(self):
-        """Gets the sso_id of this UserModel.  # noqa: E501
+    def groups(self):
+        """Gets the groups of this UserModel.  # noqa: E501
 
+        The permissions granted to this user  # noqa: E501
 
-        :return: The sso_id of this UserModel.  # noqa: E501
+        :return: The groups of this UserModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this UserModel.
+
+        The permissions granted to this user  # noqa: E501
+
+        :param groups: The groups of this UserModel.  # noqa: E501
+        :type: list[str]
+        """
+        if groups is None:
+            raise ValueError("Invalid value for `groups`, must not be `None`")  # noqa: E501
+
+        self._groups = groups
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this UserModel.  # noqa: E501
+
+        The unique identifier of this user, which must be their valid email address  # noqa: E501
+
+        :return: The identifier of this UserModel.  # noqa: E501
         :rtype: str
         """
-        return self._sso_id
+        return self._identifier
 
-    @sso_id.setter
-    def sso_id(self, sso_id):
-        """Sets the sso_id of this UserModel.
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this UserModel.
 
+        The unique identifier of this user, which must be their valid email address  # noqa: E501
 
-        :param sso_id: The sso_id of this UserModel.  # noqa: E501
+        :param identifier: The identifier of this UserModel.  # noqa: E501
         :type: str
         """
+        if identifier is None:
+            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
-        self._sso_id = sso_id
+        self._identifier = identifier
 
     @property
     def last_successful_login(self):
@@ -163,29 +167,25 @@ def last_successful_login(self, last_successful_login):
         self._last_successful_login = last_successful_login
 
     @property
-    def groups(self):
-        """Gets the groups of this UserModel.  # noqa: E501
+    def sso_id(self):
+        """Gets the sso_id of this UserModel.  # noqa: E501
 
-        The permissions granted to this user  # noqa: E501
 
-        :return: The groups of this UserModel.  # noqa: E501
-        :rtype: list[str]
+        :return: The sso_id of this UserModel.  # noqa: E501
+        :rtype: str
         """
-        return self._groups
+        return self._sso_id
 
-    @groups.setter
-    def groups(self, groups):
-        """Sets the groups of this UserModel.
+    @sso_id.setter
+    def sso_id(self, sso_id):
+        """Sets the sso_id of this UserModel.
 
-        The permissions granted to this user  # noqa: E501
 
-        :param groups: The groups of this UserModel.  # noqa: E501
-        :type: list[str]
+        :param sso_id: The sso_id of this UserModel.  # noqa: E501
+        :type: str
         """
-        if groups is None:
-            raise ValueError("Invalid value for `groups`, must not be `None`")  # noqa: E501
 
-        self._groups = groups
+        self._sso_id = sso_id
 
     @property
     def user_groups(self):
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 0c8de28..f7d13ff 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -31,125 +31,125 @@ class UserRequestDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'identifier': 'str',
-        'sso_id': 'str',
         'customer': 'str',
         'groups': 'list[str]',
+        'identifier': 'str',
+        'sso_id': 'str',
         'user_groups': 'list[str]'
     }
 
     attribute_map = {
-        'identifier': 'identifier',
-        'sso_id': 'ssoId',
         'customer': 'customer',
         'groups': 'groups',
+        'identifier': 'identifier',
+        'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, identifier=None, sso_id=None, customer=None, groups=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
 
-        self._identifier = None
-        self._sso_id = None
         self._customer = None
         self._groups = None
+        self._identifier = None
+        self._sso_id = None
         self._user_groups = None
         self.discriminator = None
 
-        if identifier is not None:
-            self.identifier = identifier
-        if sso_id is not None:
-            self.sso_id = sso_id
         if customer is not None:
             self.customer = customer
         if groups is not None:
             self.groups = groups
+        if identifier is not None:
+            self.identifier = identifier
+        if sso_id is not None:
+            self.sso_id = sso_id
         if user_groups is not None:
             self.user_groups = user_groups
 
     @property
-    def identifier(self):
-        """Gets the identifier of this UserRequestDTO.  # noqa: E501
+    def customer(self):
+        """Gets the customer of this UserRequestDTO.  # noqa: E501
 
 
-        :return: The identifier of this UserRequestDTO.  # noqa: E501
+        :return: The customer of this UserRequestDTO.  # noqa: E501
         :rtype: str
         """
-        return self._identifier
+        return self._customer
 
-    @identifier.setter
-    def identifier(self, identifier):
-        """Sets the identifier of this UserRequestDTO.
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserRequestDTO.
 
 
-        :param identifier: The identifier of this UserRequestDTO.  # noqa: E501
+        :param customer: The customer of this UserRequestDTO.  # noqa: E501
         :type: str
         """
 
-        self._identifier = identifier
+        self._customer = customer
 
     @property
-    def sso_id(self):
-        """Gets the sso_id of this UserRequestDTO.  # noqa: E501
+    def groups(self):
+        """Gets the groups of this UserRequestDTO.  # noqa: E501
 
 
-        :return: The sso_id of this UserRequestDTO.  # noqa: E501
-        :rtype: str
+        :return: The groups of this UserRequestDTO.  # noqa: E501
+        :rtype: list[str]
         """
-        return self._sso_id
+        return self._groups
 
-    @sso_id.setter
-    def sso_id(self, sso_id):
-        """Sets the sso_id of this UserRequestDTO.
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this UserRequestDTO.
 
 
-        :param sso_id: The sso_id of this UserRequestDTO.  # noqa: E501
-        :type: str
+        :param groups: The groups of this UserRequestDTO.  # noqa: E501
+        :type: list[str]
         """
 
-        self._sso_id = sso_id
+        self._groups = groups
 
     @property
-    def customer(self):
-        """Gets the customer of this UserRequestDTO.  # noqa: E501
+    def identifier(self):
+        """Gets the identifier of this UserRequestDTO.  # noqa: E501
 
 
-        :return: The customer of this UserRequestDTO.  # noqa: E501
+        :return: The identifier of this UserRequestDTO.  # noqa: E501
         :rtype: str
         """
-        return self._customer
+        return self._identifier
 
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this UserRequestDTO.
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this UserRequestDTO.
 
 
-        :param customer: The customer of this UserRequestDTO.  # noqa: E501
+        :param identifier: The identifier of this UserRequestDTO.  # noqa: E501
         :type: str
         """
 
-        self._customer = customer
+        self._identifier = identifier
 
     @property
-    def groups(self):
-        """Gets the groups of this UserRequestDTO.  # noqa: E501
+    def sso_id(self):
+        """Gets the sso_id of this UserRequestDTO.  # noqa: E501
 
 
-        :return: The groups of this UserRequestDTO.  # noqa: E501
-        :rtype: list[str]
+        :return: The sso_id of this UserRequestDTO.  # noqa: E501
+        :rtype: str
         """
-        return self._groups
+        return self._sso_id
 
-    @groups.setter
-    def groups(self, groups):
-        """Sets the groups of this UserRequestDTO.
+    @sso_id.setter
+    def sso_id(self, sso_id):
+        """Sets the sso_id of this UserRequestDTO.
 
 
-        :param groups: The groups of this UserRequestDTO.  # noqa: E501
-        :type: list[str]
+        :param sso_id: The sso_id of this UserRequestDTO.  # noqa: E501
+        :type: str
         """
 
-        self._groups = groups
+        self._sso_id = sso_id
 
     @property
     def user_groups(self):
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 5ceeff7..635d5d4 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -31,82 +31,82 @@ class UserSettings(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'preferred_time_zone': 'str',
+        'always_hide_querybuilder': 'bool',
         'chart_title_scalar': 'int',
-        'show_querybuilder_by_default': 'bool',
         'hide_ts_when_querybuilder_shown': 'bool',
-        'always_hide_querybuilder': 'bool',
-        'use24_hour_time': 'bool',
-        'use_dark_theme': 'bool',
         'landing_dashboard_slug': 'str',
-        'show_onboarding': 'bool'
+        'preferred_time_zone': 'str',
+        'show_onboarding': 'bool',
+        'show_querybuilder_by_default': 'bool',
+        'use24_hour_time': 'bool',
+        'use_dark_theme': 'bool'
     }
 
     attribute_map = {
-        'preferred_time_zone': 'preferredTimeZone',
+        'always_hide_querybuilder': 'alwaysHideQuerybuilder',
         'chart_title_scalar': 'chartTitleScalar',
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
         'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
-        'always_hide_querybuilder': 'alwaysHideQuerybuilder',
-        'use24_hour_time': 'use24HourTime',
-        'use_dark_theme': 'useDarkTheme',
         'landing_dashboard_slug': 'landingDashboardSlug',
-        'show_onboarding': 'showOnboarding'
+        'preferred_time_zone': 'preferredTimeZone',
+        'show_onboarding': 'showOnboarding',
+        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'use24_hour_time': 'use24HourTime',
+        'use_dark_theme': 'useDarkTheme'
     }
 
-    def __init__(self, preferred_time_zone=None, chart_title_scalar=None, show_querybuilder_by_default=None, hide_ts_when_querybuilder_shown=None, always_hide_querybuilder=None, use24_hour_time=None, use_dark_theme=None, landing_dashboard_slug=None, show_onboarding=None):  # noqa: E501
+    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
         """UserSettings - a model defined in Swagger"""  # noqa: E501
 
-        self._preferred_time_zone = None
+        self._always_hide_querybuilder = None
         self._chart_title_scalar = None
-        self._show_querybuilder_by_default = None
         self._hide_ts_when_querybuilder_shown = None
-        self._always_hide_querybuilder = None
-        self._use24_hour_time = None
-        self._use_dark_theme = None
         self._landing_dashboard_slug = None
+        self._preferred_time_zone = None
         self._show_onboarding = None
+        self._show_querybuilder_by_default = None
+        self._use24_hour_time = None
+        self._use_dark_theme = None
         self.discriminator = None
 
-        if preferred_time_zone is not None:
-            self.preferred_time_zone = preferred_time_zone
+        if always_hide_querybuilder is not None:
+            self.always_hide_querybuilder = always_hide_querybuilder
         if chart_title_scalar is not None:
             self.chart_title_scalar = chart_title_scalar
-        if show_querybuilder_by_default is not None:
-            self.show_querybuilder_by_default = show_querybuilder_by_default
         if hide_ts_when_querybuilder_shown is not None:
             self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        if always_hide_querybuilder is not None:
-            self.always_hide_querybuilder = always_hide_querybuilder
-        if use24_hour_time is not None:
-            self.use24_hour_time = use24_hour_time
-        if use_dark_theme is not None:
-            self.use_dark_theme = use_dark_theme
         if landing_dashboard_slug is not None:
             self.landing_dashboard_slug = landing_dashboard_slug
+        if preferred_time_zone is not None:
+            self.preferred_time_zone = preferred_time_zone
         if show_onboarding is not None:
             self.show_onboarding = show_onboarding
+        if show_querybuilder_by_default is not None:
+            self.show_querybuilder_by_default = show_querybuilder_by_default
+        if use24_hour_time is not None:
+            self.use24_hour_time = use24_hour_time
+        if use_dark_theme is not None:
+            self.use_dark_theme = use_dark_theme
 
     @property
-    def preferred_time_zone(self):
-        """Gets the preferred_time_zone of this UserSettings.  # noqa: E501
+    def always_hide_querybuilder(self):
+        """Gets the always_hide_querybuilder of this UserSettings.  # noqa: E501
 
 
-        :return: The preferred_time_zone of this UserSettings.  # noqa: E501
-        :rtype: str
+        :return: The always_hide_querybuilder of this UserSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._preferred_time_zone
+        return self._always_hide_querybuilder
 
-    @preferred_time_zone.setter
-    def preferred_time_zone(self, preferred_time_zone):
-        """Sets the preferred_time_zone of this UserSettings.
+    @always_hide_querybuilder.setter
+    def always_hide_querybuilder(self, always_hide_querybuilder):
+        """Sets the always_hide_querybuilder of this UserSettings.
 
 
-        :param preferred_time_zone: The preferred_time_zone of this UserSettings.  # noqa: E501
-        :type: str
+        :param always_hide_querybuilder: The always_hide_querybuilder of this UserSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._preferred_time_zone = preferred_time_zone
+        self._always_hide_querybuilder = always_hide_querybuilder
 
     @property
     def chart_title_scalar(self):
@@ -130,151 +130,151 @@ def chart_title_scalar(self, chart_title_scalar):
         self._chart_title_scalar = chart_title_scalar
 
     @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this UserSettings.  # noqa: E501
+    def hide_ts_when_querybuilder_shown(self):
+        """Gets the hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
 
 
-        :return: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
+        :return: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._show_querybuilder_by_default
+        return self._hide_ts_when_querybuilder_shown
 
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this UserSettings.
+    @hide_ts_when_querybuilder_shown.setter
+    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
+        """Sets the hide_ts_when_querybuilder_shown of this UserSettings.
 
 
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
+        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
         :type: bool
         """
 
-        self._show_querybuilder_by_default = show_querybuilder_by_default
+        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
 
     @property
-    def hide_ts_when_querybuilder_shown(self):
-        """Gets the hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
+    def landing_dashboard_slug(self):
+        """Gets the landing_dashboard_slug of this UserSettings.  # noqa: E501
 
 
-        :return: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
-        :rtype: bool
+        :return: The landing_dashboard_slug of this UserSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._hide_ts_when_querybuilder_shown
+        return self._landing_dashboard_slug
 
-    @hide_ts_when_querybuilder_shown.setter
-    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
-        """Sets the hide_ts_when_querybuilder_shown of this UserSettings.
+    @landing_dashboard_slug.setter
+    def landing_dashboard_slug(self, landing_dashboard_slug):
+        """Sets the landing_dashboard_slug of this UserSettings.
 
 
-        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
-        :type: bool
+        :param landing_dashboard_slug: The landing_dashboard_slug of this UserSettings.  # noqa: E501
+        :type: str
         """
 
-        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
+        self._landing_dashboard_slug = landing_dashboard_slug
 
     @property
-    def always_hide_querybuilder(self):
-        """Gets the always_hide_querybuilder of this UserSettings.  # noqa: E501
+    def preferred_time_zone(self):
+        """Gets the preferred_time_zone of this UserSettings.  # noqa: E501
 
 
-        :return: The always_hide_querybuilder of this UserSettings.  # noqa: E501
-        :rtype: bool
+        :return: The preferred_time_zone of this UserSettings.  # noqa: E501
+        :rtype: str
         """
-        return self._always_hide_querybuilder
+        return self._preferred_time_zone
 
-    @always_hide_querybuilder.setter
-    def always_hide_querybuilder(self, always_hide_querybuilder):
-        """Sets the always_hide_querybuilder of this UserSettings.
+    @preferred_time_zone.setter
+    def preferred_time_zone(self, preferred_time_zone):
+        """Sets the preferred_time_zone of this UserSettings.
 
 
-        :param always_hide_querybuilder: The always_hide_querybuilder of this UserSettings.  # noqa: E501
-        :type: bool
+        :param preferred_time_zone: The preferred_time_zone of this UserSettings.  # noqa: E501
+        :type: str
         """
 
-        self._always_hide_querybuilder = always_hide_querybuilder
+        self._preferred_time_zone = preferred_time_zone
 
     @property
-    def use24_hour_time(self):
-        """Gets the use24_hour_time of this UserSettings.  # noqa: E501
+    def show_onboarding(self):
+        """Gets the show_onboarding of this UserSettings.  # noqa: E501
 
 
-        :return: The use24_hour_time of this UserSettings.  # noqa: E501
+        :return: The show_onboarding of this UserSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._use24_hour_time
+        return self._show_onboarding
 
-    @use24_hour_time.setter
-    def use24_hour_time(self, use24_hour_time):
-        """Sets the use24_hour_time of this UserSettings.
+    @show_onboarding.setter
+    def show_onboarding(self, show_onboarding):
+        """Sets the show_onboarding of this UserSettings.
 
 
-        :param use24_hour_time: The use24_hour_time of this UserSettings.  # noqa: E501
+        :param show_onboarding: The show_onboarding of this UserSettings.  # noqa: E501
         :type: bool
         """
 
-        self._use24_hour_time = use24_hour_time
+        self._show_onboarding = show_onboarding
 
     @property
-    def use_dark_theme(self):
-        """Gets the use_dark_theme of this UserSettings.  # noqa: E501
+    def show_querybuilder_by_default(self):
+        """Gets the show_querybuilder_by_default of this UserSettings.  # noqa: E501
 
 
-        :return: The use_dark_theme of this UserSettings.  # noqa: E501
+        :return: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._use_dark_theme
+        return self._show_querybuilder_by_default
 
-    @use_dark_theme.setter
-    def use_dark_theme(self, use_dark_theme):
-        """Sets the use_dark_theme of this UserSettings.
+    @show_querybuilder_by_default.setter
+    def show_querybuilder_by_default(self, show_querybuilder_by_default):
+        """Sets the show_querybuilder_by_default of this UserSettings.
 
 
-        :param use_dark_theme: The use_dark_theme of this UserSettings.  # noqa: E501
+        :param show_querybuilder_by_default: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
         :type: bool
         """
 
-        self._use_dark_theme = use_dark_theme
+        self._show_querybuilder_by_default = show_querybuilder_by_default
 
     @property
-    def landing_dashboard_slug(self):
-        """Gets the landing_dashboard_slug of this UserSettings.  # noqa: E501
+    def use24_hour_time(self):
+        """Gets the use24_hour_time of this UserSettings.  # noqa: E501
 
 
-        :return: The landing_dashboard_slug of this UserSettings.  # noqa: E501
-        :rtype: str
+        :return: The use24_hour_time of this UserSettings.  # noqa: E501
+        :rtype: bool
         """
-        return self._landing_dashboard_slug
+        return self._use24_hour_time
 
-    @landing_dashboard_slug.setter
-    def landing_dashboard_slug(self, landing_dashboard_slug):
-        """Sets the landing_dashboard_slug of this UserSettings.
+    @use24_hour_time.setter
+    def use24_hour_time(self, use24_hour_time):
+        """Sets the use24_hour_time of this UserSettings.
 
 
-        :param landing_dashboard_slug: The landing_dashboard_slug of this UserSettings.  # noqa: E501
-        :type: str
+        :param use24_hour_time: The use24_hour_time of this UserSettings.  # noqa: E501
+        :type: bool
         """
 
-        self._landing_dashboard_slug = landing_dashboard_slug
+        self._use24_hour_time = use24_hour_time
 
     @property
-    def show_onboarding(self):
-        """Gets the show_onboarding of this UserSettings.  # noqa: E501
+    def use_dark_theme(self):
+        """Gets the use_dark_theme of this UserSettings.  # noqa: E501
 
 
-        :return: The show_onboarding of this UserSettings.  # noqa: E501
+        :return: The use_dark_theme of this UserSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._show_onboarding
+        return self._use_dark_theme
 
-    @show_onboarding.setter
-    def show_onboarding(self, show_onboarding):
-        """Sets the show_onboarding of this UserSettings.
+    @use_dark_theme.setter
+    def use_dark_theme(self, use_dark_theme):
+        """Sets the use_dark_theme of this UserSettings.
 
 
-        :param show_onboarding: The show_onboarding of this UserSettings.  # noqa: E501
+        :param use_dark_theme: The use_dark_theme of this UserSettings.  # noqa: E501
         :type: bool
         """
 
-        self._show_onboarding = show_onboarding
+        self._use_dark_theme = use_dark_theme
 
     def to_dict(self):
         """Returns the model properties as a dict"""

From b5b45e6e58fd8ef97493ad08c2f37395ce71b998 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Mon, 18 Mar 2019 16:49:16 -0700
Subject: [PATCH 022/161] Delete the swagger.json Copy.

---
 .swagger-codegen/swagger.json | 13886 --------------------------------
 1 file changed, 13886 deletions(-)
 delete mode 100644 .swagger-codegen/swagger.json

diff --git a/.swagger-codegen/swagger.json b/.swagger-codegen/swagger.json
deleted file mode 100644
index 2675b2a..0000000
--- a/.swagger-codegen/swagger.json
+++ /dev/null
@@ -1,13886 +0,0 @@
-{
-    "basePath": "/",
-    "definitions": {
-        "ACL": {
-            "description": "Api model for ACL",
-            "properties": {
-                "entityId": {
-                    "description": "The entity Id",
-                    "type": "string"
-                },
-                "modifyAcl": {
-                    "description": "List of users and user groups ids that have modify permission",
-                    "items": {
-                        "$ref": "#/definitions/AccessControlElement"
-                    },
-                    "type": "array",
-                    "uniqueItems": true
-                },
-                "viewAcl": {
-                    "description": "List of users and user group ids that have view permission",
-                    "items": {
-                        "$ref": "#/definitions/AccessControlElement"
-                    },
-                    "type": "array",
-                    "uniqueItems": true
-                }
-            },
-            "required": [
-                "entityId",
-                "modifyAcl",
-                "viewAcl"
-            ],
-            "type": "object"
-        },
-        "AWSBaseCredentials": {
-            "properties": {
-                "externalId": {
-                    "description": "The external id corresponding to the Role ARN",
-                    "example": "wave228",
-                    "type": "string"
-                },
-                "roleArn": {
-                    "description": "The Role ARN that the customer has created in AWS IAM to allow access to Wavefront",
-                    "example": "arn:aws:iam::<accountid>:role/<rolename>",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "externalId",
-                "roleArn"
-            ],
-            "type": "object"
-        },
-        "AccessControlElement": {
-            "properties": {
-                "id": {
-                    "type": "string"
-                },
-                "name": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AccessControlListSimple": {
-            "properties": {
-                "canModify": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "canView": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "Alert": {
-            "description": "Wavefront Alert",
-            "properties": {
-                "activeMaintenanceWindows": {
-                    "description": "The names of the active maintenance windows that are affecting this alert",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "additionalInformation": {
-                    "description": "User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc",
-                    "type": "string"
-                },
-                "alertType": {
-                    "description": "Alert type.",
-                    "enum": [
-                        "CLASSIC",
-                        "THRESHOLD"
-                    ],
-                    "type": "string"
-                },
-                "alertsLastDay": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "alertsLastMonth": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "alertsLastWeek": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "condition": {
-                    "description": "A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes",
-                    "type": "string"
-                },
-                "conditionQBEnabled": {
-                    "description": "Whether the condition query was created using the Query Builder.  Default false",
-                    "type": "boolean"
-                },
-                "conditionQBSerialization": {
-                    "description": "The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true",
-                    "type": "string"
-                },
-                "conditions": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Multi - alert conditions.",
-                    "type": "object"
-                },
-                "createUserId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "created": {
-                    "description": "When this alert was created, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "deleted": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "displayExpression": {
-                    "description": "A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted",
-                    "type": "string"
-                },
-                "displayExpressionQBEnabled": {
-                    "description": "Whether the display expression query was created using the Query Builder. Default false",
-                    "type": "boolean"
-                },
-                "displayExpressionQBSerialization": {
-                    "description": "The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true",
-                    "type": "string"
-                },
-                "event": {
-                    "$ref": "#/definitions/Event"
-                },
-                "failingHostLabelPairs": {
-                    "description": "Failing host/metric pairs",
-                    "items": {
-                        "$ref": "#/definitions/SourceLabelPair"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "hidden": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "hostsUsed": {
-                    "description": "Number of hosts checked by the alert condition",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "inMaintenanceHostLabelPairs": {
-                    "description": "Lists the sources that will not be checked for this alert, due to matching a maintenance window",
-                    "items": {
-                        "$ref": "#/definitions/SourceLabelPair"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "inTrash": {
-                    "type": "boolean"
-                },
-                "includeObsoleteMetrics": {
-                    "description": "Whether to include obsolete metrics in alert query",
-                    "type": "boolean"
-                },
-                "lastErrorMessage": {
-                    "description": "The last error encountered when running this alert's condition query",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "lastEventTime": {
-                    "description": "Start time (in epoch millis) of the last event associated with this alert.",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastFailedTime": {
-                    "description": "The time of the last error encountered when running this alert's condition query, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastNotificationMillis": {
-                    "description": "When this alert last caused a notification, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastProcessedMillis": {
-                    "description": "The time when this alert was last checked, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastQueryTime": {
-                    "description": "Last query time of the alert, averaged on hourly basis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "metricsUsed": {
-                    "description": "Number of metrics checked by the alert condition",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "minutes": {
-                    "description": "The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "noDataEvent": {
-                    "$ref": "#/definitions/Event",
-                    "description": "No data event related to the alert",
-                    "readOnly": true
-                },
-                "notificants": {
-                    "description": "A derived field listing the webhook ids used by this alert",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "notificationResendFrequencyMinutes": {
-                    "description": "How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "numPointsInFailureFrame": {
-                    "description": "Number of points scanned in alert query time frame.",
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "pointsScannedAtLastQuery": {
-                    "description": "A derived field recording the number of data points scanned when the system last computed this alert's condition",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "prefiringHostLabelPairs": {
-                    "description": "Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter",
-                    "items": {
-                        "$ref": "#/definitions/SourceLabelPair"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "processRateMinutes": {
-                    "description": "The interval between checks for this alert, in minutes.  Defaults to 1 minute",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "queryFailing": {
-                    "description": "Whether there was an exception when the alert condition last ran",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "resolveAfterMinutes": {
-                    "description": "The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "severity": {
-                    "description": "Severity of the alert",
-                    "enum": [
-                        "INFO",
-                        "SMOKE",
-                        "WARN",
-                        "SEVERE"
-                    ],
-                    "type": "string"
-                },
-                "severityList": {
-                    "description": "Alert severity list for multi-threshold type.",
-                    "items": {
-                        "enum": [
-                            "INFO",
-                            "SMOKE",
-                            "WARN",
-                            "SEVERE"
-                        ],
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "snoozed": {
-                    "description": "The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "sortAttr": {
-                    "description": "Attribute used for default alert sort that is derived from state and severity",
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "status": {
-                    "description": "Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "systemOwned": {
-                    "description": "Whether this alert is system-owned and not writeable",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "tags": {
-                    "$ref": "#/definitions/WFTags"
-                },
-                "target": {
-                    "description": "The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes",
-                    "type": "string"
-                },
-                "targetInfo": {
-                    "description": "List of alert targets display information that includes name, id and type.",
-                    "items": {
-                        "$ref": "#/definitions/TargetInfo"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "targets": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Targets for severity.",
-                    "type": "object"
-                },
-                "updateUserId": {
-                    "description": "The user that last updated this alert",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "updated": {
-                    "description": "When the alert was last updated, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "condition",
-                "minutes",
-                "name"
-            ],
-            "type": "object"
-        },
-        "AvroBackedStandardizedDTO": {
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "type": "string"
-                },
-                "deleted": {
-                    "type": "boolean"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AzureActivityLogConfiguration": {
-            "description": "Configurations specific to the Azure activity logs integration. Only applicable when the containing Credential has service=AZUREACTIVITYLOG",
-            "properties": {
-                "baseCredentials": {
-                    "$ref": "#/definitions/AzureBaseCredentials"
-                },
-                "categoryFilter": {
-                    "description": "A list of Azure ActivityLog categories to pull events for.Allowable values are ADMINISTRATIVE, SERVICEHEALTH, ALERT, AUTOSCALE, SECURITY",
-                    "items": {
-                        "enum": [
-                            "ADMINISTRATIVE",
-                            "SERVICEHEALTH",
-                            "ALERT",
-                            "AUTOSCALE",
-                            "SECURITY"
-                        ],
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AzureBaseCredentials": {
-            "properties": {
-                "clientId": {
-                    "description": "Client Id for an Azure service account within your project.",
-                    "type": "string"
-                },
-                "clientSecret": {
-                    "description": "Client Secret for an Azure service account within your project. Use 'saved_secret' to retain the client secret when updating.",
-                    "type": "string"
-                },
-                "tenant": {
-                    "description": "Tenant Id for an Azure service account within your project.",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "clientId",
-                "clientSecret",
-                "tenant"
-            ],
-            "type": "object"
-        },
-        "AzureConfiguration": {
-            "description": "Configurations specific to the Azure integration. Only applicable when the containing Credential has service=AZURE",
-            "properties": {
-                "baseCredentials": {
-                    "$ref": "#/definitions/AzureBaseCredentials"
-                },
-                "categoryFilter": {
-                    "description": "A list of Azure services (such as Microsoft.Compute/virtualMachines, Microsoft.Cache/redis etc) from which to pull metrics.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "metricFilterRegex": {
-                    "description": "A regular expression that a metric name must match (case-insensitively) in order to be ingested",
-                    "example": "^azure.(compute|network|dbforpostgresql).*$",
-                    "type": "string"
-                },
-                "resourceGroupFilter": {
-                    "description": "A list of Azure resource groups from which to pull metrics.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "BusinessActionGroupBasicDTO": {
-            "properties": {
-                "description": {
-                    "type": "string"
-                },
-                "displayName": {
-                    "type": "string"
-                },
-                "groupName": {
-                    "type": "string"
-                },
-                "requiredDefault": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "Chart": {
-            "description": "Representation of a Wavefront chart",
-            "properties": {
-                "base": {
-                    "description": "If the chart has a log-scale Y-axis, the base for the logarithms",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "chartAttributes": {
-                    "$ref": "#/definitions/JsonNode",
-                    "description": "Experimental field for chart attributes"
-                },
-                "chartSettings": {
-                    "$ref": "#/definitions/ChartSettings"
-                },
-                "description": {
-                    "description": "Description of the chart",
-                    "type": "string"
-                },
-                "includeObsoleteMetrics": {
-                    "description": "Whether to show obsolete metrics.  Default: false",
-                    "type": "boolean"
-                },
-                "interpolatePoints": {
-                    "description": "Whether to interpolate points in the charts produced. Default: true",
-                    "type": "boolean"
-                },
-                "name": {
-                    "description": "Name of the source",
-                    "type": "string"
-                },
-                "noDefaultEvents": {
-                    "description": "Whether to hide events related to the sources in the charts produced. Default false (i.e. shows events)",
-                    "type": "boolean"
-                },
-                "sources": {
-                    "description": "Query expression to plot on the chart",
-                    "items": {
-                        "$ref": "#/definitions/ChartSourceQuery"
-                    },
-                    "type": "array"
-                },
-                "summarization": {
-                    "description": "Summarization strategy for the chart.  MEAN is default",
-                    "enum": [
-                        "MEAN",
-                        "MEDIAN",
-                        "MIN",
-                        "MAX",
-                        "SUM",
-                        "COUNT",
-                        "LAST",
-                        "FIRST"
-                    ],
-                    "type": "string"
-                },
-                "units": {
-                    "description": "String to label the units of the chart on the Y-axis",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "name",
-                "sources"
-            ],
-            "type": "object"
-        },
-        "ChartSettings": {
-            "description": "Representation of the settings of a Wavefront chart",
-            "properties": {
-                "autoColumnTags": {
-                    "description": "deprecated",
-                    "type": "boolean"
-                },
-                "columnTags": {
-                    "description": "deprecated",
-                    "type": "string"
-                },
-                "customTags": {
-                    "description": "For the tabular view, a list of point tags to display when using the \"custom\" tag display mode",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "expectedDataSpacing": {
-                    "description": "Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "fixedLegendDisplayStats": {
-                    "description": "For a chart with a fixed legend, a list of statistics to display in the legend",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "fixedLegendEnabled": {
-                    "description": "Whether to enable a fixed tabular legend adjacent to the chart",
-                    "type": "boolean"
-                },
-                "fixedLegendFilterField": {
-                    "description": "Statistic to use for determining whether a series is displayed on the fixed legend",
-                    "enum": [
-                        "CURRENT",
-                        "MEAN",
-                        "MEDIAN",
-                        "SUM",
-                        "MIN",
-                        "MAX",
-                        "COUNT"
-                    ],
-                    "type": "string"
-                },
-                "fixedLegendFilterLimit": {
-                    "description": "Number of series to include in the fixed legend",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "fixedLegendFilterSort": {
-                    "description": "Whether to display \"Top\"- or \"Bottom\"-ranked series in the fixed legend",
-                    "enum": [
-                        "TOP",
-                        "BOTTOM"
-                    ],
-                    "type": "string"
-                },
-                "fixedLegendHideLabel": {
-                    "description": "deprecated",
-                    "type": "boolean"
-                },
-                "fixedLegendPosition": {
-                    "description": "Where the fixed legend should be displayed with respect to the chart",
-                    "enum": [
-                        "RIGHT",
-                        "TOP",
-                        "LEFT",
-                        "BOTTOM"
-                    ],
-                    "type": "string"
-                },
-                "fixedLegendUseRawStats": {
-                    "description": "If true, the legend uses non-summarized stats instead of summarized",
-                    "type": "boolean"
-                },
-                "groupBySource": {
-                    "description": "For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row",
-                    "type": "boolean"
-                },
-                "invertDynamicLegendHoverControl": {
-                    "description": "Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed)",
-                    "type": "boolean"
-                },
-                "lineType": {
-                    "description": "Plot interpolation type.  linear is default",
-                    "enum": [
-                        "linear",
-                        "step-before",
-                        "step-after",
-                        "basis",
-                        "cardinal",
-                        "monotone"
-                    ],
-                    "type": "string"
-                },
-                "max": {
-                    "description": "Max value of Y-axis.  Set to null or leave blank for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "min": {
-                    "description": "Min value of Y-axis.  Set to null or leave blank for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "numTags": {
-                    "description": "For the tabular view, how many point tags to display",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "plainMarkdownContent": {
-                    "description": "The Markdown content for a Markdown display, in plain text.  Use this field instead of `markdownContent`.",
-                    "type": "string"
-                },
-                "showHosts": {
-                    "description": "For the tabular view, whether to display sources.  Default: true",
-                    "type": "boolean"
-                },
-                "showLabels": {
-                    "description": "For the tabular view, whether to display labels.  Default: true",
-                    "type": "boolean"
-                },
-                "showRawValues": {
-                    "description": "For the tabular view, whether to display raw values.  Default: false",
-                    "type": "boolean"
-                },
-                "sortValuesDescending": {
-                    "description": "For the tabular view, whether to display display values in descending order.  Default: false",
-                    "type": "boolean"
-                },
-                "sparklineDecimalPrecision": {
-                    "description": "For the single stat view, the decimal precision of the displayed number",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "sparklineDisplayColor": {
-                    "description": "For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
-                    "type": "string"
-                },
-                "sparklineDisplayFontSize": {
-                    "description": "For the single stat view, the font size of the displayed text, in percent",
-                    "type": "string"
-                },
-                "sparklineDisplayHorizontalPosition": {
-                    "description": "For the single stat view, the horizontal position of the displayed text",
-                    "enum": [
-                        "MIDDLE",
-                        "LEFT",
-                        "RIGHT"
-                    ],
-                    "type": "string"
-                },
-                "sparklineDisplayPostfix": {
-                    "description": "For the single stat view, a string to append to the displayed text",
-                    "type": "string"
-                },
-                "sparklineDisplayPrefix": {
-                    "description": "For the single stat view, a string to add before the displayed text",
-                    "type": "string"
-                },
-                "sparklineDisplayValueType": {
-                    "description": "For the single stat view, whether to display the name of the query or the value of query",
-                    "enum": [
-                        "VALUE",
-                        "LABEL"
-                    ],
-                    "type": "string"
-                },
-                "sparklineDisplayVerticalPosition": {
-                    "description": "deprecated",
-                    "type": "string"
-                },
-                "sparklineFillColor": {
-                    "description": "For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
-                    "type": "string"
-                },
-                "sparklineLineColor": {
-                    "description": "For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
-                    "type": "string"
-                },
-                "sparklineSize": {
-                    "description": "For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE",
-                    "enum": [
-                        "BACKGROUND",
-                        "BOTTOM",
-                        "NONE"
-                    ],
-                    "type": "string"
-                },
-                "sparklineValueColorMapApplyTo": {
-                    "description": "For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND",
-                    "enum": [
-                        "TEXT",
-                        "BACKGROUND"
-                    ],
-                    "type": "string"
-                },
-                "sparklineValueColorMapColors": {
-                    "description": "For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "sparklineValueColorMapValues": {
-                    "description": "deprecated",
-                    "items": {
-                        "format": "int64",
-                        "type": "integer"
-                    },
-                    "type": "array"
-                },
-                "sparklineValueColorMapValuesV2": {
-                    "description": "For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors",
-                    "items": {
-                        "format": "float",
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "sparklineValueTextMapText": {
-                    "description": "For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "sparklineValueTextMapThresholds": {
-                    "description": "For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText",
-                    "items": {
-                        "format": "float",
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "stackType": {
-                    "description": "Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y=0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream",
-                    "enum": [
-                        "zero",
-                        "expand",
-                        "wiggle",
-                        "silhouette"
-                    ],
-                    "type": "string"
-                },
-                "tagMode": {
-                    "description": "For the tabular view, which mode to use to determine which point tags to display",
-                    "enum": [
-                        "all",
-                        "top",
-                        "custom"
-                    ],
-                    "type": "string"
-                },
-                "timeBasedColoring": {
-                    "description": "Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false",
-                    "type": "boolean"
-                },
-                "type": {
-                    "description": "Chart Type.  'line' refers to the Line Plot, 'scatter' to the Point Plot, 'stacked-area' to the Stacked Area plot, 'table' to the Tabular View, 'scatterploy-xy' to Scatter Plot, 'markdown-widget' to the Markdown display, and 'sparkline' to the Single Stat view",
-                    "enum": [
-                        "line",
-                        "scatterplot",
-                        "stacked-area",
-                        "table",
-                        "scatterplot-xy",
-                        "markdown-widget",
-                        "sparkline"
-                    ],
-                    "type": "string"
-                },
-                "windowSize": {
-                    "description": "Width, in minutes, of the time window to use for \"last\" windowing",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "windowing": {
-                    "description": "For the tabular view, whether to use the full time window for the query or the last X minutes",
-                    "enum": [
-                        "full",
-                        "last"
-                    ],
-                    "type": "string"
-                },
-                "xmax": {
-                    "description": "For x-y scatterplots, max value for X-axis.  Set null for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "xmin": {
-                    "description": "For x-y scatterplots, min value for X-axis.  Set null for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "y0ScaleSIBy1024": {
-                    "description": "Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)",
-                    "type": "boolean"
-                },
-                "y0UnitAutoscaling": {
-                    "description": "Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units",
-                    "type": "boolean"
-                },
-                "y1Max": {
-                    "description": "For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "y1Min": {
-                    "description": "For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "y1ScaleSIBy1024": {
-                    "description": "Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)",
-                    "type": "boolean"
-                },
-                "y1UnitAutoscaling": {
-                    "description": "Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units",
-                    "type": "boolean"
-                },
-                "y1Units": {
-                    "description": "For plots with multiple Y-axes, units for right-side Y-axis",
-                    "type": "string"
-                },
-                "ymax": {
-                    "description": "For x-y scatterplots, max value for Y-axis.  Set null for auto",
-                    "format": "double",
-                    "type": "number"
-                },
-                "ymin": {
-                    "description": "For x-y scatterplots, min value for Y-axis.  Set null for auto",
-                    "format": "double",
-                    "type": "number"
-                }
-            },
-            "required": [
-                "type"
-            ],
-            "type": "object"
-        },
-        "ChartSourceQuery": {
-            "properties": {
-                "disabled": {
-                    "description": "Whether the source is disabled",
-                    "type": "boolean"
-                },
-                "name": {
-                    "description": "Name of the source",
-                    "type": "string"
-                },
-                "query": {
-                    "description": "Query expression to plot on the chart",
-                    "type": "string"
-                },
-                "querybuilderEnabled": {
-                    "description": "Whether or not this source line should have the query builder enabled",
-                    "type": "boolean"
-                },
-                "querybuilderSerialization": {
-                    "description": "Opaque representation of the querybuilder",
-                    "type": "string"
-                },
-                "scatterPlotSource": {
-                    "description": "For scatter plots, does this query source the X-axis or the Y-axis",
-                    "enum": [
-                        "X",
-                        "Y"
-                    ],
-                    "type": "string"
-                },
-                "secondaryAxis": {
-                    "description": "Determines if this source relates to the right hand Y-axis or not",
-                    "type": "boolean"
-                },
-                "sourceColor": {
-                    "description": "The color used to draw all results from this source (auto if unset)",
-                    "type": "string"
-                },
-                "sourceDescription": {
-                    "description": "A description for the purpose of this source",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "name",
-                "query"
-            ],
-            "type": "object"
-        },
-        "CloudIntegration": {
-            "description": "Wavefront Cloud Integration",
-            "properties": {
-                "additionalTags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A list of point tag key-values to add to every point ingested using this integration",
-                    "type": "object"
-                },
-                "azure": {
-                    "$ref": "#/definitions/AzureConfiguration"
-                },
-                "azureActivityLog": {
-                    "$ref": "#/definitions/AzureActivityLogConfiguration"
-                },
-                "cloudTrail": {
-                    "$ref": "#/definitions/CloudTrailConfiguration"
-                },
-                "cloudWatch": {
-                    "$ref": "#/definitions/CloudWatchConfiguration"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "deleted": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "disabled": {
-                    "description": "True when an aws credential failed to authenticate.",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "ec2": {
-                    "$ref": "#/definitions/EC2Configuration"
-                },
-                "forceSave": {
-                    "type": "boolean"
-                },
-                "gcp": {
-                    "$ref": "#/definitions/GCPConfiguration"
-                },
-                "gcpBilling": {
-                    "$ref": "#/definitions/GCPBillingConfiguration"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "inTrash": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "lastError": {
-                    "description": "Digest of the last error encountered by Wavefront servers when fetching data using this integration",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "lastErrorEvent": {
-                    "$ref": "#/definitions/Event"
-                },
-                "lastErrorMs": {
-                    "description": "Time, in epoch millis, of the last error encountered by Wavefront servers when fetching data using this integration",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastMetricCount": {
-                    "description": "Number of metrics / events ingested by this integration the last time it ran",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastProcessingTimestamp": {
-                    "description": "Time, in epoch millis, that this integration was last processed",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastProcessorId": {
-                    "description": "Opaque id of the last Wavefront integrations service to act on this integration",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "lastReceivedDataPointMs": {
-                    "description": "Time that this integration last received a data point, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "name": {
-                    "description": "The human-readable name of this integration",
-                    "type": "string"
-                },
-                "newRelic": {
-                    "$ref": "#/definitions/NewRelicConfiguration"
-                },
-                "service": {
-                    "description": "A value denoting which cloud service this integration integrates with",
-                    "enum": [
-                        "CLOUDWATCH",
-                        "CLOUDTRAIL",
-                        "EC2",
-                        "GCP",
-                        "GCPBILLING",
-                        "TESLA",
-                        "AZURE",
-                        "AZUREACTIVITYLOG"
-                    ],
-                    "type": "string"
-                },
-                "serviceRefreshRateInMins": {
-                    "description": "Service refresh rate in minutes.",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "tesla": {
-                    "$ref": "#/definitions/TeslaConfiguration"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "name",
-                "service"
-            ],
-            "type": "object"
-        },
-        "CloudTrailConfiguration": {
-            "description": "Configurations specific to the CloudTrail AWS integration.  Only applicable when the containing Credential has service=CLOUDTRAIL",
-            "properties": {
-                "baseCredentials": {
-                    "$ref": "#/definitions/AWSBaseCredentials"
-                },
-                "bucketName": {
-                    "description": "Name of the S3 bucket where CloudTrail logs are stored",
-                    "type": "string"
-                },
-                "filterRule": {
-                    "description": "Rule to filter cloud trail log event.",
-                    "type": "string"
-                },
-                "prefix": {
-                    "description": "The common prefix, if any, appended to all CloudTrail log files",
-                    "type": "string"
-                },
-                "region": {
-                    "description": "The AWS region of the S3 bucket where CloudTrail logs are stored",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "bucketName",
-                "region"
-            ],
-            "type": "object"
-        },
-        "CloudWatchConfiguration": {
-            "description": "Configuration specific to the CloudWatch AWS integration.  Only applicable when the containing Credential has service=CLOUDWATCH",
-            "properties": {
-                "baseCredentials": {
-                    "$ref": "#/definitions/AWSBaseCredentials"
-                },
-                "instanceSelectionTags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed",
-                    "type": "object"
-                },
-                "metricFilterRegex": {
-                    "description": "A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested",
-                    "example": "^aws.(billing|instance|sqs|sns|reservedInstance|ebs|route53.health|ec2.status|elb).*$",
-                    "type": "string"
-                },
-                "namespaces": {
-                    "description": "A list of namespace that limit what we query from CloudWatch.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "pointTagFilterRegex": {
-                    "description": "A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested",
-                    "example": "(region|name)",
-                    "type": "string"
-                },
-                "volumeSelectionTags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed",
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "CustomerFacingUserObject": {
-            "properties": {
-                "customer": {
-                    "description": "The id of the customer to which the user belongs",
-                    "type": "string"
-                },
-                "escapedIdentifier": {
-                    "description": "URL Escaped Identifier",
-                    "type": "string"
-                },
-                "gravatarUrl": {
-                    "description": "URL id For User's gravatar (see gravatar.com), if one exists.",
-                    "type": "string"
-                },
-                "groups": {
-                    "description": "List of permission groups this user has been granted access to",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "id": {
-                    "description": "The unique identifier of this user, which should be their valid email address",
-                    "type": "string"
-                },
-                "identifier": {
-                    "description": "The unique identifier of this user, which should be their valid email address",
-                    "type": "string"
-                },
-                "lastSuccessfulLogin": {
-                    "description": "The last time the user logged in, in epoch milliseconds",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "self": {
-                    "description": "Whether this user is the one calling the API",
-                    "type": "boolean"
-                },
-                "userGroups": {
-                    "description": "List of user group identifiers this user belongs to",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "customer",
-                "id",
-                "identifier",
-                "self"
-            ],
-            "type": "object"
-        },
-        "CustomerPreferences": {
-            "description": "Wavefront customer preferences entity",
-            "properties": {
-                "blacklistedEmails": {
-                    "additionalProperties": {
-                        "format": "int32",
-                        "type": "integer"
-                    },
-                    "description": "List of blacklisted emails of the customer",
-                    "type": "object"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "type": "string"
-                },
-                "customerId": {
-                    "description": "The id of the customer preferences are attached to",
-                    "type": "string"
-                },
-                "defaultUserGroups": {
-                    "description": "List of default user groups of the customer",
-                    "items": {
-                        "$ref": "#/definitions/UserGroup"
-                    },
-                    "type": "array"
-                },
-                "deleted": {
-                    "type": "boolean"
-                },
-                "grantModifyAccessToEveryone": {
-                    "description": "Whether modify access of new entites is granted to Everyone or to the Creator",
-                    "type": "boolean"
-                },
-                "hiddenMetricPrefixes": {
-                    "additionalProperties": {
-                        "format": "int32",
-                        "type": "integer"
-                    },
-                    "description": "Metric prefixes which should be hidden from user",
-                    "type": "object"
-                },
-                "hideTSWhenQuerybuilderShown": {
-                    "description": "Whether to hide TS source input when Querybuilder is shown",
-                    "type": "boolean"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "invitePermissions": {
-                    "description": "List of permissions that are assigned to newly invited users",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "landingDashboardSlug": {
-                    "description": "Dashboard where user will be redirected from landing page",
-                    "type": "string"
-                },
-                "showOnboarding": {
-                    "description": "Whether to show onboarding for any new user without an override",
-                    "type": "boolean"
-                },
-                "showQuerybuilderByDefault": {
-                    "description": "Whether the Querybuilder is shown by default",
-                    "type": "boolean"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "customerId",
-                "grantModifyAccessToEveryone",
-                "hideTSWhenQuerybuilderShown",
-                "showOnboarding",
-                "showQuerybuilderByDefault"
-            ],
-            "type": "object"
-        },
-        "CustomerPreferencesUpdating": {
-            "description": "Wavefront customer preferences updating model",
-            "properties": {
-                "defaultUserGroups": {
-                    "description": "List of default user groups of the customer",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "grantModifyAccessToEveryone": {
-                    "description": "Whether modify access of new entites is granted to Everyone or to the Creator",
-                    "type": "boolean"
-                },
-                "hideTSWhenQuerybuilderShown": {
-                    "description": "Whether to hide TS source input when Querybuilder is shown",
-                    "type": "boolean"
-                },
-                "invitePermissions": {
-                    "description": "List of invite permissions to apply for each new user",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "landingDashboardSlug": {
-                    "description": "Dashboard where user will be redirected from landing page",
-                    "type": "string"
-                },
-                "showOnboarding": {
-                    "description": "Whether to show onboarding for any new user without an override",
-                    "type": "boolean"
-                },
-                "showQuerybuilderByDefault": {
-                    "description": "Whether the Querybuilder is shown by default",
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "grantModifyAccessToEveryone",
-                "hideTSWhenQuerybuilderShown",
-                "showOnboarding",
-                "showQuerybuilderByDefault"
-            ],
-            "type": "object"
-        },
-        "Dashboard": {
-            "description": "Wavefront dashboard entity",
-            "properties": {
-                "acl": {
-                    "$ref": "#/definitions/AccessControlListSimple",
-                    "readOnly": true
-                },
-                "canUserModify": {
-                    "type": "boolean"
-                },
-                "chartTitleBgColor": {
-                    "description": "Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue)",
-                    "type": "string"
-                },
-                "chartTitleColor": {
-                    "description": "Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue)",
-                    "type": "string"
-                },
-                "chartTitleScalar": {
-                    "description": "Scale (normally 100) of chart title text size",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "customer": {
-                    "description": "id of the customer to which this dashboard belongs",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "defaultEndTime": {
-                    "description": "Default end time in milliseconds to query charts",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "defaultStartTime": {
-                    "description": "Default start time in milliseconds to query charts",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "defaultTimeWindow": {
-                    "description": "Default time window to query charts",
-                    "type": "string"
-                },
-                "deleted": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "description": {
-                    "description": "Human-readable description of the dashboard",
-                    "type": "string"
-                },
-                "displayDescription": {
-                    "description": "Whether the dashboard description section is opened by default when the dashboard is shown",
-                    "type": "boolean"
-                },
-                "displayQueryParameters": {
-                    "description": "Whether the dashboard parameters section is opened by default when the dashboard is shown",
-                    "type": "boolean"
-                },
-                "displaySectionTableOfContents": {
-                    "description": "Whether the \"pills\" quick-linked the sections of the dashboard are displayed by default when the dashboard is shown",
-                    "type": "boolean"
-                },
-                "eventFilterType": {
-                    "description": "How charts belonging to this dashboard should display events.  BYCHART is default if unspecified",
-                    "enum": [
-                        "BYCHART",
-                        "AUTOMATIC",
-                        "ALL",
-                        "NONE",
-                        "BYDASHBOARD",
-                        "BYCHARTANDDASHBOARD"
-                    ],
-                    "type": "string"
-                },
-                "eventQuery": {
-                    "description": "Event query to run on dashboard charts",
-                    "type": "string"
-                },
-                "favorite": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "hidden": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "id": {
-                    "description": "Unique identifier, also URL slug, of the dashboard",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "Name of the dashboard",
-                    "type": "string"
-                },
-                "numCharts": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "numFavorites": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "orphan": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "parameterDetails": {
-                    "additionalProperties": {
-                        "$ref": "#/definitions/DashboardParameterValue"
-                    },
-                    "description": "The current (as of Wavefront 4.0) JSON representation of dashboard parameters.  This is a map from a parameter name to its representation",
-                    "type": "object"
-                },
-                "parameters": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Deprecated.  An obsolete representation of dashboard parameters",
-                    "type": "object"
-                },
-                "sections": {
-                    "description": "Dashboard chart sections",
-                    "items": {
-                        "$ref": "#/definitions/DashboardSection"
-                    },
-                    "type": "array"
-                },
-                "systemOwned": {
-                    "description": "Whether this dashboard is system-owned and not writeable",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "tags": {
-                    "$ref": "#/definitions/WFTags"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "url": {
-                    "description": "Unique identifier, also URL slug, of the dashboard",
-                    "type": "string"
-                },
-                "viewsLastDay": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "viewsLastMonth": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "viewsLastWeek": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                }
-            },
-            "required": [
-                "id",
-                "name",
-                "sections",
-                "url"
-            ],
-            "type": "object"
-        },
-        "DashboardParameterValue": {
-            "properties": {
-                "allowAll": {
-                    "type": "boolean"
-                },
-                "defaultValue": {
-                    "type": "string"
-                },
-                "description": {
-                    "type": "string"
-                },
-                "dynamicFieldType": {
-                    "enum": [
-                        "SOURCE",
-                        "SOURCE_TAG",
-                        "METRIC_NAME",
-                        "TAG_KEY",
-                        "MATCHING_SOURCE_TAG"
-                    ],
-                    "type": "string"
-                },
-                "hideFromView": {
-                    "type": "boolean"
-                },
-                "label": {
-                    "type": "string"
-                },
-                "multivalue": {
-                    "type": "boolean"
-                },
-                "parameterType": {
-                    "enum": [
-                        "SIMPLE",
-                        "LIST",
-                        "DYNAMIC"
-                    ],
-                    "type": "string"
-                },
-                "queryValue": {
-                    "type": "string"
-                },
-                "reverseDynSort": {
-                    "description": "Whether to reverse alphabetically sort the returned result.",
-                    "type": "boolean"
-                },
-                "tagKey": {
-                    "type": "string"
-                },
-                "valuesToReadableStrings": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "DashboardSection": {
-            "properties": {
-                "name": {
-                    "description": "Name of this section",
-                    "type": "string"
-                },
-                "rows": {
-                    "description": "Rows of this section",
-                    "items": {
-                        "$ref": "#/definitions/DashboardSectionRow"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "name",
-                "rows"
-            ],
-            "type": "object"
-        },
-        "DashboardSectionRow": {
-            "properties": {
-                "charts": {
-                    "description": "Charts in this section row",
-                    "items": {
-                        "$ref": "#/definitions/Chart"
-                    },
-                    "type": "array"
-                },
-                "heightFactor": {
-                    "description": "Scalar for the height of this row. 100 is normal and default. 50 is half height",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "required": [
-                "charts"
-            ],
-            "type": "object"
-        },
-        "DerivedMetricDefinition": {
-            "description": "Wavefront Derived Metric",
-            "properties": {
-                "additionalInformation": {
-                    "description": "User-supplied additional explanatory information for the derived metric",
-                    "type": "string"
-                },
-                "createUserId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "created": {
-                    "description": "When this derived metric was created, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "deleted": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "hostsUsed": {
-                    "description": "Number of hosts checked by the query",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "inTrash": {
-                    "type": "boolean"
-                },
-                "includeObsoleteMetrics": {
-                    "description": "Whether to include obsolete metrics in query",
-                    "type": "boolean"
-                },
-                "lastErrorMessage": {
-                    "description": "The last error encountered when running the query",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "lastFailedTime": {
-                    "description": "The time of the last error encountered when running the query, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastProcessedMillis": {
-                    "description": "The last time when the derived metric query was run, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastQueryTime": {
-                    "description": "Time for the query execute, averaged on hourly basis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "metricsUsed": {
-                    "description": "Number of metrics checked by the query",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "minutes": {
-                    "description": "How frequently the query generating the derived metric is run",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "pointsScannedAtLastQuery": {
-                    "description": "A derived field recording the number of data points scanned when the system last computed the query",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "processRateMinutes": {
-                    "description": "The interval between executing the query, in minutes.  Defaults to 1 minute",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "query": {
-                    "description": "A Wavefront query that is evaluated at regular intervals (default 1m).",
-                    "type": "string"
-                },
-                "queryFailing": {
-                    "description": "Whether there was an exception when the query last ran",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "queryQBEnabled": {
-                    "description": "Whether the query was created using the Query Builder. Default false",
-                    "type": "boolean"
-                },
-                "queryQBSerialization": {
-                    "description": "The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true",
-                    "type": "string"
-                },
-                "status": {
-                    "description": "Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "tags": {
-                    "$ref": "#/definitions/WFTags"
-                },
-                "updateUserId": {
-                    "description": "The user that last updated this derived metric definition",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "updated": {
-                    "description": "When the derived metric definition was last updated, in epoch millis",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "minutes",
-                "name",
-                "query"
-            ],
-            "type": "object"
-        },
-        "EC2Configuration": {
-            "description": "Configurations specific to the EC2 AWS integration.  Only applicable when the containing Credential has service=EC2",
-            "properties": {
-                "baseCredentials": {
-                    "$ref": "#/definitions/AWSBaseCredentials"
-                },
-                "hostNameTags": {
-                    "description": "A list of AWS instance tags that, when found, will be used as the \"source\" name in a series.  Default: [\"hostname\", \"host\", \"name\"].  If no tag in this list is found, the series source is set to the instance id.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "Event": {
-            "description": "Wavefront Event",
-            "properties": {
-                "annotations": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A string->string map of additional annotations on the event",
-                    "type": "object"
-                },
-                "canClose": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "canDelete": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "createdAt": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "creatorType": {
-                    "items": {
-                        "enum": [
-                            "USER",
-                            "ALERT",
-                            "SYSTEM"
-                        ],
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                },
-                "endTime": {
-                    "description": "End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "hosts": {
-                    "description": "A list of sources/hosts affected by the event",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "isEphemeral": {
-                    "description": "Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "isUserEvent": {
-                    "description": "Whether this event was created by a user, versus the system.  Default: system",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "name": {
-                    "description": "The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value",
-                    "type": "string"
-                },
-                "runningState": {
-                    "enum": [
-                        "ONGOING",
-                        "PENDING",
-                        "ENDED"
-                    ],
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "startTime": {
-                    "description": "Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "summarizedEvents": {
-                    "description": "In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "table": {
-                    "description": "The customer to which the event belongs",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "tags": {
-                    "description": "A list of event tags",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "updatedAt": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "annotations",
-                "name",
-                "startTime"
-            ],
-            "type": "object"
-        },
-        "EventSearchRequest": {
-            "properties": {
-                "cursor": {
-                    "description": "The id (exclusive) from which search results resume returning.  Users should supply an entity 'id' to this property.  Its main purpose is to resume where a previous search left off because of the 'limit' parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results",
-                    "type": "string"
-                },
-                "limit": {
-                    "description": "The number of results to return.  Default: 100",
-                    "example": 100,
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "query": {
-                    "description": "A list of queries by which to limit the search results",
-                    "items": {
-                        "$ref": "#/definitions/SearchQuery"
-                    },
-                    "type": "array"
-                },
-                "sortTimeAscending": {
-                    "description": "Whether to sort event results ascending in start time.  Default: false",
-                    "type": "boolean"
-                },
-                "timeRange": {
-                    "$ref": "#/definitions/EventTimeRange"
-                }
-            },
-            "type": "object"
-        },
-        "EventTimeRange": {
-            "description": "Refinement of time range over which to search (for events).  Operates on the *start* time of the event.",
-            "properties": {
-                "earliestStartTimeEpochMillis": {
-                    "description": "Start of search time window, in milliseconds since the Unix Epoch.  Events whose start time occurs after this value will be returned.  If no value is supplied, defaults to 2 hours prior the present time.",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "latestStartTimeEpochMillis": {
-                    "description": "End of the search time window, in milliseconds since the Unix Epoch.  Events whose start time occurs before this value will be returned.   If no value is supplied, defaults to now.",
-                    "format": "int64",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "ExternalLink": {
-            "description": "Links that can be generated from Wavefront to other analytical platforms",
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "description": {
-                    "description": "Human-readable description for this external link",
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "metricFilterRegex": {
-                    "description": "Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "Name of the external link.  Will be displayed in context (right-click) menus on charts",
-                    "type": "string"
-                },
-                "pointTagFilterRegexes": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed",
-                    "type": "object"
-                },
-                "sourceFilterRegex": {
-                    "description": "Controls whether a link displayed in the context menu of a highlighted series.  If present, the source name of the highlighted series must match this regular expression in order for the link to be displayed",
-                    "type": "string"
-                },
-                "template": {
-                    "description": "The mustache template for this link.  This template must expand to a full URL, including scheme, origin, etc",
-                    "type": "string"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "description",
-                "name",
-                "template"
-            ],
-            "type": "object"
-        },
-        "FacetResponse": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "FacetSearchRequestContainer": {
-            "properties": {
-                "facetQuery": {
-                    "description": "A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned.",
-                    "type": "string"
-                },
-                "facetQueryMatchingMethod": {
-                    "description": "The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.",
-                    "enum": [
-                        "CONTAINS",
-                        "STARTSWITH",
-                        "EXACT",
-                        "TAGPATH"
-                    ],
-                    "type": "string"
-                },
-                "limit": {
-                    "description": "The number of results to return.  Default: 100",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "offset": {
-                    "description": "The number of results to skip before returning values.  Default: 0",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "query": {
-                    "description": "A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned",
-                    "items": {
-                        "$ref": "#/definitions/SearchQuery"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "FacetsResponseContainer": {
-            "properties": {
-                "facets": {
-                    "additionalProperties": {
-                        "items": {
-                            "type": "string"
-                        },
-                        "type": "array"
-                    },
-                    "description": "The requested facets, returned in a map whose key is the facet property and whose value is a list of facet values",
-                    "type": "object"
-                },
-                "limit": {
-                    "description": "The requested limit",
-                    "format": "int64",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "FacetsSearchRequestContainer": {
-            "properties": {
-                "facetQuery": {
-                    "description": "A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned",
-                    "type": "string"
-                },
-                "facetQueryMatchingMethod": {
-                    "description": "The matching method used to filter when 'facetQuery' is used. Defaults to CONTAINS.",
-                    "enum": [
-                        "CONTAINS",
-                        "STARTSWITH",
-                        "EXACT",
-                        "TAGPATH"
-                    ],
-                    "type": "string"
-                },
-                "facets": {
-                    "description": "A list of facets (property keys) to return values from found in entities matching 'query'.  Examples are 'tags', 'creatorId', etc",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "description": "The number of results to return.  Default 100",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "query": {
-                    "description": "A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of 'entity search results'.  All facets listed in the 'facets' search parameter of all entities within 'entity search results' are scanned to produce the search results (of facet values).",
-                    "items": {
-                        "$ref": "#/definitions/SearchQuery"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "facets"
-            ],
-            "type": "object"
-        },
-        "GCPBillingConfiguration": {
-            "description": "Configurations specific to the Google Cloud Platform Billing integration.  Only applicable when the containing Credential has service=GCPBilling",
-            "properties": {
-                "gcpApiKey": {
-                    "description": "API key for Google Cloud Platform (GCP). Use 'saved_api_key' to retain existing API key when updating",
-                    "type": "string"
-                },
-                "gcpJsonKey": {
-                    "description": "Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.",
-                    "type": "string"
-                },
-                "projectId": {
-                    "description": "The Google Cloud Platform (GCP) project id.",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "gcpApiKey",
-                "gcpJsonKey",
-                "projectId"
-            ],
-            "type": "object"
-        },
-        "GCPConfiguration": {
-            "description": "Configurations specific to the Google Cloud Platform integration.  Only applicable when the containing Credential has service=GCP",
-            "properties": {
-                "categoriesToFetch": {
-                    "description": "A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN",
-                    "items": {
-                        "enum": [
-                            "APPENGINE",
-                            "BIGQUERY",
-                            "BIGTABLE",
-                            "CLOUDFUNCTIONS",
-                            "CLOUDIOT",
-                            "CLOUDSQL",
-                            "CLOUDTASKS",
-                            "COMPUTE",
-                            "CONTAINER",
-                            "DATAFLOW",
-                            "DATAPROC",
-                            "DATASTORE",
-                            "FIREBASEDATABASE",
-                            "FIREBASEHOSTING",
-                            "INTERCONNECT",
-                            "LOADBALANCING",
-                            "LOGGING",
-                            "ML",
-                            "MONITORING",
-                            "PUBSUB",
-                            "REDIS",
-                            "ROUTER",
-                            "SERVICERUNTIME",
-                            "SPANNER",
-                            "STORAGE",
-                            "TPU",
-                            "VPN"
-                        ],
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "gcpJsonKey": {
-                    "description": "Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use '{\"project_id\": \"%s\"}' to retain the existing key when updating.",
-                    "type": "string"
-                },
-                "metricFilterRegex": {
-                    "description": "A regular expression that a metric name must match (case-insensitively) in order to be ingested",
-                    "example": "^gcp.(compute|container|pubsub).*$",
-                    "type": "string"
-                },
-                "projectId": {
-                    "description": "The Google Cloud Platform (GCP) project id.",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "gcpJsonKey",
-                "projectId"
-            ],
-            "type": "object"
-        },
-        "HistoryEntry": {
-            "description": "An entry in the edit-history of an entity such as alert or dashboard",
-            "properties": {
-                "changeDescription": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "inTrash": {
-                    "type": "boolean"
-                },
-                "updateTime": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "updateUser": {
-                    "type": "string"
-                },
-                "version": {
-                    "format": "int64",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "HistoryResponse": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/HistoryEntry"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "InstallAlerts": {
-            "description": "Install Alerts",
-            "properties": {
-                "target": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "Integration": {
-            "description": "Wavefront integrations are a set of incoming metrics along with a bundle of functionality (initially dashboards but alerts, webhooks, and the like in the near future",
-            "properties": {
-                "alerts": {
-                    "description": "A list of alerts belonging to this integration",
-                    "items": {
-                        "$ref": "#/definitions/IntegrationAlert"
-                    },
-                    "type": "array"
-                },
-                "aliasIntegrations": {
-                    "description": "If set, a list of objects describing integrations that alias this one.",
-                    "items": {
-                        "$ref": "#/definitions/IntegrationAlias"
-                    },
-                    "type": "array"
-                },
-                "aliasOf": {
-                    "description": "If set, designates this integration as an alias integration, of the integration whose id is specified.",
-                    "type": "string"
-                },
-                "baseUrl": {
-                    "description": "Base URL for this integration's assets",
-                    "type": "string"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "type": "string"
-                },
-                "dashboards": {
-                    "description": "A list of dashboards belonging to this integration",
-                    "items": {
-                        "$ref": "#/definitions/IntegrationDashboard"
-                    },
-                    "type": "array"
-                },
-                "deleted": {
-                    "type": "boolean"
-                },
-                "description": {
-                    "description": "Integration description",
-                    "type": "string"
-                },
-                "icon": {
-                    "description": "URI path to the integration icon",
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "metrics": {
-                    "$ref": "#/definitions/IntegrationMetrics"
-                },
-                "name": {
-                    "description": "Integration name",
-                    "type": "string"
-                },
-                "overview": {
-                    "description": "Descriptive text giving an overview of integration functionality",
-                    "type": "string"
-                },
-                "setup": {
-                    "description": "How the integration will be set-up",
-                    "type": "string"
-                },
-                "status": {
-                    "$ref": "#/definitions/IntegrationStatus"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "type": "string"
-                },
-                "version": {
-                    "description": "Integration version string",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "description",
-                "icon",
-                "name",
-                "version"
-            ],
-            "type": "object"
-        },
-        "IntegrationAlert": {
-            "description": "A alert definition belonging to a particular integration",
-            "properties": {
-                "alertObj": {
-                    "$ref": "#/definitions/Alert"
-                },
-                "description": {
-                    "description": "Alert description",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "Alert name",
-                    "type": "string"
-                },
-                "url": {
-                    "description": "URL path to the JSON definition of this alert",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "description",
-                "name",
-                "url"
-            ],
-            "type": "object"
-        },
-        "IntegrationAlias": {
-            "description": "An integration that aliases this one",
-            "properties": {
-                "baseUrl": {
-                    "description": "Base URL of this alias Integration",
-                    "type": "string"
-                },
-                "description": {
-                    "description": "Description of the alias Integration",
-                    "type": "string"
-                },
-                "icon": {
-                    "description": "Icon path of the alias Integration",
-                    "type": "string"
-                },
-                "id": {
-                    "description": "ID of the alias Integration",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "Name of the alias Integration",
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "IntegrationDashboard": {
-            "description": "A dashboard definition belonging to a particular integration",
-            "properties": {
-                "dashboardObj": {
-                    "$ref": "#/definitions/Dashboard"
-                },
-                "description": {
-                    "description": "Dashboard description",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "Dashboard name",
-                    "type": "string"
-                },
-                "url": {
-                    "description": "URL path to the JSON definition of this dashboard",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "description",
-                "name",
-                "url"
-            ],
-            "type": "object"
-        },
-        "IntegrationManifestGroup": {
-            "description": "A functional group of integrations defined together in a manifest",
-            "properties": {
-                "integrationObjs": {
-                    "description": "Materialized JSONs for integrations belonging to this group, as referenced by `integrations`",
-                    "items": {
-                        "$ref": "#/definitions/Integration"
-                    },
-                    "type": "array"
-                },
-                "integrations": {
-                    "description": "A list of paths to JSON definitions for integrations in this group",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "subtitle": {
-                    "description": "Subtitle of this integration group",
-                    "type": "string"
-                },
-                "title": {
-                    "description": "Title of this integration group",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "integrations",
-                "subtitle",
-                "title"
-            ],
-            "type": "object"
-        },
-        "IntegrationMetrics": {
-            "description": "Definition of the metrics belonging this integration",
-            "properties": {
-                "chartObjs": {
-                    "description": "Chart JSONs materialized from the links in `charts`",
-                    "items": {
-                        "$ref": "#/definitions/Chart"
-                    },
-                    "type": "array"
-                },
-                "charts": {
-                    "description": "URLs for JSON definitions of charts that display info about this integration's metrics",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "display": {
-                    "description": "Set of metrics that are displayed in the metric panel during integration setup",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ppsDimensions": {
-                    "description": "For reported points belonging to this integration, these point tags are escalated to the internal point-rate counters so that reporting can be broken out by these dimensions",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "prefixes": {
-                    "description": "Set of metric prefix namespaces belonging to this integration",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "required": {
-                    "description": "Set of \"canary\" metrics that define the \"liveness\" of this integration's metric ingestion",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "charts",
-                "display",
-                "prefixes",
-                "required"
-            ],
-            "type": "object"
-        },
-        "IntegrationStatus": {
-            "description": "Status of this integration",
-            "properties": {
-                "alertStatuses": {
-                    "additionalProperties": {
-                        "enum": [
-                            "VISIBLE",
-                            "HIDDEN",
-                            "NOT_LOADED"
-                        ],
-                        "type": "string"
-                    },
-                    "description": "A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, `VISIBLE`, `HIDDEN`, and `NOT_LOADED`",
-                    "readOnly": true,
-                    "type": "object"
-                },
-                "contentStatus": {
-                    "description": "Status of integration content, e.g. dashboards",
-                    "enum": [
-                        "INVALID",
-                        "NOT_LOADED",
-                        "HIDDEN",
-                        "VISIBLE"
-                    ],
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "installStatus": {
-                    "description": "Whether the customer or an automated process has installed the dashboards for this integration",
-                    "enum": [
-                        "UNDECIDED",
-                        "UNINSTALLED",
-                        "INSTALLED"
-                    ],
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "metricStatuses": {
-                    "additionalProperties": {
-                        "$ref": "#/definitions/MetricStatus"
-                    },
-                    "description": "A Map from names of the required metrics to an object representing their reporting status.  The reporting status object has 3 boolean fields denoting whether the metric has been received during the corresponding time period: `ever`, `recentExceptNow`, and `now`.  `now` is on the order of a few hours, and `recentExceptNow` is on the order of the past few days, excluding the period considered to be `now`.",
-                    "readOnly": true,
-                    "type": "object"
-                }
-            },
-            "required": [
-                "alertStatuses",
-                "contentStatus",
-                "installStatus",
-                "metricStatuses"
-            ],
-            "type": "object"
-        },
-        "IteratorEntryStringJsonNode": {
-            "type": "object"
-        },
-        "IteratorJsonNode": {
-            "type": "object"
-        },
-        "IteratorString": {
-            "type": "object"
-        },
-        "JsonNode": {
-            "type": "object"
-        },
-        "LogicalType": {
-            "properties": {
-                "name": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "MaintenanceWindow": {
-            "description": "Wavefront maintenance window entity",
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "customerId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "endTimeInSeconds": {
-                    "description": "The time in epoch seconds when this maintenance window will end",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "eventName": {
-                    "description": "The name of an event associated with the creation/update of this maintenance window",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "hostTagGroupHostNamesGroupAnded": {
-                    "description": "If true, a source/host must be in 'relevantHostNames' and have tags matching the specification formed by 'relevantHostTags' and 'relevantHostTagsAnded' in order for this maintenance window to apply. If false, a source/host must either be in 'relevantHostNames' or match 'relevantHostTags' and 'relevantHostTagsAnded'. Default: false",
-                    "type": "boolean"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "reason": {
-                    "description": "The purpose of this maintenance window",
-                    "type": "string"
-                },
-                "relevantCustomerTags": {
-                    "description": "List of alert tags whose matching alerts will be put into maintenance because of this maintenance window",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "relevantHostNames": {
-                    "description": "List of source/host names that will be put into maintenance because of this maintenance window",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "relevantHostTags": {
-                    "description": "List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "relevantHostTagsAnded": {
-                    "description": "Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a source/host must contain one of the tags. Default: false",
-                    "type": "boolean"
-                },
-                "runningState": {
-                    "enum": [
-                        "ONGOING",
-                        "PENDING",
-                        "ENDED"
-                    ],
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "sortAttr": {
-                    "description": "Numeric value used in default sorting",
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "startTimeInSeconds": {
-                    "description": "The time in epoch seconds when this maintenance window will start",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "title": {
-                    "description": "Title of this maintenance window",
-                    "type": "string"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "endTimeInSeconds",
-                "reason",
-                "relevantCustomerTags",
-                "startTimeInSeconds",
-                "title"
-            ],
-            "type": "object"
-        },
-        "Message": {
-            "description": "A message for display to a particular user, all users within a customer, or all users on a cluster",
-            "properties": {
-                "attributes": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A string->string map of additional properties associated with this message",
-                    "type": "object"
-                },
-                "content": {
-                    "description": "Message content",
-                    "type": "string"
-                },
-                "display": {
-                    "description": "The form of display for this message",
-                    "enum": [
-                        "BANNER",
-                        "TOASTER"
-                    ],
-                    "type": "string"
-                },
-                "endEpochMillis": {
-                    "description": "When this message will stop being displayed, in epoch millis",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "read": {
-                    "description": "A derived field for whether the current user has read this message",
-                    "type": "boolean"
-                },
-                "scope": {
-                    "description": "The audience scope that this message should reach",
-                    "enum": [
-                        "CLUSTER",
-                        "CUSTOMER",
-                        "USER"
-                    ],
-                    "type": "string"
-                },
-                "severity": {
-                    "description": "Message severity",
-                    "enum": [
-                        "MARKETING",
-                        "INFO",
-                        "WARN",
-                        "SEVERE"
-                    ],
-                    "type": "string"
-                },
-                "source": {
-                    "description": "Message source.  System messages will com from 'system@wavefront.com'",
-                    "type": "string"
-                },
-                "startEpochMillis": {
-                    "description": "When this message will begin to be displayed, in epoch millis",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "target": {
-                    "description": "For scope=CUSTOMER or scope=USER, the individual customer or user id",
-                    "type": "string"
-                },
-                "title": {
-                    "description": "Title of this message",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "content",
-                "display",
-                "endEpochMillis",
-                "scope",
-                "severity",
-                "source",
-                "startEpochMillis",
-                "title"
-            ],
-            "type": "object"
-        },
-        "MetricDetails": {
-            "description": "Details of the reporting metric",
-            "properties": {
-                "host": {
-                    "description": "The source reporting this metric",
-                    "type": "string"
-                },
-                "last_update": {
-                    "description": "Approximate time of last reporting, in milliseconds since the Unix epoch",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "tags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A key-value map of the point tags associated with this source",
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "MetricDetailsResponse": {
-            "description": "Response container for MetricDetails",
-            "properties": {
-                "hosts": {
-                    "description": "List of sources/hosts reporting this metric",
-                    "items": {
-                        "$ref": "#/definitions/MetricDetails"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "MetricStatus": {
-            "properties": {
-                "ever": {
-                    "type": "boolean"
-                },
-                "now": {
-                    "type": "boolean"
-                },
-                "recentExceptNow": {
-                    "type": "boolean"
-                },
-                "status": {
-                    "enum": [
-                        "OK",
-                        "PENDING"
-                    ],
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "NewRelicConfiguration": {
-            "description": "Configurations specific to the NewRelic integration.  Only applicable when the containing Credential has service=NEWRELIC",
-            "properties": {
-                "apiKey": {
-                    "description": "New Relic REST API Key.",
-                    "type": "string"
-                },
-                "appFilterRegex": {
-                    "description": "A regular expression that a application name must match (case-insensitively) in order to collect metrics.",
-                    "example": "^hostingservice-(prod|dev)*$",
-                    "type": "string"
-                },
-                "hostFilterRegex": {
-                    "description": "A regular expression that a host name must match (case-insensitively) in order to collect metrics.",
-                    "example": "host[1-9].xyz.com",
-                    "type": "string"
-                },
-                "newRelicMetricFilters": {
-                    "description": "Application specific metric filter",
-                    "items": {
-                        "$ref": "#/definitions/NewRelicMetricFilters"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "apiKey"
-            ],
-            "type": "object"
-        },
-        "NewRelicMetricFilters": {
-            "properties": {
-                "appName": {
-                    "type": "string"
-                },
-                "metricFilterRegex": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "Notificant": {
-            "description": "Wavefront notificant entity",
-            "properties": {
-                "contentType": {
-                    "description": "The value of the Content-Type header of the webhook POST request.",
-                    "enum": [
-                        "application/json",
-                        "text/html",
-                        "text/plain",
-                        "application/x-www-form-urlencoded",
-                        ""
-                    ],
-                    "type": "string"
-                },
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "customHttpHeaders": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "A string->string map specifying the custom HTTP header key / value pairs that will be sent in the requests of this web hook",
-                    "type": "object"
-                },
-                "customerId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "description": {
-                    "description": "Description",
-                    "type": "string"
-                },
-                "emailSubject": {
-                    "description": "The subject title of an email notification target",
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "isHtmlContent": {
-                    "description": "Determine whether the email alert target content is sent as html or text.",
-                    "type": "boolean"
-                },
-                "method": {
-                    "description": "The notification method used for notification target.",
-                    "enum": [
-                        "WEBHOOK",
-                        "EMAIL",
-                        "PAGERDUTY"
-                    ],
-                    "type": "string"
-                },
-                "recipient": {
-                    "description": "The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point",
-                    "type": "string"
-                },
-                "template": {
-                    "description": "A mustache template that will form the body of the POST request, email and summary of the PagerDuty.",
-                    "type": "string"
-                },
-                "title": {
-                    "description": "Title",
-                    "type": "string"
-                },
-                "triggers": {
-                    "description": "A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED",
-                    "items": {
-                        "enum": [
-                            "ALERT_OPENED",
-                            "ALERT_UPDATED",
-                            "ALERT_RESOLVED",
-                            "ALERT_MAINTENANCE",
-                            "ALERT_SNOOZED",
-                            "ALERT_INVALID",
-                            "ALERT_NO_LONGER_INVALID",
-                            "ALERT_TESTING",
-                            "ALERT_RETRIGGERED",
-                            "ALERT_NO_DATA",
-                            "ALERT_NO_DATA_RESOLVED",
-                            "ALERT_NO_DATA_MAINTENANCE",
-                            "ALERT_SERIES_SEVERITY_UPDATE",
-                            "ALERT_SEVERITY_UPDATE"
-                        ],
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "description",
-                "method",
-                "recipient",
-                "template",
-                "title",
-                "triggers"
-            ],
-            "type": "object"
-        },
-        "Number": {
-            "type": "object"
-        },
-        "PagedAlert": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Alert"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedAlertWithStats": {
-            "properties": {
-                "alertCounts": {
-                    "additionalProperties": {
-                        "format": "int32",
-                        "type": "integer"
-                    },
-                    "description": "A map from alert state to the number of alerts in that state within the search results",
-                    "readOnly": true,
-                    "type": "object"
-                },
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Alert"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedCloudIntegration": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/CloudIntegration"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedCustomerFacingUserObject": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/CustomerFacingUserObject"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedDashboard": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Dashboard"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedDerivedMetricDefinition": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/DerivedMetricDefinition"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedDerivedMetricDefinitionWithStats": {
-            "properties": {
-                "counts": {
-                    "additionalProperties": {
-                        "format": "int32",
-                        "type": "integer"
-                    },
-                    "description": "A map from the state of the derived metric definition to the number of entities in that state within the search results",
-                    "readOnly": true,
-                    "type": "object"
-                },
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/DerivedMetricDefinition"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedEvent": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Event"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedExternalLink": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/ExternalLink"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedIntegration": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Integration"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedMaintenanceWindow": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/MaintenanceWindow"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedMessage": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Message"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedNotificant": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Notificant"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedProxy": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Proxy"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedSavedSearch": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/SavedSearch"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedSource": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/Source"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "PagedUserGroup": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "$ref": "#/definitions/UserGroup"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "Point": {
-            "properties": {
-                "timestamp": {
-                    "description": "The timestamp of the point in milliseconds",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "value": {
-                    "format": "double",
-                    "type": "number"
-                }
-            },
-            "required": [
-                "timestamp",
-                "value"
-            ],
-            "type": "object"
-        },
-        "Proxy": {
-            "description": "Wavefront forwarding proxy",
-            "properties": {
-                "bytesLeftForBuffer": {
-                    "description": "Number of bytes of space remaining in the persistent disk queue of this proxy",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "bytesPerMinuteForBuffer": {
-                    "description": "Bytes used per minute by the persistent disk queue of this proxy",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "customerId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "deleted": {
-                    "type": "boolean"
-                },
-                "ephemeral": {
-                    "description": "When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in)",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "hostname": {
-                    "description": "Host name of the machine running the proxy",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "inTrash": {
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "lastCheckInTime": {
-                    "description": "Last time when this proxy checked in (in milliseconds since the unix epoch)",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastErrorEvent": {
-                    "$ref": "#/definitions/Event"
-                },
-                "lastErrorTime": {
-                    "description": "deprecated",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "lastKnownError": {
-                    "description": "deprecated",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "localQueueSize": {
-                    "description": "Number of items in the persistent disk queue of this proxy",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "name": {
-                    "description": "Proxy name (modifiable)",
-                    "type": "string"
-                },
-                "sshAgent": {
-                    "description": "deprecated",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "status": {
-                    "description": "the proxy's status",
-                    "enum": [
-                        "ACTIVE",
-                        "STOPPED_UNKNOWN",
-                        "STOPPED_BY_SERVER"
-                    ],
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "statusCause": {
-                    "description": "The reason why the proxy is in current status",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "timeDrift": {
-                    "description": "Time drift of the proxy's clock compared to Wavefront servers",
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "version": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "name"
-            ],
-            "type": "object"
-        },
-        "QueryEvent": {
-            "description": "A representation of events as returned by the querying api, rather than the event api",
-            "properties": {
-                "end": {
-                    "description": "End time of event, in epoch millis",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "hosts": {
-                    "description": "Sources (hosts) to which the event pertains",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "isEphemeral": {
-                    "description": "Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend",
-                    "type": "boolean"
-                },
-                "name": {
-                    "description": "Event name",
-                    "type": "string"
-                },
-                "start": {
-                    "description": "Start time of event, in epoch millis",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "summarized": {
-                    "description": "In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "tags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Tags (annotations) on the event",
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "QueryResult": {
-            "properties": {
-                "events": {
-                    "items": {
-                        "$ref": "#/definitions/QueryEvent"
-                    },
-                    "type": "array"
-                },
-                "granularity": {
-                    "description": "The granularity of the returned results, in seconds",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "name": {
-                    "description": "The name of this query",
-                    "type": "string"
-                },
-                "query": {
-                    "description": "The query used to obtain this result",
-                    "type": "string"
-                },
-                "stats": {
-                    "$ref": "#/definitions/StatsModel"
-                },
-                "timeseries": {
-                    "items": {
-                        "$ref": "#/definitions/Timeseries"
-                    },
-                    "type": "array"
-                },
-                "warnings": {
-                    "description": "The warnings incurred by this query",
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "RawTimeseries": {
-            "properties": {
-                "points": {
-                    "items": {
-                        "$ref": "#/definitions/Point"
-                    },
-                    "type": "array"
-                },
-                "tags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Associated tags of the time series",
-                    "type": "object"
-                }
-            },
-            "required": [
-                "points"
-            ],
-            "type": "object"
-        },
-        "ResponseContainer": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "type": "object"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerAlert": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Alert"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerCloudIntegration": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/CloudIntegration"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerDashboard": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Dashboard"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerDerivedMetricDefinition": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/DerivedMetricDefinition"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerEvent": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Event"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerExternalLink": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/ExternalLink"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerFacetResponse": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/FacetResponse"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerFacetsResponseContainer": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/FacetsResponseContainer"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerHistoryResponse": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/HistoryResponse"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerIntegration": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Integration"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerIntegrationStatus": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/IntegrationStatus"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerListACL": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "items": {
-                        "$ref": "#/definitions/ACL"
-                    },
-                    "type": "array"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerListIntegration": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "items": {
-                        "$ref": "#/definitions/Integration"
-                    },
-                    "type": "array"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerListIntegrationManifestGroup": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "items": {
-                        "$ref": "#/definitions/IntegrationManifestGroup"
-                    },
-                    "type": "array"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerListString": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerListUserGroup": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "items": {
-                        "$ref": "#/definitions/UserGroup"
-                    },
-                    "type": "array"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerMaintenanceWindow": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/MaintenanceWindow"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerMapStringInteger": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "additionalProperties": {
-                        "format": "int32",
-                        "type": "integer"
-                    },
-                    "type": "object"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerMapStringIntegrationStatus": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "additionalProperties": {
-                        "$ref": "#/definitions/IntegrationStatus"
-                    },
-                    "type": "object"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerMessage": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Message"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerNotificant": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Notificant"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedAlert": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedAlert"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedAlertWithStats": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedAlertWithStats"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedCloudIntegration": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedCloudIntegration"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedCustomerFacingUserObject": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedCustomerFacingUserObject"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedDashboard": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedDashboard"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedDerivedMetricDefinition": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedDerivedMetricDefinition"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedDerivedMetricDefinitionWithStats": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedDerivedMetricDefinitionWithStats"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedEvent": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedEvent"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedExternalLink": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedExternalLink"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedIntegration": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedIntegration"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedMaintenanceWindow": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedMaintenanceWindow"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedMessage": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedMessage"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedNotificant": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedNotificant"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedProxy": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedProxy"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedSavedSearch": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedSavedSearch"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedSource": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedSource"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerPagedUserGroup": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/PagedUserGroup"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerProxy": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Proxy"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerSavedSearch": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/SavedSearch"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerSource": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/Source"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerTagsResponse": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/TagsResponse"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseContainerUserGroup": {
-            "description": "JSON container for the HTTP response along with status",
-            "properties": {
-                "response": {
-                    "$ref": "#/definitions/UserGroup"
-                },
-                "status": {
-                    "$ref": "#/definitions/ResponseStatus"
-                }
-            },
-            "required": [
-                "status"
-            ],
-            "type": "object"
-        },
-        "ResponseStatus": {
-            "properties": {
-                "code": {
-                    "description": "HTTP Response code corresponding to this response",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "message": {
-                    "description": "Descriptive message of the status of this response",
-                    "type": "string"
-                },
-                "result": {
-                    "enum": [
-                        "OK",
-                        "ERROR"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "code",
-                "result"
-            ],
-            "type": "object"
-        },
-        "SavedSearch": {
-            "description": "Saved queries for searches over Wavefront entities",
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "entityType": {
-                    "description": "The Wavefront entity type over which to search",
-                    "enum": [
-                        "DASHBOARD",
-                        "ALERT",
-                        "MAINTENANCE_WINDOW",
-                        "NOTIFICANT",
-                        "EVENT",
-                        "SOURCE",
-                        "EXTERNAL_LINK",
-                        "AGENT",
-                        "CLOUD_INTEGRATION",
-                        "APPLICATION",
-                        "REGISTERED_QUERY",
-                        "USER",
-                        "USER_GROUP"
-                    ],
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "query": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "The map corresponding to the search query.  The key is the name of the query, and the value is a JSON representation of the query",
-                    "type": "object"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "userId": {
-                    "description": "The user for whom this search is saved",
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "entityType",
-                "query"
-            ],
-            "type": "object"
-        },
-        "SearchQuery": {
-            "properties": {
-                "key": {
-                    "description": "The entity facet (key) by which to search.  Valid keys are any property keys returned by the JSON representation of the entity.  Examples are 'creatorId', 'name', etc.  The following special key keywords are also valid:  'tags' performs a search on entity tags, 'tagpath' performs a hierarchical search on tags, with  periods (.) as path level separators.  'freetext' performs a free text search across many fields of the entity",
-                    "type": "string"
-                },
-                "matchingMethod": {
-                    "description": "The method by which search matching is performed.  Default: CONTAINS",
-                    "enum": [
-                        "CONTAINS",
-                        "STARTSWITH",
-                        "EXACT",
-                        "TAGPATH"
-                    ],
-                    "type": "string"
-                },
-                "value": {
-                    "description": "The entity facet value for which to search",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "key",
-                "value"
-            ],
-            "type": "object"
-        },
-        "SortableSearchRequest": {
-            "properties": {
-                "limit": {
-                    "description": "The number of results to return.  Default: 100",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "offset": {
-                    "description": "The number of results to skip before returning values.  Default: 0",
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "query": {
-                    "description": "A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned",
-                    "items": {
-                        "$ref": "#/definitions/SearchQuery"
-                    },
-                    "type": "array"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                }
-            },
-            "type": "object"
-        },
-        "Sorting": {
-            "description": "Specifies how returned items should be sorted",
-            "properties": {
-                "ascending": {
-                    "description": "Whether to sort ascending.  If undefined, sorting is not guaranteed",
-                    "type": "boolean"
-                },
-                "default": {
-                    "description": "Whether this sort requests the default ranking order.  Ascending/descending does not matter if this attribute is true.",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "field": {
-                    "description": "The facet by which to sort",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ascending",
-                "field"
-            ],
-            "type": "object"
-        },
-        "Source": {
-            "description": "A source (sometimes called host) of time series data from telemetry ingestion",
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "creatorId": {
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "description": {
-                    "description": "Description of this source",
-                    "type": "string"
-                },
-                "hidden": {
-                    "description": "A derived field denoting whether this source has been hidden (e.g. excluding it from query autocomplete among other things)",
-                    "readOnly": true,
-                    "type": "boolean"
-                },
-                "id": {
-                    "description": "id of this source, must be exactly equivalent to 'sourceName'",
-                    "type": "string"
-                },
-                "markedNewEpochMillis": {
-                    "description": "Epoch Millis when this source was marked as ~status.new",
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "sourceName": {
-                    "description": "The name of the source, usually set by ingested telemetry",
-                    "type": "string"
-                },
-                "tags": {
-                    "additionalProperties": {
-                        "type": "boolean"
-                    },
-                    "description": "A Map (String -> boolean) Representing the source tags associated with this source.  To create a tag, set it as a KEY in this map, with associated value equal to true",
-                    "type": "object"
-                },
-                "updatedEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "updaterId": {
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "required": [
-                "id",
-                "sourceName"
-            ],
-            "type": "object"
-        },
-        "SourceLabelPair": {
-            "description": "Convenience wrapper for the identifier of a unique series, which consists of a source (host) and a metric or aggregation (label)",
-            "properties": {
-                "firing": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "host": {
-                    "description": "Source (or host).  \"Source\" and \"host\" are synonyms in current versions of wavefront, but the host terminology is deprecated",
-                    "type": "string"
-                },
-                "label": {
-                    "type": "string"
-                },
-                "observed": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "severity": {
-                    "enum": [
-                        "INFO",
-                        "SMOKE",
-                        "WARN",
-                        "SEVERE"
-                    ],
-                    "type": "string"
-                },
-                "tags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "SourceSearchRequestContainer": {
-            "properties": {
-                "cursor": {
-                    "description": "The id (exclusive) from which search results resume returning.  Users should supply an entity 'id' to this property.  Its main purpose is to resume where a previous search left off because of the 'limit' parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results",
-                    "type": "string"
-                },
-                "limit": {
-                    "description": "The number of results to return.  Default: 100",
-                    "example": 100,
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "query": {
-                    "description": "A list of queries by which to limit the search results",
-                    "items": {
-                        "$ref": "#/definitions/SearchQuery"
-                    },
-                    "type": "array"
-                },
-                "sortSourcesAscending": {
-                    "description": "Whether to sort source results ascending lexigraphically by id/sourceName.  Default: true",
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "StatsModel": {
-            "properties": {
-                "buffer_keys": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "cached_compacted_keys": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "compacted_keys": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "compacted_points": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "cpu_ns": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "hosts_used": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "keys": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "latency": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "metrics_used": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "points": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "queries": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "query_tasks": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "s3_keys": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "skipped_compacted_keys": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "summaries": {
-                    "format": "int64",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "TagsResponse": {
-            "properties": {
-                "cursor": {
-                    "description": "The id at which the current (limited) search can be continued to obtain more matching items",
-                    "type": "string"
-                },
-                "items": {
-                    "description": "List of requested items",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "limit": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "moreItems": {
-                    "description": "Whether more items are available for return by increment offset or cursor",
-                    "type": "boolean"
-                },
-                "offset": {
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "sort": {
-                    "$ref": "#/definitions/Sorting"
-                },
-                "totalItems": {
-                    "description": "An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries",
-                    "format": "int32",
-                    "type": "integer"
-                }
-            },
-            "type": "object"
-        },
-        "TargetInfo": {
-            "description": "Alert target display information that includes type, id, and the name of the alert target.",
-            "properties": {
-                "id": {
-                    "description": "ID of the alert target",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "method": {
-                    "description": "Notification method of the alert target",
-                    "enum": [
-                        "EMAIL",
-                        "PAGERDUTY",
-                        "WEBHOOK"
-                    ],
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "name": {
-                    "description": "Name of the alert target",
-                    "readOnly": true,
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "TeslaConfiguration": {
-            "description": "Configurations specific to the Tesla integration.  Only applicable when the containing Credential has service=TESLA",
-            "properties": {
-                "email": {
-                    "description": "Email address for Tesla account login",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "email"
-            ],
-            "type": "object"
-        },
-        "Timeseries": {
-            "properties": {
-                "data": {
-                    "description": "Data returned by this time series.  This is returned as a list of points, where each point is represented as a two-element list with 1st element being the timestamp in epoch SECONDS and the 2nd element being the numeric value of the series at the timestamp",
-                    "items": {
-                        "items": {
-                            "format": "float",
-                            "type": "number"
-                        },
-                        "type": "array"
-                    },
-                    "type": "array"
-                },
-                "host": {
-                    "description": "Source/Host of this timeseries",
-                    "type": "string"
-                },
-                "label": {
-                    "description": "Label of this timeseries",
-                    "type": "string"
-                },
-                "tags": {
-                    "additionalProperties": {
-                        "type": "string"
-                    },
-                    "description": "Tags (key-value annotations) of this timeseries",
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "User": {
-            "properties": {
-                "apiToken": {
-                    "type": "string"
-                },
-                "apiToken2": {
-                    "type": "string"
-                },
-                "credential": {
-                    "type": "string"
-                },
-                "customer": {
-                    "type": "string"
-                },
-                "groups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "identifier": {
-                    "type": "string"
-                },
-                "invalidPasswordAttempts": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "lastLogout": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "lastSuccessfulLogin": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "onboardingState": {
-                    "type": "string"
-                },
-                "provider": {
-                    "type": "string"
-                },
-                "resetToken": {
-                    "type": "string"
-                },
-                "resetTokenCreationMillis": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "settings": {
-                    "$ref": "#/definitions/UserSettings"
-                },
-                "ssoId": {
-                    "type": "string"
-                },
-                "superAdmin": {
-                    "type": "boolean"
-                },
-                "userGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "UserGroup": {
-            "description": "Wavefront user group entity",
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "customer": {
-                    "description": "The id of the customer to which the user group belongs",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "id": {
-                    "description": "The unique identifier of the user group",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "The name of the user group",
-                    "type": "string"
-                },
-                "permissions": {
-                    "description": "List of permissions the user group has been granted access to",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "properties": {
-                    "$ref": "#/definitions/UserGroupPropertiesDTO",
-                    "description": "The properties of the user group(name editable, users editable, etc.)",
-                    "readOnly": true
-                },
-                "userCount": {
-                    "description": "Total number of users that are members of the user group",
-                    "format": "int32",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "users": {
-                    "description": "List(may be incomplete) of users that are members of the user group.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "readOnly": true,
-                    "type": "array"
-                }
-            },
-            "required": [
-                "name",
-                "permissions"
-            ],
-            "type": "object"
-        },
-        "UserGroupPropertiesDTO": {
-            "properties": {
-                "nameEditable": {
-                    "type": "boolean"
-                },
-                "permissionsEditable": {
-                    "type": "boolean"
-                },
-                "usersEditable": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "UserGroupWrite": {
-            "description": "Wavefront user group entity for write requests",
-            "properties": {
-                "createdEpochMillis": {
-                    "format": "int64",
-                    "readOnly": true,
-                    "type": "integer"
-                },
-                "customer": {
-                    "description": "The id of the customer to which the user group belongs",
-                    "readOnly": true,
-                    "type": "string"
-                },
-                "id": {
-                    "description": "The unique identifier of the user group",
-                    "type": "string"
-                },
-                "name": {
-                    "description": "The name of the user group",
-                    "type": "string"
-                },
-                "permissions": {
-                    "description": "List of permissions the user group has been granted access to",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "name",
-                "permissions"
-            ],
-            "type": "object"
-        },
-        "UserModel": {
-            "description": "Model for an user object",
-            "properties": {
-                "customer": {
-                    "description": "The id of the customer to which this user belongs",
-                    "type": "string"
-                },
-                "groups": {
-                    "description": "The permissions granted to this user",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "identifier": {
-                    "description": "The unique identifier of this user, which must be their valid email address",
-                    "type": "string"
-                },
-                "lastSuccessfulLogin": {
-                    "format": "int64",
-                    "type": "integer"
-                },
-                "ssoId": {
-                    "type": "string"
-                },
-                "userGroups": {
-                    "description": "The list of user groups the user belongs to",
-                    "items": {
-                        "$ref": "#/definitions/UserGroup"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "customer",
-                "groups",
-                "identifier",
-                "userGroups"
-            ],
-            "type": "object"
-        },
-        "UserRequestDTO": {
-            "properties": {
-                "customer": {
-                    "type": "string"
-                },
-                "groups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "identifier": {
-                    "type": "string"
-                },
-                "ssoId": {
-                    "type": "string"
-                },
-                "userGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "UserSettings": {
-            "properties": {
-                "alwaysHideQuerybuilder": {
-                    "type": "boolean"
-                },
-                "chartTitleScalar": {
-                    "format": "int32",
-                    "type": "integer"
-                },
-                "hideTSWhenQuerybuilderShown": {
-                    "type": "boolean"
-                },
-                "landingDashboardSlug": {
-                    "type": "string"
-                },
-                "preferredTimeZone": {
-                    "type": "string"
-                },
-                "showOnboarding": {
-                    "type": "boolean"
-                },
-                "showQuerybuilderByDefault": {
-                    "type": "boolean"
-                },
-                "use24HourTime": {
-                    "type": "boolean"
-                },
-                "useDarkTheme": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "UserToCreate": {
-            "properties": {
-                "emailAddress": {
-                    "description": "The (unique) identifier of the user to create. Must be a valid email address",
-                    "type": "string"
-                },
-                "groups": {
-                    "description": "List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "userGroups": {
-                    "description": "List of user groups to this user. ",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "emailAddress",
-                "groups",
-                "userGroups"
-            ],
-            "type": "object"
-        },
-        "WFTags": {
-            "properties": {
-                "customerTags": {
-                    "description": "Customer-wide tags.  Can be on various wavefront entities such alerts or dashboards.",
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        }
-    },
-    "info": {
-        "description": "<p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>",
-        "title": "Wavefront REST API",
-        "version": "v2"
-    },
-    "paths": {
-        "/api/v2/alert": {
-            "get": {
-                "description": "",
-                "operationId": "getAllAlert",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all alerts for a customer",
-                "tags": [
-                    "Alert"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createAlert",
-                "parameters": [
-                    {
-                        "description": "Example Classic Body: \n<pre>{\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}</pre>\nExample Threshold Body: \n<pre>{\n    \"name\": \"Alert Name\",\n    \"alertType\": \"THRESHOLD\",\n    \"conditions\": {\n        \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",\n        \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"\n    },\n    \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n    \"minutes\": 5,\n    \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Alert"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/summary": {
-            "get": {
-                "description": "",
-                "operationId": "getAlertsSummary",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMapStringInteger"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Count alerts of various statuses for a customer",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteAlert",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getAlert",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateAlert",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"id\": \"1459375928549\",\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Alert"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"id\": \"1459375928549\",\n  \"name\": \"Alert Name\",\n  \"target\": \"success@simulator.amazonses.com\",\n  \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",\n  \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",\n  \"minutes\": 5,\n  \"resolveAfterMinutes\": 2,\n  \"severity\": \"INFO\",\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"alertTag1\"\n    ]\n  }\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/history": {
-            "get": {
-                "description": "",
-                "operationId": "getAlertHistory",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerHistoryResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get the version history of a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/history/{version}": {
-            "get": {
-                "description": "",
-                "operationId": "getAlertVersion",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "format": "int64",
-                        "in": "path",
-                        "name": "version",
-                        "required": true,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific historical version of a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/install": {
-            "post": {
-                "description": "",
-                "operationId": "unhideAlert",
-                "parameters": [
-                    {
-                        "format": "int64",
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Unhide a specific integration alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/snooze": {
-            "post": {
-                "description": "",
-                "operationId": "snoozeAlert",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "format": "int64",
-                        "in": "query",
-                        "name": "seconds",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Snooze a specific alert for some number of seconds",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/tag": {
-            "get": {
-                "description": "",
-                "operationId": "getAlertTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerTagsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all tags associated with a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setAlertTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set all tags associated with a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/tag/{tagValue}": {
-            "delete": {
-                "description": "",
-                "operationId": "removeAlertTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove a tag from a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addAlertTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Add a tag to a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/undelete": {
-            "post": {
-                "description": "",
-                "operationId": "undeleteAlert",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Undelete a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/uninstall": {
-            "post": {
-                "description": "",
-                "operationId": "hideAlert",
-                "parameters": [
-                    {
-                        "format": "int64",
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Hide a specific integration alert ",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/alert/{id}/unsnooze": {
-            "post": {
-                "description": "",
-                "operationId": "unsnoozeAlert",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Unsnooze a specific alert",
-                "tags": [
-                    "Alert"
-                ]
-            }
-        },
-        "/api/v2/chart/api": {
-            "get": {
-                "description": "Long time spans and small granularities can take a long time to calculate",
-                "operationId": "queryApi",
-                "parameters": [
-                    {
-                        "description": "name used to identify the query",
-                        "in": "query",
-                        "name": "n",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "the query expression to execute",
-                        "in": "query",
-                        "name": "q",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "the start time of the query window in epoch milliseconds",
-                        "in": "query",
-                        "name": "s",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "the end time of the query window in epoch milliseconds (null to use now)",
-                        "in": "query",
-                        "name": "e",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "the granularity of the points returned",
-                        "enum": [
-                            "d",
-                            "h",
-                            "m",
-                            "s"
-                        ],
-                        "in": "query",
-                        "name": "g",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "the approximate maximum number of points to return (may not limit number of points exactly)",
-                        "in": "query",
-                        "name": "p",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "whether series with only points that are outside of the query window will be returned (defaults to true)",
-                        "in": "query",
-                        "name": "i",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "description": "whether events for sources included in the query will be automatically returned by the query",
-                        "in": "query",
-                        "name": "autoEvents",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "description": "summarization strategy to use when bucketing points together",
-                        "enum": [
-                            "MEAN",
-                            "MEDIAN",
-                            "MIN",
-                            "MAX",
-                            "SUM",
-                            "COUNT",
-                            "LAST",
-                            "FIRST"
-                        ],
-                        "in": "query",
-                        "name": "summarization",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "retrieve events more optimally displayed for a list",
-                        "in": "query",
-                        "name": "listMode",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "description": "do not return points outside the query window [s;e), defaults to false",
-                        "in": "query",
-                        "name": "strict",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "description": "include metrics that have not been reporting recently, defaults to false",
-                        "in": "query",
-                        "name": "includeObsoleteMetrics",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "default": false,
-                        "description": "sorts the output so that returned series are in order, defaults to false",
-                        "in": "query",
-                        "name": "sorted",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "default": true,
-                        "description": "whether the query cache is used, defaults to true",
-                        "in": "query",
-                        "name": "cached",
-                        "required": false,
-                        "type": "boolean"
-                    }
-                ],
-                "produces": [
-                    "application/json",
-                    "application/x-javascript; charset=UTF-8",
-                    "application/javascript; charset=UTF-8"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/QueryResult"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity",
-                "tags": [
-                    "Query"
-                ]
-            }
-        },
-        "/api/v2/chart/metric/detail": {
-            "get": {
-                "description": "",
-                "operationId": "getMetricDetails",
-                "parameters": [
-                    {
-                        "description": "Metric name",
-                        "in": "query",
-                        "name": "m",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "limit",
-                        "format": "int32",
-                        "in": "query",
-                        "name": "l",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "description": "cursor value to continue if the number of results exceeds 1000",
-                        "in": "query",
-                        "name": "c",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "collectionFormat": "multi",
-                        "description": "glob pattern for sources to include in the query result",
-                        "in": "query",
-                        "items": {
-                            "type": "string"
-                        },
-                        "name": "h",
-                        "required": false,
-                        "type": "array"
-                    }
-                ],
-                "produces": [
-                    "application/json",
-                    "application/x-javascript",
-                    "application/javascript"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/MetricDetailsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get more details on a metric, including reporting sources and approximate last time reported",
-                "tags": [
-                    "Metric"
-                ]
-            }
-        },
-        "/api/v2/chart/raw": {
-            "get": {
-                "description": "An API to check if ingested points are as expected.  Points ingested within a single second are averaged when returned.",
-                "operationId": "queryRaw",
-                "parameters": [
-                    {
-                        "description": "host to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.",
-                        "in": "query",
-                        "name": "host",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "source to query ingested points for (cannot contain wildcards). host or source is equivalent, only one should be used.",
-                        "in": "query",
-                        "name": "source",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "metric to query ingested points for (cannot contain wildcards)",
-                        "in": "query",
-                        "name": "metric",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "start time in epoch milliseconds (cannot be more than a day in the past) null to use an hour before endTime",
-                        "format": "int64",
-                        "in": "query",
-                        "name": "startTime",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "description": "end time in epoch milliseconds (cannot be more than a day in the past) null to use now",
-                        "format": "int64",
-                        "in": "query",
-                        "name": "endTime",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/RawTimeseries"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "400": {
-                        "description": "Invalid request parameters"
-                    },
-                    "401": {
-                        "description": "Authorization Error"
-                    },
-                    "404": {
-                        "description": "Metric not found for specified source/host"
-                    },
-                    "500": {
-                        "description": "Server Error"
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Perform a raw data query against Wavefront servers that returns second granularity points grouped by tags",
-                "tags": [
-                    "Query"
-                ]
-            }
-        },
-        "/api/v2/cloudintegration": {
-            "get": {
-                "description": "",
-                "operationId": "getAllCloudIntegration",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all cloud integrations for a customer",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createCloudIntegration",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/CloudIntegration"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            }
-        },
-        "/api/v2/cloudintegration/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteCloudIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getCloudIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateCloudIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/CloudIntegration"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\":\"CloudWatch integration\",\n  \"service\":\"CLOUDWATCH\",\n  \"cloudWatch\":{\n    \"baseCredentials\":{\n      \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",\n      \"externalId\":\"wave123\"\n    },\n    \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",\n    \"pointTagFilterRegex\":\"(region|name)\"\n  },\n  \"serviceRefreshRateInMins\":5\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            }
-        },
-        "/api/v2/cloudintegration/{id}/disable": {
-            "post": {
-                "description": "",
-                "operationId": "disableCloudIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Disable a specific cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            }
-        },
-        "/api/v2/cloudintegration/{id}/enable": {
-            "post": {
-                "description": "",
-                "operationId": "enableCloudIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Enable a specific cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            }
-        },
-        "/api/v2/cloudintegration/{id}/undelete": {
-            "post": {
-                "description": "",
-                "operationId": "undeleteCloudIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Undelete a specific cloud integration",
-                "tags": [
-                    "Cloud Integration"
-                ]
-            }
-        },
-        "/api/v2/customer/permissions": {
-            "get": {
-                "description": "Returns all permissions' info data",
-                "operationId": "getAllPermissions",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/BusinessActionGroupBasicDTO"
-                            },
-                            "type": "array"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all permissions",
-                "tags": [
-                    "Settings"
-                ]
-            }
-        },
-        "/api/v2/customer/preferences": {
-            "get": {
-                "description": "",
-                "operationId": "getCustomerPreferences",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/CustomerPreferences"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get customer preferences",
-                "tags": [
-                    "Settings"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "postCustomerPreferences",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/CustomerPreferencesUpdating"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/CustomerPreferences"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update selected fields of customer preferences",
-                "tags": [
-                    "Settings"
-                ]
-            }
-        },
-        "/api/v2/customer/preferences/defaultUserGroups": {
-            "get": {
-                "description": "",
-                "operationId": "getDefaultUserGroups",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/User"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerListUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get default user groups customer preferences",
-                "tags": [
-                    "Settings"
-                ]
-            }
-        },
-        "/api/v2/dashboard": {
-            "get": {
-                "description": "",
-                "operationId": "getAllDashboard",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all dashboards for a customer",
-                "tags": [
-                    "Dashboard"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createDashboard",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Dashboard"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/acl": {
-            "get": {
-                "description": "",
-                "operationId": "getAccessControlList",
-                "parameters": [
-                    {
-                        "collectionFormat": "multi",
-                        "in": "query",
-                        "items": {
-                            "type": "string"
-                        },
-                        "name": "id",
-                        "required": false,
-                        "type": "array"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerListACL"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get list of Access Control Lists for the specified dashboards",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/acl/add": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addAccess",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/ACL"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "default": {
-                        "description": "successful operation"
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Adds the specified ids to the given dashboards' ACL",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/acl/remove": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "removeAccess",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/ACL"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "default": {
-                        "description": "successful operation"
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Removes the specified ids from the given dashboards' ACL",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/acl/set": {
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setAcl",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/ACL"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "default": {
-                        "description": "successful operation"
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set ACL for the specified dashboards",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteDashboard",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getDashboard",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateDashboard",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Dashboard"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"Dashboard API example\",\n  \"id\": \"api-example\",\n  \"url\": \"api-example\",\n  \"description\": \"Dashboard Description\",\n  \"sections\": [\n    {\n      \"name\": \"Section 1\",\n      \"rows\": [\n        {\n          \"charts\": [\n            {\n              \"name\": \"Chart 1\",\n              \"description\": \"description1\",\n              \"sources\": [\n                {\n                  \"name\": \"Source1\",\n                  \"query\": \"ts()\"\n                }\n              ]\n            }\n          ]\n        }\n      ]\n    }\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/favorite": {
-            "post": {
-                "description": "",
-                "operationId": "favoriteDashboard",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Mark a dashboard as favorite",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/history": {
-            "get": {
-                "description": "",
-                "operationId": "getDashboardHistory",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerHistoryResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get the version history of a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/history/{version}": {
-            "get": {
-                "description": "",
-                "operationId": "getDashboardVersion",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "format": "int64",
-                        "in": "path",
-                        "name": "version",
-                        "required": true,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific version of a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/tag": {
-            "get": {
-                "description": "",
-                "operationId": "getDashboardTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerTagsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all tags associated with a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setDashboardTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set all tags associated with a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/tag/{tagValue}": {
-            "delete": {
-                "description": "",
-                "operationId": "removeDashboardTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove a tag from a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addDashboardTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Add a tag to a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/undelete": {
-            "post": {
-                "description": "",
-                "operationId": "undeleteDashboard",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Undelete a specific dashboard",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/dashboard/{id}/unfavorite": {
-            "post": {
-                "description": "",
-                "operationId": "unfavoriteDashboard",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Unmark a dashboard as favorite",
-                "tags": [
-                    "Dashboard"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric": {
-            "get": {
-                "description": "",
-                "operationId": "getAllDerivedMetrics",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all derived metric definitions for a customer",
-                "tags": [
-                    "Derived Metric"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createDerivedMetric",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"Query Name\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"derivedMetricTag1\"\n    ]\n  }\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/DerivedMetricDefinition"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"Query Name\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\",\n  \"tags\": {\n    \"customerTags\": [\n      \"derivedMetricTag1\"\n    ]\n  }\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteDerivedMetric",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getDerivedMetric",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific registered query",
-                "tags": [
-                    "Derived Metric"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateDerivedMetric",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"id\": \"1459375928549\",\n  \"name\": \"Query Name\",\n  \"createUserId\": \"user\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/DerivedMetricDefinition"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"id\": \"1459375928549\",\n  \"name\": \"Query Name\",\n  \"createUserId\": \"user\",\n  \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",\n  \"minutes\": 5,\n  \"additionalInformation\": \"Additional Info\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric/{id}/history": {
-            "get": {
-                "description": "",
-                "operationId": "getDerivedMetricHistory",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerHistoryResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get the version history of a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric/{id}/history/{version}": {
-            "get": {
-                "description": "",
-                "operationId": "getDerivedMetricByVersion",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "format": "int64",
-                        "in": "path",
-                        "name": "version",
-                        "required": true,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific historical version of a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric/{id}/tag": {
-            "get": {
-                "description": "",
-                "operationId": "getDerivedMetricTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerTagsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all tags associated with a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setDerivedMetricTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set all tags associated with a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric/{id}/tag/{tagValue}": {
-            "delete": {
-                "description": "",
-                "operationId": "removeTagFromDerivedMetric",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove a tag from a specific Derived Metric",
-                "tags": [
-                    "Derived Metric"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addTagToDerivedMetric",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Add a tag to a specific Derived Metric",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/derivedmetric/{id}/undelete": {
-            "post": {
-                "description": "",
-                "operationId": "undeleteDerivedMetric",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Undelete a specific derived metric definition",
-                "tags": [
-                    "Derived Metric"
-                ]
-            }
-        },
-        "/api/v2/event": {
-            "get": {
-                "description": "",
-                "operationId": "getAllEventsWithTimeRange",
-                "parameters": [
-                    {
-                        "format": "int64",
-                        "in": "query",
-                        "name": "earliestStartTimeEpochMillis",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "format": "int64",
-                        "in": "query",
-                        "name": "latestStartTimeEpochMillis",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "in": "query",
-                        "name": "cursor",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "List all the events for a customer within a time range",
-                "tags": [
-                    "Event"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>",
-                "operationId": "createEvent",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Event"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific event",
-                "tags": [
-                    "Event"
-                ]
-            }
-        },
-        "/api/v2/event/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteEvent",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific event",
-                "tags": [
-                    "Event"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getEvent",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific event",
-                "tags": [
-                    "Event"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>",
-                "operationId": "updateEvent",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Event"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"Event API Example\",\n  \"annotations\": {\n    \"severity\": \"info\",\n    \"type\": \"event type\",\n    \"details\": \"description\"\n  },\n  \"tags\" : [\n    \"eventTag1\"\n  ],\n  \"startTime\": 1490000000000,\n  \"endTime\": 1490000000001\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific event",
-                "tags": [
-                    "Event"
-                ]
-            }
-        },
-        "/api/v2/event/{id}/close": {
-            "post": {
-                "description": "",
-                "operationId": "closeEvent",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Close a specific event",
-                "tags": [
-                    "Event"
-                ]
-            }
-        },
-        "/api/v2/event/{id}/tag": {
-            "get": {
-                "description": "",
-                "operationId": "getEventTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerTagsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all tags associated with a specific event",
-                "tags": [
-                    "Event"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setEventTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set all tags associated with a specific event",
-                "tags": [
-                    "Event"
-                ]
-            }
-        },
-        "/api/v2/event/{id}/tag/{tagValue}": {
-            "delete": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "removeEventTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove a tag from a specific event",
-                "tags": [
-                    "Event"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addEventTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Add a tag to a specific event",
-                "tags": [
-                    "Event"
-                ]
-            }
-        },
-        "/api/v2/extlink": {
-            "get": {
-                "description": "",
-                "operationId": "getAllExternalLink",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedExternalLink"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all external links for a customer",
-                "tags": [
-                    "External Link"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createExternalLink",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ExternalLink"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerExternalLink"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific external link",
-                "tags": [
-                    "External Link"
-                ]
-            }
-        },
-        "/api/v2/extlink/{id}": {
-            "delete": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "deleteExternalLink",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerExternalLink"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific external link",
-                "tags": [
-                    "External Link"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getExternalLink",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerExternalLink"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific external link",
-                "tags": [
-                    "External Link"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateExternalLink",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/ExternalLink"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"External Link API Example\",\n  \"template\": \"https://example.com/{{source}}\",\n  \"description\": \"External Link Description\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerExternalLink"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific external link",
-                "tags": [
-                    "External Link"
-                ]
-            }
-        },
-        "/api/v2/integration": {
-            "get": {
-                "description": "",
-                "operationId": "getAllIntegration",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets a flat list of all Wavefront integrations available, along with their status",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/installed": {
-            "get": {
-                "description": "",
-                "operationId": "getInstalledIntegration",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerListIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets a flat list of all Integrations that are installed, along with their status",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/manifests": {
-            "get": {
-                "description": "",
-                "operationId": "getAllIntegrationInManifests",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerListIntegrationManifestGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets all Wavefront integrations as structured in their integration manifests, along with their status and content",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/manifests/min": {
-            "get": {
-                "description": "",
-                "operationId": "getAllIntegrationInManifestsMin",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerListIntegrationManifestGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets all Wavefront integrations as structured in their integration manifests.",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/status": {
-            "get": {
-                "description": "",
-                "operationId": "getAllIntegrationStatuses",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMapStringIntegrationStatus"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets the status of all Wavefront integrations",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/{id}": {
-            "get": {
-                "description": "",
-                "operationId": "getIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "query",
-                        "name": "refresh",
-                        "required": false,
-                        "type": "boolean"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets a single Wavefront integration by its id, along with its status",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/{id}/install": {
-            "post": {
-                "description": "",
-                "operationId": "installIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Installs a Wavefront integration",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/{id}/install-all-alerts": {
-            "post": {
-                "description": "",
-                "operationId": "installAllIntegrationAlerts",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/InstallAlerts"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Enable all alerts associated with this integration",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/{id}/status": {
-            "get": {
-                "description": "",
-                "operationId": "getIntegrationStatus",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets the status of a single Wavefront integration",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/{id}/uninstall": {
-            "post": {
-                "description": "",
-                "operationId": "uninstallIntegration",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Uninstalls a Wavefront integration",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/integration/{id}/uninstall-all-alerts": {
-            "post": {
-                "description": "",
-                "operationId": "uninstallAllIntegrationAlerts",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerIntegrationStatus"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Disable all alerts associated with this integration",
-                "tags": [
-                    "Integration"
-                ]
-            }
-        },
-        "/api/v2/maintenancewindow": {
-            "get": {
-                "description": "",
-                "operationId": "getAllMaintenanceWindow",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedMaintenanceWindow"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all maintenance windows for a customer",
-                "tags": [
-                    "Maintenance Window"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createMaintenanceWindow",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/MaintenanceWindow"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a maintenance window",
-                "tags": [
-                    "Maintenance Window"
-                ]
-            }
-        },
-        "/api/v2/maintenancewindow/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteMaintenanceWindow",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific maintenance window",
-                "tags": [
-                    "Maintenance Window"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getMaintenanceWindow",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific maintenance window",
-                "tags": [
-                    "Maintenance Window"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateMaintenanceWindow",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/MaintenanceWindow"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"reason\": \"MW Reason\",\n  \"title\": \"MW Title\",\n  \"startTimeInSeconds\": 1483228800,\n  \"endTimeInSeconds\": 1483232400,\n  \"relevantCustomerTags\": [\n    \"alertId1\"\n  ],\n  \"relevantHostTags\": [\n    \"sourceTag1\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMaintenanceWindow"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific maintenance window",
-                "tags": [
-                    "Maintenance Window"
-                ]
-            }
-        },
-        "/api/v2/message": {
-            "get": {
-                "description": "",
-                "operationId": "userGetMessages",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": true,
-                        "in": "query",
-                        "name": "unreadOnly",
-                        "required": false,
-                        "type": "boolean"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedMessage"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Gets messages applicable to the current user, i.e. within time range and distribution scope",
-                "tags": [
-                    "Message"
-                ]
-            }
-        },
-        "/api/v2/message/{id}/read": {
-            "post": {
-                "description": "",
-                "operationId": "userReadMessage",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerMessage"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Mark a specific message as read",
-                "tags": [
-                    "Message"
-                ]
-            }
-        },
-        "/api/v2/notificant": {
-            "get": {
-                "description": "",
-                "operationId": "getAllNotificants",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all notification targets for a customer",
-                "tags": [
-                    "Notificant"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createNotificant",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Notificant"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a notification target",
-                "tags": [
-                    "Notificant"
-                ]
-            }
-        },
-        "/api/v2/notificant/test/{id}": {
-            "post": {
-                "description": "",
-                "operationId": "testNotificant",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Test a specific notification target",
-                "tags": [
-                    "Notificant"
-                ]
-            }
-        },
-        "/api/v2/notificant/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteNotificant",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific notification target",
-                "tags": [
-                    "Notificant"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getNotificant",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific notification target",
-                "tags": [
-                    "Notificant"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateNotificant",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Notificant"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"description\": \"Notificant Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"Email title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"method\": \"EMAIL\",\n  \"recipient\": \"value@example.com\",\n  \"emailSubject\": \"Email subject cannot contain new line\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific notification target",
-                "tags": [
-                    "Notificant"
-                ]
-            }
-        },
-        "/api/v2/proxy": {
-            "get": {
-                "description": "",
-                "operationId": "getAllProxy",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all proxies for a customer",
-                "tags": [
-                    "Proxy"
-                ]
-            }
-        },
-        "/api/v2/proxy/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteProxy",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific proxy",
-                "tags": [
-                    "Proxy"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getProxy",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific proxy",
-                "tags": [
-                    "Proxy"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateProxy",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"New Name for proxy\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Proxy"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"New Name for proxy\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update the name of a specific proxy",
-                "tags": [
-                    "Proxy"
-                ]
-            }
-        },
-        "/api/v2/proxy/{id}/undelete": {
-            "post": {
-                "description": "",
-                "operationId": "undeleteProxy",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Undelete a specific proxy",
-                "tags": [
-                    "Proxy"
-                ]
-            }
-        },
-        "/api/v2/savedsearch": {
-            "get": {
-                "description": "",
-                "operationId": "getAllSavedSearches",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedSavedSearch"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all saved searches for a user",
-                "tags": [
-                    "Saved Search"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createSavedSearch",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SavedSearch"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSavedSearch"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a saved search",
-                "tags": [
-                    "Saved Search"
-                ]
-            }
-        },
-        "/api/v2/savedsearch/type/{entitytype}": {
-            "get": {
-                "description": "",
-                "operationId": "getAllEntityTypeSavedSearches",
-                "parameters": [
-                    {
-                        "enum": [
-                            "DASHBOARD",
-                            "ALERT",
-                            "MAINTENANCE_WINDOW",
-                            "NOTIFICANT",
-                            "EVENT",
-                            "SOURCE",
-                            "EXTERNAL_LINK",
-                            "AGENT",
-                            "CLOUD_INTEGRATION",
-                            "USER",
-                            "USER_GROUP"
-                        ],
-                        "in": "path",
-                        "name": "entitytype",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedSavedSearch"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all saved searches for a specific entity type for a user",
-                "tags": [
-                    "Saved Search"
-                ]
-            }
-        },
-        "/api/v2/savedsearch/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteSavedSearch",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSavedSearch"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific saved search",
-                "tags": [
-                    "Saved Search"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getSavedSearch",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSavedSearch"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific saved search",
-                "tags": [
-                    "Saved Search"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateSavedSearch",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SavedSearch"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"query\": {\n    \"foo\": \"{\\\"searchTerms\\\":[{\\\"type\\\":\\\"freetext\\\",\\\"value\\\":\\\"foo\\\"}]}\"\n  },\n  \"entityType\": \"DASHBOARD\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSavedSearch"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific saved search",
-                "tags": [
-                    "Saved Search"
-                ]
-            }
-        },
-        "/api/v2/search/alert": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchAlertEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedAlertWithStats"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's non-deleted alerts",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/alert/deleted": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchAlertDeletedEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedAlert"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's deleted alerts",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/alert/deleted/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchAlertDeletedForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's deleted alerts",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/alert/deleted/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchAlertDeletedForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's deleted alerts",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/alert/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchAlertForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's non-deleted alerts",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/alert/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchAlertForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's non-deleted alerts",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/cloudintegration": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchCloudIntegrationEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's non-deleted cloud integrations",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/cloudintegration/deleted": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchCloudIntegrationDeletedEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedCloudIntegration"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's deleted cloud integrations",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/cloudintegration/deleted/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchCloudIntegrationDeletedForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's deleted cloud integrations",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/cloudintegration/deleted/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchCloudIntegrationDeletedForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's deleted cloud integrations",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/cloudintegration/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchCloudIntegrationForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's non-deleted cloud integrations",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/cloudintegration/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchCloudIntegrationForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's non-deleted cloud integrations",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/dashboard": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchDashboardEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's non-deleted dashboards",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/dashboard/deleted": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchDashboardDeletedEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedDashboard"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's deleted dashboards",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/dashboard/deleted/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchDashboardDeletedForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's deleted dashboards",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/dashboard/deleted/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchDashboardDeletedForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's deleted dashboards",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/dashboard/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchDashboardForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's non-deleted dashboards",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/dashboard/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchDashboardForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's non-deleted dashboards",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/derivedmetric": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchRegisteredQueryEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedDerivedMetricDefinitionWithStats"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's non-deleted derived metric definitions",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/derivedmetric/deleted": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchRegisteredQueryDeletedEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedDerivedMetricDefinition"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's deleted derived metric definitions",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/derivedmetric/deleted/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchRegisteredQueryDeletedForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's deleted derived metric definitions",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/derivedmetric/deleted/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchRegisteredQueryDeletedForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's deleted derived metric definitions",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/derivedmetric/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchRegisteredQueryForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's non-deleted derived metric definition",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/derivedmetric/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchRegisteredQueryForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's non-deleted derived metric definitions",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/event": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchReportEventEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/EventSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedEvent"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's events",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/event/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchReportEventForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's events",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/event/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchReportEventForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's events",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/extlink": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchExternalLinkEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedExternalLink"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's external links",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/extlink/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchExternalLinksForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's external links",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/extlink/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchExternalLinksForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's external links",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/maintenancewindow": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchMaintenanceWindowEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedMaintenanceWindow"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's maintenance windows",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/maintenancewindow/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchMaintenanceWindowForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's maintenance windows",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/maintenancewindow/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchMaintenanceWindowForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's maintenance windows",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/notificant": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchNotificantEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's notificants",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/notificant/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchNotficantForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's notificants",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/notificant/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchNotificantForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's notificants",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/proxy": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchProxyEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's non-deleted proxies",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/proxy/deleted": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchProxyDeletedEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedProxy"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's deleted proxies",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/proxy/deleted/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchProxyDeletedForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's deleted proxies",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/proxy/deleted/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchProxyDeletedForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's deleted proxies",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/proxy/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchProxyForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's non-deleted proxies",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/proxy/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchProxyForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's non-deleted proxies",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/source": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchTaggedSourceEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SourceSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedSource"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's sources",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/source/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchTaggedSourceForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's sources",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/source/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchTaggedSourceForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's sources",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/user": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchUserEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedCustomerFacingUserObject"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's users",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/user/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchUserForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's users",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/user/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchUserForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's users",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/usergroup": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchUserGroupEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's user groups",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/usergroup/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchUserGroupForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's user groups",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/usergroup/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchUserGroupForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's user groups",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/webhook": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchWebHookEntities",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/SortableSearchRequest"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Search over a customer's webhooks",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/webhook/facets": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchWebhookForFacets",
-                "parameters": [
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetsSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetsResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of one or more facets over the customer's webhooks",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/search/webhook/{facet}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "searchWebHookForFacet",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "facet",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/FacetSearchRequestContainer"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerFacetResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Lists the values of a specific facet over the customer's webhooks",
-                "tags": [
-                    "Search"
-                ]
-            }
-        },
-        "/api/v2/source": {
-            "get": {
-                "description": "",
-                "operationId": "getAllSource",
-                "parameters": [
-                    {
-                        "in": "query",
-                        "name": "cursor",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedSource"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all sources for a customer",
-                "tags": [
-                    "Source"
-                ]
-            },
-            "post": {
-                "description": "",
-                "operationId": "createSource",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Source"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSource"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create metadata (description or tags) for a specific source",
-                "tags": [
-                    "Source"
-                ]
-            }
-        },
-        "/api/v2/source/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteSource",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSource"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete metadata (description and tags) for a specific source",
-                "tags": [
-                    "Source"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getSource",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSource"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific source for a customer",
-                "tags": [
-                    "Source"
-                ]
-            },
-            "put": {
-                "description": "The \"hidden\" property is stored as a tag. To set the value, add \"hidden\": &lt;value&gt; to the list of tags.",
-                "operationId": "updateSource",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Source"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n    \"sourceName\": \"source.name\",\n    \"tags\": {\"sourceTag1\": true},\n    \"description\": \"Source Description\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerSource"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update metadata (description or tags) for a specific source.",
-                "tags": [
-                    "Source"
-                ]
-            }
-        },
-        "/api/v2/source/{id}/description": {
-            "delete": {
-                "description": "",
-                "operationId": "removeDescription",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove description from a specific source",
-                "tags": [
-                    "Source"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setDescription",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set description associated with a specific source",
-                "tags": [
-                    "Source"
-                ]
-            }
-        },
-        "/api/v2/source/{id}/tag": {
-            "get": {
-                "description": "",
-                "operationId": "getSourceTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerTagsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all tags associated with a specific source",
-                "tags": [
-                    "Source"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "setSourceTags",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Set all tags associated with a specific source",
-                "tags": [
-                    "Source"
-                ]
-            }
-        },
-        "/api/v2/source/{id}/tag/{tagValue}": {
-            "delete": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "removeSourceTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove a tag from a specific source",
-                "tags": [
-                    "Source"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addSourceTag",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "path",
-                        "name": "tagValue",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainer"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Add a tag to a specific source",
-                "tags": [
-                    "Source"
-                ]
-            }
-        },
-        "/api/v2/user": {
-            "get": {
-                "description": "Returns all users",
-                "operationId": "getAllUser",
-                "parameters": [],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/UserModel"
-                            },
-                            "type": "array"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all users",
-                "tags": [
-                    "User"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createOrUpdateUser",
-                "parameters": [
-                    {
-                        "description": "Whether to send email notification to the user, if created.  Default: false",
-                        "enum": [
-                            "true",
-                            "false"
-                        ],
-                        "in": "query",
-                        "name": "sendEmail",
-                        "required": false,
-                        "type": "boolean"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/UserToCreate"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Creates or updates a user",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/deleteUsers": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "deleteMultipleUsers",
-                "parameters": [
-                    {
-                        "description": "identifiers of list of users which should be deleted",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerListString"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Deletes multiple users",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/grant/{permission}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "grantPermissionToUsers",
-                "parameters": [
-                    {
-                        "description": "Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission",
-                        "enum": [
-                            "agent_management",
-                            "alerts_management",
-                            "dashboard_management",
-                            "embedded_charts",
-                            "events_management",
-                            "external_links_management",
-                            "host_tag_management",
-                            "metrics_management",
-                            "user_management"
-                        ],
-                        "in": "path",
-                        "name": "permission",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "list of users which should be revoked by specified permission",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Grants a specific user permission to multiple users",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/invite": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "inviteUsers",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>[\n{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}\n]</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "$ref": "#/definitions/UserToCreate"
-                            },
-                            "type": "array"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"emailAddress\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Invite users with given user groups and permissions.",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/revoke/{permission}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "revokePermissionFromUsers",
-                "parameters": [
-                    {
-                        "description": "Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission",
-                        "enum": [
-                            "agent_management",
-                            "alerts_management",
-                            "dashboard_management",
-                            "embedded_charts",
-                            "events_management",
-                            "external_links_management",
-                            "host_tag_management",
-                            "metrics_management",
-                            "user_management"
-                        ],
-                        "in": "path",
-                        "name": "permission",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "list of users which should be revoked by specified permission",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Revokes a specific user permission from multiple users",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteUser",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "default": {
-                        "description": "successful operation"
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Deletes a user identified by id",
-                "tags": [
-                    "User"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getUser",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Retrieves a user by identifier (email addr)",
-                "tags": [
-                    "User"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateUser",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"identifier\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/UserRequestDTO"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"identifier\": \"user@example.com\",\n  \"groups\": [\n    \"user_management\"\n  ],\n  \"userGroups\": [\n    \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update user with given user groups and permissions.",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/{id}/addUserGroups": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addUserToUserGroups",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "The list of user groups that should be added to the user",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Adds specific user groups to the user",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/{id}/grant": {
-            "post": {
-                "consumes": [
-                    "application/x-www-form-urlencoded"
-                ],
-                "description": "",
-                "operationId": "grantUserPermission",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission",
-                        "enum": [
-                            "agent_management",
-                            "alerts_management",
-                            "dashboard_management",
-                            "embedded_charts",
-                            "events_management",
-                            "external_links_management",
-                            "host_tag_management",
-                            "metrics_management",
-                            "user_management"
-                        ],
-                        "in": "formData",
-                        "name": "group",
-                        "required": false,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Grants a specific user permission",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/{id}/removeUserGroups": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "removeUserFromUserGroups",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "The list of user groups that should be removed from the user",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Removes specific user groups from the user",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/user/{id}/revoke": {
-            "post": {
-                "consumes": [
-                    "application/x-www-form-urlencoded"
-                ],
-                "description": "",
-                "operationId": "revokeUserPermission",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "formData",
-                        "name": "group",
-                        "required": false,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/UserModel"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Revokes a specific user permission",
-                "tags": [
-                    "User"
-                ]
-            }
-        },
-        "/api/v2/usergroup": {
-            "get": {
-                "description": "",
-                "operationId": "getAllUserGroups",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all user groups for a customer",
-                "tags": [
-                    "UserGroup"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createUserGroup",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/UserGroupWrite"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific user group",
-                "tags": [
-                    "UserGroup"
-                ]
-            }
-        },
-        "/api/v2/usergroup/grant/{permission}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "grantPermissionToUserGroups",
-                "parameters": [
-                    {
-                        "description": "Permission to grant to user group(s).",
-                        "in": "path",
-                        "name": "permission",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "List of user groups.",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Grants a single permission to user group(s)",
-                "tags": [
-                    "UserGroup"
-                ]
-            }
-        },
-        "/api/v2/usergroup/revoke/{permission}": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "revokePermissionFromUserGroups",
-                "parameters": [
-                    {
-                        "description": "Permission to revoke from user group(s).",
-                        "in": "path",
-                        "name": "permission",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "List of user groups.",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Revokes a single permission from user group(s)",
-                "tags": [
-                    "UserGroup"
-                ]
-            }
-        },
-        "/api/v2/usergroup/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteUserGroup",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific user group",
-                "tags": [
-                    "UserGroup"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getUserGroup",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific user group",
-                "tags": [
-                    "UserGroup"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateUserGroup",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"id\": \"UserGroup identifier\",\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/UserGroupWrite"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"id\": \"UserGroup identifier\",\n  \"name\": \"UserGroup name\",\n  \"permissions\": [\n  \"permission1\",\n  \"permission2\",\n  \"permission3\"\n  ]\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific user group",
-                "tags": [
-                    "UserGroup"
-                ]
-            }
-        },
-        "/api/v2/usergroup/{id}/addUsers": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "addUsersToUserGroup",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "List of users that should be added to user group",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Add multiple users to a specific user group",
-                "tags": [
-                    "UserGroup"
-                ]
-            }
-        },
-        "/api/v2/usergroup/{id}/removeUsers": {
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "removeUsersFromUserGroup",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "List of users that should be removed from user group",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerUserGroup"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Remove multiple users from a specific user group",
-                "tags": [
-                    "UserGroup"
-                ]
-            }
-        },
-        "/api/v2/webhook": {
-            "get": {
-                "description": "",
-                "operationId": "getAllWebhooks",
-                "parameters": [
-                    {
-                        "default": 0,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "offset",
-                        "required": false,
-                        "type": "integer"
-                    },
-                    {
-                        "default": 100,
-                        "format": "int32",
-                        "in": "query",
-                        "name": "limit",
-                        "required": false,
-                        "type": "integer"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerPagedNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get all webhooks for a customer",
-                "tags": [
-                    "Webhook"
-                ]
-            },
-            "post": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "createWebhook",
-                "parameters": [
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Notificant"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Create a specific webhook",
-                "tags": [
-                    "Webhook"
-                ]
-            }
-        },
-        "/api/v2/webhook/{id}": {
-            "delete": {
-                "description": "",
-                "operationId": "deleteWebhook",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Delete a specific webhook",
-                "tags": [
-                    "Webhook"
-                ]
-            },
-            "get": {
-                "description": "",
-                "operationId": "getWebhook",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Get a specific webhook",
-                "tags": [
-                    "Webhook"
-                ]
-            },
-            "put": {
-                "consumes": [
-                    "application/json"
-                ],
-                "description": "",
-                "operationId": "updateWebhook",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Example Body: \n<pre>{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}</pre>",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "$ref": "#/definitions/Notificant"
-                        },
-                        "x-examples": {
-                            "application/json": "{\n  \"description\": \"WebHook Description\",\n  \"template\": \"POST Body -- Mustache syntax\",\n  \"title\": \"WebHook Title\",\n  \"triggers\": [\n    \"ALERT_OPENED\"\n  ],\n  \"recipient\": \"http://example.com\",\n  \"customHttpHeaders\": {},\n  \"contentType\": \"text/plain\"\n}"
-                        }
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "responses": {
-                    "200": {
-                        "description": "successful operation",
-                        "schema": {
-                            "$ref": "#/definitions/ResponseContainerNotificant"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Update a specific webhook",
-                "tags": [
-                    "Webhook"
-                ]
-            }
-        },
-        "/report": {
-            "post": {
-                "consumes": [
-                    "application/octet-stream",
-                    "application/x-www-form-urlencoded",
-                    "text/plain"
-                ],
-                "description": "",
-                "operationId": "report",
-                "parameters": [
-                    {
-                        "default": "wavefront",
-                        "description": "Format of data to be ingested",
-                        "enum": [
-                            "wavefront",
-                            "histogram",
-                            "trace"
-                        ],
-                        "in": "query",
-                        "name": "f",
-                        "required": false,
-                        "type": "string"
-                    },
-                    {
-                        "description": "Data to be ingested, in the specified format.  See https://docs.wavefront.com/direct_ingestion.html for more detail on how to format the data. Example in \"wavefront\" format: \n<pre>test.metric 100 source=test.source</pre>\nwhich ingests a time series point with metric name \"test.metric\", source name \"test.source\", and value of 100 with timestamp of now.",
-                        "in": "body",
-                        "name": "body",
-                        "required": false,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "default": {
-                        "description": "successful operation"
-                    }
-                },
-                "security": [
-                    {
-                        "api_key": []
-                    }
-                ],
-                "summary": "Directly ingest data/data stream with specified format",
-                "tags": [
-                    "Direct ingestion"
-                ]
-            }
-        }
-    },
-    "securityDefinitions": {
-        "api_key": {
-            "in": "header",
-            "name": "X-AUTH-TOKEN",
-            "type": "apiKey"
-        }
-    },
-    "swagger": "2.0",
-    "tags": [
-        {
-            "name": "Notificant"
-        },
-        {
-            "name": "Cloud Integration"
-        },
-        {
-            "name": "Settings"
-        },
-        {
-            "name": "Webhook"
-        },
-        {
-            "name": "Message"
-        },
-        {
-            "name": "User"
-        },
-        {
-            "name": "Query"
-        },
-        {
-            "name": "Event"
-        },
-        {
-            "name": "Metric"
-        },
-        {
-            "name": "Derived Metric"
-        },
-        {
-            "name": "Alert"
-        },
-        {
-            "name": "Proxy"
-        },
-        {
-            "name": "Maintenance Window"
-        },
-        {
-            "name": "Saved Search"
-        },
-        {
-            "name": "Integration"
-        },
-        {
-            "name": "Direct ingestion"
-        },
-        {
-            "name": "Dashboard"
-        },
-        {
-            "name": "UserGroup"
-        },
-        {
-            "name": "External Link"
-        },
-        {
-            "name": "Search"
-        },
-        {
-            "name": "Source"
-        }
-    ]
-}

From 901d470bccb9d575e4287cbff04e426d94ac251a Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Fri, 22 Mar 2019 16:29:48 -0700
Subject: [PATCH 023/161] Bump the Version to 2.9.39

1) Fetched the config:
```
$ curl https://vmware.wavefront.com/api/v2/swagger.json | python3 -m json.tool --sort-keys > .swagger-codegen/swagger.json
```
2) Updated the version in `.swagger-codegen/config.json` to 2.9.39
3) Generated the client:
```
$ java -jar ~/Applications/swagger-codegen-cli.jar generate -l python -i .swagger-codegen/swagger.json -c .swagger-codegen/config.json --additional-properties basePath=https://YOUR_INSTANCE.wavefront.com,infoEmail=support@wavefront.com
```
---
 .swagger-codegen/config.json          | 2 +-
 README.md                             | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index b35d449..bddab43 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.9.38"
+    "packageVersion": "2.9.39"
 }
diff --git a/README.md b/README.md
index 088e909..4ed4316 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.9.38
+- Package version: 2.9.39
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index f398796..2271cf2 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.9.38"
+VERSION = "2.9.39"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3cf2e53..b45f725 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -73,7 +73,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.9.38/python'
+        self.user_agent = 'Swagger-Codegen/2.9.39/python'
 
     def __del__(self):
         self.pool.close()
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index af62b27..a771ad8 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.9.38".\
+               "SDK Package Version: 2.9.39".\
                format(env=sys.platform, pyversion=sys.version)

From 216007e68f0c1e36517de75568a777a6d9b4d01e Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Fri, 22 Mar 2019 16:52:46 -0700
Subject: [PATCH 024/161] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2c886a5..ce508f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
-install: "pip install -r test-requirements.txt"
+install: "pip install -r requirements.txt"
 script: nosetests
 deploy:
 - provider: pypi

From ce9cc8624dc5e87a8f4125c28976317e29ec0a8c Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Fri, 22 Mar 2019 17:00:50 -0700
Subject: [PATCH 025/161] Update .travis.yml and requirements.txt

---
 .travis.yml      |  5 ++---
 requirements.txt | 10 +++++-----
 setup.py         |  7 ++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce508f7..860f99c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ dist: xenial
 language: python
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
   - "3.7"
@@ -13,13 +12,13 @@ deploy:
   user: wavefront-cs
   server: https://test.pypi.org/legacy/
   password:
-    secure: dWIjYPu1efm3WOHOTZr4Ci2VsdlXq0mMjAujo/WH+7SpymM7QDx9WpYgGzeq/ISsHH5+Tn6fLeovGtVzIGyH2QWTBU8G+bkzKvWD4BEutGqXFZ+cBHf6TYGQ1OIlZQ0VhkGb4mPczSkQN4Q9mqBHJBwFrtACTuTaUvZqmhyxQpFrrnT8wGeBqJ0LA9SK/Vt4992TUMLPCmrqW3bkiLTu81oMVhJb/CIPG+hMMcjdn6loTRsvbpWWCoNvcYueUeYKgEoPirkOAa5xc87rE6Ld9HZSdHKpsvuTICFe9tDqkegAK4pI5pnQvN504WM66Q9iK1jEWTeKm8KBc9wDxi77S/o+y1l98D9ulzpu1SNoy5X+seIe1UTN5L2L8kGUjAU9BLs32h64+KiR8w5LJrcXmqaod3JoPjr9a/e/02hpz1NaLoVIcpqfq9oTgz0BYlmO/2RCoQi6V3q4nSn6DDxgDuHYr3uJz0AYaMc1TEGqHeUkGuJNxuP+m1C9Ite1crZfDRsKviie/CDToM3Lr2dOPk4R90N6tzlP31BV7WaCJfyIAFwW1osrPScZ32cFdvzQBRhHN49kliSF6FOAQiiegB74lOgvkMy4rLtXLSJcUea/3iD9oCpsa+1FJjtKAX0b70F2G1tF2GZ4wH5shT9m9/9zUAFAck056XPIs80ZRkE=
+    secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
   on:
     python: 3.7
 - provider: pypi
   user: wavefront-cs
   password:
-    secure: dWIjYPu1efm3WOHOTZr4Ci2VsdlXq0mMjAujo/WH+7SpymM7QDx9WpYgGzeq/ISsHH5+Tn6fLeovGtVzIGyH2QWTBU8G+bkzKvWD4BEutGqXFZ+cBHf6TYGQ1OIlZQ0VhkGb4mPczSkQN4Q9mqBHJBwFrtACTuTaUvZqmhyxQpFrrnT8wGeBqJ0LA9SK/Vt4992TUMLPCmrqW3bkiLTu81oMVhJb/CIPG+hMMcjdn6loTRsvbpWWCoNvcYueUeYKgEoPirkOAa5xc87rE6Ld9HZSdHKpsvuTICFe9tDqkegAK4pI5pnQvN504WM66Q9iK1jEWTeKm8KBc9wDxi77S/o+y1l98D9ulzpu1SNoy5X+seIe1UTN5L2L8kGUjAU9BLs32h64+KiR8w5LJrcXmqaod3JoPjr9a/e/02hpz1NaLoVIcpqfq9oTgz0BYlmO/2RCoQi6V3q4nSn6DDxgDuHYr3uJz0AYaMc1TEGqHeUkGuJNxuP+m1C9Ite1crZfDRsKviie/CDToM3Lr2dOPk4R90N6tzlP31BV7WaCJfyIAFwW1osrPScZ32cFdvzQBRhHN49kliSF6FOAQiiegB74lOgvkMy4rLtXLSJcUea/3iD9oCpsa+1FJjtKAX0b70F2G1tF2GZ4wH5shT9m9/9zUAFAck056XPIs80ZRkE=
+    secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
   on:
     python: 3.7
     tags: true
diff --git a/requirements.txt b/requirements.txt
index bafdc07..a4b284b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-certifi >= 14.05.14
-six >= 1.10
-python_dateutil >= 2.5.3
-setuptools >= 21.0.0
-urllib3 >= 1.15.1
+certifi>=2017.4.17
+python-dateutil>=2.1
+setuptools>=21.0.0
+six>=1.10
+urllib3>=1.23
diff --git a/setup.py b/setup.py
index 2271cf2..150861b 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,12 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
+REQUIRES = [
+    "certifi>=2017.4.17",
+    "python-dateutil>=2.1",
+    "six>=1.10",
+    "urllib3>=1.23"
+]
 
 setup(
     name=NAME,

From 4d9cfa32075a6a65d88a38fe9e72b282e87b8808 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 2 Apr 2019 09:51:39 -0700
Subject: [PATCH 026/161] Update Python Client to v.2.29.47 (#48)

* Update Python Client to v.2.9.47

```
curl http://central.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.4/swagger-codegen-cli-2.4.4.jar -o ~/Applications/swagger-codegen-cli.jar

curl -s https://metrics.wavefront.com/api/v2/swagger.json | python3 -m json.tool --sort-keys > .swagger-codegen/swagger.json

java -jar ~/Applications/swagger-codegen-cli.jar generate \
-l python \
-i .swagger-codegen/swagger.json \
-c .swagger-codegen/config.json \
--additional-properties \
basePath=https://YOUR_INSTANCE.wavefront.com,infoEmail=support@wavefront.com
```

* Bump the Version Up to v2.29.47 (Based on 29.47)

* Freeze the requirements.txt
---
 .swagger-codegen-ignore                       |   1 +
 .swagger-codegen/VERSION                      |   2 +-
 .swagger-codegen/config.json                  |   2 +-
 README.md                                     |   6 +-
 docs/ResponseContainerValidatedUsersDTO.md    |  11 +
 docs/UserApi.md                               |  55 ++++
 docs/UserDTO.md                               |  15 ++
 docs/ValidatedUsersDTO.md                     |  11 +
 setup.py                                      |   3 +-
 ..._response_container_validated_users_dto.py |  40 +++
 test/test_user_dto.py                         |  40 +++
 test/test_validated_users_dto.py              |  40 +++
 wavefront_api_client/__init__.py              |   3 +
 wavefront_api_client/api/user_api.py          |  95 +++++++
 wavefront_api_client/api_client.py            |  16 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   3 +
 .../response_container_validated_users_dto.py | 145 ++++++++++
 wavefront_api_client/models/user_dto.py       | 247 ++++++++++++++++++
 .../models/validated_users_dto.py             | 143 ++++++++++
 20 files changed, 871 insertions(+), 9 deletions(-)
 create mode 100644 docs/ResponseContainerValidatedUsersDTO.md
 create mode 100644 docs/UserDTO.md
 create mode 100644 docs/ValidatedUsersDTO.md
 create mode 100644 test/test_response_container_validated_users_dto.py
 create mode 100644 test/test_user_dto.py
 create mode 100644 test/test_validated_users_dto.py
 create mode 100644 wavefront_api_client/models/response_container_validated_users_dto.py
 create mode 100644 wavefront_api_client/models/user_dto.py
 create mode 100644 wavefront_api_client/models/validated_users_dto.py

diff --git a/.swagger-codegen-ignore b/.swagger-codegen-ignore
index 3df273c..3bc9477 100644
--- a/.swagger-codegen-ignore
+++ b/.swagger-codegen-ignore
@@ -1,2 +1,3 @@
 .travis.yml
 git_push.sh
+requirements.txt
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index acdc3f1..ab6d278 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.2
\ No newline at end of file
+2.4.4
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index bddab43..a70f002 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.9.39"
+    "packageVersion": "2.29.47"
 }
diff --git a/README.md b/README.md
index 4ed4316..bf546a8 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.9.39
+- Package version: 2.29.47
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -268,6 +268,7 @@ Class | Method | HTTP request | Description
 *UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific user permission from multiple users
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific user permission
 *UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
+*UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and invalid identifiers from the given list
 *UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 *UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 *UserGroupApi* | [**delete_user_group**](docs/UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
@@ -411,6 +412,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserGroup](docs/ResponseContainerUserGroup.md)
+ - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [SavedSearch](docs/SavedSearch.md)
  - [SearchQuery](docs/SearchQuery.md)
@@ -425,6 +427,7 @@ Class | Method | HTTP request | Description
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [User](docs/User.md)
+ - [UserDTO](docs/UserDTO.md)
  - [UserGroup](docs/UserGroup.md)
  - [UserGroupPropertiesDTO](docs/UserGroupPropertiesDTO.md)
  - [UserGroupWrite](docs/UserGroupWrite.md)
@@ -432,6 +435,7 @@ Class | Method | HTTP request | Description
  - [UserRequestDTO](docs/UserRequestDTO.md)
  - [UserSettings](docs/UserSettings.md)
  - [UserToCreate](docs/UserToCreate.md)
+ - [ValidatedUsersDTO](docs/ValidatedUsersDTO.md)
  - [WFTags](docs/WFTags.md)
 
 
diff --git a/docs/ResponseContainerValidatedUsersDTO.md b/docs/ResponseContainerValidatedUsersDTO.md
new file mode 100644
index 0000000..4c05a98
--- /dev/null
+++ b/docs/ResponseContainerValidatedUsersDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerValidatedUsersDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**ValidatedUsersDTO**](ValidatedUsersDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 77a4ec2..503de7d 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -17,6 +17,7 @@ Method | HTTP request | Description
 [**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific user permission from multiple users
 [**revoke_user_permission**](UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific user permission
 [**update_user**](UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
+[**validate_users**](UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and invalid identifiers from the given list
 
 
 # **add_user_to_user_groups**
@@ -732,3 +733,57 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **validate_users**
+> ResponseContainerValidatedUsersDTO validate_users(body=body)
+
+Returns valid users and invalid identifiers from the given list
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
+
+try:
+    # Returns valid users and invalid identifiers from the given list
+    api_response = api_instance.validate_users(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->validate_users: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerValidatedUsersDTO**](ResponseContainerValidatedUsersDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
new file mode 100644
index 0000000..9e22696
--- /dev/null
+++ b/docs/UserDTO.md
@@ -0,0 +1,15 @@
+# UserDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer** | **str** |  | [optional] 
+**groups** | **list[str]** |  | [optional] 
+**identifier** | **str** |  | [optional] 
+**last_successful_login** | **int** |  | [optional] 
+**sso_id** | **str** |  | [optional] 
+**user_groups** | [**list[UserGroup]**](UserGroup.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ValidatedUsersDTO.md b/docs/ValidatedUsersDTO.md
new file mode 100644
index 0000000..6f5542f
--- /dev/null
+++ b/docs/ValidatedUsersDTO.md
@@ -0,0 +1,11 @@
+# ValidatedUsersDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**invalid_identifiers** | **list[str]** |  | [optional] 
+**valid_users** | [**list[UserDTO]**](UserDTO.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 150861b..6cae13b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.9.39"
+VERSION = "2.29.47"
 # To install the library, run the following
 #
 # python setup.py install
@@ -28,6 +28,7 @@
     "six>=1.10",
     "urllib3>=1.23"
 ]
+    
 
 setup(
     name=NAME,
diff --git a/test/test_response_container_validated_users_dto.py b/test/test_response_container_validated_users_dto.py
new file mode 100644
index 0000000..ccca8f0
--- /dev/null
+++ b/test/test_response_container_validated_users_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerValidatedUsersDTO(unittest.TestCase):
+    """ResponseContainerValidatedUsersDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerValidatedUsersDTO(self):
+        """Test ResponseContainerValidatedUsersDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_validated_users_dto.ResponseContainerValidatedUsersDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_dto.py b/test/test_user_dto.py
new file mode 100644
index 0000000..f179fcc
--- /dev/null
+++ b/test/test_user_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_dto import UserDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserDTO(unittest.TestCase):
+    """UserDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserDTO(self):
+        """Test UserDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_dto.UserDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_validated_users_dto.py b/test/test_validated_users_dto.py
new file mode 100644
index 0000000..fe61f54
--- /dev/null
+++ b/test/test_validated_users_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestValidatedUsersDTO(unittest.TestCase):
+    """ValidatedUsersDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testValidatedUsersDTO(self):
+        """Test ValidatedUsersDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.validated_users_dto.ValidatedUsersDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index ad7c4dd..cca484b 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -167,6 +167,7 @@
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup
+from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
@@ -181,6 +182,7 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.user import User
+from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
@@ -188,4 +190,5 @@
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_settings import UserSettings
 from wavefront_api_client.models.user_to_create import UserToCreate
+from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index cd50465..10a9b8e 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -1319,3 +1319,98 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
+
+    def validate_users(self, **kwargs):  # noqa: E501
+        """Returns valid users and invalid identifiers from the given list  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.validate_users(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body:
+        :return: ResponseContainerValidatedUsersDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.validate_users_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.validate_users_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def validate_users_with_http_info(self, **kwargs):  # noqa: E501
+        """Returns valid users and invalid identifiers from the given list  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.validate_users_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body:
+        :return: ResponseContainerValidatedUsersDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method validate_users" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/validateUsers', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerValidatedUsersDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b45f725..22cea83 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -66,18 +66,26 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             configuration = Configuration()
         self.configuration = configuration
 
-        self.pool = ThreadPool()
+        # Use the pool property to lazily initialize the ThreadPool.
+        self._pool = None
         self.rest_client = rest.RESTClientObject(configuration)
         self.default_headers = {}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.9.39/python'
+        self.user_agent = 'Swagger-Codegen/2.29.47/python'
 
     def __del__(self):
-        self.pool.close()
-        self.pool.join()
+        if self._pool is not None:
+            self._pool.close()
+            self._pool.join()
+
+    @property
+    def pool(self):
+        if self._pool is None:
+            self._pool = ThreadPool()
+        return self._pool
 
     @property
     def user_agent(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index a771ad8..27195a5 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.9.39".\
+               "SDK Package Version: 2.29.47".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 4ae97f0..436a2b4 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -140,6 +140,7 @@
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup
+from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
@@ -154,6 +155,7 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.user import User
+from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
@@ -161,4 +163,5 @@
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_settings import UserSettings
 from wavefront_api_client.models.user_to_create import UserToCreate
+from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
new file mode 100644
index 0000000..faae21c
--- /dev/null
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO  # noqa: F401,E501
+
+
+class ResponseContainerValidatedUsersDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'ValidatedUsersDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerValidatedUsersDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+        :rtype: ValidatedUsersDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerValidatedUsersDTO.
+
+
+        :param response: The response of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+        :type: ValidatedUsersDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerValidatedUsersDTO.
+
+
+        :param status: The status of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerValidatedUsersDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerValidatedUsersDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
new file mode 100644
index 0000000..0fa4735
--- /dev/null
+++ b/wavefront_api_client/models/user_dto.py
@@ -0,0 +1,247 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
+
+class UserDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer': 'str',
+        'groups': 'list[str]',
+        'identifier': 'str',
+        'last_successful_login': 'int',
+        'sso_id': 'str',
+        'user_groups': 'list[UserGroup]'
+    }
+
+    attribute_map = {
+        'customer': 'customer',
+        'groups': 'groups',
+        'identifier': 'identifier',
+        'last_successful_login': 'lastSuccessfulLogin',
+        'sso_id': 'ssoId',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, customer=None, groups=None, identifier=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
+        """UserDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._customer = None
+        self._groups = None
+        self._identifier = None
+        self._last_successful_login = None
+        self._sso_id = None
+        self._user_groups = None
+        self.discriminator = None
+
+        if customer is not None:
+            self.customer = customer
+        if groups is not None:
+            self.groups = groups
+        if identifier is not None:
+            self.identifier = identifier
+        if last_successful_login is not None:
+            self.last_successful_login = last_successful_login
+        if sso_id is not None:
+            self.sso_id = sso_id
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def customer(self):
+        """Gets the customer of this UserDTO.  # noqa: E501
+
+
+        :return: The customer of this UserDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserDTO.
+
+
+        :param customer: The customer of this UserDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def groups(self):
+        """Gets the groups of this UserDTO.  # noqa: E501
+
+
+        :return: The groups of this UserDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this UserDTO.
+
+
+        :param groups: The groups of this UserDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this UserDTO.  # noqa: E501
+
+
+        :return: The identifier of this UserDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._identifier
+
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this UserDTO.
+
+
+        :param identifier: The identifier of this UserDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._identifier = identifier
+
+    @property
+    def last_successful_login(self):
+        """Gets the last_successful_login of this UserDTO.  # noqa: E501
+
+
+        :return: The last_successful_login of this UserDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_successful_login
+
+    @last_successful_login.setter
+    def last_successful_login(self, last_successful_login):
+        """Sets the last_successful_login of this UserDTO.
+
+
+        :param last_successful_login: The last_successful_login of this UserDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._last_successful_login = last_successful_login
+
+    @property
+    def sso_id(self):
+        """Gets the sso_id of this UserDTO.  # noqa: E501
+
+
+        :return: The sso_id of this UserDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._sso_id
+
+    @sso_id.setter
+    def sso_id(self, sso_id):
+        """Sets the sso_id of this UserDTO.
+
+
+        :param sso_id: The sso_id of this UserDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._sso_id = sso_id
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this UserDTO.  # noqa: E501
+
+
+        :return: The user_groups of this UserDTO.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this UserDTO.
+
+
+        :param user_groups: The user_groups of this UserDTO.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
new file mode 100644
index 0000000..253e989
--- /dev/null
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -0,0 +1,143 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: support@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_dto import UserDTO  # noqa: F401,E501
+
+
+class ValidatedUsersDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'invalid_identifiers': 'list[str]',
+        'valid_users': 'list[UserDTO]'
+    }
+
+    attribute_map = {
+        'invalid_identifiers': 'invalidIdentifiers',
+        'valid_users': 'validUsers'
+    }
+
+    def __init__(self, invalid_identifiers=None, valid_users=None):  # noqa: E501
+        """ValidatedUsersDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._invalid_identifiers = None
+        self._valid_users = None
+        self.discriminator = None
+
+        if invalid_identifiers is not None:
+            self.invalid_identifiers = invalid_identifiers
+        if valid_users is not None:
+            self.valid_users = valid_users
+
+    @property
+    def invalid_identifiers(self):
+        """Gets the invalid_identifiers of this ValidatedUsersDTO.  # noqa: E501
+
+
+        :return: The invalid_identifiers of this ValidatedUsersDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._invalid_identifiers
+
+    @invalid_identifiers.setter
+    def invalid_identifiers(self, invalid_identifiers):
+        """Sets the invalid_identifiers of this ValidatedUsersDTO.
+
+
+        :param invalid_identifiers: The invalid_identifiers of this ValidatedUsersDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._invalid_identifiers = invalid_identifiers
+
+    @property
+    def valid_users(self):
+        """Gets the valid_users of this ValidatedUsersDTO.  # noqa: E501
+
+
+        :return: The valid_users of this ValidatedUsersDTO.  # noqa: E501
+        :rtype: list[UserDTO]
+        """
+        return self._valid_users
+
+    @valid_users.setter
+    def valid_users(self, valid_users):
+        """Sets the valid_users of this ValidatedUsersDTO.
+
+
+        :param valid_users: The valid_users of this ValidatedUsersDTO.  # noqa: E501
+        :type: list[UserDTO]
+        """
+
+        self._valid_users = valid_users
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ValidatedUsersDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ValidatedUsersDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From b0f1046a8f68c2c7d69e395f7167241f224c738a Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 16 Apr 2019 10:05:41 -0700
Subject: [PATCH 027/161] Autogenerated Update v2.30.15 Using Bash Script.
 (#49)

* Experiment With Storing Swagger API Spec.

Command
```
$ curl https://metrics.wavefront.com/api/v2/swagger.json | python3 -m json.tool > swagger.json
```

* Second Run Of Storing the Same Config.

Command
```
$ curl https://metrics.wavefront.com/api/v2/swagger.json | python3 -m json.tool > swagger.json
```

* Use json.tool With --sort-keys

```
curl https://metrics.wavefront.com/api/v2/swagger.json | python3 -m json.tool --sort-keys > swagger.json
```

* Autogenerated Update v2.30.15.

* Do Not Cache Swagger JSON on GitHub.

* Replace 'support' With 'chitimba' in Contact.

* Update Contact Info in test/* as Well.

* Use Python2 if Python3 Isn't Available.

* Fix Typo.
---
 .swagger-codegen/config.json                  |    2 +-
 README.md                                     |    4 +-
 docs/DerivedMetricDefinitionApi.md            |  684 ---------
 example.py                                    |   17 -
 generate_client                               |   79 ++
 setup.py                                      |    6 +-
 test/test_access_control_element.py           |    2 +-
 test/test_access_control_list_simple.py       |    2 +-
 test/test_acl.py                              |    2 +-
 test/test_alert.py                            |    2 +-
 test/test_alert_api.py                        |    2 +-
 test/test_avro_backed_standardized_dto.py     |    2 +-
 test/test_aws_base_credentials.py             |    2 +-
 test/test_azure_activity_log_configuration.py |    2 +-
 test/test_azure_base_credentials.py           |    2 +-
 test/test_azure_configuration.py              |    2 +-
 test/test_business_action_group_basic_dto.py  |    2 +-
 test/test_chart.py                            |    2 +-
 test/test_chart_settings.py                   |    2 +-
 test/test_chart_source_query.py               |    2 +-
 test/test_cloud_integration.py                |    2 +-
 test/test_cloud_integration_api.py            |    2 +-
 test/test_cloud_trail_configuration.py        |    2 +-
 test/test_cloud_watch_configuration.py        |    2 +-
 test/test_customer_facing_user_object.py      |    2 +-
 test/test_customer_preferences.py             |    2 +-
 test/test_customer_preferences_updating.py    |    2 +-
 test/test_dashboard.py                        |    2 +-
 test/test_dashboard_api.py                    |    2 +-
 test/test_dashboard_parameter_value.py        |    2 +-
 test/test_dashboard_section.py                |    2 +-
 test/test_dashboard_section_row.py            |    2 +-
 test/test_derived_metric_api.py               |    2 +-
 test/test_derived_metric_definition.py        |    2 +-
 test/test_direct_ingestion_api.py             |    2 +-
 test/test_ec2_configuration.py                |    2 +-
 test/test_event.py                            |    2 +-
 test/test_event_api.py                        |    2 +-
 test/test_event_search_request.py             |    2 +-
 test/test_event_time_range.py                 |    2 +-
 test/test_external_link.py                    |    2 +-
 test/test_external_link_api.py                |    2 +-
 test/test_facet_response.py                   |    2 +-
 test/test_facet_search_request_container.py   |    2 +-
 test/test_facets_response_container.py        |    2 +-
 test/test_facets_search_request_container.py  |    2 +-
 test/test_gcp_billing_configuration.py        |    2 +-
 test/test_gcp_configuration.py                |    2 +-
 test/test_history_entry.py                    |    2 +-
 test/test_history_response.py                 |    2 +-
 test/test_install_alerts.py                   |    2 +-
 test/test_integration.py                      |    2 +-
 test/test_integration_alert.py                |    2 +-
 test/test_integration_alias.py                |    2 +-
 test/test_integration_api.py                  |    2 +-
 test/test_integration_dashboard.py            |    2 +-
 test/test_integration_manifest_group.py       |    2 +-
 test/test_integration_metrics.py              |    2 +-
 test/test_integration_status.py               |    2 +-
 test/test_iterator_entry_string_json_node.py  |    2 +-
 test/test_iterator_json_node.py               |    2 +-
 test/test_iterator_string.py                  |    2 +-
 test/test_json_node.py                        |    2 +-
 test/test_logical_type.py                     |    2 +-
 test/test_maintenance_window.py               |    2 +-
 test/test_maintenance_window_api.py           |    2 +-
 test/test_message.py                          |    2 +-
 test/test_message_api.py                      |    2 +-
 test/test_metric_api.py                       |    2 +-
 test/test_metric_details.py                   |    2 +-
 test/test_metric_details_response.py          |    2 +-
 test/test_metric_status.py                    |    2 +-
 test/test_new_relic_configuration.py          |    2 +-
 test/test_new_relic_metric_filters.py         |    2 +-
 test/test_notificant.py                       |    2 +-
 test/test_notificant_api.py                   |    2 +-
 test/test_number.py                           |    2 +-
 test/test_paged_alert.py                      |    2 +-
 test/test_paged_alert_with_stats.py           |    2 +-
 test/test_paged_cloud_integration.py          |    2 +-
 .../test_paged_customer_facing_user_object.py |    2 +-
 test/test_paged_dashboard.py                  |    2 +-
 test/test_paged_derived_metric_definition.py  |    2 +-
 ...ed_derived_metric_definition_with_stats.py |    2 +-
 test/test_paged_event.py                      |    2 +-
 test/test_paged_external_link.py              |    2 +-
 test/test_paged_integration.py                |    2 +-
 test/test_paged_maintenance_window.py         |    2 +-
 test/test_paged_message.py                    |    2 +-
 test/test_paged_notificant.py                 |    2 +-
 test/test_paged_proxy.py                      |    2 +-
 test/test_paged_saved_search.py               |    2 +-
 test/test_paged_source.py                     |    2 +-
 test/test_paged_user_group.py                 |    2 +-
 test/test_point.py                            |    2 +-
 test/test_proxy.py                            |    2 +-
 test/test_proxy_api.py                        |    2 +-
 test/test_query_api.py                        |    2 +-
 test/test_query_event.py                      |    2 +-
 test/test_query_result.py                     |    2 +-
 test/test_raw_timeseries.py                   |    2 +-
 test/test_response_container.py               |    2 +-
 test/test_response_container_alert.py         |    2 +-
 ...st_response_container_cloud_integration.py |    2 +-
 test/test_response_container_dashboard.py     |    2 +-
 ...nse_container_derived_metric_definition.py |    2 +-
 test/test_response_container_event.py         |    2 +-
 test/test_response_container_external_link.py |    2 +-
 .../test_response_container_facet_response.py |    2 +-
 ...nse_container_facets_response_container.py |    2 +-
 ...est_response_container_history_response.py |    2 +-
 test/test_response_container_integration.py   |    2 +-
 ...t_response_container_integration_status.py |    2 +-
 test/test_response_container_list_acl.py      |    2 +-
 ...est_response_container_list_integration.py |    2 +-
 ...ntainer_list_integration_manifest_group.py |    2 +-
 test/test_response_container_list_string.py   |    2 +-
 ...test_response_container_list_user_group.py |    2 +-
 ...t_response_container_maintenance_window.py |    2 +-
 ...t_response_container_map_string_integer.py |    2 +-
 ...container_map_string_integration_status.py |    2 +-
 test/test_response_container_message.py       |    2 +-
 test/test_response_container_notificant.py    |    2 +-
 test/test_response_container_paged_alert.py   |    2 +-
 ...sponse_container_paged_alert_with_stats.py |    2 +-
 ...ponse_container_paged_cloud_integration.py |    2 +-
 ...ainer_paged_customer_facing_user_object.py |    2 +-
 ...test_response_container_paged_dashboard.py |    2 +-
 ...ntainer_paged_derived_metric_definition.py |    2 +-
 ...ed_derived_metric_definition_with_stats.py |    2 +-
 test/test_response_container_paged_event.py   |    2 +-
 ..._response_container_paged_external_link.py |    2 +-
 ...st_response_container_paged_integration.py |    2 +-
 ...onse_container_paged_maintenance_window.py |    2 +-
 test/test_response_container_paged_message.py |    2 +-
 ...est_response_container_paged_notificant.py |    2 +-
 test/test_response_container_paged_proxy.py   |    2 +-
 ...t_response_container_paged_saved_search.py |    2 +-
 test/test_response_container_paged_source.py  |    2 +-
 ...est_response_container_paged_user_group.py |    2 +-
 test/test_response_container_proxy.py         |    2 +-
 test/test_response_container_saved_search.py  |    2 +-
 test/test_response_container_source.py        |    2 +-
 test/test_response_container_tags_response.py |    2 +-
 test/test_response_container_user_group.py    |    2 +-
 ..._response_container_validated_users_dto.py |    2 +-
 test/test_response_status.py                  |    2 +-
 test/test_saved_search.py                     |    2 +-
 test/test_saved_search_api.py                 |    2 +-
 test/test_search_api.py                       |    2 +-
 test/test_search_query.py                     |    2 +-
 test/test_settings_api.py                     |    2 +-
 test/test_sortable_search_request.py          |    2 +-
 test/test_sorting.py                          |    2 +-
 test/test_source.py                           |    2 +-
 test/test_source_api.py                       |    2 +-
 test/test_source_label_pair.py                |    2 +-
 test/test_source_search_request_container.py  |    2 +-
 test/test_stats_model.py                      |    2 +-
 test/test_tags_response.py                    |    2 +-
 test/test_target_info.py                      |    2 +-
 test/test_tesla_configuration.py              |    2 +-
 test/test_timeseries.py                       |    2 +-
 test/test_user.py                             |    2 +-
 test/test_user_api.py                         |    9 +-
 test/test_user_dto.py                         |    2 +-
 test/test_user_group.py                       |    2 +-
 test/test_user_group_api.py                   |    2 +-
 test/test_user_group_properties_dto.py        |    2 +-
 test/test_user_group_write.py                 |    2 +-
 test/test_user_model.py                       |    2 +-
 test/test_user_request_dto.py                 |    2 +-
 test/test_user_settings.py                    |    2 +-
 test/test_user_to_create.py                   |    2 +-
 test/test_validated_users_dto.py              |    2 +-
 test/test_webhook_api.py                      |    2 +-
 test/test_wf_tags.py                          |    2 +-
 wavefront_api_client/__init__.py              |    2 +-
 wavefront_api_client/api/alert_api.py         |    2 +-
 .../api/cloud_integration_api.py              |    2 +-
 wavefront_api_client/api/dashboard_api.py     |    2 +-
 .../api/derived_metric_api.py                 |    2 +-
 .../api/derived_metric_definition_api.py      | 1226 -----------------
 .../api/direct_ingestion_api.py               |    2 +-
 wavefront_api_client/api/event_api.py         |    2 +-
 wavefront_api_client/api/external_link_api.py |    2 +-
 wavefront_api_client/api/integration_api.py   |    2 +-
 .../api/maintenance_window_api.py             |    2 +-
 wavefront_api_client/api/message_api.py       |    2 +-
 wavefront_api_client/api/metric_api.py        |    2 +-
 wavefront_api_client/api/notificant_api.py    |    2 +-
 wavefront_api_client/api/proxy_api.py         |    2 +-
 wavefront_api_client/api/query_api.py         |    2 +-
 wavefront_api_client/api/saved_search_api.py  |    2 +-
 wavefront_api_client/api/search_api.py        |    2 +-
 wavefront_api_client/api/settings_api.py      |    2 +-
 wavefront_api_client/api/source_api.py        |    2 +-
 wavefront_api_client/api/user_api.py          |    2 +-
 wavefront_api_client/api/user_group_api.py    |    2 +-
 wavefront_api_client/api/webhook_api.py       |    2 +-
 wavefront_api_client/api_client.py            |    4 +-
 wavefront_api_client/configuration.py         |    4 +-
 wavefront_api_client/models/__init__.py       |    2 +-
 .../models/access_control_element.py          |    2 +-
 .../models/access_control_list_simple.py      |    2 +-
 wavefront_api_client/models/acl.py            |    2 +-
 wavefront_api_client/models/alert.py          |    2 +-
 .../models/avro_backed_standardized_dto.py    |    2 +-
 .../models/aws_base_credentials.py            |    2 +-
 .../azure_activity_log_configuration.py       |    2 +-
 .../models/azure_base_credentials.py          |    2 +-
 .../models/azure_configuration.py             |    2 +-
 .../models/business_action_group_basic_dto.py |    2 +-
 wavefront_api_client/models/chart.py          |    2 +-
 wavefront_api_client/models/chart_settings.py |    2 +-
 .../models/chart_source_query.py              |    2 +-
 .../models/cloud_integration.py               |    2 +-
 .../models/cloud_trail_configuration.py       |    2 +-
 .../models/cloud_watch_configuration.py       |    2 +-
 .../models/customer_facing_user_object.py     |    2 +-
 .../models/customer_preferences.py            |    2 +-
 .../models/customer_preferences_updating.py   |    2 +-
 wavefront_api_client/models/dashboard.py      |    2 +-
 .../models/dashboard_parameter_value.py       |    2 +-
 .../models/dashboard_section.py               |    2 +-
 .../models/dashboard_section_row.py           |    2 +-
 .../models/derived_metric_definition.py       |    2 +-
 .../models/ec2_configuration.py               |    2 +-
 wavefront_api_client/models/event.py          |    2 +-
 .../models/event_search_request.py            |    2 +-
 .../models/event_time_range.py                |    2 +-
 wavefront_api_client/models/external_link.py  |    2 +-
 wavefront_api_client/models/facet_response.py |    2 +-
 .../models/facet_search_request_container.py  |    2 +-
 .../models/facets_response_container.py       |    2 +-
 .../models/facets_search_request_container.py |    2 +-
 .../models/gcp_billing_configuration.py       |    2 +-
 .../models/gcp_configuration.py               |    2 +-
 wavefront_api_client/models/history_entry.py  |    2 +-
 .../models/history_response.py                |    2 +-
 wavefront_api_client/models/install_alerts.py |    2 +-
 wavefront_api_client/models/integration.py    |    2 +-
 .../models/integration_alert.py               |    2 +-
 .../models/integration_alias.py               |    2 +-
 .../models/integration_dashboard.py           |    2 +-
 .../models/integration_manifest_group.py      |    2 +-
 .../models/integration_metrics.py             |    2 +-
 .../models/integration_status.py              |    2 +-
 .../models/iterator_entry_string_json_node.py |    2 +-
 .../models/iterator_json_node.py              |    2 +-
 .../models/iterator_string.py                 |    2 +-
 wavefront_api_client/models/json_node.py      |    2 +-
 wavefront_api_client/models/logical_type.py   |    2 +-
 .../models/maintenance_window.py              |    2 +-
 wavefront_api_client/models/message.py        |    2 +-
 wavefront_api_client/models/metric_details.py |    2 +-
 .../models/metric_details_response.py         |    2 +-
 wavefront_api_client/models/metric_status.py  |    2 +-
 .../models/new_relic_configuration.py         |    2 +-
 .../models/new_relic_metric_filters.py        |    2 +-
 wavefront_api_client/models/notificant.py     |    2 +-
 wavefront_api_client/models/number.py         |    2 +-
 wavefront_api_client/models/paged_alert.py    |    2 +-
 .../models/paged_alert_with_stats.py          |    2 +-
 .../models/paged_cloud_integration.py         |    2 +-
 .../paged_customer_facing_user_object.py      |    2 +-
 .../models/paged_dashboard.py                 |    2 +-
 .../models/paged_derived_metric_definition.py |    2 +-
 ...ed_derived_metric_definition_with_stats.py |    2 +-
 wavefront_api_client/models/paged_event.py    |    2 +-
 .../models/paged_external_link.py             |    2 +-
 .../models/paged_integration.py               |    2 +-
 .../models/paged_maintenance_window.py        |    2 +-
 wavefront_api_client/models/paged_message.py  |    2 +-
 .../models/paged_notificant.py                |    2 +-
 wavefront_api_client/models/paged_proxy.py    |    2 +-
 .../models/paged_saved_search.py              |    2 +-
 wavefront_api_client/models/paged_source.py   |    2 +-
 .../models/paged_user_group.py                |    2 +-
 wavefront_api_client/models/point.py          |    2 +-
 wavefront_api_client/models/proxy.py          |    2 +-
 wavefront_api_client/models/query_event.py    |    2 +-
 wavefront_api_client/models/query_result.py   |    2 +-
 wavefront_api_client/models/raw_timeseries.py |    2 +-
 .../models/response_container.py              |    2 +-
 .../models/response_container_alert.py        |    2 +-
 .../response_container_cloud_integration.py   |    2 +-
 .../models/response_container_dashboard.py    |    2 +-
 ...nse_container_derived_metric_definition.py |    2 +-
 .../models/response_container_event.py        |    2 +-
 .../response_container_external_link.py       |    2 +-
 .../response_container_facet_response.py      |    2 +-
 ...nse_container_facets_response_container.py |    2 +-
 .../response_container_history_response.py    |    2 +-
 .../models/response_container_integration.py  |    2 +-
 .../response_container_integration_status.py  |    2 +-
 .../models/response_container_list_acl.py     |    2 +-
 .../response_container_list_integration.py    |    2 +-
 ...ntainer_list_integration_manifest_group.py |    2 +-
 .../models/response_container_list_string.py  |    2 +-
 .../response_container_list_user_group.py     |    2 +-
 .../response_container_maintenance_window.py  |    2 +-
 .../response_container_map_string_integer.py  |    2 +-
 ...container_map_string_integration_status.py |    2 +-
 .../models/response_container_message.py      |    2 +-
 .../models/response_container_notificant.py   |    2 +-
 .../models/response_container_paged_alert.py  |    2 +-
 ...sponse_container_paged_alert_with_stats.py |    2 +-
 ...ponse_container_paged_cloud_integration.py |    2 +-
 ...ainer_paged_customer_facing_user_object.py |    2 +-
 .../response_container_paged_dashboard.py     |    2 +-
 ...ntainer_paged_derived_metric_definition.py |    2 +-
 ...ed_derived_metric_definition_with_stats.py |    2 +-
 .../models/response_container_paged_event.py  |    2 +-
 .../response_container_paged_external_link.py |    2 +-
 .../response_container_paged_integration.py   |    2 +-
 ...onse_container_paged_maintenance_window.py |    2 +-
 .../response_container_paged_message.py       |    2 +-
 .../response_container_paged_notificant.py    |    2 +-
 .../models/response_container_paged_proxy.py  |    2 +-
 .../response_container_paged_saved_search.py  |    2 +-
 .../models/response_container_paged_source.py |    2 +-
 .../response_container_paged_user_group.py    |    2 +-
 .../models/response_container_proxy.py        |    2 +-
 .../models/response_container_saved_search.py |    2 +-
 .../models/response_container_source.py       |    2 +-
 .../response_container_tags_response.py       |    2 +-
 .../models/response_container_user_group.py   |    2 +-
 .../response_container_validated_users_dto.py |    2 +-
 .../models/response_status.py                 |    2 +-
 wavefront_api_client/models/saved_search.py   |    2 +-
 wavefront_api_client/models/search_query.py   |    2 +-
 .../models/sortable_search_request.py         |    2 +-
 wavefront_api_client/models/sorting.py        |    2 +-
 wavefront_api_client/models/source.py         |    2 +-
 .../models/source_label_pair.py               |    2 +-
 .../models/source_search_request_container.py |    2 +-
 wavefront_api_client/models/stats_model.py    |    2 +-
 wavefront_api_client/models/tags_response.py  |    2 +-
 wavefront_api_client/models/target_info.py    |    2 +-
 .../models/tesla_configuration.py             |    2 +-
 wavefront_api_client/models/timeseries.py     |    2 +-
 wavefront_api_client/models/user.py           |    2 +-
 wavefront_api_client/models/user_dto.py       |    2 +-
 wavefront_api_client/models/user_group.py     |    2 +-
 .../models/user_group_properties_dto.py       |    2 +-
 .../models/user_group_write.py                |    2 +-
 wavefront_api_client/models/user_model.py     |    2 +-
 .../models/user_request_dto.py                |    2 +-
 wavefront_api_client/models/user_settings.py  |    2 +-
 wavefront_api_client/models/user_to_create.py |    2 +-
 .../models/validated_users_dto.py             |    2 +-
 wavefront_api_client/models/wf_tags.py        |    2 +-
 wavefront_api_client/rest.py                  |    2 +-
 354 files changed, 441 insertions(+), 2282 deletions(-)
 delete mode 100644 docs/DerivedMetricDefinitionApi.md
 delete mode 100644 example.py
 create mode 100755 generate_client
 delete mode 100644 wavefront_api_client/api/derived_metric_definition_api.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index a70f002..5de2c54 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.29.47"
+    "packageVersion": "2.30.15"
 }
diff --git a/README.md b/README.md
index bf546a8..bb09680 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.29.47
+- Package version: 2.30.15
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -451,5 +451,5 @@ Class | Method | HTTP request | Description
 
 ## Author
 
-support@wavefront.com
+chitimba@wavefront.com
 
diff --git a/docs/DerivedMetricDefinitionApi.md b/docs/DerivedMetricDefinitionApi.md
deleted file mode 100644
index cb9dbcd..0000000
--- a/docs/DerivedMetricDefinitionApi.md
+++ /dev/null
@@ -1,684 +0,0 @@
-# wavefront_api_client.DerivedMetricDefinitionApi
-
-All URIs are relative to *https://localhost*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**add_tag_to_derived_metric_definition**](DerivedMetricDefinitionApi.md#add_tag_to_derived_metric_definition) | **PUT** /api/v2/derivedmetricdefinition/{id}/tag/{tagValue} | Add a tag to a specific Derived Metric Definition
-[**create_derived_metric_definition**](DerivedMetricDefinitionApi.md#create_derived_metric_definition) | **POST** /api/v2/derivedmetricdefinition | Create a specific derived metric definition
-[**delete_derived_metric_definition**](DerivedMetricDefinitionApi.md#delete_derived_metric_definition) | **DELETE** /api/v2/derivedmetricdefinition/{id} | Delete a specific derived metric definition
-[**get_all_derived_metric_definitions**](DerivedMetricDefinitionApi.md#get_all_derived_metric_definitions) | **GET** /api/v2/derivedmetricdefinition | Get all derived metric definitions for a customer
-[**get_derived_metric_definition_by_version**](DerivedMetricDefinitionApi.md#get_derived_metric_definition_by_version) | **GET** /api/v2/derivedmetricdefinition/{id}/history/{version} | Get a specific historical version of a specific derived metric definition
-[**get_derived_metric_definition_history**](DerivedMetricDefinitionApi.md#get_derived_metric_definition_history) | **GET** /api/v2/derivedmetricdefinition/{id}/history | Get the version history of a specific derived metric definition
-[**get_derived_metric_definition_tags**](DerivedMetricDefinitionApi.md#get_derived_metric_definition_tags) | **GET** /api/v2/derivedmetricdefinition/{id}/tag | Get all tags associated with a specific derived metric definition
-[**get_registered_query**](DerivedMetricDefinitionApi.md#get_registered_query) | **GET** /api/v2/derivedmetricdefinition/{id} | Get a specific registered query
-[**remove_tag_from_derived_metric_definition**](DerivedMetricDefinitionApi.md#remove_tag_from_derived_metric_definition) | **DELETE** /api/v2/derivedmetricdefinition/{id}/tag/{tagValue} | Remove a tag from a specific Derived Metric Definition
-[**set_derived_metric_definition_tags**](DerivedMetricDefinitionApi.md#set_derived_metric_definition_tags) | **POST** /api/v2/derivedmetricdefinition/{id}/tag | Set all tags associated with a specific derived metric definition
-[**undelete_derived_metric_definition**](DerivedMetricDefinitionApi.md#undelete_derived_metric_definition) | **POST** /api/v2/derivedmetricdefinition/{id}/undelete | Undelete a specific derived metric definition
-[**update_derived_metric_definition**](DerivedMetricDefinitionApi.md#update_derived_metric_definition) | **PUT** /api/v2/derivedmetricdefinition/{id} | Update a specific derived metric definition
-
-
-# **add_tag_to_derived_metric_definition**
-> ResponseContainer add_tag_to_derived_metric_definition(id, tag_value)
-
-Add a tag to a specific Derived Metric Definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
-
-try:
-    # Add a tag to a specific Derived Metric Definition
-    api_response = api_instance.add_tag_to_derived_metric_definition(id, tag_value)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->add_tag_to_derived_metric_definition: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **tag_value** | **str**|  | 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **create_derived_metric_definition**
-> ResponseContainerDerivedMetricDefinition create_derived_metric_definition(body=body)
-
-Create a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.DerivedMetricDefinition() # DerivedMetricDefinition | Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre> (optional)
-
-try:
-    # Create a specific derived metric definition
-    api_response = api_instance.create_derived_metric_definition(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->create_derived_metric_definition: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Query Name\&quot;,   \&quot;query\&quot;: \&quot;aliasMetric(ts(~sample.cpu.loadavg.1m), \\\&quot;my.new.metric\\\&quot;)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot; }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **delete_derived_metric_definition**
-> ResponseContainerDerivedMetricDefinition delete_derived_metric_definition(id)
-
-Delete a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Delete a specific derived metric definition
-    api_response = api_instance.delete_derived_metric_definition(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->delete_derived_metric_definition: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_all_derived_metric_definitions**
-> ResponseContainerPagedDerivedMetricDefinition get_all_derived_metric_definitions(offset=offset, limit=limit)
-
-Get all derived metric definitions for a customer
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
-
-try:
-    # Get all derived metric definitions for a customer
-    api_response = api_instance.get_all_derived_metric_definitions(offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->get_all_derived_metric_definitions: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
-
-### Return type
-
-[**ResponseContainerPagedDerivedMetricDefinition**](ResponseContainerPagedDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_derived_metric_definition_by_version**
-> ResponseContainerDerivedMetricDefinition get_derived_metric_definition_by_version(id, version)
-
-Get a specific historical version of a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-version = 789 # int | 
-
-try:
-    # Get a specific historical version of a specific derived metric definition
-    api_response = api_instance.get_derived_metric_definition_by_version(id, version)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->get_derived_metric_definition_by_version: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **version** | **int**|  | 
-
-### Return type
-
-[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_derived_metric_definition_history**
-> ResponseContainerHistoryResponse get_derived_metric_definition_history(id, offset=offset, limit=limit)
-
-Get the version history of a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
-
-try:
-    # Get the version history of a specific derived metric definition
-    api_response = api_instance.get_derived_metric_definition_history(id, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->get_derived_metric_definition_history: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
-
-### Return type
-
-[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_derived_metric_definition_tags**
-> ResponseContainerTagsResponse get_derived_metric_definition_tags(id)
-
-Get all tags associated with a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Get all tags associated with a specific derived metric definition
-    api_response = api_instance.get_derived_metric_definition_tags(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->get_derived_metric_definition_tags: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerTagsResponse**](ResponseContainerTagsResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_registered_query**
-> ResponseContainerDerivedMetricDefinition get_registered_query(id)
-
-Get a specific registered query
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Get a specific registered query
-    api_response = api_instance.get_registered_query(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->get_registered_query: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **remove_tag_from_derived_metric_definition**
-> ResponseContainer remove_tag_from_derived_metric_definition(id, tag_value)
-
-Remove a tag from a specific Derived Metric Definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
-
-try:
-    # Remove a tag from a specific Derived Metric Definition
-    api_response = api_instance.remove_tag_from_derived_metric_definition(id, tag_value)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->remove_tag_from_derived_metric_definition: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **tag_value** | **str**|  | 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **set_derived_metric_definition_tags**
-> ResponseContainer set_derived_metric_definition_tags(id, body=body)
-
-Set all tags associated with a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
-
-try:
-    # Set all tags associated with a specific derived metric definition
-    api_response = api_instance.set_derived_metric_definition_tags(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->set_derived_metric_definition_tags: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**|  | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **undelete_derived_metric_definition**
-> ResponseContainerDerivedMetricDefinition undelete_derived_metric_definition(id)
-
-Undelete a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Undelete a specific derived metric definition
-    api_response = api_instance.undelete_derived_metric_definition(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->undelete_derived_metric_definition: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **update_derived_metric_definition**
-> ResponseContainerDerivedMetricDefinition update_derived_metric_definition(id, body=body)
-
-Update a specific derived metric definition
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.DerivedMetricDefinitionApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = wavefront_api_client.DerivedMetricDefinition() # DerivedMetricDefinition | Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre> (optional)
-
-try:
-    # Update a specific derived metric definition
-    api_response = api_instance.update_derived_metric_definition(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling DerivedMetricDefinitionApi->update_derived_metric_definition: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Query Name\&quot;,   \&quot;createUserId\&quot;: \&quot;user\&quot;,   \&quot;query\&quot;: \&quot;aliasMetric(ts(~sample.cpu.loadavg.1m), \\\&quot;my.new.metric\\\&quot;)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot; }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerDerivedMetricDefinition**](ResponseContainerDerivedMetricDefinition.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/example.py b/example.py
deleted file mode 100644
index 976e99f..0000000
--- a/example.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-import wavefront_api_client as wave_api
-
-base_url = 'https://try.wavefront.com'
-api_key = 'YOUR_API_KEY'
-
-config = wave_api.Configuration()
-config.host = base_url
-client = wave_api.ApiClient(configuration=config, header_name='Authorization', header_value='Bearer ' + api_key)
-
-# instantiate source API
-
-source_api = wave_api.SourceApi(client)
-
-sources = source_api.get_all_source()
-
-print sources
diff --git a/generate_client b/generate_client
new file mode 100755
index 0000000..c3fc85b
--- /dev/null
+++ b/generate_client
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+if [[ "$1" == "" ]]; then
+    echo "Please specify the name of the cluster as an argument."
+    exit 1
+fi
+
+CGEN_NAME="swagger-codegen-cli"
+CGEN_VER="2.4.4"  # For 3.x use CGEN_VER="3.0.7"
+CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
+CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
+io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
+# io/swagger/codegen/v3/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
+# Uncomment above if you'd like to use swagger-codegen-cli version 3.x
+
+CONFIG_FILE=".swagger-codegen/config.json"
+EXTRA_PROPS="basePath=https://YOUR_INSTANCE.wavefront.com"
+EXTRA_PROPS+=",infoEmail=chitimba@wavefront.com"
+
+SWGR_JSON="swagger.json"
+SWGR_URL="https://$1.wavefront.com/api/v2/${SWGR_JSON}"
+VERSION_URL="https://$1.wavefront.com/auth/forgetPassword"
+
+PYTHON=$(command -v python3 || command -v python)
+
+# Check if config file exists in '.swagger-codegen' directory.
+[[ -f "${CONFIG_FILE}" ]] || echo "Config file '${CONFIG_FILE}' not found!"
+# Get the current version from the config file.
+CONFIG_VER=$($PYTHON -c "import json, sys;\
+  sys.stdout.write(json.load(sys.stdin)['packageVersion'][2:]+'\n')"\
+  < "${CONFIG_FILE}"
+)
+echo "Fetching the current version from '$1' cluster..."
+SERVER_VER=$(curl -s "${VERSION_URL}" | grep 'version:' | grep -o '\d*\.\d*')
+
+echo "Current Version in config is: ${CONFIG_VER}"
+echo "Current Version on server is: ${SERVER_VER}"
+
+if [[ -z "${CONFIG_VER}" || -z "${SERVER_VER}" ]]; then
+  echo "Unable to determine the version for '$1' cluster."
+  exit 1
+elif [[ "${CONFIG_VER}" == "${SERVER_VER}" ]]; then
+  echo "No Version Change Detected. Bye."
+else
+  echo "Version change detected from ${CONFIG_VER} to ${SERVER_VER}..."
+  TEMP_DIR_NAME="$(mktemp -d)"
+  SWAGGER_FILE="${TEMP_DIR_NAME}/${SWGR_JSON}"
+  CGEN_JAR_BINARY="${TEMP_DIR_NAME}/${CGEN_JAR_NAME}"
+
+  echo "Step 1: Fetching the latest swagger-codegen..."
+  curl -s "${CGEN_JAR_URL}" -o "${CGEN_JAR_BINARY}"
+
+  echo "Step 2: Fetching the latest swagger.json..."
+  curl -s "${SWGR_URL}" | $PYTHON -m json.tool --sort-keys > "${SWAGGER_FILE}"
+
+  echo "Step 3: Generating the client..."
+  java -jar "${CGEN_JAR_BINARY}" generate -l python \
+       -c "${CONFIG_FILE}" -i "${SWAGGER_FILE}" \
+       --additional-properties "${EXTRA_PROPS}"
+
+  echo "Step 4: Checking if anything has changed..."
+  if [[ -n "$(git status --porcelain)" ]]; then
+    echo "Step 5: Updating the version in the config..."
+    sed -i '' "s/${CONFIG_VER//./\\.}/${SERVER_VER//./\\.}/" "${CONFIG_FILE}"
+
+    echo "Step 6: Generating the updated client..."
+    java -jar "${CGEN_JAR_BINARY}" generate -l python \
+         -c "${CONFIG_FILE}" -i "${SWAGGER_FILE}" \
+         --additional-properties "${EXTRA_PROPS}"
+
+    echo "Step 7: Committing the updated files..."
+    git add -A && git commit -am "Autogenerated Update v2.${SERVER_VER}."
+
+    echo "Step 8: Pushing the update to GitHub..."
+    git push
+  fi
+  echo "Cleaning up..."
+  rm -rv "${TEMP_DIR_NAME}"
+fi
diff --git a/setup.py b/setup.py
index 6cae13b..4d93a1f 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.29.47"
+VERSION = "2.30.15"
 # To install the library, run the following
 #
 # python setup.py install
@@ -34,7 +34,7 @@
     name=NAME,
     version=VERSION,
     description="Wavefront REST API",
-    author_email="support@wavefront.com",
+    author_email="chitimba@wavefront.com",
     url="https://github.com/wavefrontHQ/python-client",
     keywords=["Swagger", "Wavefront REST API"],
     install_requires=REQUIRES,
diff --git a/test/test_access_control_element.py b/test/test_access_control_element.py
index 93b6623..b15b306 100644
--- a/test/test_access_control_element.py
+++ b/test/test_access_control_element.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_access_control_list_simple.py b/test/test_access_control_list_simple.py
index 7b77df9..d863359 100644
--- a/test/test_access_control_list_simple.py
+++ b/test/test_access_control_list_simple.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_acl.py b/test/test_acl.py
index be28dbe..4a233ae 100644
--- a/test/test_acl.py
+++ b/test/test_acl.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_alert.py b/test/test_alert.py
index fd815b9..ca44980 100644
--- a/test/test_alert.py
+++ b/test/test_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_alert_api.py b/test/test_alert_api.py
index 2b07544..d44f872 100644
--- a/test/test_alert_api.py
+++ b/test/test_alert_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_avro_backed_standardized_dto.py b/test/test_avro_backed_standardized_dto.py
index e916bbc..13dd18a 100644
--- a/test/test_avro_backed_standardized_dto.py
+++ b/test/test_avro_backed_standardized_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_aws_base_credentials.py b/test/test_aws_base_credentials.py
index 96cb5c0..d87cf75 100644
--- a/test/test_aws_base_credentials.py
+++ b/test/test_aws_base_credentials.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_azure_activity_log_configuration.py b/test/test_azure_activity_log_configuration.py
index f8e7295..d6bf655 100644
--- a/test/test_azure_activity_log_configuration.py
+++ b/test/test_azure_activity_log_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_azure_base_credentials.py b/test/test_azure_base_credentials.py
index dc19590..79397d1 100644
--- a/test/test_azure_base_credentials.py
+++ b/test/test_azure_base_credentials.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_azure_configuration.py b/test/test_azure_configuration.py
index b08bd20..efc0aa5 100644
--- a/test/test_azure_configuration.py
+++ b/test/test_azure_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_business_action_group_basic_dto.py b/test/test_business_action_group_basic_dto.py
index 8308ddd..52708b6 100644
--- a/test/test_business_action_group_basic_dto.py
+++ b/test/test_business_action_group_basic_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_chart.py b/test/test_chart.py
index 03b728b..09faf83 100644
--- a/test/test_chart.py
+++ b/test/test_chart.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_chart_settings.py b/test/test_chart_settings.py
index 40fc2c8..dadff10 100644
--- a/test/test_chart_settings.py
+++ b/test/test_chart_settings.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_chart_source_query.py b/test/test_chart_source_query.py
index 1267104..fd83f17 100644
--- a/test/test_chart_source_query.py
+++ b/test/test_chart_source_query.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_cloud_integration.py b/test/test_cloud_integration.py
index a3e6d11..7f5761a 100644
--- a/test/test_cloud_integration.py
+++ b/test/test_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_cloud_integration_api.py b/test/test_cloud_integration_api.py
index 2f2a7eb..c6d7272 100644
--- a/test/test_cloud_integration_api.py
+++ b/test/test_cloud_integration_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_cloud_trail_configuration.py b/test/test_cloud_trail_configuration.py
index b84875a..a340cbc 100644
--- a/test/test_cloud_trail_configuration.py
+++ b/test/test_cloud_trail_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_cloud_watch_configuration.py b/test/test_cloud_watch_configuration.py
index 32012a3..5045785 100644
--- a/test/test_cloud_watch_configuration.py
+++ b/test/test_cloud_watch_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_customer_facing_user_object.py b/test/test_customer_facing_user_object.py
index ff71a6f..11651af 100644
--- a/test/test_customer_facing_user_object.py
+++ b/test/test_customer_facing_user_object.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_customer_preferences.py b/test/test_customer_preferences.py
index 4ddbf42..0caa4a4 100644
--- a/test/test_customer_preferences.py
+++ b/test/test_customer_preferences.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_customer_preferences_updating.py b/test/test_customer_preferences_updating.py
index 3ebc904..5fb2afa 100644
--- a/test/test_customer_preferences_updating.py
+++ b/test/test_customer_preferences_updating.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_dashboard.py b/test/test_dashboard.py
index 3422df4..7900c2d 100644
--- a/test/test_dashboard.py
+++ b/test/test_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_dashboard_api.py b/test/test_dashboard_api.py
index a62a9ca..7b7ee05 100644
--- a/test/test_dashboard_api.py
+++ b/test/test_dashboard_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_dashboard_parameter_value.py b/test/test_dashboard_parameter_value.py
index ec1f559..7299c58 100644
--- a/test/test_dashboard_parameter_value.py
+++ b/test/test_dashboard_parameter_value.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_dashboard_section.py b/test/test_dashboard_section.py
index 6a3102e..42786a4 100644
--- a/test/test_dashboard_section.py
+++ b/test/test_dashboard_section.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_dashboard_section_row.py b/test/test_dashboard_section_row.py
index 75234fa..6458c61 100644
--- a/test/test_dashboard_section_row.py
+++ b/test/test_dashboard_section_row.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_derived_metric_api.py b/test/test_derived_metric_api.py
index 4a04d2f..9224f77 100644
--- a/test/test_derived_metric_api.py
+++ b/test/test_derived_metric_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_derived_metric_definition.py b/test/test_derived_metric_definition.py
index 87297df..8efcf71 100644
--- a/test/test_derived_metric_definition.py
+++ b/test/test_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_direct_ingestion_api.py b/test/test_direct_ingestion_api.py
index 75803ec..15df2a7 100644
--- a/test/test_direct_ingestion_api.py
+++ b/test/test_direct_ingestion_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_ec2_configuration.py b/test/test_ec2_configuration.py
index a65ab09..259a8b8 100644
--- a/test/test_ec2_configuration.py
+++ b/test/test_ec2_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_event.py b/test/test_event.py
index 18aa45b..7e12230 100644
--- a/test/test_event.py
+++ b/test/test_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_event_api.py b/test/test_event_api.py
index 5a4818f..5050ab0 100644
--- a/test/test_event_api.py
+++ b/test/test_event_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_event_search_request.py b/test/test_event_search_request.py
index 534573c..d37d9fa 100644
--- a/test/test_event_search_request.py
+++ b/test/test_event_search_request.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_event_time_range.py b/test/test_event_time_range.py
index cc0b178..2e41f54 100644
--- a/test/test_event_time_range.py
+++ b/test/test_event_time_range.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_external_link.py b/test/test_external_link.py
index 1415ba3..d91f66d 100644
--- a/test/test_external_link.py
+++ b/test/test_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_external_link_api.py b/test/test_external_link_api.py
index 4b9777c..fdfa08b 100644
--- a/test/test_external_link_api.py
+++ b/test/test_external_link_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_facet_response.py b/test/test_facet_response.py
index 1a0c440..3de393a 100644
--- a/test/test_facet_response.py
+++ b/test/test_facet_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_facet_search_request_container.py b/test/test_facet_search_request_container.py
index 43fc472..fc0f0e5 100644
--- a/test/test_facet_search_request_container.py
+++ b/test/test_facet_search_request_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_facets_response_container.py b/test/test_facets_response_container.py
index 3c7952a..1c07e6d 100644
--- a/test/test_facets_response_container.py
+++ b/test/test_facets_response_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_facets_search_request_container.py b/test/test_facets_search_request_container.py
index c6bb16b..f2fcd40 100644
--- a/test/test_facets_search_request_container.py
+++ b/test/test_facets_search_request_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_gcp_billing_configuration.py b/test/test_gcp_billing_configuration.py
index 28c7488..ce4fcbd 100644
--- a/test/test_gcp_billing_configuration.py
+++ b/test/test_gcp_billing_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_gcp_configuration.py b/test/test_gcp_configuration.py
index 893ca10..f7c0449 100644
--- a/test/test_gcp_configuration.py
+++ b/test/test_gcp_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_history_entry.py b/test/test_history_entry.py
index 7686610..2eb7c49 100644
--- a/test/test_history_entry.py
+++ b/test/test_history_entry.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_history_response.py b/test/test_history_response.py
index ac2e48f..929c314 100644
--- a/test/test_history_response.py
+++ b/test/test_history_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_install_alerts.py b/test/test_install_alerts.py
index 645ea83..b378a0c 100644
--- a/test/test_install_alerts.py
+++ b/test/test_install_alerts.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration.py b/test/test_integration.py
index 072611e..1b45188 100644
--- a/test/test_integration.py
+++ b/test/test_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_alert.py b/test/test_integration_alert.py
index 1a47596..f4c80c6 100644
--- a/test/test_integration_alert.py
+++ b/test/test_integration_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_alias.py b/test/test_integration_alias.py
index a1b99bf..1964054 100644
--- a/test/test_integration_alias.py
+++ b/test/test_integration_alias.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_api.py b/test/test_integration_api.py
index c6859e0..4ec9330 100644
--- a/test/test_integration_api.py
+++ b/test/test_integration_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_dashboard.py b/test/test_integration_dashboard.py
index f978edd..6bd5d9c 100644
--- a/test/test_integration_dashboard.py
+++ b/test/test_integration_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_manifest_group.py b/test/test_integration_manifest_group.py
index 423c236..0ea52e2 100644
--- a/test/test_integration_manifest_group.py
+++ b/test/test_integration_manifest_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_metrics.py b/test/test_integration_metrics.py
index 0e3ff5e..13f0ed0 100644
--- a/test/test_integration_metrics.py
+++ b/test/test_integration_metrics.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_integration_status.py b/test/test_integration_status.py
index eb99345..c17eafc 100644
--- a/test/test_integration_status.py
+++ b/test/test_integration_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_iterator_entry_string_json_node.py b/test/test_iterator_entry_string_json_node.py
index 9fd9dca..3287f3b 100644
--- a/test/test_iterator_entry_string_json_node.py
+++ b/test/test_iterator_entry_string_json_node.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_iterator_json_node.py b/test/test_iterator_json_node.py
index 0b7eb08..742e685 100644
--- a/test/test_iterator_json_node.py
+++ b/test/test_iterator_json_node.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_iterator_string.py b/test/test_iterator_string.py
index 247458c..ff17e8e 100644
--- a/test/test_iterator_string.py
+++ b/test/test_iterator_string.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_json_node.py b/test/test_json_node.py
index 56c9814..a04c65f 100644
--- a/test/test_json_node.py
+++ b/test/test_json_node.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_logical_type.py b/test/test_logical_type.py
index 9611707..36e9b3c 100644
--- a/test/test_logical_type.py
+++ b/test/test_logical_type.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_maintenance_window.py b/test/test_maintenance_window.py
index c0c6837..49e0a4c 100644
--- a/test/test_maintenance_window.py
+++ b/test/test_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_maintenance_window_api.py b/test/test_maintenance_window_api.py
index 93c6037..61d9463 100644
--- a/test/test_maintenance_window_api.py
+++ b/test/test_maintenance_window_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_message.py b/test/test_message.py
index 8a7cb25..9d39d14 100644
--- a/test/test_message.py
+++ b/test/test_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_message_api.py b/test/test_message_api.py
index a60740a..b08053d 100644
--- a/test/test_message_api.py
+++ b/test/test_message_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_metric_api.py b/test/test_metric_api.py
index 811cbed..71e03d6 100644
--- a/test/test_metric_api.py
+++ b/test/test_metric_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_metric_details.py b/test/test_metric_details.py
index a9e398b..1c7a82a 100644
--- a/test/test_metric_details.py
+++ b/test/test_metric_details.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_metric_details_response.py b/test/test_metric_details_response.py
index 50554cc..e4ea0c3 100644
--- a/test/test_metric_details_response.py
+++ b/test/test_metric_details_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_metric_status.py b/test/test_metric_status.py
index 391d42d..d6baf4a 100644
--- a/test/test_metric_status.py
+++ b/test/test_metric_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_new_relic_configuration.py b/test/test_new_relic_configuration.py
index 229064b..64620bb 100644
--- a/test/test_new_relic_configuration.py
+++ b/test/test_new_relic_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_new_relic_metric_filters.py b/test/test_new_relic_metric_filters.py
index 15fa27c..eb1b073 100644
--- a/test/test_new_relic_metric_filters.py
+++ b/test/test_new_relic_metric_filters.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_notificant.py b/test/test_notificant.py
index 4e8ba71..bcaf706 100644
--- a/test/test_notificant.py
+++ b/test/test_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_notificant_api.py b/test/test_notificant_api.py
index 0c0dba5..5d997de 100644
--- a/test/test_notificant_api.py
+++ b/test/test_notificant_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_number.py b/test/test_number.py
index 14a94e3..c8dcebd 100644
--- a/test/test_number.py
+++ b/test/test_number.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_alert.py b/test/test_paged_alert.py
index 1acb3ee..e901155 100644
--- a/test/test_paged_alert.py
+++ b/test/test_paged_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_alert_with_stats.py b/test/test_paged_alert_with_stats.py
index 44233e5..8d3bc66 100644
--- a/test/test_paged_alert_with_stats.py
+++ b/test/test_paged_alert_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_cloud_integration.py b/test/test_paged_cloud_integration.py
index 6a8bb67..3c00d3a 100644
--- a/test/test_paged_cloud_integration.py
+++ b/test/test_paged_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_customer_facing_user_object.py b/test/test_paged_customer_facing_user_object.py
index f49bfe5..1b8c7df 100644
--- a/test/test_paged_customer_facing_user_object.py
+++ b/test/test_paged_customer_facing_user_object.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_dashboard.py b/test/test_paged_dashboard.py
index f54bd62..5f04bbf 100644
--- a/test/test_paged_dashboard.py
+++ b/test/test_paged_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_derived_metric_definition.py b/test/test_paged_derived_metric_definition.py
index 6e9db5b..444dff6 100644
--- a/test/test_paged_derived_metric_definition.py
+++ b/test/test_paged_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_derived_metric_definition_with_stats.py b/test/test_paged_derived_metric_definition_with_stats.py
index ffe7459..6bd4e8c 100644
--- a/test/test_paged_derived_metric_definition_with_stats.py
+++ b/test/test_paged_derived_metric_definition_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_event.py b/test/test_paged_event.py
index 679eb0d..891b319 100644
--- a/test/test_paged_event.py
+++ b/test/test_paged_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_external_link.py b/test/test_paged_external_link.py
index 25ca6af..6413d48 100644
--- a/test/test_paged_external_link.py
+++ b/test/test_paged_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_integration.py b/test/test_paged_integration.py
index 961b639..4bf6870 100644
--- a/test/test_paged_integration.py
+++ b/test/test_paged_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_maintenance_window.py b/test/test_paged_maintenance_window.py
index cf6ada9..41368e5 100644
--- a/test/test_paged_maintenance_window.py
+++ b/test/test_paged_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_message.py b/test/test_paged_message.py
index e2c1b81..2c9aec7 100644
--- a/test/test_paged_message.py
+++ b/test/test_paged_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_notificant.py b/test/test_paged_notificant.py
index 891f1f3..11424e0 100644
--- a/test/test_paged_notificant.py
+++ b/test/test_paged_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_proxy.py b/test/test_paged_proxy.py
index 498cf9f..9cf734d 100644
--- a/test/test_paged_proxy.py
+++ b/test/test_paged_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_saved_search.py b/test/test_paged_saved_search.py
index 0c12c02..26cbf1f 100644
--- a/test/test_paged_saved_search.py
+++ b/test/test_paged_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_source.py b/test/test_paged_source.py
index 341374a..764df62 100644
--- a/test/test_paged_source.py
+++ b/test/test_paged_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_paged_user_group.py b/test/test_paged_user_group.py
index c7c41c1..959fc96 100644
--- a/test/test_paged_user_group.py
+++ b/test/test_paged_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_point.py b/test/test_point.py
index 32a45b6..c9cef34 100644
--- a/test/test_point.py
+++ b/test/test_point.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_proxy.py b/test/test_proxy.py
index bba07f0..03ad9c3 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_proxy_api.py b/test/test_proxy_api.py
index 8ec30ad..6cdb7a4 100644
--- a/test/test_proxy_api.py
+++ b/test/test_proxy_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_query_api.py b/test/test_query_api.py
index bfdabbb..b013fcc 100644
--- a/test/test_query_api.py
+++ b/test/test_query_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_query_event.py b/test/test_query_event.py
index b0f19d5..96297c9 100644
--- a/test/test_query_event.py
+++ b/test/test_query_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_query_result.py b/test/test_query_result.py
index 46ede40..20dd7ef 100644
--- a/test/test_query_result.py
+++ b/test/test_query_result.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_raw_timeseries.py b/test/test_raw_timeseries.py
index befccf1..adfc98e 100644
--- a/test/test_raw_timeseries.py
+++ b/test/test_raw_timeseries.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container.py b/test/test_response_container.py
index bb797ec..c570f82 100644
--- a/test/test_response_container.py
+++ b/test/test_response_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_alert.py b/test/test_response_container_alert.py
index a30765e..6380bb0 100644
--- a/test/test_response_container_alert.py
+++ b/test/test_response_container_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_cloud_integration.py b/test/test_response_container_cloud_integration.py
index 6c4602f..90f6d17 100644
--- a/test/test_response_container_cloud_integration.py
+++ b/test/test_response_container_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_dashboard.py b/test/test_response_container_dashboard.py
index 392a0ad..bd56f84 100644
--- a/test/test_response_container_dashboard.py
+++ b/test/test_response_container_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_derived_metric_definition.py b/test/test_response_container_derived_metric_definition.py
index d14ce39..b4026d6 100644
--- a/test/test_response_container_derived_metric_definition.py
+++ b/test/test_response_container_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_event.py b/test/test_response_container_event.py
index d996858..7d6ac63 100644
--- a/test/test_response_container_event.py
+++ b/test/test_response_container_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_external_link.py b/test/test_response_container_external_link.py
index e09c631..3102d90 100644
--- a/test/test_response_container_external_link.py
+++ b/test/test_response_container_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_facet_response.py b/test/test_response_container_facet_response.py
index 49831e2..79c8a31 100644
--- a/test/test_response_container_facet_response.py
+++ b/test/test_response_container_facet_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_facets_response_container.py b/test/test_response_container_facets_response_container.py
index 5bfd77e..c10ad78 100644
--- a/test/test_response_container_facets_response_container.py
+++ b/test/test_response_container_facets_response_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_history_response.py b/test/test_response_container_history_response.py
index e410fa2..e6b9c8f 100644
--- a/test/test_response_container_history_response.py
+++ b/test/test_response_container_history_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_integration.py b/test/test_response_container_integration.py
index e330051..e27a342 100644
--- a/test/test_response_container_integration.py
+++ b/test/test_response_container_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_integration_status.py b/test/test_response_container_integration_status.py
index 95f47e4..087a59a 100644
--- a/test/test_response_container_integration_status.py
+++ b/test/test_response_container_integration_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_list_acl.py b/test/test_response_container_list_acl.py
index becf093..d310d5a 100644
--- a/test/test_response_container_list_acl.py
+++ b/test/test_response_container_list_acl.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_list_integration.py b/test/test_response_container_list_integration.py
index 7d07ec8..3938780 100644
--- a/test/test_response_container_list_integration.py
+++ b/test/test_response_container_list_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_list_integration_manifest_group.py b/test/test_response_container_list_integration_manifest_group.py
index 5dc8103..ce0962a 100644
--- a/test/test_response_container_list_integration_manifest_group.py
+++ b/test/test_response_container_list_integration_manifest_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_list_string.py b/test/test_response_container_list_string.py
index 0494c43..43aacaf 100644
--- a/test/test_response_container_list_string.py
+++ b/test/test_response_container_list_string.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_list_user_group.py b/test/test_response_container_list_user_group.py
index 3614c30..b2b40c6 100644
--- a/test/test_response_container_list_user_group.py
+++ b/test/test_response_container_list_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_maintenance_window.py b/test/test_response_container_maintenance_window.py
index e0fa8da..5a1373a 100644
--- a/test/test_response_container_maintenance_window.py
+++ b/test/test_response_container_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_map_string_integer.py b/test/test_response_container_map_string_integer.py
index 1d8127d..3e4222f 100644
--- a/test/test_response_container_map_string_integer.py
+++ b/test/test_response_container_map_string_integer.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_map_string_integration_status.py b/test/test_response_container_map_string_integration_status.py
index 04376cf..0b3dfa4 100644
--- a/test/test_response_container_map_string_integration_status.py
+++ b/test/test_response_container_map_string_integration_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_message.py b/test/test_response_container_message.py
index 5bce86a..2b37dd5 100644
--- a/test/test_response_container_message.py
+++ b/test/test_response_container_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_notificant.py b/test/test_response_container_notificant.py
index 800324e..7891ccd 100644
--- a/test/test_response_container_notificant.py
+++ b/test/test_response_container_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_alert.py b/test/test_response_container_paged_alert.py
index b24b1e0..9fd71a0 100644
--- a/test/test_response_container_paged_alert.py
+++ b/test/test_response_container_paged_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_alert_with_stats.py b/test/test_response_container_paged_alert_with_stats.py
index d49f540..4e76e01 100644
--- a/test/test_response_container_paged_alert_with_stats.py
+++ b/test/test_response_container_paged_alert_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_cloud_integration.py b/test/test_response_container_paged_cloud_integration.py
index a52561b..11a32bc 100644
--- a/test/test_response_container_paged_cloud_integration.py
+++ b/test/test_response_container_paged_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_customer_facing_user_object.py b/test/test_response_container_paged_customer_facing_user_object.py
index c9e5c95..af8512b 100644
--- a/test/test_response_container_paged_customer_facing_user_object.py
+++ b/test/test_response_container_paged_customer_facing_user_object.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_dashboard.py b/test/test_response_container_paged_dashboard.py
index f4c5751..f67e65e 100644
--- a/test/test_response_container_paged_dashboard.py
+++ b/test/test_response_container_paged_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_derived_metric_definition.py b/test/test_response_container_paged_derived_metric_definition.py
index 1a056b2..2953550 100644
--- a/test/test_response_container_paged_derived_metric_definition.py
+++ b/test/test_response_container_paged_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_derived_metric_definition_with_stats.py b/test/test_response_container_paged_derived_metric_definition_with_stats.py
index f43f870..18f6fcb 100644
--- a/test/test_response_container_paged_derived_metric_definition_with_stats.py
+++ b/test/test_response_container_paged_derived_metric_definition_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_event.py b/test/test_response_container_paged_event.py
index 207d05a..18222aa 100644
--- a/test/test_response_container_paged_event.py
+++ b/test/test_response_container_paged_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_external_link.py b/test/test_response_container_paged_external_link.py
index 7e9ce96..35d7d21 100644
--- a/test/test_response_container_paged_external_link.py
+++ b/test/test_response_container_paged_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_integration.py b/test/test_response_container_paged_integration.py
index 5a7b946..51cff95 100644
--- a/test/test_response_container_paged_integration.py
+++ b/test/test_response_container_paged_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_maintenance_window.py b/test/test_response_container_paged_maintenance_window.py
index 14dd9b2..0065d0e 100644
--- a/test/test_response_container_paged_maintenance_window.py
+++ b/test/test_response_container_paged_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_message.py b/test/test_response_container_paged_message.py
index 9d20dda..072c8dc 100644
--- a/test/test_response_container_paged_message.py
+++ b/test/test_response_container_paged_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_notificant.py b/test/test_response_container_paged_notificant.py
index e109f62..08d7e1d 100644
--- a/test/test_response_container_paged_notificant.py
+++ b/test/test_response_container_paged_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_proxy.py b/test/test_response_container_paged_proxy.py
index 5324bf9..ae99a1d 100644
--- a/test/test_response_container_paged_proxy.py
+++ b/test/test_response_container_paged_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_saved_search.py b/test/test_response_container_paged_saved_search.py
index 173d9ea..00f209a 100644
--- a/test/test_response_container_paged_saved_search.py
+++ b/test/test_response_container_paged_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_source.py b/test/test_response_container_paged_source.py
index 6bf2bcd..a96290a 100644
--- a/test/test_response_container_paged_source.py
+++ b/test/test_response_container_paged_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_paged_user_group.py b/test/test_response_container_paged_user_group.py
index 6cd5db7..b308db7 100644
--- a/test/test_response_container_paged_user_group.py
+++ b/test/test_response_container_paged_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_proxy.py b/test/test_response_container_proxy.py
index d2a2c98..4ebd001 100644
--- a/test/test_response_container_proxy.py
+++ b/test/test_response_container_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_saved_search.py b/test/test_response_container_saved_search.py
index 4284c4e..e0d8008 100644
--- a/test/test_response_container_saved_search.py
+++ b/test/test_response_container_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_source.py b/test/test_response_container_source.py
index 99c4b71..0552b9b 100644
--- a/test/test_response_container_source.py
+++ b/test/test_response_container_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_tags_response.py b/test/test_response_container_tags_response.py
index 66794cc..9aeb7a2 100644
--- a/test/test_response_container_tags_response.py
+++ b/test/test_response_container_tags_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_user_group.py b/test/test_response_container_user_group.py
index b823ea6..0937994 100644
--- a/test/test_response_container_user_group.py
+++ b/test/test_response_container_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_container_validated_users_dto.py b/test/test_response_container_validated_users_dto.py
index ccca8f0..c41d410 100644
--- a/test/test_response_container_validated_users_dto.py
+++ b/test/test_response_container_validated_users_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_response_status.py b/test/test_response_status.py
index ae7bc6f..2481efa 100644
--- a/test/test_response_status.py
+++ b/test/test_response_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_saved_search.py b/test/test_saved_search.py
index 476067b..b950255 100644
--- a/test/test_saved_search.py
+++ b/test/test_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_saved_search_api.py b/test/test_saved_search_api.py
index fed9536..dd83835 100644
--- a/test/test_saved_search_api.py
+++ b/test/test_saved_search_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_search_api.py b/test/test_search_api.py
index c11929a..b5df1bf 100644
--- a/test/test_search_api.py
+++ b/test/test_search_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_search_query.py b/test/test_search_query.py
index ad4f39e..26b0cf5 100644
--- a/test/test_search_query.py
+++ b/test/test_search_query.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_settings_api.py b/test/test_settings_api.py
index b22238b..477df3e 100644
--- a/test/test_settings_api.py
+++ b/test/test_settings_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_sortable_search_request.py b/test/test_sortable_search_request.py
index d4817c7..d0c1dd9 100644
--- a/test/test_sortable_search_request.py
+++ b/test/test_sortable_search_request.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_sorting.py b/test/test_sorting.py
index 76a657b..5e65782 100644
--- a/test/test_sorting.py
+++ b/test/test_sorting.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_source.py b/test/test_source.py
index 7eb2ae1..f4a68f6 100644
--- a/test/test_source.py
+++ b/test/test_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_source_api.py b/test/test_source_api.py
index 3a9c2e8..60bd4c3 100644
--- a/test/test_source_api.py
+++ b/test/test_source_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_source_label_pair.py b/test/test_source_label_pair.py
index bcbbb2a..acadd0a 100644
--- a/test/test_source_label_pair.py
+++ b/test/test_source_label_pair.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_source_search_request_container.py b/test/test_source_search_request_container.py
index 93ffb88..35f6755 100644
--- a/test/test_source_search_request_container.py
+++ b/test/test_source_search_request_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_stats_model.py b/test/test_stats_model.py
index ff3aa15..b849343 100644
--- a/test/test_stats_model.py
+++ b/test/test_stats_model.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_tags_response.py b/test/test_tags_response.py
index 0a7fea9..ee42efd 100644
--- a/test/test_tags_response.py
+++ b/test/test_tags_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_target_info.py b/test/test_target_info.py
index 7b197b3..90ba865 100644
--- a/test/test_target_info.py
+++ b/test/test_target_info.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_tesla_configuration.py b/test/test_tesla_configuration.py
index 7476cab..2b54d64 100644
--- a/test/test_tesla_configuration.py
+++ b/test/test_tesla_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_timeseries.py b/test/test_timeseries.py
index 3a3b497..7d2ea65 100644
--- a/test/test_timeseries.py
+++ b/test/test_timeseries.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user.py b/test/test_user.py
index c5334d9..82e167e 100644
--- a/test/test_user.py
+++ b/test/test_user.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_api.py b/test/test_user_api.py
index c3b9933..d782177 100644
--- a/test/test_user_api.py
+++ b/test/test_user_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -120,6 +120,13 @@ def test_update_user(self):
         """
         pass
 
+    def test_validate_users(self):
+        """Test case for validate_users
+
+        Returns valid users and invalid identifiers from the given list  # noqa: E501
+        """
+        pass
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_user_dto.py b/test/test_user_dto.py
index f179fcc..5222fa8 100644
--- a/test/test_user_dto.py
+++ b/test/test_user_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_group.py b/test/test_user_group.py
index 8ad2a9e..7e4ea3a 100644
--- a/test/test_user_group.py
+++ b/test/test_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_group_api.py b/test/test_user_group_api.py
index fb80a3c..53485cb 100644
--- a/test/test_user_group_api.py
+++ b/test/test_user_group_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_group_properties_dto.py b/test/test_user_group_properties_dto.py
index 54a107f..d6ca2c1 100644
--- a/test/test_user_group_properties_dto.py
+++ b/test/test_user_group_properties_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_group_write.py b/test/test_user_group_write.py
index e535d9f..6d1d395 100644
--- a/test/test_user_group_write.py
+++ b/test/test_user_group_write.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_model.py b/test/test_user_model.py
index 0a80e75..b93d190 100644
--- a/test/test_user_model.py
+++ b/test/test_user_model.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_request_dto.py b/test/test_user_request_dto.py
index 42abb41..aa8054b 100644
--- a/test/test_user_request_dto.py
+++ b/test/test_user_request_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_settings.py b/test/test_user_settings.py
index 267adfa..8986d4f 100644
--- a/test/test_user_settings.py
+++ b/test/test_user_settings.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_user_to_create.py b/test/test_user_to_create.py
index ca0a39a..6c01aa4 100644
--- a/test/test_user_to_create.py
+++ b/test/test_user_to_create.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_validated_users_dto.py b/test/test_validated_users_dto.py
index fe61f54..6597873 100644
--- a/test/test_validated_users_dto.py
+++ b/test/test_validated_users_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_webhook_api.py b/test/test_webhook_api.py
index 6cf1d98..85833f2 100644
--- a/test/test_webhook_api.py
+++ b/test/test_webhook_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/test/test_wf_tags.py b/test/test_wf_tags.py
index ab936f9..859f1c5 100644
--- a/test/test_wf_tags.py
+++ b/test/test_wf_tags.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index cca484b..9122e8e 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -8,7 +8,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 5d11d08..fa0f220 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 13c5fe8..abd560f 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index c84fba8..4c30b70 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index a7b5dcd..8c5e4c2 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/derived_metric_definition_api.py b/wavefront_api_client/api/derived_metric_definition_api.py
deleted file mode 100644
index 206d769..0000000
--- a/wavefront_api_client/api/derived_metric_definition_api.py
+++ /dev/null
@@ -1,1226 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront Public API
-
-    <p>The Wavefront public API enables you to interact with Wavefront servers using standard web service API tools. You can use the API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make API calls outside the Wavefront API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p><p>For legacy versions of the Wavefront API, see the <a href=\"/api-docs/ui/deprecated\">legacy API documentation</a>.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from wavefront_api_client.api_client import ApiClient
-
-
-class DerivedMetricDefinitionApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def add_tag_to_derived_metric_definition(self, id, tag_value, **kwargs):  # noqa: E501
-        """Add a tag to a specific Derived Metric Definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_tag_to_derived_metric_definition(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-        else:
-            (data) = self.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-            return data
-
-    def add_tag_to_derived_metric_definition_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
-        """Add a tag to a specific Derived Metric Definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_tag_to_derived_metric_definition_with_http_info(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_tag_to_derived_metric_definition" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `add_tag_to_derived_metric_definition`")  # noqa: E501
-        # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
-            raise ValueError("Missing the required parameter `tag_value` when calling `add_tag_to_derived_metric_definition`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'tag_value' in params:
-            path_params['tagValue'] = params['tag_value']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/tag/{tagValue}', 'PUT',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def create_derived_metric_definition(self, **kwargs):  # noqa: E501
-        """Create a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_derived_metric_definition(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.create_derived_metric_definition_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.create_derived_metric_definition_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def create_derived_metric_definition_with_http_info(self, **kwargs):  # noqa: E501
-        """Create a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_derived_metric_definition_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"name\": \"Query Name\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method create_derived_metric_definition" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def delete_derived_metric_definition(self, id, **kwargs):  # noqa: E501
-        """Delete a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.delete_derived_metric_definition(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.delete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def delete_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Delete a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.delete_derived_metric_definition_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method delete_derived_metric_definition" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `delete_derived_metric_definition`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}', 'DELETE',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_all_derived_metric_definitions(self, **kwargs):  # noqa: E501
-        """Get all derived metric definitions for a customer  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_derived_metric_definitions(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_all_derived_metric_definitions_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_all_derived_metric_definitions_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_all_derived_metric_definitions_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all derived metric definitions for a customer  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_derived_metric_definitions_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_all_derived_metric_definitions" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_derived_metric_definition_by_version(self, id, version, **kwargs):  # noqa: E501
-        """Get a specific historical version of a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_derived_metric_definition_by_version(id, version, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int version: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_derived_metric_definition_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_derived_metric_definition_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
-            return data
-
-    def get_derived_metric_definition_by_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
-        """Get a specific historical version of a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_derived_metric_definition_by_version_with_http_info(id, version, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int version: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'version']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_derived_metric_definition_by_version" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_definition_by_version`")  # noqa: E501
-        # verify the required parameter 'version' is set
-        if ('version' not in params or
-                params['version'] is None):
-            raise ValueError("Missing the required parameter `version` when calling `get_derived_metric_definition_by_version`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'version' in params:
-            path_params['version'] = params['version']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/history/{version}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_derived_metric_definition_history(self, id, **kwargs):  # noqa: E501
-        """Get the version history of a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_derived_metric_definition_history(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_derived_metric_definition_history_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_derived_metric_definition_history_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_derived_metric_definition_history_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get the version history of a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_derived_metric_definition_history_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_derived_metric_definition_history" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_definition_history`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/history', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerHistoryResponse',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_derived_metric_definition_tags(self, id, **kwargs):  # noqa: E501
-        """Get all tags associated with a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_derived_metric_definition_tags(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerTagsResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get all tags associated with a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_derived_metric_definition_tags_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerTagsResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_derived_metric_definition_tags" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_definition_tags`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/tag', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerTagsResponse',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_registered_query(self, id, **kwargs):  # noqa: E501
-        """Get a specific registered query  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_registered_query(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_registered_query_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_registered_query_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_registered_query_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get a specific registered query  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_registered_query_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_registered_query" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_registered_query`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def remove_tag_from_derived_metric_definition(self, id, tag_value, **kwargs):  # noqa: E501
-        """Remove a tag from a specific Derived Metric Definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_tag_from_derived_metric_definition(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-            return data
-
-    def remove_tag_from_derived_metric_definition_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
-        """Remove a tag from a specific Derived Metric Definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_tag_from_derived_metric_definition_with_http_info(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_tag_from_derived_metric_definition" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `remove_tag_from_derived_metric_definition`")  # noqa: E501
-        # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
-            raise ValueError("Missing the required parameter `tag_value` when calling `remove_tag_from_derived_metric_definition`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'tag_value' in params:
-            path_params['tagValue'] = params['tag_value']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/tag/{tagValue}', 'DELETE',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def set_derived_metric_definition_tags(self, id, **kwargs):  # noqa: E501
-        """Set all tags associated with a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_derived_metric_definition_tags(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body:
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.set_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.set_derived_metric_definition_tags_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def set_derived_metric_definition_tags_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Set all tags associated with a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_derived_metric_definition_tags_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body:
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method set_derived_metric_definition_tags" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `set_derived_metric_definition_tags`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/tag', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def undelete_derived_metric_definition(self, id, **kwargs):  # noqa: E501
-        """Undelete a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.undelete_derived_metric_definition(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.undelete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.undelete_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def undelete_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Undelete a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.undelete_derived_metric_definition_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method undelete_derived_metric_definition" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `undelete_derived_metric_definition`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}/undelete', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def update_derived_metric_definition(self, id, **kwargs):  # noqa: E501
-        """Update a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_derived_metric_definition(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.update_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_derived_metric_definition_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def update_derived_metric_definition_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Update a specific derived metric definition  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_derived_metric_definition_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param DerivedMetricDefinition body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Query Name\",   \"createUserId\": \"user\",   \"query\": \"aliasMetric(ts(~sample.cpu.loadavg.1m), \\\"my.new.metric\\\")\",   \"minutes\": 5,   \"additionalInformation\": \"Additional Info\" }</pre>
-        :return: ResponseContainerDerivedMetricDefinition
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method update_derived_metric_definition" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `update_derived_metric_definition`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/derivedmetricdefinition/{id}', 'PUT',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerDerivedMetricDefinition',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/direct_ingestion_api.py b/wavefront_api_client/api/direct_ingestion_api.py
index 4bce041..1adc466 100644
--- a/wavefront_api_client/api/direct_ingestion_api.py
+++ b/wavefront_api_client/api/direct_ingestion_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index f26a531..3542c1b 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index 4114a28..b7820c3 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index 5aa7ce7..4c9e0b5 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index 099ee51..0dd30a7 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index 2fa3443..819e3fa 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index 70c0103..25a5b09 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 877fd34..3b0c062 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 31c57e7..ff5cdf8 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index fb8a6ad..9f733c9 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index 87e18c9..6be1843 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index e74332c..58b19b9 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/settings_api.py b/wavefront_api_client/api/settings_api.py
index 5346429..e5af965 100644
--- a/wavefront_api_client/api/settings_api.py
+++ b/wavefront_api_client/api/settings_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 169634f..3f4ecbc 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 10a9b8e..5058d6b 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index d2363d8..c385cdc 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 9babce9..9179a5b 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 22cea83..eea9c2f 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -5,7 +5,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.29.47/python'
+        self.user_agent = 'Swagger-Codegen/2.30.15/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 27195a5..bfc235e 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.29.47".\
+               "SDK Package Version: 2.30.15".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 436a2b4..60f843c 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -7,7 +7,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index d90039e..cfd01b9 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
index 6d20052..0703002 100644
--- a/wavefront_api_client/models/access_control_list_simple.py
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/acl.py b/wavefront_api_client/models/acl.py
index 50f7a21..85f76f9 100644
--- a/wavefront_api_client/models/acl.py
+++ b/wavefront_api_client/models/acl.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 042e5d0..f46d7e5 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/avro_backed_standardized_dto.py b/wavefront_api_client/models/avro_backed_standardized_dto.py
index 6999370..a494d72 100644
--- a/wavefront_api_client/models/avro_backed_standardized_dto.py
+++ b/wavefront_api_client/models/avro_backed_standardized_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index c689b47..1e2c6d9 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index f7c9ec6..6be8231 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 4aeac68..9b0a780 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index abd36ed..b9b66e3 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/business_action_group_basic_dto.py b/wavefront_api_client/models/business_action_group_basic_dto.py
index 5d5f087..f2dfac6 100644
--- a/wavefront_api_client/models/business_action_group_basic_dto.py
+++ b/wavefront_api_client/models/business_action_group_basic_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 7473f26..e62ee26 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 821dc02..a7f97d2 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index 6c9c451..3960da3 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 3f10c59..719f82d 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index e2df08d..2cc9f37 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 036ed6c..0a47eb8 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index f752a84..dd2b0d4 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
index be5be2b..145b732 100644
--- a/wavefront_api_client/models/customer_preferences.py
+++ b/wavefront_api_client/models/customer_preferences.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/customer_preferences_updating.py b/wavefront_api_client/models/customer_preferences_updating.py
index 3b2b671..21c3110 100644
--- a/wavefront_api_client/models/customer_preferences_updating.py
+++ b/wavefront_api_client/models/customer_preferences_updating.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 52d4798..e6f68bd 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index 753d5d7..78878e9 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index f3fe571..aed68a4 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index 2eb3e9d..b57b846 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 3408eda..1face76 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index a17cbba..1c837ca 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index e4582cf..d1a08c6 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 76ed460..362a078 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/event_time_range.py b/wavefront_api_client/models/event_time_range.py
index 24363b9..4ca623b 100644
--- a/wavefront_api_client/models/event_time_range.py
+++ b/wavefront_api_client/models/event_time_range.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index c3aa4c2..b40ae76 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index af4bda4..2d6ad58 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 17633fd..e711b3c 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index 4a460d9..04a0b2b 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index b2b3a91..7211a06 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index 40b028a..861e939 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 75ccbe9..176f5d5 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index 205ed42..2d416bb 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index 358f2da..6cb6a7f 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/install_alerts.py b/wavefront_api_client/models/install_alerts.py
index 0b581ee..c3e3088 100644
--- a/wavefront_api_client/models/install_alerts.py
+++ b/wavefront_api_client/models/install_alerts.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index f8971de..6769f9f 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index be92bf0..86b4395 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index afb4a98..c907820 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 7f1287b..6ff2cf2 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 20ea82a..396204e 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index 0c53344..74022fe 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index c80d2b4..696be17 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/iterator_entry_string_json_node.py b/wavefront_api_client/models/iterator_entry_string_json_node.py
index c840c45..bc7bc26 100644
--- a/wavefront_api_client/models/iterator_entry_string_json_node.py
+++ b/wavefront_api_client/models/iterator_entry_string_json_node.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/iterator_json_node.py b/wavefront_api_client/models/iterator_json_node.py
index c243c60..2f2e4bb 100644
--- a/wavefront_api_client/models/iterator_json_node.py
+++ b/wavefront_api_client/models/iterator_json_node.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/iterator_string.py b/wavefront_api_client/models/iterator_string.py
index b9b8aa4..a6c1925 100644
--- a/wavefront_api_client/models/iterator_string.py
+++ b/wavefront_api_client/models/iterator_string.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/json_node.py b/wavefront_api_client/models/json_node.py
index cdeed31..f2e44f3 100644
--- a/wavefront_api_client/models/json_node.py
+++ b/wavefront_api_client/models/json_node.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
index 975cdca..cb2bee3 100644
--- a/wavefront_api_client/models/logical_type.py
+++ b/wavefront_api_client/models/logical_type.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index d14f34b..a037c1f 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 4723e92..38cee86 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/metric_details.py b/wavefront_api_client/models/metric_details.py
index f6bfe44..1cfcf24 100644
--- a/wavefront_api_client/models/metric_details.py
+++ b/wavefront_api_client/models/metric_details.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index d6bd5f9..687d5e0 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index ed39379..4f892e9 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index ba9a7aa..83e0c7f 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/new_relic_metric_filters.py b/wavefront_api_client/models/new_relic_metric_filters.py
index e41fa49..27424a4 100644
--- a/wavefront_api_client/models/new_relic_metric_filters.py
+++ b/wavefront_api_client/models/new_relic_metric_filters.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index eb39840..b5ee08f 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/number.py b/wavefront_api_client/models/number.py
index 9521e38..6856868 100644
--- a/wavefront_api_client/models/number.py
+++ b/wavefront_api_client/models/number.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index f5eb375..4f6235c 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index 0a18b0d..6bde6fe 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index edaaed5..a39caf8 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index 6c9f1e3..9b14b74 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index edd4fd5..de12e70 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index 660ced1..5d1f744 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index 41d3c4c..5d49e2f 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index 93156c3..c724b8a 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index 8d26d38..e5a2299 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index 49aad88..aa98497 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index 8bcd05d..083c47f 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index cef1f7c..f974970 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 0b07c5a..1ec6e98 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index 7e50d08..a01cf21 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index 6cf16fd..9d88ca2 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index 7141abb..203944d 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/paged_user_group.py b/wavefront_api_client/models/paged_user_group.py
index d23137e..ce65312 100644
--- a/wavefront_api_client/models/paged_user_group.py
+++ b/wavefront_api_client/models/paged_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index 35d2f65..0217fe3 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 58ccf31..742ee2c 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index 1595bd7..0d41672 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index 59067c1..3017bd6 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index 7e3bdf5..2999267 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index f644c3f..249a499 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index c69f084..6f8ca58 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index e436ea4..132ac6e 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index ecf5ce6..673911a 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 621b99d..953516f 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 8682267..b4fc52a 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index eef085c..9351e88 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 36a9426..6d4657c 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 40e4b14..49486a4 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 9bb9177..8c4ad8e 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index 3043af5..350c851 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index a533d01..60cb7ac 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_list_acl.py b/wavefront_api_client/models/response_container_list_acl.py
index 886d6f3..fae89b8 100644
--- a/wavefront_api_client/models/response_container_list_acl.py
+++ b/wavefront_api_client/models/response_container_list_acl.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index dfd2c35..a26ecb6 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index dc8fb08..cbb2c9c 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index 1c4316d..83445d2 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_list_user_group.py b/wavefront_api_client/models/response_container_list_user_group.py
index ba8169b..aa53f46 100644
--- a/wavefront_api_client/models/response_container_list_user_group.py
+++ b/wavefront_api_client/models/response_container_list_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index b19f62c..8aaeb7d 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 99ddd28..6f8253a 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index d8724ce..db9169d 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index cb06095..00e1c03 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index 2e831fc..fdd4111 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index 42932ee..b145604 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index cd55ab9..2956631 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index 10b5c47..8200d05 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index df6a5e7..38746fc 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index ddfa55a..9afa94c 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index 05c50c8..f583c92 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 57202cc..3fe05a2 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index 61edb35..a2fcf69 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index 85a2053..c9d27da 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index cbe7b70..4fd533b 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index 24b54df..5dfbf3d 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index e8b56f1..0bbd80a 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index 134ec15..24c1651 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index b134ac2..a94bbcf 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 76de3bf..1ad7a98 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 15893a7..ec1979c 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_paged_user_group.py b/wavefront_api_client/models/response_container_paged_user_group.py
index c39821b..4479d73 100644
--- a/wavefront_api_client/models/response_container_paged_user_group.py
+++ b/wavefront_api_client/models/response_container_paged_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index 5d1335c..c41bfc3 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index aa3a65b..0075b1d 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 5fa807c..69b14e7 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index ca37e13..b3260e8 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_user_group.py b/wavefront_api_client/models/response_container_user_group.py
index 05721a1..1a7391a 100644
--- a/wavefront_api_client/models/response_container_user_group.py
+++ b/wavefront_api_client/models/response_container_user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index faae21c..36d137c 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index 51ee770..1caa934 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 979dd62..fee34fb 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index e6f10c9..5f0d998 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 662c1d1..1eb4e59 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index 908c753..ff3975f 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 435138d..19cf450 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 07c3262..627262f 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index 0f2f651..6df86c4 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/stats_model.py b/wavefront_api_client/models/stats_model.py
index 9759ec2..eda36f8 100644
--- a/wavefront_api_client/models/stats_model.py
+++ b/wavefront_api_client/models/stats_model.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 857bd97..4dbb103 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index 907a455..8ac8f88 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/tesla_configuration.py b/wavefront_api_client/models/tesla_configuration.py
index 11dee4d..df37c1f 100644
--- a/wavefront_api_client/models/tesla_configuration.py
+++ b/wavefront_api_client/models/tesla_configuration.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index efa7e3f..eeb19b2 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
index 4319359..0649abd 100644
--- a/wavefront_api_client/models/user.py
+++ b/wavefront_api_client/models/user.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 0fa4735..9d19911 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index 13537d7..b975a03 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index 005f263..5c18c93 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index cc89ebc..480f5b1 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 581483c..d69c31f 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index f7d13ff..5b6de13 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 635d5d4..681916a 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index da25433..62c30cf 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
index 253e989..a07b70b 100644
--- a/wavefront_api_client/models/validated_users_dto.py
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/models/wf_tags.py b/wavefront_api_client/models/wf_tags.py
index e70f994..2ede460 100644
--- a/wavefront_api_client/models/wf_tags.py
+++ b/wavefront_api_client/models/wf_tags.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
diff --git a/wavefront_api_client/rest.py b/wavefront_api_client/rest.py
index e42c675..6091697 100644
--- a/wavefront_api_client/rest.py
+++ b/wavefront_api_client/rest.py
@@ -6,7 +6,7 @@
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
     OpenAPI spec version: v2
-    Contact: support@wavefront.com
+    Contact: chitimba@wavefront.com
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 

From 173216985aa51d9d6f3dd4c1b7131366afcdfc24 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Thu, 9 May 2019 16:47:50 -0700
Subject: [PATCH 028/161] Update Python Client Generator Script. (#53)

* Update Python Client Generator Script.
* Introduce More Checks & Fix Linters Errors.
---
 generate_client | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/generate_client b/generate_client
index c3fc85b..00f679d 100755
--- a/generate_client
+++ b/generate_client
@@ -1,12 +1,15 @@
 #!/bin/bash
 
-if [[ "$1" == "" ]]; then
-    echo "Please specify the name of the cluster as an argument."
+function _exit {
+    echo "$1" >&2
     exit 1
-fi
+}
+
+# Exit if cluster name was not specified as a first argument.
+[[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.4"  # For 3.x use CGEN_VER="3.0.7"
+CGEN_VER="2.4.5"  # For 3.x use CGEN_VER="3.0.7"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
@@ -23,22 +26,27 @@ VERSION_URL="https://$1.wavefront.com/auth/forgetPassword"
 
 PYTHON=$(command -v python3 || command -v python)
 
+# Make sure required python version and curl tool are present or exit.
+$PYTHON -V | grep -q "Python 3" || _exit "Python ^^^ is obsolete. Aborting."
+[[ "$(command -v curl)" ]] || _exit "The curl command was not found. Aborting."
+
 # Check if config file exists in '.swagger-codegen' directory.
-[[ -f "${CONFIG_FILE}" ]] || echo "Config file '${CONFIG_FILE}' not found!"
+[[ -f "${CONFIG_FILE}" ]] || _exit "File '${CONFIG_FILE}' not found."
+
 # Get the current version from the config file.
 CONFIG_VER=$($PYTHON -c "import json, sys;\
   sys.stdout.write(json.load(sys.stdin)['packageVersion'][2:]+'\n')"\
   < "${CONFIG_FILE}"
 )
 echo "Fetching the current version from '$1' cluster..."
-SERVER_VER=$(curl -s "${VERSION_URL}" | grep 'version:' | grep -o '\d*\.\d*')
+SERVER_VER=$(curl -s "${VERSION_URL}" | grep 'version: ' |\
+             grep -o '[0-9]\+\.[0-9]\+')
 
-echo "Current Version in config is: ${CONFIG_VER}"
 echo "Current Version on server is: ${SERVER_VER}"
+echo "Current Version in config is: ${CONFIG_VER}"
 
 if [[ -z "${CONFIG_VER}" || -z "${SERVER_VER}" ]]; then
-  echo "Unable to determine the version for '$1' cluster."
-  exit 1
+  _exit "Unable to determine the version for '$1' cluster."
 elif [[ "${CONFIG_VER}" == "${SERVER_VER}" ]]; then
   echo "No Version Change Detected. Bye."
 else
@@ -50,16 +58,19 @@ else
   echo "Step 1: Fetching the latest swagger-codegen..."
   curl -s "${CGEN_JAR_URL}" -o "${CGEN_JAR_BINARY}"
 
-  echo "Step 2: Fetching the latest swagger.json..."
+  echo "Step 2: Fetching the config from '${SWGR_URL}'..."
   curl -s "${SWGR_URL}" | $PYTHON -m json.tool --sort-keys > "${SWAGGER_FILE}"
 
+  # Exit if swagger file is missing at this point.
+  [[ -f "${SWAGGER_FILE}" ]] || _exit "Failed to fetch ${SWGR_JSON}."
+
   echo "Step 3: Generating the client..."
   java -jar "${CGEN_JAR_BINARY}" generate -l python \
        -c "${CONFIG_FILE}" -i "${SWAGGER_FILE}" \
        --additional-properties "${EXTRA_PROPS}"
 
   echo "Step 4: Checking if anything has changed..."
-  if [[ -n "$(git status --porcelain)" ]]; then
+  if [[ -n "$(git status --porcelain)" ]]; then  # non-zero diff detected.
     echo "Step 5: Updating the version in the config..."
     sed -i '' "s/${CONFIG_VER//./\\.}/${SERVER_VER//./\\.}/" "${CONFIG_FILE}"
 
@@ -71,9 +82,7 @@ else
     echo "Step 7: Committing the updated files..."
     git add -A && git commit -am "Autogenerated Update v2.${SERVER_VER}."
 
-    echo "Step 8: Pushing the update to GitHub..."
-    git push
+    echo "Please run git push in order to push commit to GitHub... Bye."
   fi
-  echo "Cleaning up..."
-  rm -rv "${TEMP_DIR_NAME}"
+  echo "Cleaning up..." && rm -rv "${TEMP_DIR_NAME}"
 fi

From e1a160c6eb85c9f13a34750b242c561cb5658df1 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Fri, 10 May 2019 15:34:44 -0700
Subject: [PATCH 029/161] Fix `sed` Command to Work in Ubuntu. (#54)

---
 generate_client | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate_client b/generate_client
index 00f679d..68d5de2 100755
--- a/generate_client
+++ b/generate_client
@@ -72,7 +72,7 @@ else
   echo "Step 4: Checking if anything has changed..."
   if [[ -n "$(git status --porcelain)" ]]; then  # non-zero diff detected.
     echo "Step 5: Updating the version in the config..."
-    sed -i '' "s/${CONFIG_VER//./\\.}/${SERVER_VER//./\\.}/" "${CONFIG_FILE}"
+    sed -ie "s/${CONFIG_VER//./\\.}/${SERVER_VER//./\\.}/" "${CONFIG_FILE}"
 
     echo "Step 6: Generating the updated client..."
     java -jar "${CGEN_JAR_BINARY}" generate -l python \

From 3819d1c4ac8a89998959508a53e7ff24237e5003 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 10 May 2019 16:12:13 -0700
Subject: [PATCH 030/161] Autogenerated Update v2.32.19.

---
 .swagger-codegen/VERSION                      |   2 +-
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   7 +
 README.md                                     |  43 +-
 docs/AccessControlElement.md                  |   1 +
 docs/AccessControlListReadDTO.md              |  12 +
 docs/AccessControlListWriteDTO.md             |  12 +
 docs/Alert.md                                 |   3 +
 docs/AlertApi.md                              | 329 ++++++++++
 docs/ApiTokenApi.md                           | 222 +++++++
 docs/CustomerPreferences.md                   |   2 +-
 docs/Dashboard.md                             |   2 +-
 docs/DashboardApi.md                          |  16 +-
 docs/PagedUserGroupModel.md                   |  16 +
 ...seContainerListAccessControlListReadDTO.md |  11 +
 docs/ResponseContainerListUserApiToken.md     |  11 +
 docs/ResponseContainerListUserGroupModel.md   |  11 +
 docs/ResponseContainerPagedUserGroupModel.md  |  11 +
 docs/ResponseContainerUserApiToken.md         |  11 +
 docs/ResponseContainerUserGroupModel.md       |  11 +
 docs/SearchApi.md                             |   4 +-
 docs/SearchQuery.md                           |   1 +
 docs/SettingsApi.md                           |   4 +-
 docs/User.md                                  |   2 +
 docs/UserApi.md                               |  24 +-
 docs/UserApiToken.md                          |  11 +
 docs/UserGroup.md                             |  12 +-
 docs/UserGroupApi.md                          |  44 +-
 docs/UserGroupModel.md                        |  18 +
 docs/UserGroupWrite.md                        |   1 +
 docs/UserSettings.md                          |   1 +
 setup.py                                      |   2 +-
 test/test_access_control_list_read_dto.py     |  40 ++
 test/test_access_control_list_write_dto.py    |  40 ++
 test/test_api_token_api.py                    |  62 ++
 test/test_paged_user_group_model.py           |  40 ++
 ...ainer_list_access_control_list_read_dto.py |  40 ++
 ..._response_container_list_user_api_token.py |  40 ++
 ...esponse_container_list_user_group_model.py |  40 ++
 ...sponse_container_paged_user_group_model.py |  40 ++
 .../test_response_container_user_api_token.py |  40 ++
 ...est_response_container_user_group_model.py |  40 ++
 test/test_user_api_token.py                   |  40 ++
 test/test_user_group_model.py                 |  40 ++
 wavefront_api_client/__init__.py              |  18 +-
 wavefront_api_client/api/__init__.py          |   1 +
 wavefront_api_client/api/alert_api.py         | 581 ++++++++++++++++++
 wavefront_api_client/api/api_token_api.py     | 406 ++++++++++++
 wavefront_api_client/api/dashboard_api.py     |  18 +-
 wavefront_api_client/api/search_api.py        |   6 +-
 wavefront_api_client/api/settings_api.py      |   6 +-
 wavefront_api_client/api/user_api.py          |  26 +-
 wavefront_api_client/api/user_group_api.py    |  62 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  17 +-
 .../models/access_control_element.py          |  28 +-
 .../models/access_control_list_read_dto.py    | 175 ++++++
 .../models/access_control_list_write_dto.py   | 173 ++++++
 wavefront_api_client/models/alert.py          |  83 ++-
 .../models/customer_preferences.py            |   8 +-
 wavefront_api_client/models/dashboard.py      |   2 +
 .../models/paged_user_group_model.py          | 282 +++++++++
 ...ainer_list_access_control_list_read_dto.py | 145 +++++
 .../response_container_list_user_api_token.py | 145 +++++
 ...esponse_container_list_user_group_model.py | 145 +++++
 ...sponse_container_paged_user_group_model.py | 145 +++++
 .../response_container_user_api_token.py      | 145 +++++
 .../response_container_user_group_model.py    | 145 +++++
 wavefront_api_client/models/search_query.py   |  30 +-
 wavefront_api_client/models/user.py           |  54 +-
 wavefront_api_client/models/user_api_token.py | 146 +++++
 wavefront_api_client/models/user_group.py     |  84 +--
 .../models/user_group_model.py                | 343 +++++++++++
 .../models/user_group_write.py                |  30 +-
 wavefront_api_client/models/user_settings.py  |  28 +-
 76 files changed, 4645 insertions(+), 197 deletions(-)
 create mode 100644 .swagger-codegen/config.jsone
 create mode 100644 docs/AccessControlListReadDTO.md
 create mode 100644 docs/AccessControlListWriteDTO.md
 create mode 100644 docs/ApiTokenApi.md
 create mode 100644 docs/PagedUserGroupModel.md
 create mode 100644 docs/ResponseContainerListAccessControlListReadDTO.md
 create mode 100644 docs/ResponseContainerListUserApiToken.md
 create mode 100644 docs/ResponseContainerListUserGroupModel.md
 create mode 100644 docs/ResponseContainerPagedUserGroupModel.md
 create mode 100644 docs/ResponseContainerUserApiToken.md
 create mode 100644 docs/ResponseContainerUserGroupModel.md
 create mode 100644 docs/UserApiToken.md
 create mode 100644 docs/UserGroupModel.md
 create mode 100644 test/test_access_control_list_read_dto.py
 create mode 100644 test/test_access_control_list_write_dto.py
 create mode 100644 test/test_api_token_api.py
 create mode 100644 test/test_paged_user_group_model.py
 create mode 100644 test/test_response_container_list_access_control_list_read_dto.py
 create mode 100644 test/test_response_container_list_user_api_token.py
 create mode 100644 test/test_response_container_list_user_group_model.py
 create mode 100644 test/test_response_container_paged_user_group_model.py
 create mode 100644 test/test_response_container_user_api_token.py
 create mode 100644 test/test_response_container_user_group_model.py
 create mode 100644 test/test_user_api_token.py
 create mode 100644 test/test_user_group_model.py
 create mode 100644 wavefront_api_client/api/api_token_api.py
 create mode 100644 wavefront_api_client/models/access_control_list_read_dto.py
 create mode 100644 wavefront_api_client/models/access_control_list_write_dto.py
 create mode 100644 wavefront_api_client/models/paged_user_group_model.py
 create mode 100644 wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
 create mode 100644 wavefront_api_client/models/response_container_list_user_api_token.py
 create mode 100644 wavefront_api_client/models/response_container_list_user_group_model.py
 create mode 100644 wavefront_api_client/models/response_container_paged_user_group_model.py
 create mode 100644 wavefront_api_client/models/response_container_user_api_token.py
 create mode 100644 wavefront_api_client/models/response_container_user_group_model.py
 create mode 100644 wavefront_api_client/models/user_api_token.py
 create mode 100644 wavefront_api_client/models/user_group_model.py

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index ab6d278..26f8b8b 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.4
\ No newline at end of file
+2.4.5
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5de2c54..cb56f8a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.30.15"
+    "packageVersion": "2.32.19"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
new file mode 100644
index 0000000..5de2c54
--- /dev/null
+++ b/.swagger-codegen/config.jsone
@@ -0,0 +1,7 @@
+{
+    "gitRepoId": "python-client",
+    "gitUserId": "wavefrontHQ",
+    "packageName": "wavefront_api_client",
+    "packageUrl": "https://github.com/wavefrontHQ/python-client",
+    "packageVersion": "2.30.15"
+}
diff --git a/README.md b/README.md
index bb09680..f826ef9 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.30.15
+- Package version: 2.32.19
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -59,15 +59,13 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
 
 try:
-    # Add a tag to a specific alert
-    api_response = api_instance.add_alert_tag(id, tag_value)
-    pprint(api_response)
+    # Adds the specified ids to the given alerts' ACL
+    api_instance.add_access(body=body)
 except ApiException as e:
-    print("Exception when calling AlertApi->add_alert_tag: %s\n" % e)
+    print("Exception when calling AlertApi->add_access: %s\n" % e)
 
 ```
 
@@ -77,9 +75,13 @@ All URIs are relative to *https://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*AlertApi* | [**add_access**](docs/AlertApi.md#add_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 *AlertApi* | [**add_alert_tag**](docs/AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
+*AlertApi* | [**can_user_modify**](docs/AlertApi.md#can_user_modify) | **GET** /api/v2/alert/{id}/canUserModify | 
+*AlertApi* | [**clone_alert**](docs/AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 *AlertApi* | [**create_alert**](docs/AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 *AlertApi* | [**delete_alert**](docs/AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
+*AlertApi* | [**get_access_control_list**](docs/AlertApi.md#get_access_control_list) | **GET** /api/v2/alert/acl | Get Access Control Lists&#39; union for the specified alerts
 *AlertApi* | [**get_alert**](docs/AlertApi.md#get_alert) | **GET** /api/v2/alert/{id} | Get a specific alert
 *AlertApi* | [**get_alert_history**](docs/AlertApi.md#get_alert_history) | **GET** /api/v2/alert/{id}/history | Get the version history of a specific alert
 *AlertApi* | [**get_alert_tags**](docs/AlertApi.md#get_alert_tags) | **GET** /api/v2/alert/{id}/tag | Get all tags associated with a specific alert
@@ -87,13 +89,19 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**get_alerts_summary**](docs/AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 *AlertApi* | [**get_all_alert**](docs/AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 *AlertApi* | [**hide_alert**](docs/AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
+*AlertApi* | [**remove_access**](docs/AlertApi.md#remove_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
 *AlertApi* | [**remove_alert_tag**](docs/AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
+*AlertApi* | [**set_acl**](docs/AlertApi.md#set_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
 *AlertApi* | [**set_alert_tags**](docs/AlertApi.md#set_alert_tags) | **POST** /api/v2/alert/{id}/tag | Set all tags associated with a specific alert
 *AlertApi* | [**snooze_alert**](docs/AlertApi.md#snooze_alert) | **POST** /api/v2/alert/{id}/snooze | Snooze a specific alert for some number of seconds
 *AlertApi* | [**undelete_alert**](docs/AlertApi.md#undelete_alert) | **POST** /api/v2/alert/{id}/undelete | Undelete a specific alert
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
+*ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
+*ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
+*ApiTokenApi* | [**get_all_tokens**](docs/ApiTokenApi.md#get_all_tokens) | **GET** /api/v2/apitoken | Get all api tokens for a user
+*ApiTokenApi* | [**update_token_name**](docs/ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
 *CloudIntegrationApi* | [**create_cloud_integration**](docs/CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
 *CloudIntegrationApi* | [**delete_cloud_integration**](docs/CloudIntegrationApi.md#delete_cloud_integration) | **DELETE** /api/v2/cloudintegration/{id} | Delete a specific cloud integration
 *CloudIntegrationApi* | [**disable_cloud_integration**](docs/CloudIntegrationApi.md#disable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/disable | Disable a specific cloud integration
@@ -259,8 +267,8 @@ Class | Method | HTTP request | Description
 *UserApi* | [**create_or_update_user**](docs/UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
 *UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users
 *UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user identified by id
-*UserApi* | [**get_all_user**](docs/UserApi.md#get_all_user) | **GET** /api/v2/user | Get all users
-*UserApi* | [**get_user**](docs/UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email addr)
+*UserApi* | [**get_all_users**](docs/UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
+*UserApi* | [**get_user**](docs/UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
 *UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific user permission to multiple users
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific user permission
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
@@ -287,10 +295,11 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Models
 
- - [ACL](docs/ACL.md)
  - [AWSBaseCredentials](docs/AWSBaseCredentials.md)
  - [AccessControlElement](docs/AccessControlElement.md)
+ - [AccessControlListReadDTO](docs/AccessControlListReadDTO.md)
  - [AccessControlListSimple](docs/AccessControlListSimple.md)
+ - [AccessControlListWriteDTO](docs/AccessControlListWriteDTO.md)
  - [Alert](docs/Alert.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
@@ -362,7 +371,7 @@ Class | Method | HTTP request | Description
  - [PagedProxy](docs/PagedProxy.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
  - [PagedSource](docs/PagedSource.md)
- - [PagedUserGroup](docs/PagedUserGroup.md)
+ - [PagedUserGroupModel](docs/PagedUserGroupModel.md)
  - [Point](docs/Point.md)
  - [Proxy](docs/Proxy.md)
  - [QueryEvent](docs/QueryEvent.md)
@@ -380,11 +389,12 @@ Class | Method | HTTP request | Description
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
- - [ResponseContainerListACL](docs/ResponseContainerListACL.md)
+ - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
  - [ResponseContainerListIntegration](docs/ResponseContainerListIntegration.md)
  - [ResponseContainerListIntegrationManifestGroup](docs/ResponseContainerListIntegrationManifestGroup.md)
  - [ResponseContainerListString](docs/ResponseContainerListString.md)
- - [ResponseContainerListUserGroup](docs/ResponseContainerListUserGroup.md)
+ - [ResponseContainerListUserApiToken](docs/ResponseContainerListUserApiToken.md)
+ - [ResponseContainerListUserGroupModel](docs/ResponseContainerListUserGroupModel.md)
  - [ResponseContainerMaintenanceWindow](docs/ResponseContainerMaintenanceWindow.md)
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
@@ -406,12 +416,13 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
- - [ResponseContainerPagedUserGroup](docs/ResponseContainerPagedUserGroup.md)
+ - [ResponseContainerPagedUserGroupModel](docs/ResponseContainerPagedUserGroupModel.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
- - [ResponseContainerUserGroup](docs/ResponseContainerUserGroup.md)
+ - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
+ - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [SavedSearch](docs/SavedSearch.md)
@@ -427,8 +438,10 @@ Class | Method | HTTP request | Description
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [User](docs/User.md)
+ - [UserApiToken](docs/UserApiToken.md)
  - [UserDTO](docs/UserDTO.md)
  - [UserGroup](docs/UserGroup.md)
+ - [UserGroupModel](docs/UserGroupModel.md)
  - [UserGroupPropertiesDTO](docs/UserGroupPropertiesDTO.md)
  - [UserGroupWrite](docs/UserGroupWrite.md)
  - [UserModel](docs/UserModel.md)
diff --git a/docs/AccessControlElement.md b/docs/AccessControlElement.md
index ea8b673..c4d4940 100644
--- a/docs/AccessControlElement.md
+++ b/docs/AccessControlElement.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**description** | **str** |  | [optional] 
 **id** | **str** |  | [optional] 
 **name** | **str** |  | [optional] 
 
diff --git a/docs/AccessControlListReadDTO.md b/docs/AccessControlListReadDTO.md
new file mode 100644
index 0000000..88dfe06
--- /dev/null
+++ b/docs/AccessControlListReadDTO.md
@@ -0,0 +1,12 @@
+# AccessControlListReadDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**entity_id** | **str** | The entity Id | [optional] 
+**modify_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user groups ids that have modify permission | [optional] 
+**view_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user group ids that have view permission | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AccessControlListWriteDTO.md b/docs/AccessControlListWriteDTO.md
new file mode 100644
index 0000000..1f79e0d
--- /dev/null
+++ b/docs/AccessControlListWriteDTO.md
@@ -0,0 +1,12 @@
+# AccessControlListWriteDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**entity_id** | **str** | The entity Id | [optional] 
+**modify_acl** | **list[str]** | List of users and user groups ids that have modify permission | [optional] 
+**view_acl** | **list[str]** | List of users and user group ids that have view permission | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Alert.md b/docs/Alert.md
index 1603379..dbf7086 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -3,12 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
 **active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
 **additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
 **alert_type** | **str** | Alert type. | [optional] 
 **alerts_last_day** | **int** |  | [optional] 
 **alerts_last_month** | **int** |  | [optional] 
 **alerts_last_week** | **int** |  | [optional] 
+**can_user_modify** | **bool** | Whether the user can modify the alert. | [optional] 
 **condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
@@ -42,6 +44,7 @@ Name | Type | Description | Notes
 **notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
 **notification_resend_frequency_minutes** | **int** | How often to re-trigger a continually failing alert. If absent or &lt;&#x3D; 0, no retriggering occurs | [optional] 
 **num_points_in_failure_frame** | **int** | Number of points scanned in alert query time frame. | [optional] 
+**orphan** | **bool** |  | [optional] 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
 **prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
 **process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index eccd37b..d3c836f 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -4,9 +4,13 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_access**](AlertApi.md#add_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 [**add_alert_tag**](AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
+[**can_user_modify**](AlertApi.md#can_user_modify) | **GET** /api/v2/alert/{id}/canUserModify | 
+[**clone_alert**](AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 [**create_alert**](AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 [**delete_alert**](AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
+[**get_access_control_list**](AlertApi.md#get_access_control_list) | **GET** /api/v2/alert/acl | Get Access Control Lists&#39; union for the specified alerts
 [**get_alert**](AlertApi.md#get_alert) | **GET** /api/v2/alert/{id} | Get a specific alert
 [**get_alert_history**](AlertApi.md#get_alert_history) | **GET** /api/v2/alert/{id}/history | Get the version history of a specific alert
 [**get_alert_tags**](AlertApi.md#get_alert_tags) | **GET** /api/v2/alert/{id}/tag | Get all tags associated with a specific alert
@@ -14,7 +18,9 @@ Method | HTTP request | Description
 [**get_alerts_summary**](AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 [**get_all_alert**](AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 [**hide_alert**](AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
+[**remove_access**](AlertApi.md#remove_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
 [**remove_alert_tag**](AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
+[**set_acl**](AlertApi.md#set_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
 [**set_alert_tags**](AlertApi.md#set_alert_tags) | **POST** /api/v2/alert/{id}/tag | Set all tags associated with a specific alert
 [**snooze_alert**](AlertApi.md#snooze_alert) | **POST** /api/v2/alert/{id}/snooze | Snooze a specific alert for some number of seconds
 [**undelete_alert**](AlertApi.md#undelete_alert) | **POST** /api/v2/alert/{id}/undelete | Undelete a specific alert
@@ -23,6 +29,59 @@ Method | HTTP request | Description
 [**update_alert**](AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 
 
+# **add_access**
+> add_access(body=body)
+
+Adds the specified ids to the given alerts' ACL
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
+
+try:
+    # Adds the specified ids to the given alerts' ACL
+    api_instance.add_access(body=body)
+except ApiException as e:
+    print("Exception when calling AlertApi->add_access: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[AccessControlListWriteDTO]**](AccessControlListWriteDTO.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **add_alert_tag**
 > ResponseContainer add_alert_tag(id, tag_value)
 
@@ -79,6 +138,116 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **can_user_modify**
+> can_user_modify(id, body=body)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.User() # User |  (optional)
+
+try:
+    api_instance.can_user_modify(id, body=body)
+except ApiException as e:
+    print("Exception when calling AlertApi->can_user_modify: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**User**](User.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **clone_alert**
+> ResponseContainerAlert clone_alert(id, name=name, v=v)
+
+Clones the specified alert
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+name = 'name_example' # str |  (optional)
+v = 789 # int |  (optional)
+
+try:
+    # Clones the specified alert
+    api_response = api_instance.clone_alert(id, name=name, v=v)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->clone_alert: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **name** | **str**|  | [optional] 
+ **v** | **int**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerAlert**](ResponseContainerAlert.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_alert**
 > ResponseContainerAlert create_alert(body=body)
 
@@ -187,6 +356,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_access_control_list**
+> ResponseContainerListAccessControlListReadDTO get_access_control_list(id=id)
+
+Get Access Control Lists' union for the specified alerts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+id = ['id_example'] # list[str] |  (optional)
+
+try:
+    # Get Access Control Lists' union for the specified alerts
+    api_response = api_instance.get_access_control_list(id=id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->get_access_control_list: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | [**list[str]**](str.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerListAccessControlListReadDTO**](ResponseContainerListAccessControlListReadDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_alert**
 > ResponseContainerAlert get_alert(id)
 
@@ -569,6 +792,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_access**
+> remove_access(body=body)
+
+Removes the specified ids from the given alerts' ACL
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
+
+try:
+    # Removes the specified ids from the given alerts' ACL
+    api_instance.remove_access(body=body)
+except ApiException as e:
+    print("Exception when calling AlertApi->remove_access: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[AccessControlListWriteDTO]**](AccessControlListWriteDTO.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **remove_alert_tag**
 > ResponseContainer remove_alert_tag(id, tag_value)
 
@@ -625,6 +901,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **set_acl**
+> set_acl(body=body)
+
+Set ACL for the specified alerts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
+
+try:
+    # Set ACL for the specified alerts
+    api_instance.set_acl(body=body)
+except ApiException as e:
+    print("Exception when calling AlertApi->set_acl: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[AccessControlListWriteDTO]**](AccessControlListWriteDTO.md)|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **set_alert_tags**
 > ResponseContainer set_alert_tags(id, body=body)
 
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
new file mode 100644
index 0000000..e5dcf9c
--- /dev/null
+++ b/docs/ApiTokenApi.md
@@ -0,0 +1,222 @@
+# wavefront_api_client.ApiTokenApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_token**](ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
+[**delete_token**](ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
+[**get_all_tokens**](ApiTokenApi.md#get_all_tokens) | **GET** /api/v2/apitoken | Get all api tokens for a user
+[**update_token_name**](ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
+
+
+# **create_token**
+> ResponseContainerListUserApiToken create_token()
+
+Create new api token
+
+Returns the list of all api tokens for a user. The newly created api token is the last element of returned list.
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Create new api token
+    api_response = api_instance.create_token()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->create_token: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListUserApiToken**](ResponseContainerListUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_token**
+> ResponseContainerListUserApiToken delete_token(id)
+
+Delete the specified api token
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete the specified api token
+    api_response = api_instance.delete_token(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->delete_token: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerListUserApiToken**](ResponseContainerListUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_tokens**
+> ResponseContainerListUserApiToken get_all_tokens()
+
+Get all api tokens for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all api tokens for a user
+    api_response = api_instance.get_all_tokens()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->get_all_tokens: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListUserApiToken**](ResponseContainerListUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_token_name**
+> ResponseContainerUserApiToken update_token_name(id, body=body)
+
+Update the name of the specified api token
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.UserApiToken() # UserApiToken | Example Body:  <pre>{   \"tokenID\": \"Token identifier\",   \"tokenName\": \"Token name\" }</pre> (optional)
+
+try:
+    # Update the name of the specified api token
+    api_response = api_instance.update_token_name(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->update_token_name: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**UserApiToken**](UserApiToken.md)| Example Body:  &lt;pre&gt;{   \&quot;tokenID\&quot;: \&quot;Token identifier\&quot;,   \&quot;tokenName\&quot;: \&quot;Token name\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserApiToken**](ResponseContainerUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/CustomerPreferences.md b/docs/CustomerPreferences.md
index bcdff8c..6e29533 100644
--- a/docs/CustomerPreferences.md
+++ b/docs/CustomerPreferences.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
 **customer_id** | **str** | The id of the customer preferences are attached to | 
-**default_user_groups** | [**list[UserGroup]**](UserGroup.md) | List of default user groups of the customer | [optional] 
+**default_user_groups** | [**list[UserGroupModel]**](UserGroupModel.md) | List of default user groups of the customer | [optional] 
 **deleted** | **bool** |  | [optional] 
 **grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
 **hidden_metric_prefixes** | **dict(str, int)** | Metric prefixes which should be hidden from user | [optional] 
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index 4d37f70..aa77d07 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
-**can_user_modify** | **bool** |  | [optional] 
+**can_user_modify** | **bool** | Whether the user can modify the dashboard. | [optional] 
 **chart_title_bg_color** | **str** | Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
 **chart_title_color** | **str** | Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
 **chart_title_scalar** | **int** | Scale (normally 100) of chart title text size | [optional] 
diff --git a/docs/DashboardApi.md b/docs/DashboardApi.md
index 1745c88..018c9cd 100644
--- a/docs/DashboardApi.md
+++ b/docs/DashboardApi.md
@@ -47,7 +47,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.ACL()] # list[ACL] |  (optional)
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
 
 try:
     # Adds the specified ids to the given dashboards' ACL
@@ -60,7 +60,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[ACL]**](ACL.md)|  | [optional] 
+ **body** | [**list[AccessControlListWriteDTO]**](AccessControlListWriteDTO.md)|  | [optional] 
 
 ### Return type
 
@@ -296,7 +296,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_access_control_list**
-> ResponseContainerListACL get_access_control_list(id=id)
+> ResponseContainerListAccessControlListReadDTO get_access_control_list(id=id)
 
 Get list of Access Control Lists for the specified dashboards
 
@@ -336,7 +336,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerListACL**](ResponseContainerListACL.md)
+[**ResponseContainerListAccessControlListReadDTO**](ResponseContainerListAccessControlListReadDTO.md)
 
 ### Authorization
 
@@ -650,7 +650,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.ACL()] # list[ACL] |  (optional)
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
 
 try:
     # Removes the specified ids from the given dashboards' ACL
@@ -663,7 +663,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[ACL]**](ACL.md)|  | [optional] 
+ **body** | [**list[AccessControlListWriteDTO]**](AccessControlListWriteDTO.md)|  | [optional] 
 
 ### Return type
 
@@ -759,7 +759,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.ACL()] # list[ACL] |  (optional)
+body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
 
 try:
     # Set ACL for the specified dashboards
@@ -772,7 +772,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[ACL]**](ACL.md)|  | [optional] 
+ **body** | [**list[AccessControlListWriteDTO]**](AccessControlListWriteDTO.md)|  | [optional] 
 
 ### Return type
 
diff --git a/docs/PagedUserGroupModel.md b/docs/PagedUserGroupModel.md
new file mode 100644
index 0000000..89a99a4
--- /dev/null
+++ b/docs/PagedUserGroupModel.md
@@ -0,0 +1,16 @@
+# PagedUserGroupModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[UserGroupModel]**](UserGroupModel.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListAccessControlListReadDTO.md b/docs/ResponseContainerListAccessControlListReadDTO.md
new file mode 100644
index 0000000..435283c
--- /dev/null
+++ b/docs/ResponseContainerListAccessControlListReadDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerListAccessControlListReadDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[AccessControlListReadDTO]**](AccessControlListReadDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListUserApiToken.md b/docs/ResponseContainerListUserApiToken.md
new file mode 100644
index 0000000..2a7df32
--- /dev/null
+++ b/docs/ResponseContainerListUserApiToken.md
@@ -0,0 +1,11 @@
+# ResponseContainerListUserApiToken
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[UserApiToken]**](UserApiToken.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListUserGroupModel.md b/docs/ResponseContainerListUserGroupModel.md
new file mode 100644
index 0000000..49fdbe3
--- /dev/null
+++ b/docs/ResponseContainerListUserGroupModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerListUserGroupModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[UserGroupModel]**](UserGroupModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedUserGroupModel.md b/docs/ResponseContainerPagedUserGroupModel.md
new file mode 100644
index 0000000..abe6c27
--- /dev/null
+++ b/docs/ResponseContainerPagedUserGroupModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedUserGroupModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedUserGroupModel**](PagedUserGroupModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerUserApiToken.md b/docs/ResponseContainerUserApiToken.md
new file mode 100644
index 0000000..cb1523e
--- /dev/null
+++ b/docs/ResponseContainerUserApiToken.md
@@ -0,0 +1,11 @@
+# ResponseContainerUserApiToken
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**UserApiToken**](UserApiToken.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerUserGroupModel.md b/docs/ResponseContainerUserGroupModel.md
new file mode 100644
index 0000000..4ca832b
--- /dev/null
+++ b/docs/ResponseContainerUserGroupModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerUserGroupModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**UserGroupModel**](UserGroupModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index b65d3d7..d9ab65d 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -2685,7 +2685,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **search_user_group_entities**
-> ResponseContainerPagedUserGroup search_user_group_entities(body=body)
+> ResponseContainerPagedUserGroupModel search_user_group_entities(body=body)
 
 Search over a customer's user groups
 
@@ -2725,7 +2725,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedUserGroup**](ResponseContainerPagedUserGroup.md)
+[**ResponseContainerPagedUserGroupModel**](ResponseContainerPagedUserGroupModel.md)
 
 ### Authorization
 
diff --git a/docs/SearchQuery.md b/docs/SearchQuery.md
index e7883de..a6c7596 100644
--- a/docs/SearchQuery.md
+++ b/docs/SearchQuery.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **key** | **str** | The entity facet (key) by which to search.  Valid keys are any property keys returned by the JSON representation of the entity.  Examples are &#39;creatorId&#39;, &#39;name&#39;, etc.  The following special key keywords are also valid:  &#39;tags&#39; performs a search on entity tags, &#39;tagpath&#39; performs a hierarchical search on tags, with  periods (.) as path level separators.  &#39;freetext&#39; performs a free text search across many fields of the entity | 
 **matching_method** | **str** | The method by which search matching is performed.  Default: CONTAINS | [optional] 
+**negated** | **bool** | The flag to create a NOT operation. Default: false | [optional] 
 **value** | **str** | The entity facet value for which to search | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/SettingsApi.md b/docs/SettingsApi.md
index cb4cc9d..07f0001 100644
--- a/docs/SettingsApi.md
+++ b/docs/SettingsApi.md
@@ -111,7 +111,7 @@ This endpoint does not need any parameter.
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_default_user_groups**
-> ResponseContainerListUserGroup get_default_user_groups(body=body)
+> ResponseContainerListUserGroupModel get_default_user_groups(body=body)
 
 Get default user groups customer preferences
 
@@ -151,7 +151,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerListUserGroup**](ResponseContainerListUserGroup.md)
+[**ResponseContainerListUserGroupModel**](ResponseContainerListUserGroupModel.md)
 
 ### Authorization
 
diff --git a/docs/User.md b/docs/User.md
index 30db5f5..9840b57 100644
--- a/docs/User.md
+++ b/docs/User.md
@@ -7,11 +7,13 @@ Name | Type | Description | Notes
 **api_token2** | **str** |  | [optional] 
 **credential** | **str** |  | [optional] 
 **customer** | **str** |  | [optional] 
+**extra_api_tokens** | **list[str]** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
 **invalid_password_attempts** | **int** |  | [optional] 
 **last_logout** | **int** |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
+**old_passwords** | **list[str]** |  | [optional] 
 **onboarding_state** | **str** |  | [optional] 
 **provider** | **str** |  | [optional] 
 **reset_token** | **str** |  | [optional] 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 503de7d..8de4e07 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -8,8 +8,8 @@ Method | HTTP request | Description
 [**create_or_update_user**](UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
 [**delete_multiple_users**](UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users
 [**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user identified by id
-[**get_all_user**](UserApi.md#get_all_user) | **GET** /api/v2/user | Get all users
-[**get_user**](UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email addr)
+[**get_all_users**](UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
+[**get_user**](UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
 [**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific user permission to multiple users
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific user permission
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
@@ -239,8 +239,8 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_all_user**
-> list[UserModel] get_all_user()
+# **get_all_users**
+> list[UserModel] get_all_users()
 
 Get all users
 
@@ -265,10 +265,10 @@ api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(confi
 
 try:
     # Get all users
-    api_response = api_instance.get_all_user()
+    api_response = api_instance.get_all_users()
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling UserApi->get_all_user: %s\n" % e)
+    print("Exception when calling UserApi->get_all_users: %s\n" % e)
 ```
 
 ### Parameters
@@ -292,7 +292,7 @@ This endpoint does not need any parameter.
 # **get_user**
 > UserModel get_user(id)
 
-Retrieves a user by identifier (email addr)
+Retrieves a user by identifier (email address)
 
 
 
@@ -315,7 +315,7 @@ api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(confi
 id = 'id_example' # str | 
 
 try:
-    # Retrieves a user by identifier (email addr)
+    # Retrieves a user by identifier (email address)
     api_response = api_instance.get_user(id)
     pprint(api_response)
 except ApiException as e:
@@ -367,7 +367,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 permission = 'permission_example' # str | Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
-body = [wavefront_api_client.list[str]()] # list[str] | list of users which should be revoked by specified permission (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | List of users which should be granted by specified permission (optional)
 
 try:
     # Grants a specific user permission to multiple users
@@ -382,7 +382,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **permission** | **str**| Permission to grant to the users. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
- **body** | **list[str]**| list of users which should be revoked by specified permission | [optional] 
+ **body** | **list[str]**| List of users which should be granted by specified permission | [optional] 
 
 ### Return type
 
@@ -589,7 +589,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 permission = 'permission_example' # str | Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
-body = [wavefront_api_client.list[str]()] # list[str] | list of users which should be revoked by specified permission (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | List of users which should be revoked by specified permission (optional)
 
 try:
     # Revokes a specific user permission from multiple users
@@ -604,7 +604,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **permission** | **str**| Permission to grant to the users. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
- **body** | **list[str]**| list of users which should be revoked by specified permission | [optional] 
+ **body** | **list[str]**| List of users which should be revoked by specified permission | [optional] 
 
 ### Return type
 
diff --git a/docs/UserApiToken.md b/docs/UserApiToken.md
new file mode 100644
index 0000000..c0fa9b3
--- /dev/null
+++ b/docs/UserApiToken.md
@@ -0,0 +1,11 @@
+# UserApiToken
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**token_id** | **str** | The identifier of the user API token | 
+**token_name** | **str** | The name of the user API token | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserGroup.md b/docs/UserGroup.md
index 949a237..44eb5f7 100644
--- a/docs/UserGroup.md
+++ b/docs/UserGroup.md
@@ -3,14 +3,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**created_epoch_millis** | **int** |  | [optional] 
-**customer** | **str** | The id of the customer to which the user group belongs | [optional] 
-**id** | **str** | The unique identifier of the user group | [optional] 
-**name** | **str** | The name of the user group | 
-**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
+**customer** | **str** | ID of the customer to which the user group belongs | [optional] 
+**description** | **str** | The description of the user group | [optional] 
+**id** | **str** | Unique ID for the user group | [optional] 
+**name** | **str** | Name of the user group | [optional] 
+**permissions** | **list[str]** | Permission assigned to the user group | [optional] 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **user_count** | **int** | Total number of users that are members of the user group | [optional] 
-**users** | **list[str]** | List(may be incomplete) of users that are members of the user group. | [optional] 
+**users** | **list[str]** | List of Users that are members of the user group. Maybe incomplete. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 580d8e6..9f2bd2c 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -16,7 +16,7 @@ Method | HTTP request | Description
 
 
 # **add_users_to_user_group**
-> ResponseContainerUserGroup add_users_to_user_group(id, body=body)
+> ResponseContainerUserGroupModel add_users_to_user_group(id, body=body)
 
 Add multiple users to a specific user group
 
@@ -58,7 +58,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -72,7 +72,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_user_group**
-> ResponseContainerUserGroup create_user_group(body=body)
+> ResponseContainerUserGroupModel create_user_group(body=body)
 
 Create a specific user group
 
@@ -94,7 +94,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre> (optional)
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
 
 try:
     # Create a specific user group
@@ -108,11 +108,11 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -126,7 +126,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_user_group**
-> ResponseContainerUserGroup delete_user_group(id)
+> ResponseContainerUserGroupModel delete_user_group(id)
 
 Delete a specific user group
 
@@ -166,7 +166,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -180,7 +180,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_user_groups**
-> ResponseContainerPagedUserGroup get_all_user_groups(offset=offset, limit=limit)
+> ResponseContainerPagedUserGroupModel get_all_user_groups(offset=offset, limit=limit)
 
 Get all user groups for a customer
 
@@ -222,7 +222,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedUserGroup**](ResponseContainerPagedUserGroup.md)
+[**ResponseContainerPagedUserGroupModel**](ResponseContainerPagedUserGroupModel.md)
 
 ### Authorization
 
@@ -236,7 +236,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_user_group**
-> ResponseContainerUserGroup get_user_group(id)
+> ResponseContainerUserGroupModel get_user_group(id)
 
 Get a specific user group
 
@@ -276,7 +276,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -290,7 +290,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **grant_permission_to_user_groups**
-> ResponseContainerUserGroup grant_permission_to_user_groups(permission, body=body)
+> ResponseContainerUserGroupModel grant_permission_to_user_groups(permission, body=body)
 
 Grants a single permission to user group(s)
 
@@ -332,7 +332,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -346,7 +346,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_users_from_user_group**
-> ResponseContainerUserGroup remove_users_from_user_group(id, body=body)
+> ResponseContainerUserGroupModel remove_users_from_user_group(id, body=body)
 
 Remove multiple users from a specific user group
 
@@ -388,7 +388,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -402,7 +402,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **revoke_permission_from_user_groups**
-> ResponseContainerUserGroup revoke_permission_from_user_groups(permission, body=body)
+> ResponseContainerUserGroupModel revoke_permission_from_user_groups(permission, body=body)
 
 Revokes a single permission from user group(s)
 
@@ -444,7 +444,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
@@ -458,7 +458,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_user_group**
-> ResponseContainerUserGroup update_user_group(id, body=body)
+> ResponseContainerUserGroupModel update_user_group(id, body=body)
 
 Update a specific user group
 
@@ -481,7 +481,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre> (optional)
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
 
 try:
     # Update a specific user group
@@ -496,11 +496,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerUserGroup**](ResponseContainerUserGroup.md)
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
 
 ### Authorization
 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
new file mode 100644
index 0000000..79f0291
--- /dev/null
+++ b/docs/UserGroupModel.md
@@ -0,0 +1,18 @@
+# UserGroupModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**customer** | **str** | The id of the customer to which the user group belongs | [optional] 
+**description** | **str** | The description of the user group | [optional] 
+**id** | **str** | The unique identifier of the user group | [optional] 
+**name** | **str** | The name of the user group | 
+**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
+**properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
+**user_count** | **int** | Total number of users that are members of the user group | [optional] 
+**users** | **list[str]** | List(may be incomplete) of users that are members of the user group. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
index 8b4d5e4..a037da9 100644
--- a/docs/UserGroupWrite.md
+++ b/docs/UserGroupWrite.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **created_epoch_millis** | **int** |  | [optional] 
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
+**description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **permissions** | **list[str]** | List of permissions the user group has been granted access to | 
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
index 73d7534..f5b62bf 100644
--- a/docs/UserSettings.md
+++ b/docs/UserSettings.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **always_hide_querybuilder** | **bool** |  | [optional] 
 **chart_title_scalar** | **int** |  | [optional] 
+**favorite_qb_functions** | **list[str]** |  | [optional] 
 **hide_ts_when_querybuilder_shown** | **bool** |  | [optional] 
 **landing_dashboard_slug** | **str** |  | [optional] 
 **preferred_time_zone** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index 4d93a1f..bdc2963 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.30.15"
+VERSION = "2.32.19"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_access_control_list_read_dto.py b/test/test_access_control_list_read_dto.py
new file mode 100644
index 0000000..b52b0ef
--- /dev/null
+++ b/test/test_access_control_list_read_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessControlListReadDTO(unittest.TestCase):
+    """AccessControlListReadDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccessControlListReadDTO(self):
+        """Test AccessControlListReadDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.access_control_list_read_dto.AccessControlListReadDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_access_control_list_write_dto.py b/test/test_access_control_list_write_dto.py
new file mode 100644
index 0000000..d5ea6aa
--- /dev/null
+++ b/test/test_access_control_list_write_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessControlListWriteDTO(unittest.TestCase):
+    """AccessControlListWriteDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccessControlListWriteDTO(self):
+        """Test AccessControlListWriteDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.access_control_list_write_dto.AccessControlListWriteDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_api_token_api.py b/test/test_api_token_api.py
new file mode 100644
index 0000000..e4b5ab1
--- /dev/null
+++ b/test/test_api_token_api.py
@@ -0,0 +1,62 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.api_token_api import ApiTokenApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestApiTokenApi(unittest.TestCase):
+    """ApiTokenApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.api_token_api.ApiTokenApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_token(self):
+        """Test case for create_token
+
+        Create new api token  # noqa: E501
+        """
+        pass
+
+    def test_delete_token(self):
+        """Test case for delete_token
+
+        Delete the specified api token  # noqa: E501
+        """
+        pass
+
+    def test_get_all_tokens(self):
+        """Test case for get_all_tokens
+
+        Get all api tokens for a user  # noqa: E501
+        """
+        pass
+
+    def test_update_token_name(self):
+        """Test case for update_token_name
+
+        Update the name of the specified api token  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_user_group_model.py b/test/test_paged_user_group_model.py
new file mode 100644
index 0000000..0bcfdd9
--- /dev/null
+++ b/test/test_paged_user_group_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedUserGroupModel(unittest.TestCase):
+    """PagedUserGroupModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedUserGroupModel(self):
+        """Test PagedUserGroupModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_user_group_model.PagedUserGroupModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_access_control_list_read_dto.py b/test/test_response_container_list_access_control_list_read_dto.py
new file mode 100644
index 0000000..3475dbb
--- /dev/null
+++ b/test/test_response_container_list_access_control_list_read_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListAccessControlListReadDTO(unittest.TestCase):
+    """ResponseContainerListAccessControlListReadDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListAccessControlListReadDTO(self):
+        """Test ResponseContainerListAccessControlListReadDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_access_control_list_read_dto.ResponseContainerListAccessControlListReadDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_user_api_token.py b/test/test_response_container_list_user_api_token.py
new file mode 100644
index 0000000..5507d1f
--- /dev/null
+++ b/test/test_response_container_list_user_api_token.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListUserApiToken(unittest.TestCase):
+    """ResponseContainerListUserApiToken unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListUserApiToken(self):
+        """Test ResponseContainerListUserApiToken"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_user_api_token.ResponseContainerListUserApiToken()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_user_group_model.py b/test/test_response_container_list_user_group_model.py
new file mode 100644
index 0000000..c98c25a
--- /dev/null
+++ b/test/test_response_container_list_user_group_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListUserGroupModel(unittest.TestCase):
+    """ResponseContainerListUserGroupModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListUserGroupModel(self):
+        """Test ResponseContainerListUserGroupModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_user_group_model.ResponseContainerListUserGroupModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_user_group_model.py b/test/test_response_container_paged_user_group_model.py
new file mode 100644
index 0000000..c1d30d4
--- /dev/null
+++ b/test/test_response_container_paged_user_group_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedUserGroupModel(unittest.TestCase):
+    """ResponseContainerPagedUserGroupModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedUserGroupModel(self):
+        """Test ResponseContainerPagedUserGroupModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_user_group_model.ResponseContainerPagedUserGroupModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_user_api_token.py b/test/test_response_container_user_api_token.py
new file mode 100644
index 0000000..9bd8d13
--- /dev/null
+++ b/test/test_response_container_user_api_token.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerUserApiToken(unittest.TestCase):
+    """ResponseContainerUserApiToken unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerUserApiToken(self):
+        """Test ResponseContainerUserApiToken"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_user_api_token.ResponseContainerUserApiToken()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_user_group_model.py b/test/test_response_container_user_group_model.py
new file mode 100644
index 0000000..543e56e
--- /dev/null
+++ b/test/test_response_container_user_group_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerUserGroupModel(unittest.TestCase):
+    """ResponseContainerUserGroupModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerUserGroupModel(self):
+        """Test ResponseContainerUserGroupModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_user_group_model.ResponseContainerUserGroupModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_api_token.py b/test/test_user_api_token.py
new file mode 100644
index 0000000..13dd86b
--- /dev/null
+++ b/test/test_user_api_token.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserApiToken(unittest.TestCase):
+    """UserApiToken unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserApiToken(self):
+        """Test UserApiToken"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_api_token.UserApiToken()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_group_model.py b/test/test_user_group_model.py
new file mode 100644
index 0000000..c5bf731
--- /dev/null
+++ b/test/test_user_group_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserGroupModel(unittest.TestCase):
+    """UserGroupModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserGroupModel(self):
+        """Test UserGroupModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_group_model.UserGroupModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 9122e8e..cc52389 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -17,6 +17,7 @@
 
 # import apis into sdk package
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
 from wavefront_api_client.api.derived_metric_api import DerivedMetricApi
@@ -42,10 +43,11 @@
 from wavefront_api_client.api_client import ApiClient
 from wavefront_api_client.configuration import Configuration
 # import models into sdk package
-from wavefront_api_client.models.acl import ACL
 from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials
 from wavefront_api_client.models.access_control_element import AccessControlElement
+from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO
 from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
+from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
@@ -117,7 +119,7 @@
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_source import PagedSource
-from wavefront_api_client.models.paged_user_group import PagedUserGroup
+from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
@@ -135,11 +137,12 @@
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
-from wavefront_api_client.models.response_container_list_acl import ResponseContainerListACL
+from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
-from wavefront_api_client.models.response_container_list_user_group import ResponseContainerListUserGroup
+from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
+from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
@@ -161,12 +164,13 @@
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
-from wavefront_api_client.models.response_container_paged_user_group import ResponseContainerPagedUserGroup
+from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
-from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup
+from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -182,8 +186,10 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.user import User
+from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
+from wavefront_api_client.models.user_group_model import UserGroupModel
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
 from wavefront_api_client.models.user_model import UserModel
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 7bcb6c4..fdeab62 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -4,6 +4,7 @@
 
 # import apis into api package
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
 from wavefront_api_client.api.derived_metric_api import DerivedMetricApi
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index fa0f220..7772ea6 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -33,6 +33,101 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_access(self, **kwargs):  # noqa: E501
+        """Adds the specified ids to the given alerts' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_access(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[AccessControlListWriteDTO] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_access_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_access_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_access_with_http_info(self, **kwargs):  # noqa: E501
+        """Adds the specified ids to the given alerts' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_access_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[AccessControlListWriteDTO] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_access" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/acl/add', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def add_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
         """Add a tag to a specific alert  # noqa: E501
 
@@ -140,6 +235,210 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def can_user_modify(self, id, **kwargs):  # noqa: E501
+        """can_user_modify  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.can_user_modify(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param User body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.can_user_modify_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.can_user_modify_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def can_user_modify_with_http_info(self, id, **kwargs):  # noqa: E501
+        """can_user_modify  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.can_user_modify_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param User body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method can_user_modify" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `can_user_modify`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/{id}/canUserModify', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def clone_alert(self, id, **kwargs):  # noqa: E501
+        """Clones the specified alert  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.clone_alert(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str name:
+        :param int v:
+        :return: ResponseContainerAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.clone_alert_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.clone_alert_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def clone_alert_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Clones the specified alert  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.clone_alert_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str name:
+        :param int v:
+        :return: ResponseContainerAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'name', 'v']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method clone_alert" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `clone_alert`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'name' in params:
+            query_params.append(('name', params['name']))  # noqa: E501
+        if 'v' in params:
+            query_params.append(('v', params['v']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/{id}/clone', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAlert',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_alert(self, **kwargs):  # noqa: E501
         """Create a specific alert  # noqa: E501
 
@@ -330,6 +629,98 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_access_control_list(self, **kwargs):  # noqa: E501
+        """Get Access Control Lists' union for the specified alerts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_access_control_list(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] id:
+        :return: ResponseContainerListAccessControlListReadDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
+        """Get Access Control Lists' union for the specified alerts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_access_control_list_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] id:
+        :return: ResponseContainerListAccessControlListReadDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_access_control_list" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'id' in params:
+            query_params.append(('id', params['id']))  # noqa: E501
+            collection_formats['id'] = 'multi'  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/acl', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListAccessControlListReadDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_alert(self, id, **kwargs):  # noqa: E501
         """Get a specific alert  # noqa: E501
 
@@ -1003,6 +1394,101 @@ def hide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_access(self, **kwargs):  # noqa: E501
+        """Removes the specified ids from the given alerts' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_access(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[AccessControlListWriteDTO] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_access_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_access_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_access_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes the specified ids from the given alerts' ACL  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_access_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[AccessControlListWriteDTO] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_access" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/acl/remove', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
         """Remove a tag from a specific alert  # noqa: E501
 
@@ -1106,6 +1592,101 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def set_acl(self, **kwargs):  # noqa: E501
+        """Set ACL for the specified alerts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_acl(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[AccessControlListWriteDTO] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.set_acl_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.set_acl_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def set_acl_with_http_info(self, **kwargs):  # noqa: E501
+        """Set ACL for the specified alerts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_acl_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[AccessControlListWriteDTO] body:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method set_acl" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/acl/set', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def set_alert_tags(self, id, **kwargs):  # noqa: E501
         """Set all tags associated with a specific alert  # noqa: E501
 
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
new file mode 100644
index 0000000..e679254
--- /dev/null
+++ b/wavefront_api_client/api/api_token_api.py
@@ -0,0 +1,406 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class ApiTokenApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_token(self, **kwargs):  # noqa: E501
+        """Create new api token  # noqa: E501
+
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_token(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_token_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_token_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_token_with_http_info(self, **kwargs):  # noqa: E501
+        """Create new api token  # noqa: E501
+
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_token_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_token" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_token(self, id, **kwargs):  # noqa: E501
+        """Delete the specified api token  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_token(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_token_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_token_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete the specified api token  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_token_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_token" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_token`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_tokens(self, **kwargs):  # noqa: E501
+        """Get all api tokens for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_tokens(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_tokens_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_tokens_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all api tokens for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_tokens_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_tokens" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_token_name(self, id, **kwargs):  # noqa: E501
+        """Update the name of the specified api token  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_token_name(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserApiToken body: Example Body:  <pre>{   \"tokenID\": \"Token identifier\",   \"tokenName\": \"Token name\" }</pre>
+        :return: ResponseContainerUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_token_name_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_token_name_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update the name of the specified api token  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_token_name_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserApiToken body: Example Body:  <pre>{   \"tokenID\": \"Token identifier\",   \"tokenName\": \"Token name\" }</pre>
+        :return: ResponseContainerUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_token_name" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_token_name`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index 4c30b70..fa98e62 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -43,7 +43,7 @@ def add_access(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[ACL] body:
+        :param list[AccessControlListWriteDTO] body:
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -65,7 +65,7 @@ def add_access_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[ACL] body:
+        :param list[AccessControlListWriteDTO] body:
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -531,7 +531,7 @@ def get_access_control_list(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param list[str] id:
-        :return: ResponseContainerListACL
+        :return: ResponseContainerListAccessControlListReadDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -553,7 +553,7 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param list[str] id:
-        :return: ResponseContainerListACL
+        :return: ResponseContainerListAccessControlListReadDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -604,7 +604,7 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerListACL',  # noqa: E501
+            response_type='ResponseContainerListAccessControlListReadDTO',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1113,7 +1113,7 @@ def remove_access(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[ACL] body:
+        :param list[AccessControlListWriteDTO] body:
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1135,7 +1135,7 @@ def remove_access_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[ACL] body:
+        :param list[AccessControlListWriteDTO] body:
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1311,7 +1311,7 @@ def set_acl(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[ACL] body:
+        :param list[AccessControlListWriteDTO] body:
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1333,7 +1333,7 @@ def set_acl_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[ACL] body:
+        :param list[AccessControlListWriteDTO] body:
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 58b19b9..b18adfe 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -4732,7 +4732,7 @@ def search_user_group_entities(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedUserGroup
+        :return: ResponseContainerPagedUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -4754,7 +4754,7 @@ def search_user_group_entities_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedUserGroup
+        :return: ResponseContainerPagedUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -4808,7 +4808,7 @@ def search_user_group_entities_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedUserGroup',  # noqa: E501
+            response_type='ResponseContainerPagedUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/settings_api.py b/wavefront_api_client/api/settings_api.py
index e5af965..1bf89d8 100644
--- a/wavefront_api_client/api/settings_api.py
+++ b/wavefront_api_client/api/settings_api.py
@@ -218,7 +218,7 @@ def get_default_user_groups(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param User body:
-        :return: ResponseContainerListUserGroup
+        :return: ResponseContainerListUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -240,7 +240,7 @@ def get_default_user_groups_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param User body:
-        :return: ResponseContainerListUserGroup
+        :return: ResponseContainerListUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -290,7 +290,7 @@ def get_default_user_groups_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerListUserGroup',  # noqa: E501
+            response_type='ResponseContainerListUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 5058d6b..dfcdc80 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -425,13 +425,13 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_all_user(self, **kwargs):  # noqa: E501
+    def get_all_users(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
         Returns all users  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_user(async_req=True)
+        >>> thread = api.get_all_users(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -441,18 +441,18 @@ def get_all_user(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_all_user_with_http_info(**kwargs)  # noqa: E501
+            return self.get_all_users_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.get_all_user_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.get_all_users_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def get_all_user_with_http_info(self, **kwargs):  # noqa: E501
+    def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
         Returns all users  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_user_with_http_info(async_req=True)
+        >>> thread = api.get_all_users_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -472,7 +472,7 @@ def get_all_user_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_all_user" % key
+                    " to method get_all_users" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -513,7 +513,7 @@ def get_all_user_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_user(self, id, **kwargs):  # noqa: E501
-        """Retrieves a user by identifier (email addr)  # noqa: E501
+        """Retrieves a user by identifier (email address)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -535,7 +535,7 @@ def get_user(self, id, **kwargs):  # noqa: E501
             return data
 
     def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Retrieves a user by identifier (email addr)  # noqa: E501
+        """Retrieves a user by identifier (email address)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -618,7 +618,7 @@ def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
-        :param list[str] body: list of users which should be revoked by specified permission
+        :param list[str] body: List of users which should be granted by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -641,7 +641,7 @@ def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noq
 
         :param async_req bool
         :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
-        :param list[str] body: list of users which should be revoked by specified permission
+        :param list[str] body: List of users which should be granted by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1022,7 +1022,7 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
-        :param list[str] body: list of users which should be revoked by specified permission
+        :param list[str] body: List of users which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1045,7 +1045,7 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
 
         :param async_req bool
         :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
-        :param list[str] body: list of users which should be revoked by specified permission
+        :param list[str] body: List of users which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index c385cdc..b8bd85d 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -45,7 +45,7 @@ def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of users that should be added to user group
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -68,7 +68,7 @@ def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of users that should be added to user group
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -128,7 +128,7 @@ def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -146,8 +146,8 @@ def create_user_group(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
-        :return: ResponseContainerUserGroup
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -168,8 +168,8 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
-        :return: ResponseContainerUserGroup
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -223,7 +223,7 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -242,7 +242,7 @@ def delete_user_group(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -264,7 +264,7 @@ def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -318,7 +318,7 @@ def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -338,7 +338,7 @@ def get_all_user_groups(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedUserGroup
+        :return: ResponseContainerPagedUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -361,7 +361,7 @@ def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedUserGroup
+        :return: ResponseContainerPagedUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -413,7 +413,7 @@ def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedUserGroup',  # noqa: E501
+            response_type='ResponseContainerPagedUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -432,7 +432,7 @@ def get_user_group(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -454,7 +454,7 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -508,7 +508,7 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -528,7 +528,7 @@ def grant_permission_to_user_groups(self, permission, **kwargs):  # noqa: E501
         :param async_req bool
         :param str permission: Permission to grant to user group(s). (required)
         :param list[str] body: List of user groups.
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -551,7 +551,7 @@ def grant_permission_to_user_groups_with_http_info(self, permission, **kwargs):
         :param async_req bool
         :param str permission: Permission to grant to user group(s). (required)
         :param list[str] body: List of user groups.
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -611,7 +611,7 @@ def grant_permission_to_user_groups_with_http_info(self, permission, **kwargs):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -631,7 +631,7 @@ def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of users that should be removed from user group
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -654,7 +654,7 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of users that should be removed from user group
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -714,7 +714,7 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -734,7 +734,7 @@ def revoke_permission_from_user_groups(self, permission, **kwargs):  # noqa: E50
         :param async_req bool
         :param str permission: Permission to revoke from user group(s). (required)
         :param list[str] body: List of user groups.
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -757,7 +757,7 @@ def revoke_permission_from_user_groups_with_http_info(self, permission, **kwargs
         :param async_req bool
         :param str permission: Permission to revoke from user group(s). (required)
         :param list[str] body: List of user groups.
-        :return: ResponseContainerUserGroup
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -817,7 +817,7 @@ def revoke_permission_from_user_groups_with_http_info(self, permission, **kwargs
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -836,8 +836,8 @@ def update_user_group(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
-        :return: ResponseContainerUserGroup
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -859,8 +859,8 @@ def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ] }</pre>
-        :return: ResponseContainerUserGroup
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -920,7 +920,7 @@ def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerUserGroup',  # noqa: E501
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index eea9c2f..dfcef46 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.30.15/python'
+        self.user_agent = 'Swagger-Codegen/2.32.19/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index bfc235e..96ae320 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.30.15".\
+               "SDK Package Version: 2.32.19".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 60f843c..f36036d 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -15,10 +15,11 @@
 from __future__ import absolute_import
 
 # import models into model package
-from wavefront_api_client.models.acl import ACL
 from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials
 from wavefront_api_client.models.access_control_element import AccessControlElement
+from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO
 from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
+from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
@@ -90,7 +91,7 @@
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_source import PagedSource
-from wavefront_api_client.models.paged_user_group import PagedUserGroup
+from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
@@ -108,11 +109,12 @@
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
-from wavefront_api_client.models.response_container_list_acl import ResponseContainerListACL
+from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
-from wavefront_api_client.models.response_container_list_user_group import ResponseContainerListUserGroup
+from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
+from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
@@ -134,12 +136,13 @@
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
-from wavefront_api_client.models.response_container_paged_user_group import ResponseContainerPagedUserGroup
+from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
-from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup
+from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -155,8 +158,10 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.user import User
+from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
+from wavefront_api_client.models.user_group_model import UserGroupModel
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
 from wavefront_api_client.models.user_model import UserModel
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index cfd01b9..aca9c9d 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -31,27 +31,53 @@ class AccessControlElement(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'description': 'str',
         'id': 'str',
         'name': 'str'
     }
 
     attribute_map = {
+        'description': 'description',
         'id': 'id',
         'name': 'name'
     }
 
-    def __init__(self, id=None, name=None):  # noqa: E501
+    def __init__(self, description=None, id=None, name=None):  # noqa: E501
         """AccessControlElement - a model defined in Swagger"""  # noqa: E501
 
+        self._description = None
         self._id = None
         self._name = None
         self.discriminator = None
 
+        if description is not None:
+            self.description = description
         if id is not None:
             self.id = id
         if name is not None:
             self.name = name
 
+    @property
+    def description(self):
+        """Gets the description of this AccessControlElement.  # noqa: E501
+
+
+        :return: The description of this AccessControlElement.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this AccessControlElement.
+
+
+        :param description: The description of this AccessControlElement.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def id(self):
         """Gets the id of this AccessControlElement.  # noqa: E501
diff --git a/wavefront_api_client/models/access_control_list_read_dto.py b/wavefront_api_client/models/access_control_list_read_dto.py
new file mode 100644
index 0000000..90f0fc0
--- /dev/null
+++ b/wavefront_api_client/models/access_control_list_read_dto.py
@@ -0,0 +1,175 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.access_control_element import AccessControlElement  # noqa: F401,E501
+
+
+class AccessControlListReadDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'entity_id': 'str',
+        'modify_acl': 'list[AccessControlElement]',
+        'view_acl': 'list[AccessControlElement]'
+    }
+
+    attribute_map = {
+        'entity_id': 'entityId',
+        'modify_acl': 'modifyAcl',
+        'view_acl': 'viewAcl'
+    }
+
+    def __init__(self, entity_id=None, modify_acl=None, view_acl=None):  # noqa: E501
+        """AccessControlListReadDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._entity_id = None
+        self._modify_acl = None
+        self._view_acl = None
+        self.discriminator = None
+
+        if entity_id is not None:
+            self.entity_id = entity_id
+        if modify_acl is not None:
+            self.modify_acl = modify_acl
+        if view_acl is not None:
+            self.view_acl = view_acl
+
+    @property
+    def entity_id(self):
+        """Gets the entity_id of this AccessControlListReadDTO.  # noqa: E501
+
+        The entity Id  # noqa: E501
+
+        :return: The entity_id of this AccessControlListReadDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._entity_id
+
+    @entity_id.setter
+    def entity_id(self, entity_id):
+        """Sets the entity_id of this AccessControlListReadDTO.
+
+        The entity Id  # noqa: E501
+
+        :param entity_id: The entity_id of this AccessControlListReadDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._entity_id = entity_id
+
+    @property
+    def modify_acl(self):
+        """Gets the modify_acl of this AccessControlListReadDTO.  # noqa: E501
+
+        List of users and user groups ids that have modify permission  # noqa: E501
+
+        :return: The modify_acl of this AccessControlListReadDTO.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._modify_acl
+
+    @modify_acl.setter
+    def modify_acl(self, modify_acl):
+        """Sets the modify_acl of this AccessControlListReadDTO.
+
+        List of users and user groups ids that have modify permission  # noqa: E501
+
+        :param modify_acl: The modify_acl of this AccessControlListReadDTO.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._modify_acl = modify_acl
+
+    @property
+    def view_acl(self):
+        """Gets the view_acl of this AccessControlListReadDTO.  # noqa: E501
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :return: The view_acl of this AccessControlListReadDTO.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._view_acl
+
+    @view_acl.setter
+    def view_acl(self, view_acl):
+        """Sets the view_acl of this AccessControlListReadDTO.
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :param view_acl: The view_acl of this AccessControlListReadDTO.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._view_acl = view_acl
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessControlListReadDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessControlListReadDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/access_control_list_write_dto.py b/wavefront_api_client/models/access_control_list_write_dto.py
new file mode 100644
index 0000000..0350d2c
--- /dev/null
+++ b/wavefront_api_client/models/access_control_list_write_dto.py
@@ -0,0 +1,173 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AccessControlListWriteDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'entity_id': 'str',
+        'modify_acl': 'list[str]',
+        'view_acl': 'list[str]'
+    }
+
+    attribute_map = {
+        'entity_id': 'entityId',
+        'modify_acl': 'modifyAcl',
+        'view_acl': 'viewAcl'
+    }
+
+    def __init__(self, entity_id=None, modify_acl=None, view_acl=None):  # noqa: E501
+        """AccessControlListWriteDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._entity_id = None
+        self._modify_acl = None
+        self._view_acl = None
+        self.discriminator = None
+
+        if entity_id is not None:
+            self.entity_id = entity_id
+        if modify_acl is not None:
+            self.modify_acl = modify_acl
+        if view_acl is not None:
+            self.view_acl = view_acl
+
+    @property
+    def entity_id(self):
+        """Gets the entity_id of this AccessControlListWriteDTO.  # noqa: E501
+
+        The entity Id  # noqa: E501
+
+        :return: The entity_id of this AccessControlListWriteDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._entity_id
+
+    @entity_id.setter
+    def entity_id(self, entity_id):
+        """Sets the entity_id of this AccessControlListWriteDTO.
+
+        The entity Id  # noqa: E501
+
+        :param entity_id: The entity_id of this AccessControlListWriteDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._entity_id = entity_id
+
+    @property
+    def modify_acl(self):
+        """Gets the modify_acl of this AccessControlListWriteDTO.  # noqa: E501
+
+        List of users and user groups ids that have modify permission  # noqa: E501
+
+        :return: The modify_acl of this AccessControlListWriteDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._modify_acl
+
+    @modify_acl.setter
+    def modify_acl(self, modify_acl):
+        """Sets the modify_acl of this AccessControlListWriteDTO.
+
+        List of users and user groups ids that have modify permission  # noqa: E501
+
+        :param modify_acl: The modify_acl of this AccessControlListWriteDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._modify_acl = modify_acl
+
+    @property
+    def view_acl(self):
+        """Gets the view_acl of this AccessControlListWriteDTO.  # noqa: E501
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :return: The view_acl of this AccessControlListWriteDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._view_acl
+
+    @view_acl.setter
+    def view_acl(self, view_acl):
+        """Sets the view_acl of this AccessControlListWriteDTO.
+
+        List of users and user group ids that have view permission  # noqa: E501
+
+        :param view_acl: The view_acl of this AccessControlListWriteDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._view_acl = view_acl
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessControlListWriteDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessControlListWriteDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index f46d7e5..33b22f3 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -16,6 +16,7 @@
 
 import six
 
+from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple  # noqa: F401,E501
 from wavefront_api_client.models.event import Event  # noqa: F401,E501
 from wavefront_api_client.models.source_label_pair import SourceLabelPair  # noqa: F401,E501
 from wavefront_api_client.models.target_info import TargetInfo  # noqa: F401,E501
@@ -36,12 +37,14 @@ class Alert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'acl': 'AccessControlListSimple',
         'active_maintenance_windows': 'list[str]',
         'additional_information': 'str',
         'alert_type': 'str',
         'alerts_last_day': 'int',
         'alerts_last_month': 'int',
         'alerts_last_week': 'int',
+        'can_user_modify': 'bool',
         'condition': 'str',
         'condition_qb_enabled': 'bool',
         'condition_qb_serialization': 'str',
@@ -75,6 +78,7 @@ class Alert(object):
         'notificants': 'list[str]',
         'notification_resend_frequency_minutes': 'int',
         'num_points_in_failure_frame': 'int',
+        'orphan': 'bool',
         'points_scanned_at_last_query': 'int',
         'prefiring_host_label_pairs': 'list[SourceLabelPair]',
         'process_rate_minutes': 'int',
@@ -97,12 +101,14 @@ class Alert(object):
     }
 
     attribute_map = {
+        'acl': 'acl',
         'active_maintenance_windows': 'activeMaintenanceWindows',
         'additional_information': 'additionalInformation',
         'alert_type': 'alertType',
         'alerts_last_day': 'alertsLastDay',
         'alerts_last_month': 'alertsLastMonth',
         'alerts_last_week': 'alertsLastWeek',
+        'can_user_modify': 'canUserModify',
         'condition': 'condition',
         'condition_qb_enabled': 'conditionQBEnabled',
         'condition_qb_serialization': 'conditionQBSerialization',
@@ -136,6 +142,7 @@ class Alert(object):
         'notificants': 'notificants',
         'notification_resend_frequency_minutes': 'notificationResendFrequencyMinutes',
         'num_points_in_failure_frame': 'numPointsInFailureFrame',
+        'orphan': 'orphan',
         'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
         'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
         'process_rate_minutes': 'processRateMinutes',
@@ -157,15 +164,17 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, can_user_modify=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
+        self._acl = None
         self._active_maintenance_windows = None
         self._additional_information = None
         self._alert_type = None
         self._alerts_last_day = None
         self._alerts_last_month = None
         self._alerts_last_week = None
+        self._can_user_modify = None
         self._condition = None
         self._condition_qb_enabled = None
         self._condition_qb_serialization = None
@@ -199,6 +208,7 @@ def __init__(self, active_maintenance_windows=None, additional_information=None,
         self._notificants = None
         self._notification_resend_frequency_minutes = None
         self._num_points_in_failure_frame = None
+        self._orphan = None
         self._points_scanned_at_last_query = None
         self._prefiring_host_label_pairs = None
         self._process_rate_minutes = None
@@ -220,6 +230,8 @@ def __init__(self, active_maintenance_windows=None, additional_information=None,
         self._updater_id = None
         self.discriminator = None
 
+        if acl is not None:
+            self.acl = acl
         if active_maintenance_windows is not None:
             self.active_maintenance_windows = active_maintenance_windows
         if additional_information is not None:
@@ -232,6 +244,8 @@ def __init__(self, active_maintenance_windows=None, additional_information=None,
             self.alerts_last_month = alerts_last_month
         if alerts_last_week is not None:
             self.alerts_last_week = alerts_last_week
+        if can_user_modify is not None:
+            self.can_user_modify = can_user_modify
         self.condition = condition
         if condition_qb_enabled is not None:
             self.condition_qb_enabled = condition_qb_enabled
@@ -295,6 +309,8 @@ def __init__(self, active_maintenance_windows=None, additional_information=None,
             self.notification_resend_frequency_minutes = notification_resend_frequency_minutes
         if num_points_in_failure_frame is not None:
             self.num_points_in_failure_frame = num_points_in_failure_frame
+        if orphan is not None:
+            self.orphan = orphan
         if points_scanned_at_last_query is not None:
             self.points_scanned_at_last_query = points_scanned_at_last_query
         if prefiring_host_label_pairs is not None:
@@ -334,6 +350,27 @@ def __init__(self, active_maintenance_windows=None, additional_information=None,
         if updater_id is not None:
             self.updater_id = updater_id
 
+    @property
+    def acl(self):
+        """Gets the acl of this Alert.  # noqa: E501
+
+
+        :return: The acl of this Alert.  # noqa: E501
+        :rtype: AccessControlListSimple
+        """
+        return self._acl
+
+    @acl.setter
+    def acl(self, acl):
+        """Sets the acl of this Alert.
+
+
+        :param acl: The acl of this Alert.  # noqa: E501
+        :type: AccessControlListSimple
+        """
+
+        self._acl = acl
+
     @property
     def active_maintenance_windows(self):
         """Gets the active_maintenance_windows of this Alert.  # noqa: E501
@@ -472,6 +509,29 @@ def alerts_last_week(self, alerts_last_week):
 
         self._alerts_last_week = alerts_last_week
 
+    @property
+    def can_user_modify(self):
+        """Gets the can_user_modify of this Alert.  # noqa: E501
+
+        Whether the user can modify the alert.  # noqa: E501
+
+        :return: The can_user_modify of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._can_user_modify
+
+    @can_user_modify.setter
+    def can_user_modify(self, can_user_modify):
+        """Sets the can_user_modify of this Alert.
+
+        Whether the user can modify the alert.  # noqa: E501
+
+        :param can_user_modify: The can_user_modify of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._can_user_modify = can_user_modify
+
     @property
     def condition(self):
         """Gets the condition of this Alert.  # noqa: E501
@@ -1219,6 +1279,27 @@ def num_points_in_failure_frame(self, num_points_in_failure_frame):
 
         self._num_points_in_failure_frame = num_points_in_failure_frame
 
+    @property
+    def orphan(self):
+        """Gets the orphan of this Alert.  # noqa: E501
+
+
+        :return: The orphan of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._orphan
+
+    @orphan.setter
+    def orphan(self, orphan):
+        """Sets the orphan of this Alert.
+
+
+        :param orphan: The orphan of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._orphan = orphan
+
     @property
     def points_scanned_at_last_query(self):
         """Gets the points_scanned_at_last_query of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
index 145b732..4e4cde1 100644
--- a/wavefront_api_client/models/customer_preferences.py
+++ b/wavefront_api_client/models/customer_preferences.py
@@ -16,7 +16,7 @@
 
 import six
 
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
 
 
 class CustomerPreferences(object):
@@ -37,7 +37,7 @@ class CustomerPreferences(object):
         'created_epoch_millis': 'int',
         'creator_id': 'str',
         'customer_id': 'str',
-        'default_user_groups': 'list[UserGroup]',
+        'default_user_groups': 'list[UserGroupModel]',
         'deleted': 'bool',
         'grant_modify_access_to_everyone': 'bool',
         'hidden_metric_prefixes': 'dict(str, int)',
@@ -216,7 +216,7 @@ def default_user_groups(self):
         List of default user groups of the customer  # noqa: E501
 
         :return: The default_user_groups of this CustomerPreferences.  # noqa: E501
-        :rtype: list[UserGroup]
+        :rtype: list[UserGroupModel]
         """
         return self._default_user_groups
 
@@ -227,7 +227,7 @@ def default_user_groups(self, default_user_groups):
         List of default user groups of the customer  # noqa: E501
 
         :param default_user_groups: The default_user_groups of this CustomerPreferences.  # noqa: E501
-        :type: list[UserGroup]
+        :type: list[UserGroupModel]
         """
 
         self._default_user_groups = default_user_groups
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index e6f68bd..75c0ded 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -248,6 +248,7 @@ def acl(self, acl):
     def can_user_modify(self):
         """Gets the can_user_modify of this Dashboard.  # noqa: E501
 
+        Whether the user can modify the dashboard.  # noqa: E501
 
         :return: The can_user_modify of this Dashboard.  # noqa: E501
         :rtype: bool
@@ -258,6 +259,7 @@ def can_user_modify(self):
     def can_user_modify(self, can_user_modify):
         """Sets the can_user_modify of this Dashboard.
 
+        Whether the user can modify the dashboard.  # noqa: E501
 
         :param can_user_modify: The can_user_modify of this Dashboard.  # noqa: E501
         :type: bool
diff --git a/wavefront_api_client/models/paged_user_group_model.py b/wavefront_api_client/models/paged_user_group_model.py
new file mode 100644
index 0000000..9f1db48
--- /dev/null
+++ b/wavefront_api_client/models/paged_user_group_model.py
@@ -0,0 +1,282 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
+from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
+
+
+class PagedUserGroupModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[UserGroupModel]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedUserGroupModel - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedUserGroupModel.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedUserGroupModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedUserGroupModel.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedUserGroupModel.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedUserGroupModel.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedUserGroupModel.  # noqa: E501
+        :rtype: list[UserGroupModel]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedUserGroupModel.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedUserGroupModel.  # noqa: E501
+        :type: list[UserGroupModel]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedUserGroupModel.  # noqa: E501
+
+
+        :return: The limit of this PagedUserGroupModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedUserGroupModel.
+
+
+        :param limit: The limit of this PagedUserGroupModel.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedUserGroupModel.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedUserGroupModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedUserGroupModel.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedUserGroupModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedUserGroupModel.  # noqa: E501
+
+
+        :return: The offset of this PagedUserGroupModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedUserGroupModel.
+
+
+        :param offset: The offset of this PagedUserGroupModel.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedUserGroupModel.  # noqa: E501
+
+
+        :return: The sort of this PagedUserGroupModel.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedUserGroupModel.
+
+
+        :param sort: The sort of this PagedUserGroupModel.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedUserGroupModel.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedUserGroupModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedUserGroupModel.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedUserGroupModel.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedUserGroupModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedUserGroupModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
new file mode 100644
index 0000000..69fbd33
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerListAccessControlListReadDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[AccessControlListReadDTO]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerListAccessControlListReadDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+        :rtype: list[AccessControlListReadDTO]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListAccessControlListReadDTO.
+
+
+        :param response: The response of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+        :type: list[AccessControlListReadDTO]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListAccessControlListReadDTO.
+
+
+        :param status: The status of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListAccessControlListReadDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListAccessControlListReadDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
new file mode 100644
index 0000000..3e33ad0
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: F401,E501
+
+
+class ResponseContainerListUserApiToken(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[UserApiToken]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerListUserApiToken - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListUserApiToken.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListUserApiToken.  # noqa: E501
+        :rtype: list[UserApiToken]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListUserApiToken.
+
+
+        :param response: The response of this ResponseContainerListUserApiToken.  # noqa: E501
+        :type: list[UserApiToken]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListUserApiToken.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListUserApiToken.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListUserApiToken.
+
+
+        :param status: The status of this ResponseContainerListUserApiToken.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListUserApiToken, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListUserApiToken):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_user_group_model.py b/wavefront_api_client/models/response_container_list_user_group_model.py
new file mode 100644
index 0000000..7b0ad7b
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_user_group_model.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
+
+
+class ResponseContainerListUserGroupModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[UserGroupModel]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerListUserGroupModel - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListUserGroupModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListUserGroupModel.  # noqa: E501
+        :rtype: list[UserGroupModel]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListUserGroupModel.
+
+
+        :param response: The response of this ResponseContainerListUserGroupModel.  # noqa: E501
+        :type: list[UserGroupModel]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListUserGroupModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListUserGroupModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListUserGroupModel.
+
+
+        :param status: The status of this ResponseContainerListUserGroupModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListUserGroupModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListUserGroupModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
new file mode 100644
index 0000000..57c32af
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerPagedUserGroupModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedUserGroupModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedUserGroupModel - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+        :rtype: PagedUserGroupModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedUserGroupModel.
+
+
+        :param response: The response of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+        :type: PagedUserGroupModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedUserGroupModel.
+
+
+        :param status: The status of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedUserGroupModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedUserGroupModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
new file mode 100644
index 0000000..4712811
--- /dev/null
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: F401,E501
+
+
+class ResponseContainerUserApiToken(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'UserApiToken',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerUserApiToken - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerUserApiToken.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerUserApiToken.  # noqa: E501
+        :rtype: UserApiToken
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerUserApiToken.
+
+
+        :param response: The response of this ResponseContainerUserApiToken.  # noqa: E501
+        :type: UserApiToken
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerUserApiToken.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerUserApiToken.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerUserApiToken.
+
+
+        :param status: The status of this ResponseContainerUserApiToken.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerUserApiToken, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerUserApiToken):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
new file mode 100644
index 0000000..7b0e2c4
--- /dev/null
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
+
+
+class ResponseContainerUserGroupModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'UserGroupModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerUserGroupModel - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerUserGroupModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerUserGroupModel.  # noqa: E501
+        :rtype: UserGroupModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerUserGroupModel.
+
+
+        :param response: The response of this ResponseContainerUserGroupModel.  # noqa: E501
+        :type: UserGroupModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerUserGroupModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerUserGroupModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerUserGroupModel.
+
+
+        :param status: The status of this ResponseContainerUserGroupModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerUserGroupModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerUserGroupModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 5f0d998..2cb066e 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -33,26 +33,31 @@ class SearchQuery(object):
     swagger_types = {
         'key': 'str',
         'matching_method': 'str',
+        'negated': 'bool',
         'value': 'str'
     }
 
     attribute_map = {
         'key': 'key',
         'matching_method': 'matchingMethod',
+        'negated': 'negated',
         'value': 'value'
     }
 
-    def __init__(self, key=None, matching_method=None, value=None):  # noqa: E501
+    def __init__(self, key=None, matching_method=None, negated=None, value=None):  # noqa: E501
         """SearchQuery - a model defined in Swagger"""  # noqa: E501
 
         self._key = None
         self._matching_method = None
+        self._negated = None
         self._value = None
         self.discriminator = None
 
         self.key = key
         if matching_method is not None:
             self.matching_method = matching_method
+        if negated is not None:
+            self.negated = negated
         self.value = value
 
     @property
@@ -109,6 +114,29 @@ def matching_method(self, matching_method):
 
         self._matching_method = matching_method
 
+    @property
+    def negated(self):
+        """Gets the negated of this SearchQuery.  # noqa: E501
+
+        The flag to create a NOT operation. Default: false  # noqa: E501
+
+        :return: The negated of this SearchQuery.  # noqa: E501
+        :rtype: bool
+        """
+        return self._negated
+
+    @negated.setter
+    def negated(self, negated):
+        """Sets the negated of this SearchQuery.
+
+        The flag to create a NOT operation. Default: false  # noqa: E501
+
+        :param negated: The negated of this SearchQuery.  # noqa: E501
+        :type: bool
+        """
+
+        self._negated = negated
+
     @property
     def value(self):
         """Gets the value of this SearchQuery.  # noqa: E501
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
index 0649abd..0ed70c3 100644
--- a/wavefront_api_client/models/user.py
+++ b/wavefront_api_client/models/user.py
@@ -37,11 +37,13 @@ class User(object):
         'api_token2': 'str',
         'credential': 'str',
         'customer': 'str',
+        'extra_api_tokens': 'list[str]',
         'groups': 'list[str]',
         'identifier': 'str',
         'invalid_password_attempts': 'int',
         'last_logout': 'int',
         'last_successful_login': 'int',
+        'old_passwords': 'list[str]',
         'onboarding_state': 'str',
         'provider': 'str',
         'reset_token': 'str',
@@ -57,11 +59,13 @@ class User(object):
         'api_token2': 'apiToken2',
         'credential': 'credential',
         'customer': 'customer',
+        'extra_api_tokens': 'extraApiTokens',
         'groups': 'groups',
         'identifier': 'identifier',
         'invalid_password_attempts': 'invalidPasswordAttempts',
         'last_logout': 'lastLogout',
         'last_successful_login': 'lastSuccessfulLogin',
+        'old_passwords': 'oldPasswords',
         'onboarding_state': 'onboardingState',
         'provider': 'provider',
         'reset_token': 'resetToken',
@@ -72,18 +76,20 @@ class User(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, api_token=None, api_token2=None, credential=None, customer=None, groups=None, identifier=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
+    def __init__(self, api_token=None, api_token2=None, credential=None, customer=None, extra_api_tokens=None, groups=None, identifier=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, old_passwords=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
         """User - a model defined in Swagger"""  # noqa: E501
 
         self._api_token = None
         self._api_token2 = None
         self._credential = None
         self._customer = None
+        self._extra_api_tokens = None
         self._groups = None
         self._identifier = None
         self._invalid_password_attempts = None
         self._last_logout = None
         self._last_successful_login = None
+        self._old_passwords = None
         self._onboarding_state = None
         self._provider = None
         self._reset_token = None
@@ -102,6 +108,8 @@ def __init__(self, api_token=None, api_token2=None, credential=None, customer=No
             self.credential = credential
         if customer is not None:
             self.customer = customer
+        if extra_api_tokens is not None:
+            self.extra_api_tokens = extra_api_tokens
         if groups is not None:
             self.groups = groups
         if identifier is not None:
@@ -112,6 +120,8 @@ def __init__(self, api_token=None, api_token2=None, credential=None, customer=No
             self.last_logout = last_logout
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
+        if old_passwords is not None:
+            self.old_passwords = old_passwords
         if onboarding_state is not None:
             self.onboarding_state = onboarding_state
         if provider is not None:
@@ -213,6 +223,27 @@ def customer(self, customer):
 
         self._customer = customer
 
+    @property
+    def extra_api_tokens(self):
+        """Gets the extra_api_tokens of this User.  # noqa: E501
+
+
+        :return: The extra_api_tokens of this User.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._extra_api_tokens
+
+    @extra_api_tokens.setter
+    def extra_api_tokens(self, extra_api_tokens):
+        """Sets the extra_api_tokens of this User.
+
+
+        :param extra_api_tokens: The extra_api_tokens of this User.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._extra_api_tokens = extra_api_tokens
+
     @property
     def groups(self):
         """Gets the groups of this User.  # noqa: E501
@@ -318,6 +349,27 @@ def last_successful_login(self, last_successful_login):
 
         self._last_successful_login = last_successful_login
 
+    @property
+    def old_passwords(self):
+        """Gets the old_passwords of this User.  # noqa: E501
+
+
+        :return: The old_passwords of this User.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._old_passwords
+
+    @old_passwords.setter
+    def old_passwords(self, old_passwords):
+        """Sets the old_passwords of this User.
+
+
+        :param old_passwords: The old_passwords of this User.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._old_passwords = old_passwords
+
     @property
     def onboarding_state(self):
         """Gets the onboarding_state of this User.  # noqa: E501
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
new file mode 100644
index 0000000..c8dc7aa
--- /dev/null
+++ b/wavefront_api_client/models/user_api_token.py
@@ -0,0 +1,146 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class UserApiToken(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'token_id': 'str',
+        'token_name': 'str'
+    }
+
+    attribute_map = {
+        'token_id': 'tokenID',
+        'token_name': 'tokenName'
+    }
+
+    def __init__(self, token_id=None, token_name=None):  # noqa: E501
+        """UserApiToken - a model defined in Swagger"""  # noqa: E501
+
+        self._token_id = None
+        self._token_name = None
+        self.discriminator = None
+
+        self.token_id = token_id
+        if token_name is not None:
+            self.token_name = token_name
+
+    @property
+    def token_id(self):
+        """Gets the token_id of this UserApiToken.  # noqa: E501
+
+        The identifier of the user API token  # noqa: E501
+
+        :return: The token_id of this UserApiToken.  # noqa: E501
+        :rtype: str
+        """
+        return self._token_id
+
+    @token_id.setter
+    def token_id(self, token_id):
+        """Sets the token_id of this UserApiToken.
+
+        The identifier of the user API token  # noqa: E501
+
+        :param token_id: The token_id of this UserApiToken.  # noqa: E501
+        :type: str
+        """
+        if token_id is None:
+            raise ValueError("Invalid value for `token_id`, must not be `None`")  # noqa: E501
+
+        self._token_id = token_id
+
+    @property
+    def token_name(self):
+        """Gets the token_name of this UserApiToken.  # noqa: E501
+
+        The name of the user API token  # noqa: E501
+
+        :return: The token_name of this UserApiToken.  # noqa: E501
+        :rtype: str
+        """
+        return self._token_name
+
+    @token_name.setter
+    def token_name(self, token_name):
+        """Sets the token_name of this UserApiToken.
+
+        The name of the user API token  # noqa: E501
+
+        :param token_name: The token_name of this UserApiToken.  # noqa: E501
+        :type: str
+        """
+
+        self._token_name = token_name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserApiToken, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserApiToken):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index b975a03..a770cdd 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -33,8 +33,8 @@ class UserGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'created_epoch_millis': 'int',
         'customer': 'str',
+        'description': 'str',
         'id': 'str',
         'name': 'str',
         'permissions': 'list[str]',
@@ -44,8 +44,8 @@ class UserGroup(object):
     }
 
     attribute_map = {
-        'created_epoch_millis': 'createdEpochMillis',
         'customer': 'customer',
+        'description': 'description',
         'id': 'id',
         'name': 'name',
         'permissions': 'permissions',
@@ -54,11 +54,11 @@ class UserGroup(object):
         'users': 'users'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None, permissions=None, properties=None, user_count=None, users=None):  # noqa: E501
+    def __init__(self, customer=None, description=None, id=None, name=None, permissions=None, properties=None, user_count=None, users=None):  # noqa: E501
         """UserGroup - a model defined in Swagger"""  # noqa: E501
 
-        self._created_epoch_millis = None
         self._customer = None
+        self._description = None
         self._id = None
         self._name = None
         self._permissions = None
@@ -67,14 +67,16 @@ def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None,
         self._users = None
         self.discriminator = None
 
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
         if customer is not None:
             self.customer = customer
+        if description is not None:
+            self.description = description
         if id is not None:
             self.id = id
-        self.name = name
-        self.permissions = permissions
+        if name is not None:
+            self.name = name
+        if permissions is not None:
+            self.permissions = permissions
         if properties is not None:
             self.properties = properties
         if user_count is not None:
@@ -83,54 +85,56 @@ def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None,
             self.users = users
 
     @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this UserGroup.  # noqa: E501
+    def customer(self):
+        """Gets the customer of this UserGroup.  # noqa: E501
 
+        ID of the customer to which the user group belongs  # noqa: E501
 
-        :return: The created_epoch_millis of this UserGroup.  # noqa: E501
-        :rtype: int
+        :return: The customer of this UserGroup.  # noqa: E501
+        :rtype: str
         """
-        return self._created_epoch_millis
+        return self._customer
 
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this UserGroup.
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserGroup.
 
+        ID of the customer to which the user group belongs  # noqa: E501
 
-        :param created_epoch_millis: The created_epoch_millis of this UserGroup.  # noqa: E501
-        :type: int
+        :param customer: The customer of this UserGroup.  # noqa: E501
+        :type: str
         """
 
-        self._created_epoch_millis = created_epoch_millis
+        self._customer = customer
 
     @property
-    def customer(self):
-        """Gets the customer of this UserGroup.  # noqa: E501
+    def description(self):
+        """Gets the description of this UserGroup.  # noqa: E501
 
-        The id of the customer to which the user group belongs  # noqa: E501
+        The description of the user group  # noqa: E501
 
-        :return: The customer of this UserGroup.  # noqa: E501
+        :return: The description of this UserGroup.  # noqa: E501
         :rtype: str
         """
-        return self._customer
+        return self._description
 
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this UserGroup.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this UserGroup.
 
-        The id of the customer to which the user group belongs  # noqa: E501
+        The description of the user group  # noqa: E501
 
-        :param customer: The customer of this UserGroup.  # noqa: E501
+        :param description: The description of this UserGroup.  # noqa: E501
         :type: str
         """
 
-        self._customer = customer
+        self._description = description
 
     @property
     def id(self):
         """Gets the id of this UserGroup.  # noqa: E501
 
-        The unique identifier of the user group  # noqa: E501
+        Unique ID for the user group  # noqa: E501
 
         :return: The id of this UserGroup.  # noqa: E501
         :rtype: str
@@ -141,7 +145,7 @@ def id(self):
     def id(self, id):
         """Sets the id of this UserGroup.
 
-        The unique identifier of the user group  # noqa: E501
+        Unique ID for the user group  # noqa: E501
 
         :param id: The id of this UserGroup.  # noqa: E501
         :type: str
@@ -153,7 +157,7 @@ def id(self, id):
     def name(self):
         """Gets the name of this UserGroup.  # noqa: E501
 
-        The name of the user group  # noqa: E501
+        Name of the user group  # noqa: E501
 
         :return: The name of this UserGroup.  # noqa: E501
         :rtype: str
@@ -164,13 +168,11 @@ def name(self):
     def name(self, name):
         """Sets the name of this UserGroup.
 
-        The name of the user group  # noqa: E501
+        Name of the user group  # noqa: E501
 
         :param name: The name of this UserGroup.  # noqa: E501
         :type: str
         """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
 
@@ -178,7 +180,7 @@ def name(self, name):
     def permissions(self):
         """Gets the permissions of this UserGroup.  # noqa: E501
 
-        List of permissions the user group has been granted access to  # noqa: E501
+        Permission assigned to the user group  # noqa: E501
 
         :return: The permissions of this UserGroup.  # noqa: E501
         :rtype: list[str]
@@ -189,13 +191,11 @@ def permissions(self):
     def permissions(self, permissions):
         """Sets the permissions of this UserGroup.
 
-        List of permissions the user group has been granted access to  # noqa: E501
+        Permission assigned to the user group  # noqa: E501
 
         :param permissions: The permissions of this UserGroup.  # noqa: E501
         :type: list[str]
         """
-        if permissions is None:
-            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
 
         self._permissions = permissions
 
@@ -249,7 +249,7 @@ def user_count(self, user_count):
     def users(self):
         """Gets the users of this UserGroup.  # noqa: E501
 
-        List(may be incomplete) of users that are members of the user group.  # noqa: E501
+        List of Users that are members of the user group. Maybe incomplete.  # noqa: E501
 
         :return: The users of this UserGroup.  # noqa: E501
         :rtype: list[str]
@@ -260,7 +260,7 @@ def users(self):
     def users(self, users):
         """Sets the users of this UserGroup.
 
-        List(may be incomplete) of users that are members of the user group.  # noqa: E501
+        List of Users that are members of the user group. Maybe incomplete.  # noqa: E501
 
         :param users: The users of this UserGroup.  # noqa: E501
         :type: list[str]
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
new file mode 100644
index 0000000..696624d
--- /dev/null
+++ b/wavefront_api_client/models/user_group_model.py
@@ -0,0 +1,343 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO  # noqa: F401,E501
+
+
+class UserGroupModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'customer': 'str',
+        'description': 'str',
+        'id': 'str',
+        'name': 'str',
+        'permissions': 'list[str]',
+        'properties': 'UserGroupPropertiesDTO',
+        'user_count': 'int',
+        'users': 'list[str]'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'customer': 'customer',
+        'description': 'description',
+        'id': 'id',
+        'name': 'name',
+        'permissions': 'permissions',
+        'properties': 'properties',
+        'user_count': 'userCount',
+        'users': 'users'
+    }
+
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, properties=None, user_count=None, users=None):  # noqa: E501
+        """UserGroupModel - a model defined in Swagger"""  # noqa: E501
+
+        self._created_epoch_millis = None
+        self._customer = None
+        self._description = None
+        self._id = None
+        self._name = None
+        self._permissions = None
+        self._properties = None
+        self._user_count = None
+        self._users = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if customer is not None:
+            self.customer = customer
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        self.name = name
+        self.permissions = permissions
+        if properties is not None:
+            self.properties = properties
+        if user_count is not None:
+            self.user_count = user_count
+        if users is not None:
+            self.users = users
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this UserGroupModel.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this UserGroupModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this UserGroupModel.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this UserGroupModel.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def customer(self):
+        """Gets the customer of this UserGroupModel.  # noqa: E501
+
+        The id of the customer to which the user group belongs  # noqa: E501
+
+        :return: The customer of this UserGroupModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this UserGroupModel.
+
+        The id of the customer to which the user group belongs  # noqa: E501
+
+        :param customer: The customer of this UserGroupModel.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def description(self):
+        """Gets the description of this UserGroupModel.  # noqa: E501
+
+        The description of the user group  # noqa: E501
+
+        :return: The description of this UserGroupModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this UserGroupModel.
+
+        The description of the user group  # noqa: E501
+
+        :param description: The description of this UserGroupModel.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this UserGroupModel.  # noqa: E501
+
+        The unique identifier of the user group  # noqa: E501
+
+        :return: The id of this UserGroupModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this UserGroupModel.
+
+        The unique identifier of the user group  # noqa: E501
+
+        :param id: The id of this UserGroupModel.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this UserGroupModel.  # noqa: E501
+
+        The name of the user group  # noqa: E501
+
+        :return: The name of this UserGroupModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this UserGroupModel.
+
+        The name of the user group  # noqa: E501
+
+        :param name: The name of this UserGroupModel.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def permissions(self):
+        """Gets the permissions of this UserGroupModel.  # noqa: E501
+
+        List of permissions the user group has been granted access to  # noqa: E501
+
+        :return: The permissions of this UserGroupModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this UserGroupModel.
+
+        List of permissions the user group has been granted access to  # noqa: E501
+
+        :param permissions: The permissions of this UserGroupModel.  # noqa: E501
+        :type: list[str]
+        """
+        if permissions is None:
+            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
+
+        self._permissions = permissions
+
+    @property
+    def properties(self):
+        """Gets the properties of this UserGroupModel.  # noqa: E501
+
+        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
+
+        :return: The properties of this UserGroupModel.  # noqa: E501
+        :rtype: UserGroupPropertiesDTO
+        """
+        return self._properties
+
+    @properties.setter
+    def properties(self, properties):
+        """Sets the properties of this UserGroupModel.
+
+        The properties of the user group(name editable, users editable, etc.)  # noqa: E501
+
+        :param properties: The properties of this UserGroupModel.  # noqa: E501
+        :type: UserGroupPropertiesDTO
+        """
+
+        self._properties = properties
+
+    @property
+    def user_count(self):
+        """Gets the user_count of this UserGroupModel.  # noqa: E501
+
+        Total number of users that are members of the user group  # noqa: E501
+
+        :return: The user_count of this UserGroupModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._user_count
+
+    @user_count.setter
+    def user_count(self, user_count):
+        """Sets the user_count of this UserGroupModel.
+
+        Total number of users that are members of the user group  # noqa: E501
+
+        :param user_count: The user_count of this UserGroupModel.  # noqa: E501
+        :type: int
+        """
+
+        self._user_count = user_count
+
+    @property
+    def users(self):
+        """Gets the users of this UserGroupModel.  # noqa: E501
+
+        List(may be incomplete) of users that are members of the user group.  # noqa: E501
+
+        :return: The users of this UserGroupModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._users
+
+    @users.setter
+    def users(self, users):
+        """Sets the users of this UserGroupModel.
+
+        List(may be incomplete) of users that are members of the user group.  # noqa: E501
+
+        :param users: The users of this UserGroupModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._users = users
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserGroupModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserGroupModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index 480f5b1..cbdb344 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -33,6 +33,7 @@ class UserGroupWrite(object):
     swagger_types = {
         'created_epoch_millis': 'int',
         'customer': 'str',
+        'description': 'str',
         'id': 'str',
         'name': 'str',
         'permissions': 'list[str]'
@@ -41,16 +42,18 @@ class UserGroupWrite(object):
     attribute_map = {
         'created_epoch_millis': 'createdEpochMillis',
         'customer': 'customer',
+        'description': 'description',
         'id': 'id',
         'name': 'name',
         'permissions': 'permissions'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None, permissions=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
 
         self._created_epoch_millis = None
         self._customer = None
+        self._description = None
         self._id = None
         self._name = None
         self._permissions = None
@@ -60,6 +63,8 @@ def __init__(self, created_epoch_millis=None, customer=None, id=None, name=None,
             self.created_epoch_millis = created_epoch_millis
         if customer is not None:
             self.customer = customer
+        if description is not None:
+            self.description = description
         if id is not None:
             self.id = id
         self.name = name
@@ -109,6 +114,29 @@ def customer(self, customer):
 
         self._customer = customer
 
+    @property
+    def description(self):
+        """Gets the description of this UserGroupWrite.  # noqa: E501
+
+        The description of the user group  # noqa: E501
+
+        :return: The description of this UserGroupWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this UserGroupWrite.
+
+        The description of the user group  # noqa: E501
+
+        :param description: The description of this UserGroupWrite.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def id(self):
         """Gets the id of this UserGroupWrite.  # noqa: E501
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 681916a..79c3f67 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -33,6 +33,7 @@ class UserSettings(object):
     swagger_types = {
         'always_hide_querybuilder': 'bool',
         'chart_title_scalar': 'int',
+        'favorite_qb_functions': 'list[str]',
         'hide_ts_when_querybuilder_shown': 'bool',
         'landing_dashboard_slug': 'str',
         'preferred_time_zone': 'str',
@@ -45,6 +46,7 @@ class UserSettings(object):
     attribute_map = {
         'always_hide_querybuilder': 'alwaysHideQuerybuilder',
         'chart_title_scalar': 'chartTitleScalar',
+        'favorite_qb_functions': 'favoriteQBFunctions',
         'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
         'landing_dashboard_slug': 'landingDashboardSlug',
         'preferred_time_zone': 'preferredTimeZone',
@@ -54,11 +56,12 @@ class UserSettings(object):
         'use_dark_theme': 'useDarkTheme'
     }
 
-    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
+    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
         """UserSettings - a model defined in Swagger"""  # noqa: E501
 
         self._always_hide_querybuilder = None
         self._chart_title_scalar = None
+        self._favorite_qb_functions = None
         self._hide_ts_when_querybuilder_shown = None
         self._landing_dashboard_slug = None
         self._preferred_time_zone = None
@@ -72,6 +75,8 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, hide_
             self.always_hide_querybuilder = always_hide_querybuilder
         if chart_title_scalar is not None:
             self.chart_title_scalar = chart_title_scalar
+        if favorite_qb_functions is not None:
+            self.favorite_qb_functions = favorite_qb_functions
         if hide_ts_when_querybuilder_shown is not None:
             self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
         if landing_dashboard_slug is not None:
@@ -129,6 +134,27 @@ def chart_title_scalar(self, chart_title_scalar):
 
         self._chart_title_scalar = chart_title_scalar
 
+    @property
+    def favorite_qb_functions(self):
+        """Gets the favorite_qb_functions of this UserSettings.  # noqa: E501
+
+
+        :return: The favorite_qb_functions of this UserSettings.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._favorite_qb_functions
+
+    @favorite_qb_functions.setter
+    def favorite_qb_functions(self, favorite_qb_functions):
+        """Sets the favorite_qb_functions of this UserSettings.
+
+
+        :param favorite_qb_functions: The favorite_qb_functions of this UserSettings.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._favorite_qb_functions = favorite_qb_functions
+
     @property
     def hide_ts_when_querybuilder_shown(self):
         """Gets the hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501

From 2b4af50c5507175e9645c173a64740680e0f955a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Mon, 3 Jun 2019 08:16:28 -0700
Subject: [PATCH 031/161] Autogenerated Update v2.33.9.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/UserSettings.md                          |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/chart_settings.py |  2 +-
 wavefront_api_client/models/message.py        |  2 +-
 wavefront_api_client/models/user_settings.py  | 34 ++++++++++++++++++-
 10 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index cb56f8a..f1b11ab 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.32.19"
+    "packageVersion": "2.33.9"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5de2c54..cb56f8a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.30.15"
+    "packageVersion": "2.32.19"
 }
diff --git a/README.md b/README.md
index f826ef9..ae3ee96 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.32.19
+- Package version: 2.33.9
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
index f5b62bf..3008130 100644
--- a/docs/UserSettings.md
+++ b/docs/UserSettings.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **preferred_time_zone** | **str** |  | [optional] 
 **show_onboarding** | **bool** |  | [optional] 
 **show_querybuilder_by_default** | **bool** |  | [optional] 
+**ui_default** | **str** |  | [optional] 
 **use24_hour_time** | **bool** |  | [optional] 
 **use_dark_theme** | **bool** |  | [optional] 
 
diff --git a/setup.py b/setup.py
index bdc2963..ac21d2e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.32.19"
+VERSION = "2.33.9"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index dfcef46..5817e30 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.32.19/python'
+        self.user_agent = 'Swagger-Codegen/2.33.9/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 96ae320..3766e0d 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.32.19".\
+               "SDK Package Version: 2.33.9".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index a7f97d2..d0377b0 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1314,7 +1314,7 @@ def stack_type(self, stack_type):
         :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
+        allowed_values = ["zero", "expand", "wiggle", "silhouette", "bars"]  # noqa: E501
         if stack_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 38cee86..61b3872 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -164,7 +164,7 @@ def display(self, display):
         """
         if display is None:
             raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
-        allowed_values = ["BANNER", "TOASTER"]  # noqa: E501
+        allowed_values = ["BANNER", "TOASTER", "MODAL"]  # noqa: E501
         if display not in allowed_values:
             raise ValueError(
                 "Invalid value for `display` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 79c3f67..9c70813 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -39,6 +39,7 @@ class UserSettings(object):
         'preferred_time_zone': 'str',
         'show_onboarding': 'bool',
         'show_querybuilder_by_default': 'bool',
+        'ui_default': 'str',
         'use24_hour_time': 'bool',
         'use_dark_theme': 'bool'
     }
@@ -52,11 +53,12 @@ class UserSettings(object):
         'preferred_time_zone': 'preferredTimeZone',
         'show_onboarding': 'showOnboarding',
         'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'ui_default': 'uiDefault',
         'use24_hour_time': 'use24HourTime',
         'use_dark_theme': 'useDarkTheme'
     }
 
-    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
+    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, ui_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
         """UserSettings - a model defined in Swagger"""  # noqa: E501
 
         self._always_hide_querybuilder = None
@@ -67,6 +69,7 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
         self._preferred_time_zone = None
         self._show_onboarding = None
         self._show_querybuilder_by_default = None
+        self._ui_default = None
         self._use24_hour_time = None
         self._use_dark_theme = None
         self.discriminator = None
@@ -87,6 +90,8 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
             self.show_onboarding = show_onboarding
         if show_querybuilder_by_default is not None:
             self.show_querybuilder_by_default = show_querybuilder_by_default
+        if ui_default is not None:
+            self.ui_default = ui_default
         if use24_hour_time is not None:
             self.use24_hour_time = use24_hour_time
         if use_dark_theme is not None:
@@ -260,6 +265,33 @@ def show_querybuilder_by_default(self, show_querybuilder_by_default):
 
         self._show_querybuilder_by_default = show_querybuilder_by_default
 
+    @property
+    def ui_default(self):
+        """Gets the ui_default of this UserSettings.  # noqa: E501
+
+
+        :return: The ui_default of this UserSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._ui_default
+
+    @ui_default.setter
+    def ui_default(self, ui_default):
+        """Sets the ui_default of this UserSettings.
+
+
+        :param ui_default: The ui_default of this UserSettings.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["V1", "V2"]  # noqa: E501
+        if ui_default not in allowed_values:
+            raise ValueError(
+                "Invalid value for `ui_default` ({0}), must be one of {1}"  # noqa: E501
+                .format(ui_default, allowed_values)
+            )
+
+        self._ui_default = ui_default
+
     @property
     def use24_hour_time(self):
         """Gets the use24_hour_time of this UserSettings.  # noqa: E501

From 09f7d3b21cba8d7944cddc000560bc7eab60b341 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 4 Jun 2019 08:16:29 -0700
Subject: [PATCH 032/161] Autogenerated Update v2.32.24.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/UserSettings.md                          |  1 -
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/chart_settings.py |  2 +-
 wavefront_api_client/models/message.py        |  2 +-
 wavefront_api_client/models/user_settings.py  | 34 +------------------
 10 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f1b11ab..7261dad 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.33.9"
+    "packageVersion": "2.32.24"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index cb56f8a..f1b11ab 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.32.19"
+    "packageVersion": "2.33.9"
 }
diff --git a/README.md b/README.md
index ae3ee96..9ea84b4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.33.9
+- Package version: 2.32.24
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
index 3008130..f5b62bf 100644
--- a/docs/UserSettings.md
+++ b/docs/UserSettings.md
@@ -11,7 +11,6 @@ Name | Type | Description | Notes
 **preferred_time_zone** | **str** |  | [optional] 
 **show_onboarding** | **bool** |  | [optional] 
 **show_querybuilder_by_default** | **bool** |  | [optional] 
-**ui_default** | **str** |  | [optional] 
 **use24_hour_time** | **bool** |  | [optional] 
 **use_dark_theme** | **bool** |  | [optional] 
 
diff --git a/setup.py b/setup.py
index ac21d2e..2e968ea 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.33.9"
+VERSION = "2.32.24"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 5817e30..1cbea56 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.33.9/python'
+        self.user_agent = 'Swagger-Codegen/2.32.24/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 3766e0d..4968c8e 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.33.9".\
+               "SDK Package Version: 2.32.24".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index d0377b0..a7f97d2 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1314,7 +1314,7 @@ def stack_type(self, stack_type):
         :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["zero", "expand", "wiggle", "silhouette", "bars"]  # noqa: E501
+        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
         if stack_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 61b3872..38cee86 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -164,7 +164,7 @@ def display(self, display):
         """
         if display is None:
             raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
-        allowed_values = ["BANNER", "TOASTER", "MODAL"]  # noqa: E501
+        allowed_values = ["BANNER", "TOASTER"]  # noqa: E501
         if display not in allowed_values:
             raise ValueError(
                 "Invalid value for `display` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 9c70813..79c3f67 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -39,7 +39,6 @@ class UserSettings(object):
         'preferred_time_zone': 'str',
         'show_onboarding': 'bool',
         'show_querybuilder_by_default': 'bool',
-        'ui_default': 'str',
         'use24_hour_time': 'bool',
         'use_dark_theme': 'bool'
     }
@@ -53,12 +52,11 @@ class UserSettings(object):
         'preferred_time_zone': 'preferredTimeZone',
         'show_onboarding': 'showOnboarding',
         'show_querybuilder_by_default': 'showQuerybuilderByDefault',
-        'ui_default': 'uiDefault',
         'use24_hour_time': 'use24HourTime',
         'use_dark_theme': 'useDarkTheme'
     }
 
-    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, ui_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
+    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
         """UserSettings - a model defined in Swagger"""  # noqa: E501
 
         self._always_hide_querybuilder = None
@@ -69,7 +67,6 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
         self._preferred_time_zone = None
         self._show_onboarding = None
         self._show_querybuilder_by_default = None
-        self._ui_default = None
         self._use24_hour_time = None
         self._use_dark_theme = None
         self.discriminator = None
@@ -90,8 +87,6 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
             self.show_onboarding = show_onboarding
         if show_querybuilder_by_default is not None:
             self.show_querybuilder_by_default = show_querybuilder_by_default
-        if ui_default is not None:
-            self.ui_default = ui_default
         if use24_hour_time is not None:
             self.use24_hour_time = use24_hour_time
         if use_dark_theme is not None:
@@ -265,33 +260,6 @@ def show_querybuilder_by_default(self, show_querybuilder_by_default):
 
         self._show_querybuilder_by_default = show_querybuilder_by_default
 
-    @property
-    def ui_default(self):
-        """Gets the ui_default of this UserSettings.  # noqa: E501
-
-
-        :return: The ui_default of this UserSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._ui_default
-
-    @ui_default.setter
-    def ui_default(self, ui_default):
-        """Sets the ui_default of this UserSettings.
-
-
-        :param ui_default: The ui_default of this UserSettings.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["V1", "V2"]  # noqa: E501
-        if ui_default not in allowed_values:
-            raise ValueError(
-                "Invalid value for `ui_default` ({0}), must be one of {1}"  # noqa: E501
-                .format(ui_default, allowed_values)
-            )
-
-        self._ui_default = ui_default
-
     @property
     def use24_hour_time(self):
         """Gets the use24_hour_time of this UserSettings.  # noqa: E501

From 604ef913a7dbb6a689c72c3bf88812fef68837e8 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 12 Jun 2019 08:16:19 -0700
Subject: [PATCH 033/161] Autogenerated Update v2.33.15.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/UserSettings.md                          |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/chart_settings.py |  2 +-
 wavefront_api_client/models/message.py        |  2 +-
 wavefront_api_client/models/user_settings.py  | 34 ++++++++++++++++++-
 10 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 7261dad..6a92165 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.32.24"
+    "packageVersion": "2.33.15"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f1b11ab..7261dad 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.33.9"
+    "packageVersion": "2.32.24"
 }
diff --git a/README.md b/README.md
index 9ea84b4..b8b5cf3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.32.24
+- Package version: 2.33.15
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
index f5b62bf..3008130 100644
--- a/docs/UserSettings.md
+++ b/docs/UserSettings.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **preferred_time_zone** | **str** |  | [optional] 
 **show_onboarding** | **bool** |  | [optional] 
 **show_querybuilder_by_default** | **bool** |  | [optional] 
+**ui_default** | **str** |  | [optional] 
 **use24_hour_time** | **bool** |  | [optional] 
 **use_dark_theme** | **bool** |  | [optional] 
 
diff --git a/setup.py b/setup.py
index 2e968ea..479af27 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.32.24"
+VERSION = "2.33.15"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 1cbea56..eddea5e 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.32.24/python'
+        self.user_agent = 'Swagger-Codegen/2.33.15/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 4968c8e..c0658be 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.32.24".\
+               "SDK Package Version: 2.33.15".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index a7f97d2..d0377b0 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1314,7 +1314,7 @@ def stack_type(self, stack_type):
         :param stack_type: The stack_type of this ChartSettings.  # noqa: E501
         :type: str
         """
-        allowed_values = ["zero", "expand", "wiggle", "silhouette"]  # noqa: E501
+        allowed_values = ["zero", "expand", "wiggle", "silhouette", "bars"]  # noqa: E501
         if stack_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 38cee86..61b3872 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -164,7 +164,7 @@ def display(self, display):
         """
         if display is None:
             raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
-        allowed_values = ["BANNER", "TOASTER"]  # noqa: E501
+        allowed_values = ["BANNER", "TOASTER", "MODAL"]  # noqa: E501
         if display not in allowed_values:
             raise ValueError(
                 "Invalid value for `display` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 79c3f67..9c70813 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -39,6 +39,7 @@ class UserSettings(object):
         'preferred_time_zone': 'str',
         'show_onboarding': 'bool',
         'show_querybuilder_by_default': 'bool',
+        'ui_default': 'str',
         'use24_hour_time': 'bool',
         'use_dark_theme': 'bool'
     }
@@ -52,11 +53,12 @@ class UserSettings(object):
         'preferred_time_zone': 'preferredTimeZone',
         'show_onboarding': 'showOnboarding',
         'show_querybuilder_by_default': 'showQuerybuilderByDefault',
+        'ui_default': 'uiDefault',
         'use24_hour_time': 'use24HourTime',
         'use_dark_theme': 'useDarkTheme'
     }
 
-    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
+    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, ui_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
         """UserSettings - a model defined in Swagger"""  # noqa: E501
 
         self._always_hide_querybuilder = None
@@ -67,6 +69,7 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
         self._preferred_time_zone = None
         self._show_onboarding = None
         self._show_querybuilder_by_default = None
+        self._ui_default = None
         self._use24_hour_time = None
         self._use_dark_theme = None
         self.discriminator = None
@@ -87,6 +90,8 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
             self.show_onboarding = show_onboarding
         if show_querybuilder_by_default is not None:
             self.show_querybuilder_by_default = show_querybuilder_by_default
+        if ui_default is not None:
+            self.ui_default = ui_default
         if use24_hour_time is not None:
             self.use24_hour_time = use24_hour_time
         if use_dark_theme is not None:
@@ -260,6 +265,33 @@ def show_querybuilder_by_default(self, show_querybuilder_by_default):
 
         self._show_querybuilder_by_default = show_querybuilder_by_default
 
+    @property
+    def ui_default(self):
+        """Gets the ui_default of this UserSettings.  # noqa: E501
+
+
+        :return: The ui_default of this UserSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._ui_default
+
+    @ui_default.setter
+    def ui_default(self, ui_default):
+        """Sets the ui_default of this UserSettings.
+
+
+        :param ui_default: The ui_default of this UserSettings.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["V1", "V2"]  # noqa: E501
+        if ui_default not in allowed_values:
+            raise ValueError(
+                "Invalid value for `ui_default` ({0}), must be one of {1}"  # noqa: E501
+                .format(ui_default, allowed_values)
+            )
+
+        self._ui_default = ui_default
+
     @property
     def use24_hour_time(self):
         """Gets the use24_hour_time of this UserSettings.  # noqa: E501

From 6fd7d9ec2028eb7c6d24cf587d8496ba76b56563 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 6 Aug 2019 08:16:43 -0700
Subject: [PATCH 034/161] Autogenerated Update v2.35.25.

---
 .swagger-codegen/config.json                  |    2 +-
 .swagger-codegen/config.jsone                 |    2 +-
 README.md                                     |   62 +-
 docs/Account.md                               |   12 +
 docs/AccountServiceAccountApi.md              |  336 ++++
 docs/Alert.md                                 |    2 +-
 docs/AlertApi.md                              |   53 -
 docs/ApiTokenApi.md                           |  228 +++
 docs/AppDynamicsConfiguration.md              |   21 +
 docs/CloudIntegration.md                      |    1 +
 docs/Dashboard.md                             |    2 +-
 docs/DashboardParameterValue.md               |    2 +
 docs/PagedAccount.md                          |   16 +
 docs/PagedServiceAccount.md                   |   16 +
 docs/QueryResult.md                           |    6 +-
 docs/ResponseContainerListServiceAccount.md   |   11 +
 docs/ResponseContainerPagedAccount.md         |   11 +
 docs/ResponseContainerPagedServiceAccount.md  |   11 +
 docs/ResponseContainerServiceAccount.md       |   11 +
 docs/SearchApi.md                             |  334 ++++
 docs/ServiceAccount.md                        |   16 +
 docs/ServiceAccountWrite.md                   |   15 +
 docs/Span.md                                  |   16 +
 docs/StatsModelInternalUse.md                 |   24 +
 docs/Trace.md                                 |   14 +
 docs/User.md                                  |    3 +
 docs/UserApi.md                               |   74 +-
 docs/UserApiToken.md                          |    1 +
 setup.py                                      |    2 +-
 test/test_account.py                          |   40 +
 test/test_account__service_account_api.py     |   76 +
 test/test_app_dynamics_configuration.py       |   40 +
 test/test_paged_account.py                    |   40 +
 test/test_paged_service_account.py            |   40 +
 ...response_container_list_service_account.py |   40 +
 test/test_response_container_paged_account.py |   40 +
 ...esponse_container_paged_service_account.py |   40 +
 ...test_response_container_service_account.py |   40 +
 test/test_service_account.py                  |   40 +
 test/test_service_account_write.py            |   40 +
 test/test_span.py                             |   40 +
 test/test_stats_model_internal_use.py         |   40 +
 test/test_trace.py                            |   40 +
 wavefront_api_client/__init__.py              |   15 +-
 wavefront_api_client/api/__init__.py          |    1 +
 .../api/account__service_account_api.py       |  612 +++++++
 wavefront_api_client/api/alert_api.py         |   97 --
 wavefront_api_client/api/api_token_api.py     |  408 +++++
 wavefront_api_client/api/search_api.py        | 1536 ++++++++++++-----
 wavefront_api_client/api/user_api.py          |   56 +-
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |    2 +-
 wavefront_api_client/models/__init__.py       |   14 +-
 wavefront_api_client/models/account.py        |  174 ++
 wavefront_api_client/models/alert.py          |   58 +-
 .../models/app_dynamics_configuration.py      |  428 +++++
 .../models/cloud_integration.py               |   29 +-
 wavefront_api_client/models/dashboard.py      |   58 +-
 .../models/dashboard_parameter_value.py       |   54 +-
 wavefront_api_client/models/notificant.py     |    2 +-
 wavefront_api_client/models/paged_account.py  |  282 +++
 .../models/paged_service_account.py           |  282 +++
 wavefront_api_client/models/query_result.py   |  126 +-
 ...response_container_list_service_account.py |  145 ++
 .../response_container_paged_account.py       |  145 ++
 ...esponse_container_paged_service_account.py |  145 ++
 .../response_container_service_account.py     |  145 ++
 wavefront_api_client/models/saved_search.py   |    2 +-
 .../models/service_account.py                 |  290 ++++
 .../models/service_account_write.py           |  258 +++
 wavefront_api_client/models/span.py           |  285 +++
 .../models/stats_model_internal_use.py        |  479 +++++
 wavefront_api_client/models/trace.py          |  231 +++
 wavefront_api_client/models/user.py           |   86 +-
 wavefront_api_client/models/user_api_token.py |   30 +-
 75 files changed, 7591 insertions(+), 786 deletions(-)
 create mode 100644 docs/Account.md
 create mode 100644 docs/AccountServiceAccountApi.md
 create mode 100644 docs/AppDynamicsConfiguration.md
 create mode 100644 docs/PagedAccount.md
 create mode 100644 docs/PagedServiceAccount.md
 create mode 100644 docs/ResponseContainerListServiceAccount.md
 create mode 100644 docs/ResponseContainerPagedAccount.md
 create mode 100644 docs/ResponseContainerPagedServiceAccount.md
 create mode 100644 docs/ResponseContainerServiceAccount.md
 create mode 100644 docs/ServiceAccount.md
 create mode 100644 docs/ServiceAccountWrite.md
 create mode 100644 docs/Span.md
 create mode 100644 docs/StatsModelInternalUse.md
 create mode 100644 docs/Trace.md
 create mode 100644 test/test_account.py
 create mode 100644 test/test_account__service_account_api.py
 create mode 100644 test/test_app_dynamics_configuration.py
 create mode 100644 test/test_paged_account.py
 create mode 100644 test/test_paged_service_account.py
 create mode 100644 test/test_response_container_list_service_account.py
 create mode 100644 test/test_response_container_paged_account.py
 create mode 100644 test/test_response_container_paged_service_account.py
 create mode 100644 test/test_response_container_service_account.py
 create mode 100644 test/test_service_account.py
 create mode 100644 test/test_service_account_write.py
 create mode 100644 test/test_span.py
 create mode 100644 test/test_stats_model_internal_use.py
 create mode 100644 test/test_trace.py
 create mode 100644 wavefront_api_client/api/account__service_account_api.py
 create mode 100644 wavefront_api_client/models/account.py
 create mode 100644 wavefront_api_client/models/app_dynamics_configuration.py
 create mode 100644 wavefront_api_client/models/paged_account.py
 create mode 100644 wavefront_api_client/models/paged_service_account.py
 create mode 100644 wavefront_api_client/models/response_container_list_service_account.py
 create mode 100644 wavefront_api_client/models/response_container_paged_account.py
 create mode 100644 wavefront_api_client/models/response_container_paged_service_account.py
 create mode 100644 wavefront_api_client/models/response_container_service_account.py
 create mode 100644 wavefront_api_client/models/service_account.py
 create mode 100644 wavefront_api_client/models/service_account_write.py
 create mode 100644 wavefront_api_client/models/span.py
 create mode 100644 wavefront_api_client/models/stats_model_internal_use.py
 create mode 100644 wavefront_api_client/models/trace.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6a92165..b5db134 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.33.15"
+    "packageVersion": "2.35.25"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 7261dad..6a92165 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.32.24"
+    "packageVersion": "2.33.15"
 }
diff --git a/README.md b/README.md
index b8b5cf3..0b65c1c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.33.15
+- Package version: 2.35.25
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -58,14 +58,15 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlListWriteDTO] |  (optional)
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
 
 try:
-    # Adds the specified ids to the given alerts' ACL
-    api_instance.add_access(body=body)
+    # Activates the given service account
+    api_response = api_instance.activate_account(id)
+    pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AlertApi->add_access: %s\n" % e)
+    print("Exception when calling AccountServiceAccountApi->activate_account: %s\n" % e)
 
 ```
 
@@ -75,9 +76,14 @@ All URIs are relative to *https://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*AccountServiceAccountApi* | [**activate_account**](docs/AccountServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
+*AccountServiceAccountApi* | [**create_service_account**](docs/AccountServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
+*AccountServiceAccountApi* | [**deactivate_account**](docs/AccountServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
+*AccountServiceAccountApi* | [**get_all_service_accounts**](docs/AccountServiceAccountApi.md#get_all_service_accounts) | **GET** /api/v2/account/serviceaccount | Get all service accounts
+*AccountServiceAccountApi* | [**get_service_account**](docs/AccountServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
+*AccountServiceAccountApi* | [**update_service_account**](docs/AccountServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
 *AlertApi* | [**add_access**](docs/AlertApi.md#add_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 *AlertApi* | [**add_alert_tag**](docs/AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
-*AlertApi* | [**can_user_modify**](docs/AlertApi.md#can_user_modify) | **GET** /api/v2/alert/{id}/canUserModify | 
 *AlertApi* | [**clone_alert**](docs/AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 *AlertApi* | [**create_alert**](docs/AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 *AlertApi* | [**delete_alert**](docs/AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
@@ -100,8 +106,12 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
+*ApiTokenApi* | [**delete_token_service_account**](docs/ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
+*ApiTokenApi* | [**generate_token_service_account**](docs/ApiTokenApi.md#generate_token_service_account) | **POST** /api/v2/apitoken/serviceaccount/{id} | Create a new api token for the service account
 *ApiTokenApi* | [**get_all_tokens**](docs/ApiTokenApi.md#get_all_tokens) | **GET** /api/v2/apitoken | Get all api tokens for a user
+*ApiTokenApi* | [**get_tokens_service_account**](docs/ApiTokenApi.md#get_tokens_service_account) | **GET** /api/v2/apitoken/serviceaccount/{id} | Get all api tokens for the given service account
 *ApiTokenApi* | [**update_token_name**](docs/ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
+*ApiTokenApi* | [**update_token_name_service_account**](docs/ApiTokenApi.md#update_token_name_service_account) | **PUT** /api/v2/apitoken/serviceaccount/{id}/{token} | Update the name of the specified api token for the given service account
 *CloudIntegrationApi* | [**create_cloud_integration**](docs/CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
 *CloudIntegrationApi* | [**delete_cloud_integration**](docs/CloudIntegrationApi.md#delete_cloud_integration) | **DELETE** /api/v2/cloudintegration/{id} | Delete a specific cloud integration
 *CloudIntegrationApi* | [**disable_cloud_integration**](docs/CloudIntegrationApi.md#disable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/disable | Disable a specific cloud integration
@@ -194,6 +204,9 @@ Class | Method | HTTP request | Description
 *SavedSearchApi* | [**get_all_saved_searches**](docs/SavedSearchApi.md#get_all_saved_searches) | **GET** /api/v2/savedsearch | Get all saved searches for a user
 *SavedSearchApi* | [**get_saved_search**](docs/SavedSearchApi.md#get_saved_search) | **GET** /api/v2/savedsearch/{id} | Get a specific saved search
 *SavedSearchApi* | [**update_saved_search**](docs/SavedSearchApi.md#update_saved_search) | **PUT** /api/v2/savedsearch/{id} | Update a specific saved search
+*SearchApi* | [**search_account_entities**](docs/SearchApi.md#search_account_entities) | **POST** /api/v2/search/account | Search over a customer&#39;s accounts
+*SearchApi* | [**search_account_for_facet**](docs/SearchApi.md#search_account_for_facet) | **POST** /api/v2/search/account/{facet} | Lists the values of a specific facet over the customer&#39;s accounts
+*SearchApi* | [**search_account_for_facets**](docs/SearchApi.md#search_account_for_facets) | **POST** /api/v2/search/account/facets | Lists the values of one or more facets over the customer&#39;s accounts
 *SearchApi* | [**search_alert_deleted_entities**](docs/SearchApi.md#search_alert_deleted_entities) | **POST** /api/v2/search/alert/deleted | Search over a customer&#39;s deleted alerts
 *SearchApi* | [**search_alert_deleted_for_facet**](docs/SearchApi.md#search_alert_deleted_for_facet) | **POST** /api/v2/search/alert/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted alerts
 *SearchApi* | [**search_alert_deleted_for_facets**](docs/SearchApi.md#search_alert_deleted_for_facets) | **POST** /api/v2/search/alert/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted alerts
@@ -236,6 +249,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_report_event_entities**](docs/SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 *SearchApi* | [**search_report_event_for_facet**](docs/SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 *SearchApi* | [**search_report_event_for_facets**](docs/SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
+*SearchApi* | [**search_service_account_entities**](docs/SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
+*SearchApi* | [**search_service_account_for_facet**](docs/SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
+*SearchApi* | [**search_service_account_for_facets**](docs/SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
 *SearchApi* | [**search_tagged_source_entities**](docs/SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facet**](docs/SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facets**](docs/SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
@@ -263,20 +279,20 @@ Class | Method | HTTP request | Description
 *SourceApi* | [**set_description**](docs/SourceApi.md#set_description) | **POST** /api/v2/source/{id}/description | Set description associated with a specific source
 *SourceApi* | [**set_source_tags**](docs/SourceApi.md#set_source_tags) | **POST** /api/v2/source/{id}/tag | Set all tags associated with a specific source
 *SourceApi* | [**update_source**](docs/SourceApi.md#update_source) | **PUT** /api/v2/source/{id} | Update metadata (description or tags) for a specific source.
-*UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user
+*UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
 *UserApi* | [**create_or_update_user**](docs/UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
-*UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users
-*UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user identified by id
+*UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
+*UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 *UserApi* | [**get_all_users**](docs/UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
 *UserApi* | [**get_user**](docs/UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
-*UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific user permission to multiple users
-*UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific user permission
+*UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
+*UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
-*UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user
-*UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific user permission from multiple users
-*UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific user permission
+*UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
+*UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
+*UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 *UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
-*UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and invalid identifiers from the given list
+*UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
 *UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 *UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 *UserGroupApi* | [**delete_user_group**](docs/UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
@@ -300,7 +316,9 @@ Class | Method | HTTP request | Description
  - [AccessControlListReadDTO](docs/AccessControlListReadDTO.md)
  - [AccessControlListSimple](docs/AccessControlListSimple.md)
  - [AccessControlListWriteDTO](docs/AccessControlListWriteDTO.md)
+ - [Account](docs/Account.md)
  - [Alert](docs/Alert.md)
+ - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
  - [AzureBaseCredentials](docs/AzureBaseCredentials.md)
@@ -355,6 +373,7 @@ Class | Method | HTTP request | Description
  - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
  - [Number](docs/Number.md)
+ - [PagedAccount](docs/PagedAccount.md)
  - [PagedAlert](docs/PagedAlert.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
  - [PagedCloudIntegration](docs/PagedCloudIntegration.md)
@@ -370,6 +389,7 @@ Class | Method | HTTP request | Description
  - [PagedNotificant](docs/PagedNotificant.md)
  - [PagedProxy](docs/PagedProxy.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
+ - [PagedServiceAccount](docs/PagedServiceAccount.md)
  - [PagedSource](docs/PagedSource.md)
  - [PagedUserGroupModel](docs/PagedUserGroupModel.md)
  - [Point](docs/Point.md)
@@ -392,6 +412,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
  - [ResponseContainerListIntegration](docs/ResponseContainerListIntegration.md)
  - [ResponseContainerListIntegrationManifestGroup](docs/ResponseContainerListIntegrationManifestGroup.md)
+ - [ResponseContainerListServiceAccount](docs/ResponseContainerListServiceAccount.md)
  - [ResponseContainerListString](docs/ResponseContainerListString.md)
  - [ResponseContainerListUserApiToken](docs/ResponseContainerListUserApiToken.md)
  - [ResponseContainerListUserGroupModel](docs/ResponseContainerListUserGroupModel.md)
@@ -400,6 +421,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
  - [ResponseContainerMessage](docs/ResponseContainerMessage.md)
  - [ResponseContainerNotificant](docs/ResponseContainerNotificant.md)
+ - [ResponseContainerPagedAccount](docs/ResponseContainerPagedAccount.md)
  - [ResponseContainerPagedAlert](docs/ResponseContainerPagedAlert.md)
  - [ResponseContainerPagedAlertWithStats](docs/ResponseContainerPagedAlertWithStats.md)
  - [ResponseContainerPagedCloudIntegration](docs/ResponseContainerPagedCloudIntegration.md)
@@ -415,10 +437,12 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedNotificant](docs/ResponseContainerPagedNotificant.md)
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
+ - [ResponseContainerPagedServiceAccount](docs/ResponseContainerPagedServiceAccount.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
  - [ResponseContainerPagedUserGroupModel](docs/ResponseContainerPagedUserGroupModel.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
+ - [ResponseContainerServiceAccount](docs/ResponseContainerServiceAccount.md)
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
@@ -427,16 +451,20 @@ Class | Method | HTTP request | Description
  - [ResponseStatus](docs/ResponseStatus.md)
  - [SavedSearch](docs/SavedSearch.md)
  - [SearchQuery](docs/SearchQuery.md)
+ - [ServiceAccount](docs/ServiceAccount.md)
+ - [ServiceAccountWrite](docs/ServiceAccountWrite.md)
  - [SortableSearchRequest](docs/SortableSearchRequest.md)
  - [Sorting](docs/Sorting.md)
  - [Source](docs/Source.md)
  - [SourceLabelPair](docs/SourceLabelPair.md)
  - [SourceSearchRequestContainer](docs/SourceSearchRequestContainer.md)
- - [StatsModel](docs/StatsModel.md)
+ - [Span](docs/Span.md)
+ - [StatsModelInternalUse](docs/StatsModelInternalUse.md)
  - [TagsResponse](docs/TagsResponse.md)
  - [TargetInfo](docs/TargetInfo.md)
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
+ - [Trace](docs/Trace.md)
  - [User](docs/User.md)
  - [UserApiToken](docs/UserApiToken.md)
  - [UserDTO](docs/UserDTO.md)
diff --git a/docs/Account.md b/docs/Account.md
new file mode 100644
index 0000000..d0122b1
--- /dev/null
+++ b/docs/Account.md
@@ -0,0 +1,12 @@
+# Account
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**groups** | **list[str]** | The list of account&#39;s permissions. | [optional] 
+**identifier** | **str** | The unique identifier of an account. | 
+**user_groups** | **list[str]** | The list of account&#39;s user groups. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AccountServiceAccountApi.md b/docs/AccountServiceAccountApi.md
new file mode 100644
index 0000000..9e93175
--- /dev/null
+++ b/docs/AccountServiceAccountApi.md
@@ -0,0 +1,336 @@
+# wavefront_api_client.AccountServiceAccountApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**activate_account**](AccountServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
+[**create_service_account**](AccountServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
+[**deactivate_account**](AccountServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
+[**get_all_service_accounts**](AccountServiceAccountApi.md#get_all_service_accounts) | **GET** /api/v2/account/serviceaccount | Get all service accounts
+[**get_service_account**](AccountServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
+[**update_service_account**](AccountServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
+
+
+# **activate_account**
+> ResponseContainerServiceAccount activate_account(id)
+
+Activates the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Activates the given service account
+    api_response = api_instance.activate_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountServiceAccountApi->activate_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_service_account**
+> ResponseContainerServiceAccount create_service_account(body=body)
+
+Creates a service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.ServiceAccountWrite() # ServiceAccountWrite |  (optional)
+
+try:
+    # Creates a service account
+    api_response = api_instance.create_service_account(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountServiceAccountApi->create_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**ServiceAccountWrite**](ServiceAccountWrite.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deactivate_account**
+> ResponseContainerServiceAccount deactivate_account(id)
+
+Deactivates the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Deactivates the given service account
+    api_response = api_instance.deactivate_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountServiceAccountApi->deactivate_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_service_accounts**
+> ResponseContainerListServiceAccount get_all_service_accounts()
+
+Get all service accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all service accounts
+    api_response = api_instance.get_all_service_accounts()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountServiceAccountApi->get_all_service_accounts: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListServiceAccount**](ResponseContainerListServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_service_account**
+> ResponseContainerServiceAccount get_service_account(id)
+
+Retrieves a service account by identifier
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Retrieves a service account by identifier
+    api_response = api_instance.get_service_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountServiceAccountApi->get_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_service_account**
+> ResponseContainerServiceAccount update_service_account(id, body=body)
+
+Updates the service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.ServiceAccountWrite() # ServiceAccountWrite |  (optional)
+
+try:
+    # Updates the service account
+    api_response = api_instance.update_service_account(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountServiceAccountApi->update_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**ServiceAccountWrite**](ServiceAccountWrite.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/Alert.md b/docs/Alert.md
index dbf7086..b43538b 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -10,7 +10,6 @@ Name | Type | Description | Notes
 **alerts_last_day** | **int** |  | [optional] 
 **alerts_last_month** | **int** |  | [optional] 
 **alerts_last_week** | **int** |  | [optional] 
-**can_user_modify** | **bool** | Whether the user can modify the alert. | [optional] 
 **condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
@@ -39,6 +38,7 @@ Name | Type | Description | Notes
 **last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the alert condition | [optional] 
 **minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
+**modify_acl_access** | **bool** | Whether the user has modify ACL access to the alert. | [optional] 
 **name** | **str** |  | 
 **no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
 **notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index d3c836f..d4c8632 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -6,7 +6,6 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**add_access**](AlertApi.md#add_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 [**add_alert_tag**](AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
-[**can_user_modify**](AlertApi.md#can_user_modify) | **GET** /api/v2/alert/{id}/canUserModify | 
 [**clone_alert**](AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 [**create_alert**](AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 [**delete_alert**](AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
@@ -138,58 +137,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **can_user_modify**
-> can_user_modify(id, body=body)
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = wavefront_api_client.User() # User |  (optional)
-
-try:
-    api_instance.can_user_modify(id, body=body)
-except ApiException as e:
-    print("Exception when calling AlertApi->can_user_modify: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | [**User**](User.md)|  | [optional] 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **clone_alert**
 > ResponseContainerAlert clone_alert(id, name=name, v=v)
 
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
index e5dcf9c..06bdb10 100644
--- a/docs/ApiTokenApi.md
+++ b/docs/ApiTokenApi.md
@@ -6,8 +6,12 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**create_token**](ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 [**delete_token**](ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
+[**delete_token_service_account**](ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
+[**generate_token_service_account**](ApiTokenApi.md#generate_token_service_account) | **POST** /api/v2/apitoken/serviceaccount/{id} | Create a new api token for the service account
 [**get_all_tokens**](ApiTokenApi.md#get_all_tokens) | **GET** /api/v2/apitoken | Get all api tokens for a user
+[**get_tokens_service_account**](ApiTokenApi.md#get_tokens_service_account) | **GET** /api/v2/apitoken/serviceaccount/{id} | Get all api tokens for the given service account
 [**update_token_name**](ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
+[**update_token_name_service_account**](ApiTokenApi.md#update_token_name_service_account) | **PUT** /api/v2/apitoken/serviceaccount/{id}/{token} | Update the name of the specified api token for the given service account
 
 
 # **create_token**
@@ -114,6 +118,118 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **delete_token_service_account**
+> ResponseContainerListUserApiToken delete_token_service_account(id, token)
+
+Delete the specified api token of the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+token = 'token_example' # str | 
+
+try:
+    # Delete the specified api token of the given service account
+    api_response = api_instance.delete_token_service_account(id, token)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->delete_token_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **token** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerListUserApiToken**](ResponseContainerListUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **generate_token_service_account**
+> ResponseContainerListUserApiToken generate_token_service_account(id, body=body)
+
+Create a new api token for the service account
+
+Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.UserApiToken() # UserApiToken |  (optional)
+
+try:
+    # Create a new api token for the service account
+    api_response = api_instance.generate_token_service_account(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->generate_token_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**UserApiToken**](UserApiToken.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerListUserApiToken**](ResponseContainerListUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_tokens**
 > ResponseContainerListUserApiToken get_all_tokens()
 
@@ -164,6 +280,60 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_tokens_service_account**
+> ResponseContainerListUserApiToken get_tokens_service_account(id)
+
+Get all api tokens for the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get all api tokens for the given service account
+    api_response = api_instance.get_tokens_service_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->get_tokens_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerListUserApiToken**](ResponseContainerListUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **update_token_name**
 > ResponseContainerUserApiToken update_token_name(id, body=body)
 
@@ -220,3 +390,61 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **update_token_name_service_account**
+> ResponseContainerUserApiToken update_token_name_service_account(id, token, body=body)
+
+Update the name of the specified api token for the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+token = 'token_example' # str | 
+body = wavefront_api_client.UserApiToken() # UserApiToken | Example Body:  <pre>{   \"tokenID\": \"Token identifier\",   \"tokenName\": \"Token name\" }</pre> (optional)
+
+try:
+    # Update the name of the specified api token for the given service account
+    api_response = api_instance.update_token_name_service_account(id, token, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->update_token_name_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **token** | **str**|  | 
+ **body** | [**UserApiToken**](UserApiToken.md)| Example Body:  &lt;pre&gt;{   \&quot;tokenID\&quot;: \&quot;Token identifier\&quot;,   \&quot;tokenName\&quot;: \&quot;Token name\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserApiToken**](ResponseContainerUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/AppDynamicsConfiguration.md b/docs/AppDynamicsConfiguration.md
new file mode 100644
index 0000000..0af4b87
--- /dev/null
+++ b/docs/AppDynamicsConfiguration.md
@@ -0,0 +1,21 @@
+# AppDynamicsConfiguration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**app_filter_regex** | **list[str]** | List of regular expressions that a application name must match (case-insensitively) in order to be ingested. | [optional] 
+**controller_name** | **str** | Name of the SaaS controller. | 
+**enable_app_infra_metrics** | **bool** | Boolean flag to control Application Infrastructure metric injection. | [optional] 
+**enable_backend_metrics** | **bool** | Boolean flag to control Backend metric injection. | [optional] 
+**enable_business_trx_metrics** | **bool** | Boolean flag to control Business Transaction metric injection. | [optional] 
+**enable_error_metrics** | **bool** | Boolean flag to control Error metric injection. | [optional] 
+**enable_individual_node_metrics** | **bool** | Boolean flag to control Individual Node metric injection. | [optional] 
+**enable_overall_perf_metrics** | **bool** | Boolean flag to control Overall Performance metric injection. | [optional] 
+**enable_rollup** | **bool** | Set this to &#39;false&#39; to get separate results for all values within the time range, by default it is &#39;true&#39;. | [optional] 
+**enable_service_endpoint_metrics** | **bool** | Boolean flag to control Service End point metric injection. | [optional] 
+**encrypted_password** | **str** | Password for AppDynamics user. | 
+**user_name** | **str** | Username is combination of userName and the account name. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 4366ac8..f379fe1 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **additional_tags** | **dict(str, str)** | A list of point tag key-values to add to every point ingested using this integration | [optional] 
+**app_dynamics** | [**AppDynamicsConfiguration**](AppDynamicsConfiguration.md) |  | [optional] 
 **azure** | [**AzureConfiguration**](AzureConfiguration.md) |  | [optional] 
 **azure_activity_log** | [**AzureActivityLogConfiguration**](AzureActivityLogConfiguration.md) |  | [optional] 
 **cloud_trail** | [**CloudTrailConfiguration**](CloudTrailConfiguration.md) |  | [optional] 
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index aa77d07..8ddc8e9 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
-**can_user_modify** | **bool** | Whether the user can modify the dashboard. | [optional] 
 **chart_title_bg_color** | **str** | Background color of the chart title text area, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
 **chart_title_color** | **str** | Text color of the chart title text are, in rgba(rvalue,gvalue,bvalue,avalue) | [optional] 
 **chart_title_scalar** | **int** | Scale (normally 100) of chart title text size | [optional] 
@@ -24,6 +23,7 @@ Name | Type | Description | Notes
 **favorite** | **bool** |  | [optional] 
 **hidden** | **bool** |  | [optional] 
 **id** | **str** | Unique identifier, also URL slug, of the dashboard | 
+**modify_acl_access** | **bool** | Whether the user has modify ACL access to the dashboard. | [optional] 
 **name** | **str** | Name of the dashboard | 
 **num_charts** | **int** |  | [optional] 
 **num_favorites** | **int** |  | [optional] 
diff --git a/docs/DashboardParameterValue.md b/docs/DashboardParameterValue.md
index 383768e..e7b3b2d 100644
--- a/docs/DashboardParameterValue.md
+++ b/docs/DashboardParameterValue.md
@@ -10,10 +10,12 @@ Name | Type | Description | Notes
 **hide_from_view** | **bool** |  | [optional] 
 **label** | **str** |  | [optional] 
 **multivalue** | **bool** |  | [optional] 
+**order** | **int** |  | [optional] 
 **parameter_type** | **str** |  | [optional] 
 **query_value** | **str** |  | [optional] 
 **reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
 **tag_key** | **str** |  | [optional] 
+**value_ordering** | **list[str]** |  | [optional] 
 **values_to_readable_strings** | **dict(str, str)** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/PagedAccount.md b/docs/PagedAccount.md
new file mode 100644
index 0000000..73a70cb
--- /dev/null
+++ b/docs/PagedAccount.md
@@ -0,0 +1,16 @@
+# PagedAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[Account]**](Account.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedServiceAccount.md b/docs/PagedServiceAccount.md
new file mode 100644
index 0000000..1aec677
--- /dev/null
+++ b/docs/PagedServiceAccount.md
@@ -0,0 +1,16 @@
+# PagedServiceAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[ServiceAccount]**](ServiceAccount.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/QueryResult.md b/docs/QueryResult.md
index 9874e20..d823387 100644
--- a/docs/QueryResult.md
+++ b/docs/QueryResult.md
@@ -3,12 +3,16 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**error_message** | **str** | Error message, if query execution did not finish successfully | [optional] 
+**error_type** | **str** | Error type, if query execution did not finish successfully | [optional] 
 **events** | [**list[QueryEvent]**](QueryEvent.md) |  | [optional] 
 **granularity** | **int** | The granularity of the returned results, in seconds | [optional] 
 **name** | **str** | The name of this query | [optional] 
 **query** | **str** | The query used to obtain this result | [optional] 
-**stats** | [**StatsModel**](StatsModel.md) |  | [optional] 
+**spans** | [**list[Span]**](Span.md) |  | [optional] 
+**stats** | [**StatsModelInternalUse**](StatsModelInternalUse.md) |  | [optional] 
 **timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
+**traces** | [**list[Trace]**](Trace.md) |  | [optional] 
 **warnings** | **str** | The warnings incurred by this query | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/ResponseContainerListServiceAccount.md b/docs/ResponseContainerListServiceAccount.md
new file mode 100644
index 0000000..589b881
--- /dev/null
+++ b/docs/ResponseContainerListServiceAccount.md
@@ -0,0 +1,11 @@
+# ResponseContainerListServiceAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[ServiceAccount]**](ServiceAccount.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedAccount.md b/docs/ResponseContainerPagedAccount.md
new file mode 100644
index 0000000..fa1a3c1
--- /dev/null
+++ b/docs/ResponseContainerPagedAccount.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedAccount**](PagedAccount.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedServiceAccount.md b/docs/ResponseContainerPagedServiceAccount.md
new file mode 100644
index 0000000..dccd756
--- /dev/null
+++ b/docs/ResponseContainerPagedServiceAccount.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedServiceAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedServiceAccount**](PagedServiceAccount.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerServiceAccount.md b/docs/ResponseContainerServiceAccount.md
new file mode 100644
index 0000000..7541eed
--- /dev/null
+++ b/docs/ResponseContainerServiceAccount.md
@@ -0,0 +1,11 @@
+# ResponseContainerServiceAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**ServiceAccount**](ServiceAccount.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index d9ab65d..cd81a2d 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -4,6 +4,9 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**search_account_entities**](SearchApi.md#search_account_entities) | **POST** /api/v2/search/account | Search over a customer&#39;s accounts
+[**search_account_for_facet**](SearchApi.md#search_account_for_facet) | **POST** /api/v2/search/account/{facet} | Lists the values of a specific facet over the customer&#39;s accounts
+[**search_account_for_facets**](SearchApi.md#search_account_for_facets) | **POST** /api/v2/search/account/facets | Lists the values of one or more facets over the customer&#39;s accounts
 [**search_alert_deleted_entities**](SearchApi.md#search_alert_deleted_entities) | **POST** /api/v2/search/alert/deleted | Search over a customer&#39;s deleted alerts
 [**search_alert_deleted_for_facet**](SearchApi.md#search_alert_deleted_for_facet) | **POST** /api/v2/search/alert/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted alerts
 [**search_alert_deleted_for_facets**](SearchApi.md#search_alert_deleted_for_facets) | **POST** /api/v2/search/alert/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted alerts
@@ -46,6 +49,9 @@ Method | HTTP request | Description
 [**search_report_event_entities**](SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 [**search_report_event_for_facet**](SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 [**search_report_event_for_facets**](SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
+[**search_service_account_entities**](SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
+[**search_service_account_for_facet**](SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
+[**search_service_account_for_facets**](SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
 [**search_tagged_source_entities**](SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 [**search_tagged_source_for_facet**](SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 [**search_tagged_source_for_facets**](SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
@@ -60,6 +66,170 @@ Method | HTTP request | Description
 [**search_webhook_for_facets**](SearchApi.md#search_webhook_for_facets) | **POST** /api/v2/search/webhook/facets | Lists the values of one or more facets over the customer&#39;s webhooks
 
 
+# **search_account_entities**
+> ResponseContainerPagedAccount search_account_entities(body=body)
+
+Search over a customer's accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's accounts
+    api_response = api_instance.search_account_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_account_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedAccount**](ResponseContainerPagedAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_account_for_facet**
+> ResponseContainerFacetResponse search_account_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's accounts
+    api_response = api_instance.search_account_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_account_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_account_for_facets**
+> ResponseContainerFacetsResponseContainer search_account_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's accounts
+    api_response = api_instance.search_account_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_account_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_alert_deleted_entities**
 > ResponseContainerPagedAlert search_alert_deleted_entities(body=body)
 
@@ -2356,6 +2526,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_service_account_entities**
+> ResponseContainerPagedServiceAccount search_service_account_entities(body=body)
+
+Search over a customer's service accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's service accounts
+    api_response = api_instance.search_service_account_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_service_account_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedServiceAccount**](ResponseContainerPagedServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_service_account_for_facet**
+> ResponseContainerFacetResponse search_service_account_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's service accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's service accounts
+    api_response = api_instance.search_service_account_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_service_account_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_service_account_for_facets**
+> ResponseContainerFacetsResponseContainer search_service_account_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's service accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's service accounts
+    api_response = api_instance.search_service_account_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_service_account_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_tagged_source_entities**
 > ResponseContainerPagedSource search_tagged_source_entities(body=body)
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
new file mode 100644
index 0000000..d2480d5
--- /dev/null
+++ b/docs/ServiceAccount.md
@@ -0,0 +1,16 @@
+# ServiceAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**active** | **bool** | The state of the service account. | 
+**description** | **str** | The description of the service account. | [optional] 
+**groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
+**identifier** | **str** | The unique identifier of a service account. | 
+**last_used** | **int** | The last time when a token of the service account was used. | [optional] 
+**tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
+**user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of service account&#39;s user groups. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ServiceAccountWrite.md b/docs/ServiceAccountWrite.md
new file mode 100644
index 0000000..7207cc6
--- /dev/null
+++ b/docs/ServiceAccountWrite.md
@@ -0,0 +1,15 @@
+# ServiceAccountWrite
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**active** | **bool** | The current state of the service account. | [optional] 
+**description** | **str** | The description of the service account to be created. | [optional] 
+**groups** | **list[str]** | The list of permissions, the service account will be granted. | [optional] 
+**identifier** | **str** | The unique identifier for a service account. | 
+**tokens** | **list[str]** | The service account&#39;s API tokens. | [optional] 
+**user_groups** | **list[str]** | The list of user group ids, the service account will be added to. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Span.md b/docs/Span.md
new file mode 100644
index 0000000..d90d95d
--- /dev/null
+++ b/docs/Span.md
@@ -0,0 +1,16 @@
+# Span
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**annotations** | **list[dict(str, str)]** | Annotations (key-value pairs) of this span | [optional] 
+**duration_ms** | **int** | Span duration (in milliseconds) | [optional] 
+**host** | **str** | Source/Host of this span | [optional] 
+**name** | **str** | Span name | [optional] 
+**span_id** | **str** | Span ID | [optional] 
+**start_ms** | **int** | Span start time (in milliseconds) | [optional] 
+**trace_id** | **str** | Trace ID | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/StatsModelInternalUse.md b/docs/StatsModelInternalUse.md
new file mode 100644
index 0000000..c709e9d
--- /dev/null
+++ b/docs/StatsModelInternalUse.md
@@ -0,0 +1,24 @@
+# StatsModelInternalUse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**buffer_keys** | **int** |  | [optional] 
+**cached_compacted_keys** | **int** |  | [optional] 
+**compacted_keys** | **int** |  | [optional] 
+**compacted_points** | **int** |  | [optional] 
+**cpu_ns** | **int** |  | [optional] 
+**hosts_used** | **int** |  | [optional] 
+**keys** | **int** |  | [optional] 
+**latency** | **int** |  | [optional] 
+**metrics_used** | **int** |  | [optional] 
+**points** | **int** |  | [optional] 
+**queries** | **int** |  | [optional] 
+**query_tasks** | **int** |  | [optional] 
+**s3_keys** | **int** |  | [optional] 
+**skipped_compacted_keys** | **int** |  | [optional] 
+**summaries** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Trace.md b/docs/Trace.md
new file mode 100644
index 0000000..83f0ab9
--- /dev/null
+++ b/docs/Trace.md
@@ -0,0 +1,14 @@
+# Trace
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**end_ms** | **int** | Trace end time (in milliseconds) | [optional] 
+**spans** | [**list[Span]**](Span.md) | Spans associated with this trace | [optional] 
+**start_ms** | **int** | Trace start time (in milliseconds) | [optional] 
+**total_duration_ms** | **int** | Trace total duration (in milliseconds) | [optional] 
+**trace_id** | **str** | Trace ID | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/User.md b/docs/User.md
index 9840b57..c6b8e3b 100644
--- a/docs/User.md
+++ b/docs/User.md
@@ -3,16 +3,19 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**account_type** | **str** |  | [optional] 
 **api_token** | **str** |  | [optional] 
 **api_token2** | **str** |  | [optional] 
 **credential** | **str** |  | [optional] 
 **customer** | **str** |  | [optional] 
+**description** | **str** |  | [optional] 
 **extra_api_tokens** | **list[str]** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
 **invalid_password_attempts** | **int** |  | [optional] 
 **last_logout** | **int** |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
+**last_used** | **int** |  | [optional] 
 **old_passwords** | **list[str]** |  | [optional] 
 **onboarding_state** | **str** |  | [optional] 
 **provider** | **str** |  | [optional] 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 8de4e07..e33332a 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -4,26 +4,26 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_user_to_user_groups**](UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user
+[**add_user_to_user_groups**](UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
 [**create_or_update_user**](UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
-[**delete_multiple_users**](UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users
-[**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user identified by id
+[**delete_multiple_users**](UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
+[**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 [**get_all_users**](UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
 [**get_user**](UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
-[**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific user permission to multiple users
-[**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific user permission
+[**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
+[**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
-[**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user
-[**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific user permission from multiple users
-[**revoke_user_permission**](UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific user permission
+[**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
+[**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
+[**revoke_user_permission**](UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 [**update_user**](UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
-[**validate_users**](UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and invalid identifiers from the given list
+[**validate_users**](UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
 
 
 # **add_user_to_user_groups**
 > UserModel add_user_to_user_groups(id, body=body)
 
-Adds specific user groups to the user
+Adds specific user groups to the user or service account
 
 
 
@@ -44,10 +44,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be added to the user (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be added to the account (optional)
 
 try:
-    # Adds specific user groups to the user
+    # Adds specific user groups to the user or service account
     api_response = api_instance.add_user_to_user_groups(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -59,7 +59,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| The list of user groups that should be added to the user | [optional] 
+ **body** | **list[str]**| The list of user groups that should be added to the account | [optional] 
 
 ### Return type
 
@@ -135,7 +135,7 @@ Name | Type | Description  | Notes
 # **delete_multiple_users**
 > ResponseContainerListString delete_multiple_users(body=body)
 
-Deletes multiple users
+Deletes multiple users or service accounts
 
 
 
@@ -158,7 +158,7 @@ api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(confi
 body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of users which should be deleted (optional)
 
 try:
-    # Deletes multiple users
+    # Deletes multiple users or service accounts
     api_response = api_instance.delete_multiple_users(body=body)
     pprint(api_response)
 except ApiException as e:
@@ -189,7 +189,7 @@ Name | Type | Description  | Notes
 # **delete_user**
 > delete_user(id)
 
-Deletes a user identified by id
+Deletes a user or service account identified by id
 
 
 
@@ -212,7 +212,7 @@ api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(confi
 id = 'id_example' # str | 
 
 try:
-    # Deletes a user identified by id
+    # Deletes a user or service account identified by id
     api_instance.delete_user(id)
 except ApiException as e:
     print("Exception when calling UserApi->delete_user: %s\n" % e)
@@ -346,7 +346,7 @@ Name | Type | Description  | Notes
 # **grant_permission_to_users**
 > UserModel grant_permission_to_users(permission, body=body)
 
-Grants a specific user permission to multiple users
+Grants a specific permission to multiple users or service accounts
 
 
 
@@ -370,7 +370,7 @@ permission = 'permission_example' # str | Permission to grant to the users. Plea
 body = [wavefront_api_client.list[str]()] # list[str] | List of users which should be granted by specified permission (optional)
 
 try:
-    # Grants a specific user permission to multiple users
+    # Grants a specific permission to multiple users or service accounts
     api_response = api_instance.grant_permission_to_users(permission, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -402,7 +402,7 @@ Name | Type | Description  | Notes
 # **grant_user_permission**
 > UserModel grant_user_permission(id, group=group)
 
-Grants a specific user permission
+Grants a specific permission to user or service account
 
 
 
@@ -423,10 +423,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-group = 'group_example' # str | Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (optional)
+group = 'group_example' # str | Permission group to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (optional)
 
 try:
-    # Grants a specific user permission
+    # Grants a specific permission to user or service account
     api_response = api_instance.grant_user_permission(id, group=group)
     pprint(api_response)
 except ApiException as e:
@@ -438,7 +438,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **group** | **str**| Permission group to grant to this user.  Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | [optional] 
+ **group** | **str**| Permission group to grant to the account. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | [optional] 
 
 ### Return type
 
@@ -512,7 +512,7 @@ Name | Type | Description  | Notes
 # **remove_user_from_user_groups**
 > UserModel remove_user_from_user_groups(id, body=body)
 
-Removes specific user groups from the user
+Removes specific user groups from the user or service account
 
 
 
@@ -533,10 +533,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be removed from the user (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be removed from the account (optional)
 
 try:
-    # Removes specific user groups from the user
+    # Removes specific user groups from the user or service account
     api_response = api_instance.remove_user_from_user_groups(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -548,7 +548,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| The list of user groups that should be removed from the user | [optional] 
+ **body** | **list[str]**| The list of user groups that should be removed from the account | [optional] 
 
 ### Return type
 
@@ -568,7 +568,7 @@ Name | Type | Description  | Notes
 # **revoke_permission_from_users**
 > UserModel revoke_permission_from_users(permission, body=body)
 
-Revokes a specific user permission from multiple users
+Revokes a specific permission from multiple users or service accounts
 
 
 
@@ -588,11 +588,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
-body = [wavefront_api_client.list[str]()] # list[str] | List of users which should be revoked by specified permission (optional)
+permission = 'permission_example' # str | Permission to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+body = [wavefront_api_client.list[str]()] # list[str] | List of users or service accounts which should be revoked by specified permission (optional)
 
 try:
-    # Revokes a specific user permission from multiple users
+    # Revokes a specific permission from multiple users or service accounts
     api_response = api_instance.revoke_permission_from_users(permission, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -603,8 +603,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to grant to the users. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
- **body** | **list[str]**| List of users which should be revoked by specified permission | [optional] 
+ **permission** | **str**| Permission to grant to the account. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **body** | **list[str]**| List of users or service accounts which should be revoked by specified permission | [optional] 
 
 ### Return type
 
@@ -624,7 +624,7 @@ Name | Type | Description  | Notes
 # **revoke_user_permission**
 > UserModel revoke_user_permission(id, group=group)
 
-Revokes a specific user permission
+Revokes a specific permission from user or service account
 
 
 
@@ -648,7 +648,7 @@ id = 'id_example' # str |
 group = 'group_example' # str |  (optional)
 
 try:
-    # Revokes a specific user permission
+    # Revokes a specific permission from user or service account
     api_response = api_instance.revoke_user_permission(id, group=group)
     pprint(api_response)
 except ApiException as e:
@@ -736,7 +736,7 @@ Name | Type | Description  | Notes
 # **validate_users**
 > ResponseContainerValidatedUsersDTO validate_users(body=body)
 
-Returns valid users and invalid identifiers from the given list
+Returns valid users and service accounts, also invalid identifiers from the given list
 
 
 
@@ -759,7 +759,7 @@ api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(confi
 body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
 
 try:
-    # Returns valid users and invalid identifiers from the given list
+    # Returns valid users and service accounts, also invalid identifiers from the given list
     api_response = api_instance.validate_users(body=body)
     pprint(api_response)
 except ApiException as e:
diff --git a/docs/UserApiToken.md b/docs/UserApiToken.md
index c0fa9b3..1ca7be9 100644
--- a/docs/UserApiToken.md
+++ b/docs/UserApiToken.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**last_used** | **int** | The last time this token was used | [optional] 
 **token_id** | **str** | The identifier of the user API token | 
 **token_name** | **str** | The name of the user API token | [optional] 
 
diff --git a/setup.py b/setup.py
index 479af27..72f1aab 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.33.15"
+VERSION = "2.35.25"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_account.py b/test/test_account.py
new file mode 100644
index 0000000..4c0a369
--- /dev/null
+++ b/test/test_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.account import Account  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccount(unittest.TestCase):
+    """Account unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccount(self):
+        """Test Account"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.account.Account()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_account__service_account_api.py b/test/test_account__service_account_api.py
new file mode 100644
index 0000000..ffce8a7
--- /dev/null
+++ b/test/test_account__service_account_api.py
@@ -0,0 +1,76 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.account__service_account_api import AccountServiceAccountApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccountServiceAccountApi(unittest.TestCase):
+    """AccountServiceAccountApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.account__service_account_api.AccountServiceAccountApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_activate_account(self):
+        """Test case for activate_account
+
+        Activates the given service account  # noqa: E501
+        """
+        pass
+
+    def test_create_service_account(self):
+        """Test case for create_service_account
+
+        Creates a service account  # noqa: E501
+        """
+        pass
+
+    def test_deactivate_account(self):
+        """Test case for deactivate_account
+
+        Deactivates the given service account  # noqa: E501
+        """
+        pass
+
+    def test_get_all_service_accounts(self):
+        """Test case for get_all_service_accounts
+
+        Get all service accounts  # noqa: E501
+        """
+        pass
+
+    def test_get_service_account(self):
+        """Test case for get_service_account
+
+        Retrieves a service account by identifier  # noqa: E501
+        """
+        pass
+
+    def test_update_service_account(self):
+        """Test case for update_service_account
+
+        Updates the service account  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_app_dynamics_configuration.py b/test/test_app_dynamics_configuration.py
new file mode 100644
index 0000000..1e29740
--- /dev/null
+++ b/test/test_app_dynamics_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAppDynamicsConfiguration(unittest.TestCase):
+    """AppDynamicsConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAppDynamicsConfiguration(self):
+        """Test AppDynamicsConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.app_dynamics_configuration.AppDynamicsConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_account.py b/test/test_paged_account.py
new file mode 100644
index 0000000..4666781
--- /dev/null
+++ b/test/test_paged_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_account import PagedAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedAccount(unittest.TestCase):
+    """PagedAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedAccount(self):
+        """Test PagedAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_account.PagedAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_service_account.py b/test/test_paged_service_account.py
new file mode 100644
index 0000000..5f8e243
--- /dev/null
+++ b/test/test_paged_service_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_service_account import PagedServiceAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedServiceAccount(unittest.TestCase):
+    """PagedServiceAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedServiceAccount(self):
+        """Test PagedServiceAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_service_account.PagedServiceAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_service_account.py b/test/test_response_container_list_service_account.py
new file mode 100644
index 0000000..f6e2c13
--- /dev/null
+++ b/test/test_response_container_list_service_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListServiceAccount(unittest.TestCase):
+    """ResponseContainerListServiceAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListServiceAccount(self):
+        """Test ResponseContainerListServiceAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_service_account.ResponseContainerListServiceAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_account.py b/test/test_response_container_paged_account.py
new file mode 100644
index 0000000..bfdff3e
--- /dev/null
+++ b/test/test_response_container_paged_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedAccount(unittest.TestCase):
+    """ResponseContainerPagedAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedAccount(self):
+        """Test ResponseContainerPagedAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_account.ResponseContainerPagedAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_service_account.py b/test/test_response_container_paged_service_account.py
new file mode 100644
index 0000000..5eef6e9
--- /dev/null
+++ b/test/test_response_container_paged_service_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedServiceAccount(unittest.TestCase):
+    """ResponseContainerPagedServiceAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedServiceAccount(self):
+        """Test ResponseContainerPagedServiceAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_service_account.ResponseContainerPagedServiceAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_service_account.py b/test/test_response_container_service_account.py
new file mode 100644
index 0000000..9960b2e
--- /dev/null
+++ b/test/test_response_container_service_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerServiceAccount(unittest.TestCase):
+    """ResponseContainerServiceAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerServiceAccount(self):
+        """Test ResponseContainerServiceAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_service_account.ResponseContainerServiceAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_service_account.py b/test/test_service_account.py
new file mode 100644
index 0000000..08e4ab8
--- /dev/null
+++ b/test/test_service_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.service_account import ServiceAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestServiceAccount(unittest.TestCase):
+    """ServiceAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testServiceAccount(self):
+        """Test ServiceAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.service_account.ServiceAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_service_account_write.py b/test/test_service_account_write.py
new file mode 100644
index 0000000..1e3c1c0
--- /dev/null
+++ b/test/test_service_account_write.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.service_account_write import ServiceAccountWrite  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestServiceAccountWrite(unittest.TestCase):
+    """ServiceAccountWrite unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testServiceAccountWrite(self):
+        """Test ServiceAccountWrite"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.service_account_write.ServiceAccountWrite()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_span.py b/test/test_span.py
new file mode 100644
index 0000000..f5393e9
--- /dev/null
+++ b/test/test_span.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.span import Span  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSpan(unittest.TestCase):
+    """Span unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSpan(self):
+        """Test Span"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.span.Span()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_stats_model_internal_use.py b/test/test_stats_model_internal_use.py
new file mode 100644
index 0000000..afe4ae1
--- /dev/null
+++ b/test/test_stats_model_internal_use.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestStatsModelInternalUse(unittest.TestCase):
+    """StatsModelInternalUse unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testStatsModelInternalUse(self):
+        """Test StatsModelInternalUse"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.stats_model_internal_use.StatsModelInternalUse()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_trace.py b/test/test_trace.py
new file mode 100644
index 0000000..0d1be98
--- /dev/null
+++ b/test/test_trace.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.trace import Trace  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTrace(unittest.TestCase):
+    """Trace unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTrace(self):
+        """Test Trace"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.trace.Trace()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index cc52389..aa36eee 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -16,6 +16,7 @@
 from __future__ import absolute_import
 
 # import apis into sdk package
+from wavefront_api_client.api.account__service_account_api import AccountServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
@@ -48,7 +49,9 @@
 from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO
 from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
+from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
@@ -103,6 +106,7 @@
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
 from wavefront_api_client.models.number import Number
+from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
@@ -118,6 +122,7 @@
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
+from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
 from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
@@ -140,6 +145,7 @@
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
+from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
 from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel
@@ -148,6 +154,7 @@
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
+from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
 from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration
@@ -163,10 +170,12 @@
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
+from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
+from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
@@ -175,16 +184,20 @@
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
+from wavefront_api_client.models.service_account import ServiceAccount
+from wavefront_api_client.models.service_account_write import ServiceAccountWrite
 from wavefront_api_client.models.sortable_search_request import SortableSearchRequest
 from wavefront_api_client.models.sorting import Sorting
 from wavefront_api_client.models.source import Source
 from wavefront_api_client.models.source_label_pair import SourceLabelPair
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
-from wavefront_api_client.models.stats_model import StatsModel
+from wavefront_api_client.models.span import Span
+from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
+from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.user import User
 from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index fdeab62..dd6df96 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -3,6 +3,7 @@
 # flake8: noqa
 
 # import apis into api package
+from wavefront_api_client.api.account__service_account_api import AccountServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
diff --git a/wavefront_api_client/api/account__service_account_api.py b/wavefront_api_client/api/account__service_account_api.py
new file mode 100644
index 0000000..4a7a1e9
--- /dev/null
+++ b/wavefront_api_client/api/account__service_account_api.py
@@ -0,0 +1,612 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class AccountServiceAccountApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def activate_account(self, id, **kwargs):  # noqa: E501
+        """Activates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.activate_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.activate_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.activate_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Activates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.activate_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method activate_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `activate_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}/activate', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_service_account(self, **kwargs):  # noqa: E501
+        """Creates a service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_service_account(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_service_account_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_service_account_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
+        """Creates a service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_service_account_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def deactivate_account(self, id, **kwargs):  # noqa: E501
+        """Deactivates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.deactivate_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.deactivate_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.deactivate_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Deactivates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.deactivate_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method deactivate_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `deactivate_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}/deactivate', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_service_accounts(self, **kwargs):  # noqa: E501
+        """Get all service accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_service_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_service_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_service_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all service accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_service_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_service_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_service_account(self, id, **kwargs):  # noqa: E501
+        """Retrieves a service account by identifier  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_service_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_service_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_service_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Retrieves a service account by identifier  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_service_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_service_account(self, id, **kwargs):  # noqa: E501
+        """Updates the service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_service_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_service_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Updates the service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 7772ea6..1c6e955 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -235,103 +235,6 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def can_user_modify(self, id, **kwargs):  # noqa: E501
-        """can_user_modify  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.can_user_modify(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param User body:
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.can_user_modify_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.can_user_modify_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def can_user_modify_with_http_info(self, id, **kwargs):  # noqa: E501
-        """can_user_modify  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.can_user_modify_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param User body:
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method can_user_modify" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `can_user_modify`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/alert/{id}/canUserModify', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type=None,  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def clone_alert(self, id, **kwargs):  # noqa: E501
         """Clones the specified alert  # noqa: E501
 
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index e679254..c7b3218 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -215,6 +215,208 @@ def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def delete_token_service_account(self, id, token, **kwargs):  # noqa: E501
+        """Delete the specified api token of the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_token_service_account(id, token, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str token: (required)
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_token_service_account_with_http_info(id, token, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_token_service_account_with_http_info(id, token, **kwargs)  # noqa: E501
+            return data
+
+    def delete_token_service_account_with_http_info(self, id, token, **kwargs):  # noqa: E501
+        """Delete the specified api token of the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_token_service_account_with_http_info(id, token, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str token: (required)
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'token']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_token_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_token_service_account`")  # noqa: E501
+        # verify the required parameter 'token' is set
+        if ('token' not in params or
+                params['token'] is None):
+            raise ValueError("Missing the required parameter `token` when calling `delete_token_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'token' in params:
+            path_params['token'] = params['token']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/serviceaccount/{id}/{token}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def generate_token_service_account(self, id, **kwargs):  # noqa: E501
+        """Create a new api token for the service account  # noqa: E501
+
+        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.generate_token_service_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserApiToken body:
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.generate_token_service_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.generate_token_service_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Create a new api token for the service account  # noqa: E501
+
+        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.generate_token_service_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserApiToken body:
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method generate_token_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `generate_token_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/serviceaccount/{id}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_tokens(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
@@ -302,6 +504,101 @@ def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_tokens_service_account(self, id, **kwargs):  # noqa: E501
+        """Get all api tokens for the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_tokens_service_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_tokens_service_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_tokens_service_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get all api tokens for the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_tokens_service_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerListUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_tokens_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_tokens_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/serviceaccount/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def update_token_name(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
@@ -404,3 +701,114 @@ def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
+
+    def update_token_name_service_account(self, id, token, **kwargs):  # noqa: E501
+        """Update the name of the specified api token for the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_token_name_service_account(id, token, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str token: (required)
+        :param UserApiToken body: Example Body:  <pre>{   \"tokenID\": \"Token identifier\",   \"tokenName\": \"Token name\" }</pre>
+        :return: ResponseContainerUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_token_name_service_account_with_http_info(id, token, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_token_name_service_account_with_http_info(id, token, **kwargs)  # noqa: E501
+            return data
+
+    def update_token_name_service_account_with_http_info(self, id, token, **kwargs):  # noqa: E501
+        """Update the name of the specified api token for the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_token_name_service_account_with_http_info(id, token, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str token: (required)
+        :param UserApiToken body: Example Body:  <pre>{   \"tokenID\": \"Token identifier\",   \"tokenName\": \"Token name\" }</pre>
+        :return: ResponseContainerUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'token', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_token_name_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_token_name_service_account`")  # noqa: E501
+        # verify the required parameter 'token' is set
+        if ('token' not in params or
+                params['token'] is None):
+            raise ValueError("Missing the required parameter `token` when calling `update_token_name_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'token' in params:
+            path_params['token'] = params['token']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/serviceaccount/{id}/{token}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index b18adfe..ac026d3 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -33,40 +33,40 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def search_alert_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted alerts  # noqa: E501
+    def search_account_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_deleted_entities(async_req=True)
+        >>> thread = api.search_account_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedAlert
+        :return: ResponseContainerPagedAccount
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_alert_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_account_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_alert_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_account_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted alerts  # noqa: E501
+    def search_account_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_account_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedAlert
+        :return: ResponseContainerPagedAccount
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -82,7 +82,7 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_alert_deleted_entities" % key
+                    " to method search_account_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -113,14 +113,14 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/alert/deleted', 'POST',
+            '/api/v2/search/account', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedAlert',  # noqa: E501
+            response_type='ResponseContainerPagedAccount',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -128,13 +128,13 @@ def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
+    def search_account_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_account_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -146,18 +146,18 @@ def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_alert_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_account_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_alert_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_account_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
+    def search_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_account_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -179,14 +179,14 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_alert_deleted_for_facet" % key
+                    " to method search_account_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_alert_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_account_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -216,7 +216,7 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/alert/deleted/{facet}', 'POST',
+            '/api/v2/search/account/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -231,13 +231,13 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_alert_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
+    def search_account_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_deleted_for_facets(async_req=True)
+        >>> thread = api.search_account_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -248,18 +248,18 @@ def search_alert_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_alert_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_account_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_alert_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_account_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
+    def search_account_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_account_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -280,7 +280,7 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_alert_deleted_for_facets" % key
+                    " to method search_account_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -311,7 +311,7 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/alert/deleted/facets', 'POST',
+            '/api/v2/search/account/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -326,40 +326,40 @@ def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_alert_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted alerts  # noqa: E501
+    def search_alert_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_entities(async_req=True)
+        >>> thread = api.search_alert_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedAlertWithStats
+        :return: ResponseContainerPagedAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_alert_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_alert_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_alert_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_alert_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted alerts  # noqa: E501
+    def search_alert_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_entities_with_http_info(async_req=True)
+        >>> thread = api.search_alert_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedAlertWithStats
+        :return: ResponseContainerPagedAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -375,7 +375,7 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_alert_entities" % key
+                    " to method search_alert_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -406,14 +406,14 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/alert', 'POST',
+            '/api/v2/search/alert/deleted', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedAlertWithStats',  # noqa: E501
+            response_type='ResponseContainerPagedAlert',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -421,13 +421,13 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
+    def search_alert_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_for_facet(facet, async_req=True)
+        >>> thread = api.search_alert_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -439,18 +439,18 @@ def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_alert_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_alert_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_alert_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_alert_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
+    def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_alert_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -472,14 +472,14 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_alert_for_facet" % key
+                    " to method search_alert_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_alert_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_alert_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -509,7 +509,7 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/alert/{facet}', 'POST',
+            '/api/v2/search/alert/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -524,13 +524,13 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_alert_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
+    def search_alert_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_for_facets(async_req=True)
+        >>> thread = api.search_alert_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -541,18 +541,18 @@ def search_alert_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_alert_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_alert_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_alert_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_alert_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
+    def search_alert_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_alert_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_alert_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -573,7 +573,7 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_alert_for_facets" % key
+                    " to method search_alert_deleted_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -604,7 +604,7 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/alert/facets', 'POST',
+            '/api/v2/search/alert/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -619,40 +619,40 @@ def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_cloud_integration_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted cloud integrations  # noqa: E501
+    def search_alert_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_deleted_entities(async_req=True)
+        >>> thread = api.search_alert_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedCloudIntegration
+        :return: ResponseContainerPagedAlertWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_cloud_integration_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_alert_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_cloud_integration_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_alert_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted cloud integrations  # noqa: E501
+    def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_alert_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedCloudIntegration
+        :return: ResponseContainerPagedAlertWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -668,7 +668,7 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_cloud_integration_deleted_entities" % key
+                    " to method search_alert_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -699,14 +699,14 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/cloudintegration/deleted', 'POST',
+            '/api/v2/search/alert', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedCloudIntegration',  # noqa: E501
+            response_type='ResponseContainerPagedAlertWithStats',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -714,13 +714,13 @@ def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
+    def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_alert_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -732,18 +732,18 @@ def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa:
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_cloud_integration_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_alert_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_cloud_integration_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_alert_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
+    def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_alert_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -765,14 +765,14 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_cloud_integration_deleted_for_facet" % key
+                    " to method search_alert_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_cloud_integration_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_alert_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -802,7 +802,7 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/cloudintegration/deleted/{facet}', 'POST',
+            '/api/v2/search/alert/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -817,13 +817,13 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_cloud_integration_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
+    def search_alert_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_deleted_for_facets(async_req=True)
+        >>> thread = api.search_alert_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -834,18 +834,18 @@ def search_cloud_integration_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_cloud_integration_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_alert_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_cloud_integration_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_alert_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
+    def search_alert_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_alert_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -866,7 +866,7 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_cloud_integration_deleted_for_facets" % key
+                    " to method search_alert_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -897,7 +897,7 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/cloudintegration/deleted/facets', 'POST',
+            '/api/v2/search/alert/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -912,13 +912,13 @@ def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_cloud_integration_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted cloud integrations  # noqa: E501
+    def search_cloud_integration_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_entities(async_req=True)
+        >>> thread = api.search_cloud_integration_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -929,18 +929,18 @@ def search_cloud_integration_entities(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_cloud_integration_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_cloud_integration_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_cloud_integration_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_cloud_integration_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted cloud integrations  # noqa: E501
+    def search_cloud_integration_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_entities_with_http_info(async_req=True)
+        >>> thread = api.search_cloud_integration_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -961,7 +961,7 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_cloud_integration_entities" % key
+                    " to method search_cloud_integration_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -992,7 +992,7 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/cloudintegration', 'POST',
+            '/api/v2/search/cloudintegration/deleted', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1007,13 +1007,13 @@ def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
+    def search_cloud_integration_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_for_facet(facet, async_req=True)
+        >>> thread = api.search_cloud_integration_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1025,18 +1025,18 @@ def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_cloud_integration_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_cloud_integration_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_cloud_integration_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_cloud_integration_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
+    def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_cloud_integration_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1058,14 +1058,14 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_cloud_integration_for_facet" % key
+                    " to method search_cloud_integration_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_cloud_integration_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_cloud_integration_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1095,7 +1095,7 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/cloudintegration/{facet}', 'POST',
+            '/api/v2/search/cloudintegration/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1110,13 +1110,13 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_cloud_integration_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
+    def search_cloud_integration_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_for_facets(async_req=True)
+        >>> thread = api.search_cloud_integration_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1127,18 +1127,18 @@ def search_cloud_integration_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_cloud_integration_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_cloud_integration_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_cloud_integration_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_cloud_integration_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
+    def search_cloud_integration_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_cloud_integration_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_cloud_integration_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1159,7 +1159,7 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_cloud_integration_for_facets" % key
+                    " to method search_cloud_integration_deleted_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1190,7 +1190,7 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/cloudintegration/facets', 'POST',
+            '/api/v2/search/cloudintegration/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1205,40 +1205,40 @@ def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_dashboard_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted dashboards  # noqa: E501
+    def search_cloud_integration_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_deleted_entities(async_req=True)
+        >>> thread = api.search_cloud_integration_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDashboard
+        :return: ResponseContainerPagedCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_dashboard_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_cloud_integration_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_dashboard_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_cloud_integration_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted dashboards  # noqa: E501
+    def search_cloud_integration_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_cloud_integration_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDashboard
+        :return: ResponseContainerPagedCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1254,7 +1254,7 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_dashboard_deleted_entities" % key
+                    " to method search_cloud_integration_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1285,14 +1285,14 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/dashboard/deleted', 'POST',
+            '/api/v2/search/cloudintegration', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedDashboard',  # noqa: E501
+            response_type='ResponseContainerPagedCloudIntegration',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1300,13 +1300,13 @@ def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
+    def search_cloud_integration_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_cloud_integration_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1318,18 +1318,18 @@ def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_dashboard_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_cloud_integration_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_dashboard_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_cloud_integration_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
+    def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_cloud_integration_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1351,14 +1351,14 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_dashboard_deleted_for_facet" % key
+                    " to method search_cloud_integration_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_dashboard_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_cloud_integration_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1388,7 +1388,7 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/dashboard/deleted/{facet}', 'POST',
+            '/api/v2/search/cloudintegration/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1403,13 +1403,13 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_dashboard_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
+    def search_cloud_integration_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_deleted_for_facets(async_req=True)
+        >>> thread = api.search_cloud_integration_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1420,18 +1420,18 @@ def search_dashboard_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_dashboard_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_cloud_integration_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_dashboard_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_cloud_integration_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
+    def search_cloud_integration_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted cloud integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_cloud_integration_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1452,7 +1452,7 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_dashboard_deleted_for_facets" % key
+                    " to method search_cloud_integration_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1483,7 +1483,7 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/dashboard/deleted/facets', 'POST',
+            '/api/v2/search/cloudintegration/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1498,13 +1498,13 @@ def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_dashboard_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted dashboards  # noqa: E501
+    def search_dashboard_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_entities(async_req=True)
+        >>> thread = api.search_dashboard_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1515,18 +1515,18 @@ def search_dashboard_entities(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_dashboard_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_dashboard_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_dashboard_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_dashboard_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted dashboards  # noqa: E501
+    def search_dashboard_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_entities_with_http_info(async_req=True)
+        >>> thread = api.search_dashboard_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1547,7 +1547,7 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_dashboard_entities" % key
+                    " to method search_dashboard_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1578,7 +1578,7 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/dashboard', 'POST',
+            '/api/v2/search/dashboard/deleted', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1593,13 +1593,13 @@ def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
+    def search_dashboard_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_for_facet(facet, async_req=True)
+        >>> thread = api.search_dashboard_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1611,18 +1611,18 @@ def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_dashboard_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_dashboard_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_dashboard_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_dashboard_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
+    def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_dashboard_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1644,14 +1644,14 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_dashboard_for_facet" % key
+                    " to method search_dashboard_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_dashboard_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_dashboard_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1681,7 +1681,7 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/dashboard/{facet}', 'POST',
+            '/api/v2/search/dashboard/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1696,13 +1696,13 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_dashboard_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
+    def search_dashboard_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_for_facets(async_req=True)
+        >>> thread = api.search_dashboard_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1713,18 +1713,18 @@ def search_dashboard_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_dashboard_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_dashboard_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_dashboard_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_dashboard_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
+    def search_dashboard_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_dashboard_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_dashboard_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1745,7 +1745,7 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_dashboard_for_facets" % key
+                    " to method search_dashboard_deleted_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1776,7 +1776,7 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/dashboard/facets', 'POST',
+            '/api/v2/search/dashboard/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1791,40 +1791,40 @@ def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_external_link_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's external links  # noqa: E501
+    def search_dashboard_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_external_link_entities(async_req=True)
+        >>> thread = api.search_dashboard_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedExternalLink
+        :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_external_link_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_dashboard_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_external_link_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_dashboard_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's external links  # noqa: E501
+    def search_dashboard_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_external_link_entities_with_http_info(async_req=True)
+        >>> thread = api.search_dashboard_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedExternalLink
+        :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1840,7 +1840,7 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_external_link_entities" % key
+                    " to method search_dashboard_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1871,14 +1871,14 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/extlink', 'POST',
+            '/api/v2/search/dashboard', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedExternalLink',  # noqa: E501
+            response_type='ResponseContainerPagedDashboard',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1886,13 +1886,13 @@ def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's external links  # noqa: E501
+    def search_dashboard_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_external_links_for_facet(facet, async_req=True)
+        >>> thread = api.search_dashboard_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1904,18 +1904,18 @@ def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_external_links_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_dashboard_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_external_links_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_dashboard_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's external links  # noqa: E501
+    def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_external_links_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_dashboard_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1937,14 +1937,14 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_external_links_for_facet" % key
+                    " to method search_dashboard_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_external_links_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_dashboard_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1974,7 +1974,7 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/extlink/{facet}', 'POST',
+            '/api/v2/search/dashboard/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1989,13 +1989,13 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_external_links_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's external links  # noqa: E501
+    def search_dashboard_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_external_links_for_facets(async_req=True)
+        >>> thread = api.search_dashboard_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2006,18 +2006,18 @@ def search_external_links_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_external_links_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_dashboard_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_external_links_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_dashboard_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's external links  # noqa: E501
+    def search_dashboard_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_external_links_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_dashboard_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2038,7 +2038,7 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_external_links_for_facets" % key
+                    " to method search_dashboard_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -2069,7 +2069,7 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/extlink/facets', 'POST',
+            '/api/v2/search/dashboard/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2084,40 +2084,40 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_maintenance_window_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's maintenance windows  # noqa: E501
+    def search_external_link_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_maintenance_window_entities(async_req=True)
+        >>> thread = api.search_external_link_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedMaintenanceWindow
+        :return: ResponseContainerPagedExternalLink
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_maintenance_window_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_external_link_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_maintenance_window_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_external_link_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's maintenance windows  # noqa: E501
+    def search_external_link_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_maintenance_window_entities_with_http_info(async_req=True)
+        >>> thread = api.search_external_link_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedMaintenanceWindow
+        :return: ResponseContainerPagedExternalLink
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2133,7 +2133,7 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_maintenance_window_entities" % key
+                    " to method search_external_link_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -2164,14 +2164,14 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/maintenancewindow', 'POST',
+            '/api/v2/search/extlink', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedMaintenanceWindow',  # noqa: E501
+            response_type='ResponseContainerPagedExternalLink',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -2179,13 +2179,13 @@ def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
+    def search_external_links_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_maintenance_window_for_facet(facet, async_req=True)
+        >>> thread = api.search_external_links_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2197,18 +2197,18 @@ def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_maintenance_window_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_external_links_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_maintenance_window_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_external_links_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
+    def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_maintenance_window_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_external_links_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2230,14 +2230,14 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_maintenance_window_for_facet" % key
+                    " to method search_external_links_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_maintenance_window_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_external_links_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -2267,7 +2267,7 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/maintenancewindow/{facet}', 'POST',
+            '/api/v2/search/extlink/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2282,13 +2282,13 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_maintenance_window_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
+    def search_external_links_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_maintenance_window_for_facets(async_req=True)
+        >>> thread = api.search_external_links_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2299,18 +2299,18 @@ def search_maintenance_window_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_maintenance_window_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_external_links_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_maintenance_window_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_external_links_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
+    def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's external links  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_maintenance_window_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_external_links_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2331,7 +2331,7 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_maintenance_window_for_facets" % key
+                    " to method search_external_links_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -2362,7 +2362,7 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/maintenancewindow/facets', 'POST',
+            '/api/v2/search/extlink/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2377,26 +2377,319 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_notficant_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's notificants  # noqa: E501
+    def search_maintenance_window_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's maintenance windows  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notficant_for_facets(async_req=True)
+        >>> thread = api.search_maintenance_window_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMaintenanceWindow
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_maintenance_window_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_maintenance_window_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_maintenance_window_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's maintenance windows  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMaintenanceWindow
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_maintenance_window_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/maintenancewindow', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMaintenanceWindow',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_maintenance_window_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_maintenance_window_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_maintenance_window_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's maintenance windows  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_maintenance_window_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_maintenance_window_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/maintenancewindow/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_maintenance_window_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_maintenance_window_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_maintenance_window_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's maintenance windows  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_maintenance_window_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_maintenance_window_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/maintenancewindow/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_notficant_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notficant_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
     def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
@@ -2405,17 +2698,209 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notficant_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_notficant_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_notficant_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/notificant/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_notificant_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedNotificant
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedNotificant
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_notificant_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/notificant', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedNotificant',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
 
-        all_params = ['body']  # noqa: E501
+    def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -2426,14 +2911,20 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_notficant_for_facets" % key
+                    " to method search_notificant_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_notificant_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
 
         query_params = []
 
@@ -2457,14 +2948,14 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/notificant/facets', 'POST',
+            '/api/v2/search/notificant/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -2472,40 +2963,40 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_notificant_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's notificants  # noqa: E501
+    def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_entities(async_req=True)
+        >>> thread = api.search_proxy_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedNotificant
+        :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's notificants  # noqa: E501
+    def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_entities_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedNotificant
+        :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2521,7 +3012,7 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_notificant_entities" % key
+                    " to method search_proxy_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -2552,14 +3043,14 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/notificant', 'POST',
+            '/api/v2/search/proxy/deleted', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedNotificant',  # noqa: E501
+            response_type='ResponseContainerPagedProxy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -2567,13 +3058,13 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+    def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_for_facet(facet, async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2585,18 +3076,18 @@ def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+    def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2618,14 +3109,14 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_notificant_for_facet" % key
+                    " to method search_proxy_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_notificant_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -2655,7 +3146,7 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/notificant/{facet}', 'POST',
+            '/api/v2/search/proxy/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2670,13 +3161,108 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted proxies  # noqa: E501
+    def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_entities(async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_proxy_deleted_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/proxy/deleted/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_proxy_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted proxies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2687,18 +3273,18 @@ def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted proxies  # noqa: E501
+    def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2719,7 +3305,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_deleted_entities" % key
+                    " to method search_proxy_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -2750,7 +3336,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/deleted', 'POST',
+            '/api/v2/search/proxy', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2765,13 +3351,13 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_proxy_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2783,18 +3369,18 @@ def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_proxy_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2816,14 +3402,14 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_deleted_for_facet" % key
+                    " to method search_proxy_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -2853,7 +3439,7 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/deleted/{facet}', 'POST',
+            '/api/v2/search/proxy/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2868,13 +3454,13 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facets(async_req=True)
+        >>> thread = api.search_proxy_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2885,18 +3471,18 @@ def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -2917,7 +3503,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_deleted_for_facets" % key
+                    " to method search_proxy_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -2948,7 +3534,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/deleted/facets', 'POST',
+            '/api/v2/search/proxy/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -2963,40 +3549,40 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_entities(async_req=True)
+        >>> thread = api.search_registered_query_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedProxy
+        :return: ResponseContainerPagedDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_entities_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedProxy
+        :return: ResponseContainerPagedDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3012,7 +3598,7 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_entities" % key
+                    " to method search_registered_query_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3043,14 +3629,14 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy', 'POST',
+            '/api/v2/search/derivedmetric/deleted', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedProxy',  # noqa: E501
+            response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3058,13 +3644,13 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facet(facet, async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3076,18 +3662,18 @@ def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3109,14 +3695,14 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_for_facet" % key
+                    " to method search_registered_query_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -3146,7 +3732,7 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/{facet}', 'POST',
+            '/api/v2/search/derivedmetric/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3161,13 +3747,13 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facets(async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3178,18 +3764,18 @@ def search_proxy_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3210,7 +3796,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_for_facets" % key
+                    " to method search_registered_query_deleted_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3241,7 +3827,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/facets', 'POST',
+            '/api/v2/search/derivedmetric/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3256,40 +3842,40 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_entities(async_req=True)
+        >>> thread = api.search_registered_query_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinition
+        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinition
+        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3305,7 +3891,7 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_deleted_entities" % key
+                    " to method search_registered_query_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3336,14 +3922,14 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/deleted', 'POST',
+            '/api/v2/search/derivedmetric', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
+            response_type='ResponseContainerPagedDerivedMetricDefinitionWithStats',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3351,13 +3937,13 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_registered_query_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3369,18 +3955,18 @@ def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_registered_query_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3402,14 +3988,14 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_deleted_for_facet" % key
+                    " to method search_registered_query_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -3439,7 +4025,7 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/deleted/{facet}', 'POST',
+            '/api/v2/search/derivedmetric/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3454,13 +4040,13 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facets(async_req=True)
+        >>> thread = api.search_registered_query_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3471,18 +4057,18 @@ def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3503,7 +4089,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_deleted_for_facets" % key
+                    " to method search_registered_query_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3534,7 +4120,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/deleted/facets', 'POST',
+            '/api/v2/search/derivedmetric/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3549,40 +4135,40 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
+    def search_report_event_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_entities(async_req=True)
+        >>> thread = api.search_report_event_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
+    def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_entities_with_http_info(async_req=True)
+        >>> thread = api.search_report_event_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3598,7 +4184,7 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_entities" % key
+                    " to method search_report_event_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3629,14 +4215,14 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric', 'POST',
+            '/api/v2/search/event', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedDerivedMetricDefinitionWithStats',  # noqa: E501
+            response_type='ResponseContainerPagedEvent',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3644,13 +4230,13 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
+    def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facet(facet, async_req=True)
+        >>> thread = api.search_report_event_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3662,18 +4248,18 @@ def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
+    def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_report_event_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3695,14 +4281,14 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_for_facet" % key
+                    " to method search_report_event_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_report_event_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -3732,7 +4318,7 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/{facet}', 'POST',
+            '/api/v2/search/event/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3747,13 +4333,13 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
+    def search_report_event_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facets(async_req=True)
+        >>> thread = api.search_report_event_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3764,18 +4350,18 @@ def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
+    def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_report_event_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3796,7 +4382,7 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_for_facets" % key
+                    " to method search_report_event_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3827,7 +4413,7 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/facets', 'POST',
+            '/api/v2/search/event/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3842,40 +4428,40 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_report_event_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's events  # noqa: E501
+    def search_service_account_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_entities(async_req=True)
+        >>> thread = api.search_service_account_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param EventSearchRequest body:
-        :return: ResponseContainerPagedEvent
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedServiceAccount
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_service_account_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_service_account_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's events  # noqa: E501
+    def search_service_account_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_entities_with_http_info(async_req=True)
+        >>> thread = api.search_service_account_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param EventSearchRequest body:
-        :return: ResponseContainerPagedEvent
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedServiceAccount
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3891,7 +4477,7 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_report_event_entities" % key
+                    " to method search_service_account_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3922,14 +4508,14 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event', 'POST',
+            '/api/v2/search/serviceaccount', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedEvent',  # noqa: E501
+            response_type='ResponseContainerPagedServiceAccount',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3937,13 +4523,13 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's events  # noqa: E501
+    def search_service_account_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facet(facet, async_req=True)
+        >>> thread = api.search_service_account_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3955,18 +4541,18 @@ def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_service_account_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_service_account_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's events  # noqa: E501
+    def search_service_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_service_account_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3988,14 +4574,14 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_report_event_for_facet" % key
+                    " to method search_service_account_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_report_event_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_service_account_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -4025,7 +4611,7 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event/{facet}', 'POST',
+            '/api/v2/search/serviceaccount/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -4040,13 +4626,13 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_report_event_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's events  # noqa: E501
+    def search_service_account_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facets(async_req=True)
+        >>> thread = api.search_service_account_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4057,18 +4643,18 @@ def search_report_event_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_service_account_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_service_account_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's events  # noqa: E501
+    def search_service_account_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_service_account_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4089,7 +4675,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_report_event_for_facets" % key
+                    " to method search_service_account_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -4120,7 +4706,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event/facets', 'POST',
+            '/api/v2/search/serviceaccount/facets', 'POST',
             path_params,
             query_params,
             header_params,
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index dfcdc80..3305613 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -34,7 +34,7 @@ def __init__(self, api_client=None):
         self.api_client = api_client
 
     def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
-        """Adds specific user groups to the user  # noqa: E501
+        """Adds specific user groups to the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -44,7 +44,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be added to the user
+        :param list[str] body: The list of user groups that should be added to the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -57,7 +57,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
             return data
 
     def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Adds specific user groups to the user  # noqa: E501
+        """Adds specific user groups to the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -67,7 +67,7 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be added to the user
+        :param list[str] body: The list of user groups that should be added to the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -236,7 +236,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def delete_multiple_users(self, **kwargs):  # noqa: E501
-        """Deletes multiple users  # noqa: E501
+        """Deletes multiple users or service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -258,7 +258,7 @@ def delete_multiple_users(self, **kwargs):  # noqa: E501
             return data
 
     def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
-        """Deletes multiple users  # noqa: E501
+        """Deletes multiple users or service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -331,7 +331,7 @@ def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def delete_user(self, id, **kwargs):  # noqa: E501
-        """Deletes a user identified by id  # noqa: E501
+        """Deletes a user or service account identified by id  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -353,7 +353,7 @@ def delete_user(self, id, **kwargs):  # noqa: E501
             return data
 
     def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Deletes a user identified by id  # noqa: E501
+        """Deletes a user or service account identified by id  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -608,7 +608,7 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
-        """Grants a specific user permission to multiple users  # noqa: E501
+        """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -631,7 +631,7 @@ def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
             return data
 
     def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Grants a specific user permission to multiple users  # noqa: E501
+        """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -711,7 +711,7 @@ def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noq
             collection_formats=collection_formats)
 
     def grant_user_permission(self, id, **kwargs):  # noqa: E501
-        """Grants a specific user permission  # noqa: E501
+        """Grants a specific permission to user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -721,7 +721,7 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+        :param str group: Permission group to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -734,7 +734,7 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
             return data
 
     def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Grants a specific user permission  # noqa: E501
+        """Grants a specific permission to user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -744,7 +744,7 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param str group: Permission group to grant to this user.  Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+        :param str group: Permission group to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -909,7 +909,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
-        """Removes specific user groups from the user  # noqa: E501
+        """Removes specific user groups from the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -919,7 +919,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be removed from the user
+        :param list[str] body: The list of user groups that should be removed from the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -932,7 +932,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
             return data
 
     def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Removes specific user groups from the user  # noqa: E501
+        """Removes specific user groups from the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -942,7 +942,7 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be removed from the user
+        :param list[str] body: The list of user groups that should be removed from the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1012,7 +1012,7 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
             collection_formats=collection_formats)
 
     def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
-        """Revokes a specific user permission from multiple users  # noqa: E501
+        """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1021,8 +1021,8 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
-        :param list[str] body: List of users which should be revoked by specified permission
+        :param str permission: Permission to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: List of users or service accounts which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1035,7 +1035,7 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
             return data
 
     def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Revokes a specific user permission from multiple users  # noqa: E501
+        """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1044,8 +1044,8 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to the users. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
-        :param list[str] body: List of users which should be revoked by specified permission
+        :param str permission: Permission to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: List of users or service accounts which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1115,7 +1115,7 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
             collection_formats=collection_formats)
 
     def revoke_user_permission(self, id, **kwargs):  # noqa: E501
-        """Revokes a specific user permission  # noqa: E501
+        """Revokes a specific permission from user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1138,7 +1138,7 @@ def revoke_user_permission(self, id, **kwargs):  # noqa: E501
             return data
 
     def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Revokes a specific user permission  # noqa: E501
+        """Revokes a specific permission from user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1321,7 +1321,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def validate_users(self, **kwargs):  # noqa: E501
-        """Returns valid users and invalid identifiers from the given list  # noqa: E501
+        """Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1343,7 +1343,7 @@ def validate_users(self, **kwargs):  # noqa: E501
             return data
 
     def validate_users_with_http_info(self, **kwargs):  # noqa: E501
-        """Returns valid users and invalid identifiers from the given list  # noqa: E501
+        """Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index eddea5e..53a88ec 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.33.15/python'
+        self.user_agent = 'Swagger-Codegen/2.35.25/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index c0658be..ceb1864 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.33.15".\
+               "SDK Package Version: 2.35.25".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index f36036d..4f4341d 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -20,7 +20,9 @@
 from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO
 from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
+from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
@@ -75,6 +77,7 @@
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
 from wavefront_api_client.models.number import Number
+from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
@@ -90,6 +93,7 @@
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
+from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
 from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
@@ -112,6 +116,7 @@
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
+from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
 from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel
@@ -120,6 +125,7 @@
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
+from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
 from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration
@@ -135,10 +141,12 @@
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
+from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
+from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
@@ -147,16 +155,20 @@
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
+from wavefront_api_client.models.service_account import ServiceAccount
+from wavefront_api_client.models.service_account_write import ServiceAccountWrite
 from wavefront_api_client.models.sortable_search_request import SortableSearchRequest
 from wavefront_api_client.models.sorting import Sorting
 from wavefront_api_client.models.source import Source
 from wavefront_api_client.models.source_label_pair import SourceLabelPair
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
-from wavefront_api_client.models.stats_model import StatsModel
+from wavefront_api_client.models.span import Span
+from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
+from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.user import User
 from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
new file mode 100644
index 0000000..f5c388d
--- /dev/null
+++ b/wavefront_api_client/models/account.py
@@ -0,0 +1,174 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Account(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'groups': 'list[str]',
+        'identifier': 'str',
+        'user_groups': 'list[str]'
+    }
+
+    attribute_map = {
+        'groups': 'groups',
+        'identifier': 'identifier',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, groups=None, identifier=None, user_groups=None):  # noqa: E501
+        """Account - a model defined in Swagger"""  # noqa: E501
+
+        self._groups = None
+        self._identifier = None
+        self._user_groups = None
+        self.discriminator = None
+
+        if groups is not None:
+            self.groups = groups
+        self.identifier = identifier
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def groups(self):
+        """Gets the groups of this Account.  # noqa: E501
+
+        The list of account's permissions.  # noqa: E501
+
+        :return: The groups of this Account.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this Account.
+
+        The list of account's permissions.  # noqa: E501
+
+        :param groups: The groups of this Account.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this Account.  # noqa: E501
+
+        The unique identifier of an account.  # noqa: E501
+
+        :return: The identifier of this Account.  # noqa: E501
+        :rtype: str
+        """
+        return self._identifier
+
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this Account.
+
+        The unique identifier of an account.  # noqa: E501
+
+        :param identifier: The identifier of this Account.  # noqa: E501
+        :type: str
+        """
+        if identifier is None:
+            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
+
+        self._identifier = identifier
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this Account.  # noqa: E501
+
+        The list of account's user groups.  # noqa: E501
+
+        :return: The user_groups of this Account.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this Account.
+
+        The list of account's user groups.  # noqa: E501
+
+        :param user_groups: The user_groups of this Account.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Account, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Account):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 33b22f3..eef651e 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -44,7 +44,6 @@ class Alert(object):
         'alerts_last_day': 'int',
         'alerts_last_month': 'int',
         'alerts_last_week': 'int',
-        'can_user_modify': 'bool',
         'condition': 'str',
         'condition_qb_enabled': 'bool',
         'condition_qb_serialization': 'str',
@@ -73,6 +72,7 @@ class Alert(object):
         'last_query_time': 'int',
         'metrics_used': 'list[str]',
         'minutes': 'int',
+        'modify_acl_access': 'bool',
         'name': 'str',
         'no_data_event': 'Event',
         'notificants': 'list[str]',
@@ -108,7 +108,6 @@ class Alert(object):
         'alerts_last_day': 'alertsLastDay',
         'alerts_last_month': 'alertsLastMonth',
         'alerts_last_week': 'alertsLastWeek',
-        'can_user_modify': 'canUserModify',
         'condition': 'condition',
         'condition_qb_enabled': 'conditionQBEnabled',
         'condition_qb_serialization': 'conditionQBSerialization',
@@ -137,6 +136,7 @@ class Alert(object):
         'last_query_time': 'lastQueryTime',
         'metrics_used': 'metricsUsed',
         'minutes': 'minutes',
+        'modify_acl_access': 'modifyAclAccess',
         'name': 'name',
         'no_data_event': 'noDataEvent',
         'notificants': 'notificants',
@@ -164,7 +164,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, can_user_modify=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -174,7 +174,6 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._alerts_last_day = None
         self._alerts_last_month = None
         self._alerts_last_week = None
-        self._can_user_modify = None
         self._condition = None
         self._condition_qb_enabled = None
         self._condition_qb_serialization = None
@@ -203,6 +202,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._last_query_time = None
         self._metrics_used = None
         self._minutes = None
+        self._modify_acl_access = None
         self._name = None
         self._no_data_event = None
         self._notificants = None
@@ -244,8 +244,6 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.alerts_last_month = alerts_last_month
         if alerts_last_week is not None:
             self.alerts_last_week = alerts_last_week
-        if can_user_modify is not None:
-            self.can_user_modify = can_user_modify
         self.condition = condition
         if condition_qb_enabled is not None:
             self.condition_qb_enabled = condition_qb_enabled
@@ -300,6 +298,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         if metrics_used is not None:
             self.metrics_used = metrics_used
         self.minutes = minutes
+        if modify_acl_access is not None:
+            self.modify_acl_access = modify_acl_access
         self.name = name
         if no_data_event is not None:
             self.no_data_event = no_data_event
@@ -509,29 +509,6 @@ def alerts_last_week(self, alerts_last_week):
 
         self._alerts_last_week = alerts_last_week
 
-    @property
-    def can_user_modify(self):
-        """Gets the can_user_modify of this Alert.  # noqa: E501
-
-        Whether the user can modify the alert.  # noqa: E501
-
-        :return: The can_user_modify of this Alert.  # noqa: E501
-        :rtype: bool
-        """
-        return self._can_user_modify
-
-    @can_user_modify.setter
-    def can_user_modify(self, can_user_modify):
-        """Sets the can_user_modify of this Alert.
-
-        Whether the user can modify the alert.  # noqa: E501
-
-        :param can_user_modify: The can_user_modify of this Alert.  # noqa: E501
-        :type: bool
-        """
-
-        self._can_user_modify = can_user_modify
-
     @property
     def condition(self):
         """Gets the condition of this Alert.  # noqa: E501
@@ -1164,6 +1141,29 @@ def minutes(self, minutes):
 
         self._minutes = minutes
 
+    @property
+    def modify_acl_access(self):
+        """Gets the modify_acl_access of this Alert.  # noqa: E501
+
+        Whether the user has modify ACL access to the alert.  # noqa: E501
+
+        :return: The modify_acl_access of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._modify_acl_access
+
+    @modify_acl_access.setter
+    def modify_acl_access(self, modify_acl_access):
+        """Sets the modify_acl_access of this Alert.
+
+        Whether the user has modify ACL access to the alert.  # noqa: E501
+
+        :param modify_acl_access: The modify_acl_access of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._modify_acl_access = modify_acl_access
+
     @property
     def name(self):
         """Gets the name of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/app_dynamics_configuration.py b/wavefront_api_client/models/app_dynamics_configuration.py
new file mode 100644
index 0000000..e500467
--- /dev/null
+++ b/wavefront_api_client/models/app_dynamics_configuration.py
@@ -0,0 +1,428 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AppDynamicsConfiguration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'app_filter_regex': 'list[str]',
+        'controller_name': 'str',
+        'enable_app_infra_metrics': 'bool',
+        'enable_backend_metrics': 'bool',
+        'enable_business_trx_metrics': 'bool',
+        'enable_error_metrics': 'bool',
+        'enable_individual_node_metrics': 'bool',
+        'enable_overall_perf_metrics': 'bool',
+        'enable_rollup': 'bool',
+        'enable_service_endpoint_metrics': 'bool',
+        'encrypted_password': 'str',
+        'user_name': 'str'
+    }
+
+    attribute_map = {
+        'app_filter_regex': 'appFilterRegex',
+        'controller_name': 'controllerName',
+        'enable_app_infra_metrics': 'enableAppInfraMetrics',
+        'enable_backend_metrics': 'enableBackendMetrics',
+        'enable_business_trx_metrics': 'enableBusinessTrxMetrics',
+        'enable_error_metrics': 'enableErrorMetrics',
+        'enable_individual_node_metrics': 'enableIndividualNodeMetrics',
+        'enable_overall_perf_metrics': 'enableOverallPerfMetrics',
+        'enable_rollup': 'enableRollup',
+        'enable_service_endpoint_metrics': 'enableServiceEndpointMetrics',
+        'encrypted_password': 'encryptedPassword',
+        'user_name': 'userName'
+    }
+
+    def __init__(self, app_filter_regex=None, controller_name=None, enable_app_infra_metrics=None, enable_backend_metrics=None, enable_business_trx_metrics=None, enable_error_metrics=None, enable_individual_node_metrics=None, enable_overall_perf_metrics=None, enable_rollup=None, enable_service_endpoint_metrics=None, encrypted_password=None, user_name=None):  # noqa: E501
+        """AppDynamicsConfiguration - a model defined in Swagger"""  # noqa: E501
+
+        self._app_filter_regex = None
+        self._controller_name = None
+        self._enable_app_infra_metrics = None
+        self._enable_backend_metrics = None
+        self._enable_business_trx_metrics = None
+        self._enable_error_metrics = None
+        self._enable_individual_node_metrics = None
+        self._enable_overall_perf_metrics = None
+        self._enable_rollup = None
+        self._enable_service_endpoint_metrics = None
+        self._encrypted_password = None
+        self._user_name = None
+        self.discriminator = None
+
+        if app_filter_regex is not None:
+            self.app_filter_regex = app_filter_regex
+        self.controller_name = controller_name
+        if enable_app_infra_metrics is not None:
+            self.enable_app_infra_metrics = enable_app_infra_metrics
+        if enable_backend_metrics is not None:
+            self.enable_backend_metrics = enable_backend_metrics
+        if enable_business_trx_metrics is not None:
+            self.enable_business_trx_metrics = enable_business_trx_metrics
+        if enable_error_metrics is not None:
+            self.enable_error_metrics = enable_error_metrics
+        if enable_individual_node_metrics is not None:
+            self.enable_individual_node_metrics = enable_individual_node_metrics
+        if enable_overall_perf_metrics is not None:
+            self.enable_overall_perf_metrics = enable_overall_perf_metrics
+        if enable_rollup is not None:
+            self.enable_rollup = enable_rollup
+        if enable_service_endpoint_metrics is not None:
+            self.enable_service_endpoint_metrics = enable_service_endpoint_metrics
+        self.encrypted_password = encrypted_password
+        self.user_name = user_name
+
+    @property
+    def app_filter_regex(self):
+        """Gets the app_filter_regex of this AppDynamicsConfiguration.  # noqa: E501
+
+        List of regular expressions that a application name must match (case-insensitively) in order to be ingested.  # noqa: E501
+
+        :return: The app_filter_regex of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._app_filter_regex
+
+    @app_filter_regex.setter
+    def app_filter_regex(self, app_filter_regex):
+        """Sets the app_filter_regex of this AppDynamicsConfiguration.
+
+        List of regular expressions that a application name must match (case-insensitively) in order to be ingested.  # noqa: E501
+
+        :param app_filter_regex: The app_filter_regex of this AppDynamicsConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._app_filter_regex = app_filter_regex
+
+    @property
+    def controller_name(self):
+        """Gets the controller_name of this AppDynamicsConfiguration.  # noqa: E501
+
+        Name of the SaaS controller.  # noqa: E501
+
+        :return: The controller_name of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._controller_name
+
+    @controller_name.setter
+    def controller_name(self, controller_name):
+        """Sets the controller_name of this AppDynamicsConfiguration.
+
+        Name of the SaaS controller.  # noqa: E501
+
+        :param controller_name: The controller_name of this AppDynamicsConfiguration.  # noqa: E501
+        :type: str
+        """
+        if controller_name is None:
+            raise ValueError("Invalid value for `controller_name`, must not be `None`")  # noqa: E501
+
+        self._controller_name = controller_name
+
+    @property
+    def enable_app_infra_metrics(self):
+        """Gets the enable_app_infra_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Application Infrastructure metric injection.  # noqa: E501
+
+        :return: The enable_app_infra_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_app_infra_metrics
+
+    @enable_app_infra_metrics.setter
+    def enable_app_infra_metrics(self, enable_app_infra_metrics):
+        """Sets the enable_app_infra_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Application Infrastructure metric injection.  # noqa: E501
+
+        :param enable_app_infra_metrics: The enable_app_infra_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_app_infra_metrics = enable_app_infra_metrics
+
+    @property
+    def enable_backend_metrics(self):
+        """Gets the enable_backend_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Backend metric injection.  # noqa: E501
+
+        :return: The enable_backend_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_backend_metrics
+
+    @enable_backend_metrics.setter
+    def enable_backend_metrics(self, enable_backend_metrics):
+        """Sets the enable_backend_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Backend metric injection.  # noqa: E501
+
+        :param enable_backend_metrics: The enable_backend_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_backend_metrics = enable_backend_metrics
+
+    @property
+    def enable_business_trx_metrics(self):
+        """Gets the enable_business_trx_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Business Transaction metric injection.  # noqa: E501
+
+        :return: The enable_business_trx_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_business_trx_metrics
+
+    @enable_business_trx_metrics.setter
+    def enable_business_trx_metrics(self, enable_business_trx_metrics):
+        """Sets the enable_business_trx_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Business Transaction metric injection.  # noqa: E501
+
+        :param enable_business_trx_metrics: The enable_business_trx_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_business_trx_metrics = enable_business_trx_metrics
+
+    @property
+    def enable_error_metrics(self):
+        """Gets the enable_error_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Error metric injection.  # noqa: E501
+
+        :return: The enable_error_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_error_metrics
+
+    @enable_error_metrics.setter
+    def enable_error_metrics(self, enable_error_metrics):
+        """Sets the enable_error_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Error metric injection.  # noqa: E501
+
+        :param enable_error_metrics: The enable_error_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_error_metrics = enable_error_metrics
+
+    @property
+    def enable_individual_node_metrics(self):
+        """Gets the enable_individual_node_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Individual Node metric injection.  # noqa: E501
+
+        :return: The enable_individual_node_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_individual_node_metrics
+
+    @enable_individual_node_metrics.setter
+    def enable_individual_node_metrics(self, enable_individual_node_metrics):
+        """Sets the enable_individual_node_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Individual Node metric injection.  # noqa: E501
+
+        :param enable_individual_node_metrics: The enable_individual_node_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_individual_node_metrics = enable_individual_node_metrics
+
+    @property
+    def enable_overall_perf_metrics(self):
+        """Gets the enable_overall_perf_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Overall Performance metric injection.  # noqa: E501
+
+        :return: The enable_overall_perf_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_overall_perf_metrics
+
+    @enable_overall_perf_metrics.setter
+    def enable_overall_perf_metrics(self, enable_overall_perf_metrics):
+        """Sets the enable_overall_perf_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Overall Performance metric injection.  # noqa: E501
+
+        :param enable_overall_perf_metrics: The enable_overall_perf_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_overall_perf_metrics = enable_overall_perf_metrics
+
+    @property
+    def enable_rollup(self):
+        """Gets the enable_rollup of this AppDynamicsConfiguration.  # noqa: E501
+
+        Set this to 'false' to get separate results for all values within the time range, by default it is 'true'.  # noqa: E501
+
+        :return: The enable_rollup of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_rollup
+
+    @enable_rollup.setter
+    def enable_rollup(self, enable_rollup):
+        """Sets the enable_rollup of this AppDynamicsConfiguration.
+
+        Set this to 'false' to get separate results for all values within the time range, by default it is 'true'.  # noqa: E501
+
+        :param enable_rollup: The enable_rollup of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_rollup = enable_rollup
+
+    @property
+    def enable_service_endpoint_metrics(self):
+        """Gets the enable_service_endpoint_metrics of this AppDynamicsConfiguration.  # noqa: E501
+
+        Boolean flag to control Service End point metric injection.  # noqa: E501
+
+        :return: The enable_service_endpoint_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_service_endpoint_metrics
+
+    @enable_service_endpoint_metrics.setter
+    def enable_service_endpoint_metrics(self, enable_service_endpoint_metrics):
+        """Sets the enable_service_endpoint_metrics of this AppDynamicsConfiguration.
+
+        Boolean flag to control Service End point metric injection.  # noqa: E501
+
+        :param enable_service_endpoint_metrics: The enable_service_endpoint_metrics of this AppDynamicsConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_service_endpoint_metrics = enable_service_endpoint_metrics
+
+    @property
+    def encrypted_password(self):
+        """Gets the encrypted_password of this AppDynamicsConfiguration.  # noqa: E501
+
+        Password for AppDynamics user.  # noqa: E501
+
+        :return: The encrypted_password of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._encrypted_password
+
+    @encrypted_password.setter
+    def encrypted_password(self, encrypted_password):
+        """Sets the encrypted_password of this AppDynamicsConfiguration.
+
+        Password for AppDynamics user.  # noqa: E501
+
+        :param encrypted_password: The encrypted_password of this AppDynamicsConfiguration.  # noqa: E501
+        :type: str
+        """
+        if encrypted_password is None:
+            raise ValueError("Invalid value for `encrypted_password`, must not be `None`")  # noqa: E501
+
+        self._encrypted_password = encrypted_password
+
+    @property
+    def user_name(self):
+        """Gets the user_name of this AppDynamicsConfiguration.  # noqa: E501
+
+        Username is combination of userName and the account name.  # noqa: E501
+
+        :return: The user_name of this AppDynamicsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._user_name
+
+    @user_name.setter
+    def user_name(self, user_name):
+        """Sets the user_name of this AppDynamicsConfiguration.
+
+        Username is combination of userName and the account name.  # noqa: E501
+
+        :param user_name: The user_name of this AppDynamicsConfiguration.  # noqa: E501
+        :type: str
+        """
+        if user_name is None:
+            raise ValueError("Invalid value for `user_name`, must not be `None`")  # noqa: E501
+
+        self._user_name = user_name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AppDynamicsConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AppDynamicsConfiguration):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 719f82d..4107754 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -16,6 +16,7 @@
 
 import six
 
+from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.azure_configuration import AzureConfiguration  # noqa: F401,E501
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration  # noqa: F401,E501
@@ -43,6 +44,7 @@ class CloudIntegration(object):
     """
     swagger_types = {
         'additional_tags': 'dict(str, str)',
+        'app_dynamics': 'AppDynamicsConfiguration',
         'azure': 'AzureConfiguration',
         'azure_activity_log': 'AzureActivityLogConfiguration',
         'cloud_trail': 'CloudTrailConfiguration',
@@ -75,6 +77,7 @@ class CloudIntegration(object):
 
     attribute_map = {
         'additional_tags': 'additionalTags',
+        'app_dynamics': 'appDynamics',
         'azure': 'azure',
         'azure_activity_log': 'azureActivityLog',
         'cloud_trail': 'cloudTrail',
@@ -105,10 +108,11 @@ class CloudIntegration(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, additional_tags=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
 
         self._additional_tags = None
+        self._app_dynamics = None
         self._azure = None
         self._azure_activity_log = None
         self._cloud_trail = None
@@ -141,6 +145,8 @@ def __init__(self, additional_tags=None, azure=None, azure_activity_log=None, cl
 
         if additional_tags is not None:
             self.additional_tags = additional_tags
+        if app_dynamics is not None:
+            self.app_dynamics = app_dynamics
         if azure is not None:
             self.azure = azure
         if azure_activity_log is not None:
@@ -219,6 +225,27 @@ def additional_tags(self, additional_tags):
 
         self._additional_tags = additional_tags
 
+    @property
+    def app_dynamics(self):
+        """Gets the app_dynamics of this CloudIntegration.  # noqa: E501
+
+
+        :return: The app_dynamics of this CloudIntegration.  # noqa: E501
+        :rtype: AppDynamicsConfiguration
+        """
+        return self._app_dynamics
+
+    @app_dynamics.setter
+    def app_dynamics(self, app_dynamics):
+        """Sets the app_dynamics of this CloudIntegration.
+
+
+        :param app_dynamics: The app_dynamics of this CloudIntegration.  # noqa: E501
+        :type: AppDynamicsConfiguration
+        """
+
+        self._app_dynamics = app_dynamics
+
     @property
     def azure(self):
         """Gets the azure of this CloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 75c0ded..c8afcc9 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -37,7 +37,6 @@ class Dashboard(object):
     """
     swagger_types = {
         'acl': 'AccessControlListSimple',
-        'can_user_modify': 'bool',
         'chart_title_bg_color': 'str',
         'chart_title_color': 'str',
         'chart_title_scalar': 'int',
@@ -57,6 +56,7 @@ class Dashboard(object):
         'favorite': 'bool',
         'hidden': 'bool',
         'id': 'str',
+        'modify_acl_access': 'bool',
         'name': 'str',
         'num_charts': 'int',
         'num_favorites': 'int',
@@ -76,7 +76,6 @@ class Dashboard(object):
 
     attribute_map = {
         'acl': 'acl',
-        'can_user_modify': 'canUserModify',
         'chart_title_bg_color': 'chartTitleBgColor',
         'chart_title_color': 'chartTitleColor',
         'chart_title_scalar': 'chartTitleScalar',
@@ -96,6 +95,7 @@ class Dashboard(object):
         'favorite': 'favorite',
         'hidden': 'hidden',
         'id': 'id',
+        'modify_acl_access': 'modifyAclAccess',
         'name': 'name',
         'num_charts': 'numCharts',
         'num_favorites': 'numFavorites',
@@ -113,11 +113,10 @@ class Dashboard(object):
         'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, acl=None, can_user_modify=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, hidden=None, id=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None):  # noqa: E501
+    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, hidden=None, id=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
-        self._can_user_modify = None
         self._chart_title_bg_color = None
         self._chart_title_color = None
         self._chart_title_scalar = None
@@ -137,6 +136,7 @@ def __init__(self, acl=None, can_user_modify=None, chart_title_bg_color=None, ch
         self._favorite = None
         self._hidden = None
         self._id = None
+        self._modify_acl_access = None
         self._name = None
         self._num_charts = None
         self._num_favorites = None
@@ -156,8 +156,6 @@ def __init__(self, acl=None, can_user_modify=None, chart_title_bg_color=None, ch
 
         if acl is not None:
             self.acl = acl
-        if can_user_modify is not None:
-            self.can_user_modify = can_user_modify
         if chart_title_bg_color is not None:
             self.chart_title_bg_color = chart_title_bg_color
         if chart_title_color is not None:
@@ -195,6 +193,8 @@ def __init__(self, acl=None, can_user_modify=None, chart_title_bg_color=None, ch
         if hidden is not None:
             self.hidden = hidden
         self.id = id
+        if modify_acl_access is not None:
+            self.modify_acl_access = modify_acl_access
         self.name = name
         if num_charts is not None:
             self.num_charts = num_charts
@@ -244,29 +244,6 @@ def acl(self, acl):
 
         self._acl = acl
 
-    @property
-    def can_user_modify(self):
-        """Gets the can_user_modify of this Dashboard.  # noqa: E501
-
-        Whether the user can modify the dashboard.  # noqa: E501
-
-        :return: The can_user_modify of this Dashboard.  # noqa: E501
-        :rtype: bool
-        """
-        return self._can_user_modify
-
-    @can_user_modify.setter
-    def can_user_modify(self, can_user_modify):
-        """Sets the can_user_modify of this Dashboard.
-
-        Whether the user can modify the dashboard.  # noqa: E501
-
-        :param can_user_modify: The can_user_modify of this Dashboard.  # noqa: E501
-        :type: bool
-        """
-
-        self._can_user_modify = can_user_modify
-
     @property
     def chart_title_bg_color(self):
         """Gets the chart_title_bg_color of this Dashboard.  # noqa: E501
@@ -702,6 +679,29 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def modify_acl_access(self):
+        """Gets the modify_acl_access of this Dashboard.  # noqa: E501
+
+        Whether the user has modify ACL access to the dashboard.  # noqa: E501
+
+        :return: The modify_acl_access of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._modify_acl_access
+
+    @modify_acl_access.setter
+    def modify_acl_access(self, modify_acl_access):
+        """Sets the modify_acl_access of this Dashboard.
+
+        Whether the user has modify ACL access to the dashboard.  # noqa: E501
+
+        :param modify_acl_access: The modify_acl_access of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._modify_acl_access = modify_acl_access
+
     @property
     def name(self):
         """Gets the name of this Dashboard.  # noqa: E501
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index 78878e9..ec1e8e5 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -38,10 +38,12 @@ class DashboardParameterValue(object):
         'hide_from_view': 'bool',
         'label': 'str',
         'multivalue': 'bool',
+        'order': 'int',
         'parameter_type': 'str',
         'query_value': 'str',
         'reverse_dyn_sort': 'bool',
         'tag_key': 'str',
+        'value_ordering': 'list[str]',
         'values_to_readable_strings': 'dict(str, str)'
     }
 
@@ -53,14 +55,16 @@ class DashboardParameterValue(object):
         'hide_from_view': 'hideFromView',
         'label': 'label',
         'multivalue': 'multivalue',
+        'order': 'order',
         'parameter_type': 'parameterType',
         'query_value': 'queryValue',
         'reverse_dyn_sort': 'reverseDynSort',
         'tag_key': 'tagKey',
+        'value_ordering': 'valueOrdering',
         'values_to_readable_strings': 'valuesToReadableStrings'
     }
 
-    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, values_to_readable_strings=None):  # noqa: E501
+    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, order=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, value_ordering=None, values_to_readable_strings=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
 
         self._allow_all = None
@@ -70,10 +74,12 @@ def __init__(self, allow_all=None, default_value=None, description=None, dynamic
         self._hide_from_view = None
         self._label = None
         self._multivalue = None
+        self._order = None
         self._parameter_type = None
         self._query_value = None
         self._reverse_dyn_sort = None
         self._tag_key = None
+        self._value_ordering = None
         self._values_to_readable_strings = None
         self.discriminator = None
 
@@ -91,6 +97,8 @@ def __init__(self, allow_all=None, default_value=None, description=None, dynamic
             self.label = label
         if multivalue is not None:
             self.multivalue = multivalue
+        if order is not None:
+            self.order = order
         if parameter_type is not None:
             self.parameter_type = parameter_type
         if query_value is not None:
@@ -99,6 +107,8 @@ def __init__(self, allow_all=None, default_value=None, description=None, dynamic
             self.reverse_dyn_sort = reverse_dyn_sort
         if tag_key is not None:
             self.tag_key = tag_key
+        if value_ordering is not None:
+            self.value_ordering = value_ordering
         if values_to_readable_strings is not None:
             self.values_to_readable_strings = values_to_readable_strings
 
@@ -255,6 +265,27 @@ def multivalue(self, multivalue):
 
         self._multivalue = multivalue
 
+    @property
+    def order(self):
+        """Gets the order of this DashboardParameterValue.  # noqa: E501
+
+
+        :return: The order of this DashboardParameterValue.  # noqa: E501
+        :rtype: int
+        """
+        return self._order
+
+    @order.setter
+    def order(self, order):
+        """Sets the order of this DashboardParameterValue.
+
+
+        :param order: The order of this DashboardParameterValue.  # noqa: E501
+        :type: int
+        """
+
+        self._order = order
+
     @property
     def parameter_type(self):
         """Gets the parameter_type of this DashboardParameterValue.  # noqa: E501
@@ -347,6 +378,27 @@ def tag_key(self, tag_key):
 
         self._tag_key = tag_key
 
+    @property
+    def value_ordering(self):
+        """Gets the value_ordering of this DashboardParameterValue.  # noqa: E501
+
+
+        :return: The value_ordering of this DashboardParameterValue.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._value_ordering
+
+    @value_ordering.setter
+    def value_ordering(self, value_ordering):
+        """Sets the value_ordering of this DashboardParameterValue.
+
+
+        :param value_ordering: The value_ordering of this DashboardParameterValue.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._value_ordering = value_ordering
+
     @property
     def values_to_readable_strings(self):
         """Gets the values_to_readable_strings of this DashboardParameterValue.  # noqa: E501
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index b5ee08f..e63102a 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -451,7 +451,7 @@ def triggers(self, triggers):
         """
         if triggers is None:
             raise ValueError("Invalid value for `triggers`, must not be `None`")  # noqa: E501
-        allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE", "ALERT_SERIES_SEVERITY_UPDATE", "ALERT_SEVERITY_UPDATE"]  # noqa: E501
+        allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE", "ALERT_SEVERITY_UPDATE"]  # noqa: E501
         if not set(triggers).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `triggers` [{0}], must be a subset of [{1}]"  # noqa: E501
diff --git a/wavefront_api_client/models/paged_account.py b/wavefront_api_client/models/paged_account.py
new file mode 100644
index 0000000..eabf2f3
--- /dev/null
+++ b/wavefront_api_client/models/paged_account.py
@@ -0,0 +1,282 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.account import Account  # noqa: F401,E501
+from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
+
+
+class PagedAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[Account]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedAccount.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedAccount.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedAccount.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedAccount.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedAccount.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedAccount.  # noqa: E501
+        :rtype: list[Account]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedAccount.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedAccount.  # noqa: E501
+        :type: list[Account]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedAccount.  # noqa: E501
+
+
+        :return: The limit of this PagedAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedAccount.
+
+
+        :param limit: The limit of this PagedAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedAccount.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedAccount.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedAccount.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedAccount.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedAccount.  # noqa: E501
+
+
+        :return: The offset of this PagedAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedAccount.
+
+
+        :param offset: The offset of this PagedAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedAccount.  # noqa: E501
+
+
+        :return: The sort of this PagedAccount.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedAccount.
+
+
+        :param sort: The sort of this PagedAccount.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedAccount.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedAccount.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged_service_account.py b/wavefront_api_client/models/paged_service_account.py
new file mode 100644
index 0000000..c64d15e
--- /dev/null
+++ b/wavefront_api_client/models/paged_service_account.py
@@ -0,0 +1,282 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.service_account import ServiceAccount  # noqa: F401,E501
+from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
+
+
+class PagedServiceAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[ServiceAccount]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedServiceAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedServiceAccount.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedServiceAccount.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedServiceAccount.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedServiceAccount.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedServiceAccount.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedServiceAccount.  # noqa: E501
+        :rtype: list[ServiceAccount]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedServiceAccount.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedServiceAccount.  # noqa: E501
+        :type: list[ServiceAccount]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedServiceAccount.  # noqa: E501
+
+
+        :return: The limit of this PagedServiceAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedServiceAccount.
+
+
+        :param limit: The limit of this PagedServiceAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedServiceAccount.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedServiceAccount.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedServiceAccount.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedServiceAccount.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedServiceAccount.  # noqa: E501
+
+
+        :return: The offset of this PagedServiceAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedServiceAccount.
+
+
+        :param offset: The offset of this PagedServiceAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedServiceAccount.  # noqa: E501
+
+
+        :return: The sort of this PagedServiceAccount.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedServiceAccount.
+
+
+        :param sort: The sort of this PagedServiceAccount.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedServiceAccount.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedServiceAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedServiceAccount.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedServiceAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedServiceAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedServiceAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index 3017bd6..ded795f 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -17,8 +17,10 @@
 import six
 
 from wavefront_api_client.models.query_event import QueryEvent  # noqa: F401,E501
-from wavefront_api_client.models.stats_model import StatsModel  # noqa: F401,E501
+from wavefront_api_client.models.span import Span  # noqa: F401,E501
+from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse  # noqa: F401,E501
 from wavefront_api_client.models.timeseries import Timeseries  # noqa: F401,E501
+from wavefront_api_client.models.trace import Trace  # noqa: F401,E501
 
 
 class QueryResult(object):
@@ -35,37 +37,53 @@ class QueryResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'error_message': 'str',
+        'error_type': 'str',
         'events': 'list[QueryEvent]',
         'granularity': 'int',
         'name': 'str',
         'query': 'str',
-        'stats': 'StatsModel',
+        'spans': 'list[Span]',
+        'stats': 'StatsModelInternalUse',
         'timeseries': 'list[Timeseries]',
+        'traces': 'list[Trace]',
         'warnings': 'str'
     }
 
     attribute_map = {
+        'error_message': 'errorMessage',
+        'error_type': 'errorType',
         'events': 'events',
         'granularity': 'granularity',
         'name': 'name',
         'query': 'query',
+        'spans': 'spans',
         'stats': 'stats',
         'timeseries': 'timeseries',
+        'traces': 'traces',
         'warnings': 'warnings'
     }
 
-    def __init__(self, events=None, granularity=None, name=None, query=None, stats=None, timeseries=None, warnings=None):  # noqa: E501
+    def __init__(self, error_message=None, error_type=None, events=None, granularity=None, name=None, query=None, spans=None, stats=None, timeseries=None, traces=None, warnings=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
 
+        self._error_message = None
+        self._error_type = None
         self._events = None
         self._granularity = None
         self._name = None
         self._query = None
+        self._spans = None
         self._stats = None
         self._timeseries = None
+        self._traces = None
         self._warnings = None
         self.discriminator = None
 
+        if error_message is not None:
+            self.error_message = error_message
+        if error_type is not None:
+            self.error_type = error_type
         if events is not None:
             self.events = events
         if granularity is not None:
@@ -74,13 +92,69 @@ def __init__(self, events=None, granularity=None, name=None, query=None, stats=N
             self.name = name
         if query is not None:
             self.query = query
+        if spans is not None:
+            self.spans = spans
         if stats is not None:
             self.stats = stats
         if timeseries is not None:
             self.timeseries = timeseries
+        if traces is not None:
+            self.traces = traces
         if warnings is not None:
             self.warnings = warnings
 
+    @property
+    def error_message(self):
+        """Gets the error_message of this QueryResult.  # noqa: E501
+
+        Error message, if query execution did not finish successfully  # noqa: E501
+
+        :return: The error_message of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_message
+
+    @error_message.setter
+    def error_message(self, error_message):
+        """Sets the error_message of this QueryResult.
+
+        Error message, if query execution did not finish successfully  # noqa: E501
+
+        :param error_message: The error_message of this QueryResult.  # noqa: E501
+        :type: str
+        """
+
+        self._error_message = error_message
+
+    @property
+    def error_type(self):
+        """Gets the error_type of this QueryResult.  # noqa: E501
+
+        Error type, if query execution did not finish successfully  # noqa: E501
+
+        :return: The error_type of this QueryResult.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_type
+
+    @error_type.setter
+    def error_type(self, error_type):
+        """Sets the error_type of this QueryResult.
+
+        Error type, if query execution did not finish successfully  # noqa: E501
+
+        :param error_type: The error_type of this QueryResult.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["N/A", "QuerySyntaxError", "QueryExecutionError", "Timeout"]  # noqa: E501
+        if error_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `error_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(error_type, allowed_values)
+            )
+
+        self._error_type = error_type
+
     @property
     def events(self):
         """Gets the events of this QueryResult.  # noqa: E501
@@ -171,13 +245,34 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def spans(self):
+        """Gets the spans of this QueryResult.  # noqa: E501
+
+
+        :return: The spans of this QueryResult.  # noqa: E501
+        :rtype: list[Span]
+        """
+        return self._spans
+
+    @spans.setter
+    def spans(self, spans):
+        """Sets the spans of this QueryResult.
+
+
+        :param spans: The spans of this QueryResult.  # noqa: E501
+        :type: list[Span]
+        """
+
+        self._spans = spans
+
     @property
     def stats(self):
         """Gets the stats of this QueryResult.  # noqa: E501
 
 
         :return: The stats of this QueryResult.  # noqa: E501
-        :rtype: StatsModel
+        :rtype: StatsModelInternalUse
         """
         return self._stats
 
@@ -187,7 +282,7 @@ def stats(self, stats):
 
 
         :param stats: The stats of this QueryResult.  # noqa: E501
-        :type: StatsModel
+        :type: StatsModelInternalUse
         """
 
         self._stats = stats
@@ -213,6 +308,27 @@ def timeseries(self, timeseries):
 
         self._timeseries = timeseries
 
+    @property
+    def traces(self):
+        """Gets the traces of this QueryResult.  # noqa: E501
+
+
+        :return: The traces of this QueryResult.  # noqa: E501
+        :rtype: list[Trace]
+        """
+        return self._traces
+
+    @traces.setter
+    def traces(self, traces):
+        """Sets the traces of this QueryResult.
+
+
+        :param traces: The traces of this QueryResult.  # noqa: E501
+        :type: list[Trace]
+        """
+
+        self._traces = traces
+
     @property
     def warnings(self):
         """Gets the warnings of this QueryResult.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
new file mode 100644
index 0000000..58bf937
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.service_account import ServiceAccount  # noqa: F401,E501
+
+
+class ResponseContainerListServiceAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[ServiceAccount]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerListServiceAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListServiceAccount.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListServiceAccount.  # noqa: E501
+        :rtype: list[ServiceAccount]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListServiceAccount.
+
+
+        :param response: The response of this ResponseContainerListServiceAccount.  # noqa: E501
+        :type: list[ServiceAccount]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListServiceAccount.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListServiceAccount.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListServiceAccount.
+
+
+        :param status: The status of this ResponseContainerListServiceAccount.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListServiceAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListServiceAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
new file mode 100644
index 0000000..a791348
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.paged_account import PagedAccount  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerPagedAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedAccount',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedAccount.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedAccount.  # noqa: E501
+        :rtype: PagedAccount
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedAccount.
+
+
+        :param response: The response of this ResponseContainerPagedAccount.  # noqa: E501
+        :type: PagedAccount
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedAccount.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedAccount.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedAccount.
+
+
+        :param status: The status of this ResponseContainerPagedAccount.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
new file mode 100644
index 0000000..c853b36
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.paged_service_account import PagedServiceAccount  # noqa: F401,E501
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+
+
+class ResponseContainerPagedServiceAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedServiceAccount',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedServiceAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedServiceAccount.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedServiceAccount.  # noqa: E501
+        :rtype: PagedServiceAccount
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedServiceAccount.
+
+
+        :param response: The response of this ResponseContainerPagedServiceAccount.  # noqa: E501
+        :type: PagedServiceAccount
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedServiceAccount.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedServiceAccount.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedServiceAccount.
+
+
+        :param status: The status of this ResponseContainerPagedServiceAccount.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedServiceAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedServiceAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
new file mode 100644
index 0000000..8736100
--- /dev/null
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
+from wavefront_api_client.models.service_account import ServiceAccount  # noqa: F401,E501
+
+
+class ResponseContainerServiceAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'ServiceAccount',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerServiceAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerServiceAccount.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerServiceAccount.  # noqa: E501
+        :rtype: ServiceAccount
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerServiceAccount.
+
+
+        :param response: The response of this ResponseContainerServiceAccount.  # noqa: E501
+        :type: ServiceAccount
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerServiceAccount.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerServiceAccount.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerServiceAccount.
+
+
+        :param status: The status of this ResponseContainerServiceAccount.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerServiceAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerServiceAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index fee34fb..c85ae11 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -144,7 +144,7 @@ def entity_type(self, entity_type):
         """
         if entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT"]  # noqa: E501
         if entity_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
new file mode 100644
index 0000000..8deae9b
--- /dev/null
+++ b/wavefront_api_client/models/service_account.py
@@ -0,0 +1,290 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: F401,E501
+from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
+
+
+class ServiceAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'active': 'bool',
+        'description': 'str',
+        'groups': 'list[str]',
+        'identifier': 'str',
+        'last_used': 'int',
+        'tokens': 'list[UserApiToken]',
+        'user_groups': 'list[UserGroup]'
+    }
+
+    attribute_map = {
+        'active': 'active',
+        'description': 'description',
+        'groups': 'groups',
+        'identifier': 'identifier',
+        'last_used': 'lastUsed',
+        'tokens': 'tokens',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, active=None, description=None, groups=None, identifier=None, last_used=None, tokens=None, user_groups=None):  # noqa: E501
+        """ServiceAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._active = None
+        self._description = None
+        self._groups = None
+        self._identifier = None
+        self._last_used = None
+        self._tokens = None
+        self._user_groups = None
+        self.discriminator = None
+
+        self.active = active
+        if description is not None:
+            self.description = description
+        if groups is not None:
+            self.groups = groups
+        self.identifier = identifier
+        if last_used is not None:
+            self.last_used = last_used
+        if tokens is not None:
+            self.tokens = tokens
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def active(self):
+        """Gets the active of this ServiceAccount.  # noqa: E501
+
+        The state of the service account.  # noqa: E501
+
+        :return: The active of this ServiceAccount.  # noqa: E501
+        :rtype: bool
+        """
+        return self._active
+
+    @active.setter
+    def active(self, active):
+        """Sets the active of this ServiceAccount.
+
+        The state of the service account.  # noqa: E501
+
+        :param active: The active of this ServiceAccount.  # noqa: E501
+        :type: bool
+        """
+        if active is None:
+            raise ValueError("Invalid value for `active`, must not be `None`")  # noqa: E501
+
+        self._active = active
+
+    @property
+    def description(self):
+        """Gets the description of this ServiceAccount.  # noqa: E501
+
+        The description of the service account.  # noqa: E501
+
+        :return: The description of this ServiceAccount.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ServiceAccount.
+
+        The description of the service account.  # noqa: E501
+
+        :param description: The description of this ServiceAccount.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def groups(self):
+        """Gets the groups of this ServiceAccount.  # noqa: E501
+
+        The list of service account's permissions.  # noqa: E501
+
+        :return: The groups of this ServiceAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this ServiceAccount.
+
+        The list of service account's permissions.  # noqa: E501
+
+        :param groups: The groups of this ServiceAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this ServiceAccount.  # noqa: E501
+
+        The unique identifier of a service account.  # noqa: E501
+
+        :return: The identifier of this ServiceAccount.  # noqa: E501
+        :rtype: str
+        """
+        return self._identifier
+
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this ServiceAccount.
+
+        The unique identifier of a service account.  # noqa: E501
+
+        :param identifier: The identifier of this ServiceAccount.  # noqa: E501
+        :type: str
+        """
+        if identifier is None:
+            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
+
+        self._identifier = identifier
+
+    @property
+    def last_used(self):
+        """Gets the last_used of this ServiceAccount.  # noqa: E501
+
+        The last time when a token of the service account was used.  # noqa: E501
+
+        :return: The last_used of this ServiceAccount.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_used
+
+    @last_used.setter
+    def last_used(self, last_used):
+        """Sets the last_used of this ServiceAccount.
+
+        The last time when a token of the service account was used.  # noqa: E501
+
+        :param last_used: The last_used of this ServiceAccount.  # noqa: E501
+        :type: int
+        """
+
+        self._last_used = last_used
+
+    @property
+    def tokens(self):
+        """Gets the tokens of this ServiceAccount.  # noqa: E501
+
+        The service account's API tokens.  # noqa: E501
+
+        :return: The tokens of this ServiceAccount.  # noqa: E501
+        :rtype: list[UserApiToken]
+        """
+        return self._tokens
+
+    @tokens.setter
+    def tokens(self, tokens):
+        """Sets the tokens of this ServiceAccount.
+
+        The service account's API tokens.  # noqa: E501
+
+        :param tokens: The tokens of this ServiceAccount.  # noqa: E501
+        :type: list[UserApiToken]
+        """
+
+        self._tokens = tokens
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this ServiceAccount.  # noqa: E501
+
+        The list of service account's user groups.  # noqa: E501
+
+        :return: The user_groups of this ServiceAccount.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this ServiceAccount.
+
+        The list of service account's user groups.  # noqa: E501
+
+        :param user_groups: The user_groups of this ServiceAccount.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ServiceAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ServiceAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
new file mode 100644
index 0000000..868722e
--- /dev/null
+++ b/wavefront_api_client/models/service_account_write.py
@@ -0,0 +1,258 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ServiceAccountWrite(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'active': 'bool',
+        'description': 'str',
+        'groups': 'list[str]',
+        'identifier': 'str',
+        'tokens': 'list[str]',
+        'user_groups': 'list[str]'
+    }
+
+    attribute_map = {
+        'active': 'active',
+        'description': 'description',
+        'groups': 'groups',
+        'identifier': 'identifier',
+        'tokens': 'tokens',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, active=None, description=None, groups=None, identifier=None, tokens=None, user_groups=None):  # noqa: E501
+        """ServiceAccountWrite - a model defined in Swagger"""  # noqa: E501
+
+        self._active = None
+        self._description = None
+        self._groups = None
+        self._identifier = None
+        self._tokens = None
+        self._user_groups = None
+        self.discriminator = None
+
+        if active is not None:
+            self.active = active
+        if description is not None:
+            self.description = description
+        if groups is not None:
+            self.groups = groups
+        self.identifier = identifier
+        if tokens is not None:
+            self.tokens = tokens
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def active(self):
+        """Gets the active of this ServiceAccountWrite.  # noqa: E501
+
+        The current state of the service account.  # noqa: E501
+
+        :return: The active of this ServiceAccountWrite.  # noqa: E501
+        :rtype: bool
+        """
+        return self._active
+
+    @active.setter
+    def active(self, active):
+        """Sets the active of this ServiceAccountWrite.
+
+        The current state of the service account.  # noqa: E501
+
+        :param active: The active of this ServiceAccountWrite.  # noqa: E501
+        :type: bool
+        """
+
+        self._active = active
+
+    @property
+    def description(self):
+        """Gets the description of this ServiceAccountWrite.  # noqa: E501
+
+        The description of the service account to be created.  # noqa: E501
+
+        :return: The description of this ServiceAccountWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ServiceAccountWrite.
+
+        The description of the service account to be created.  # noqa: E501
+
+        :param description: The description of this ServiceAccountWrite.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def groups(self):
+        """Gets the groups of this ServiceAccountWrite.  # noqa: E501
+
+        The list of permissions, the service account will be granted.  # noqa: E501
+
+        :return: The groups of this ServiceAccountWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this ServiceAccountWrite.
+
+        The list of permissions, the service account will be granted.  # noqa: E501
+
+        :param groups: The groups of this ServiceAccountWrite.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def identifier(self):
+        """Gets the identifier of this ServiceAccountWrite.  # noqa: E501
+
+        The unique identifier for a service account.  # noqa: E501
+
+        :return: The identifier of this ServiceAccountWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._identifier
+
+    @identifier.setter
+    def identifier(self, identifier):
+        """Sets the identifier of this ServiceAccountWrite.
+
+        The unique identifier for a service account.  # noqa: E501
+
+        :param identifier: The identifier of this ServiceAccountWrite.  # noqa: E501
+        :type: str
+        """
+        if identifier is None:
+            raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
+
+        self._identifier = identifier
+
+    @property
+    def tokens(self):
+        """Gets the tokens of this ServiceAccountWrite.  # noqa: E501
+
+        The service account's API tokens.  # noqa: E501
+
+        :return: The tokens of this ServiceAccountWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tokens
+
+    @tokens.setter
+    def tokens(self, tokens):
+        """Sets the tokens of this ServiceAccountWrite.
+
+        The service account's API tokens.  # noqa: E501
+
+        :param tokens: The tokens of this ServiceAccountWrite.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tokens = tokens
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this ServiceAccountWrite.  # noqa: E501
+
+        The list of user group ids, the service account will be added to.  # noqa: E501
+
+        :return: The user_groups of this ServiceAccountWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this ServiceAccountWrite.
+
+        The list of user group ids, the service account will be added to.  # noqa: E501
+
+        :param user_groups: The user_groups of this ServiceAccountWrite.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ServiceAccountWrite, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ServiceAccountWrite):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/span.py b/wavefront_api_client/models/span.py
new file mode 100644
index 0000000..a3a4f49
--- /dev/null
+++ b/wavefront_api_client/models/span.py
@@ -0,0 +1,285 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Span(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'annotations': 'list[dict(str, str)]',
+        'duration_ms': 'int',
+        'host': 'str',
+        'name': 'str',
+        'span_id': 'str',
+        'start_ms': 'int',
+        'trace_id': 'str'
+    }
+
+    attribute_map = {
+        'annotations': 'annotations',
+        'duration_ms': 'durationMs',
+        'host': 'host',
+        'name': 'name',
+        'span_id': 'spanId',
+        'start_ms': 'startMs',
+        'trace_id': 'traceId'
+    }
+
+    def __init__(self, annotations=None, duration_ms=None, host=None, name=None, span_id=None, start_ms=None, trace_id=None):  # noqa: E501
+        """Span - a model defined in Swagger"""  # noqa: E501
+
+        self._annotations = None
+        self._duration_ms = None
+        self._host = None
+        self._name = None
+        self._span_id = None
+        self._start_ms = None
+        self._trace_id = None
+        self.discriminator = None
+
+        if annotations is not None:
+            self.annotations = annotations
+        if duration_ms is not None:
+            self.duration_ms = duration_ms
+        if host is not None:
+            self.host = host
+        if name is not None:
+            self.name = name
+        if span_id is not None:
+            self.span_id = span_id
+        if start_ms is not None:
+            self.start_ms = start_ms
+        if trace_id is not None:
+            self.trace_id = trace_id
+
+    @property
+    def annotations(self):
+        """Gets the annotations of this Span.  # noqa: E501
+
+        Annotations (key-value pairs) of this span  # noqa: E501
+
+        :return: The annotations of this Span.  # noqa: E501
+        :rtype: list[dict(str, str)]
+        """
+        return self._annotations
+
+    @annotations.setter
+    def annotations(self, annotations):
+        """Sets the annotations of this Span.
+
+        Annotations (key-value pairs) of this span  # noqa: E501
+
+        :param annotations: The annotations of this Span.  # noqa: E501
+        :type: list[dict(str, str)]
+        """
+
+        self._annotations = annotations
+
+    @property
+    def duration_ms(self):
+        """Gets the duration_ms of this Span.  # noqa: E501
+
+        Span duration (in milliseconds)  # noqa: E501
+
+        :return: The duration_ms of this Span.  # noqa: E501
+        :rtype: int
+        """
+        return self._duration_ms
+
+    @duration_ms.setter
+    def duration_ms(self, duration_ms):
+        """Sets the duration_ms of this Span.
+
+        Span duration (in milliseconds)  # noqa: E501
+
+        :param duration_ms: The duration_ms of this Span.  # noqa: E501
+        :type: int
+        """
+
+        self._duration_ms = duration_ms
+
+    @property
+    def host(self):
+        """Gets the host of this Span.  # noqa: E501
+
+        Source/Host of this span  # noqa: E501
+
+        :return: The host of this Span.  # noqa: E501
+        :rtype: str
+        """
+        return self._host
+
+    @host.setter
+    def host(self, host):
+        """Sets the host of this Span.
+
+        Source/Host of this span  # noqa: E501
+
+        :param host: The host of this Span.  # noqa: E501
+        :type: str
+        """
+
+        self._host = host
+
+    @property
+    def name(self):
+        """Gets the name of this Span.  # noqa: E501
+
+        Span name  # noqa: E501
+
+        :return: The name of this Span.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Span.
+
+        Span name  # noqa: E501
+
+        :param name: The name of this Span.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def span_id(self):
+        """Gets the span_id of this Span.  # noqa: E501
+
+        Span ID  # noqa: E501
+
+        :return: The span_id of this Span.  # noqa: E501
+        :rtype: str
+        """
+        return self._span_id
+
+    @span_id.setter
+    def span_id(self, span_id):
+        """Sets the span_id of this Span.
+
+        Span ID  # noqa: E501
+
+        :param span_id: The span_id of this Span.  # noqa: E501
+        :type: str
+        """
+
+        self._span_id = span_id
+
+    @property
+    def start_ms(self):
+        """Gets the start_ms of this Span.  # noqa: E501
+
+        Span start time (in milliseconds)  # noqa: E501
+
+        :return: The start_ms of this Span.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_ms
+
+    @start_ms.setter
+    def start_ms(self, start_ms):
+        """Sets the start_ms of this Span.
+
+        Span start time (in milliseconds)  # noqa: E501
+
+        :param start_ms: The start_ms of this Span.  # noqa: E501
+        :type: int
+        """
+
+        self._start_ms = start_ms
+
+    @property
+    def trace_id(self):
+        """Gets the trace_id of this Span.  # noqa: E501
+
+        Trace ID  # noqa: E501
+
+        :return: The trace_id of this Span.  # noqa: E501
+        :rtype: str
+        """
+        return self._trace_id
+
+    @trace_id.setter
+    def trace_id(self, trace_id):
+        """Sets the trace_id of this Span.
+
+        Trace ID  # noqa: E501
+
+        :param trace_id: The trace_id of this Span.  # noqa: E501
+        :type: str
+        """
+
+        self._trace_id = trace_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Span, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Span):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
new file mode 100644
index 0000000..8163ae7
--- /dev/null
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -0,0 +1,479 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class StatsModelInternalUse(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'buffer_keys': 'int',
+        'cached_compacted_keys': 'int',
+        'compacted_keys': 'int',
+        'compacted_points': 'int',
+        'cpu_ns': 'int',
+        'hosts_used': 'int',
+        'keys': 'int',
+        'latency': 'int',
+        'metrics_used': 'int',
+        'points': 'int',
+        'queries': 'int',
+        'query_tasks': 'int',
+        's3_keys': 'int',
+        'skipped_compacted_keys': 'int',
+        'summaries': 'int'
+    }
+
+    attribute_map = {
+        'buffer_keys': 'buffer_keys',
+        'cached_compacted_keys': 'cached_compacted_keys',
+        'compacted_keys': 'compacted_keys',
+        'compacted_points': 'compacted_points',
+        'cpu_ns': 'cpu_ns',
+        'hosts_used': 'hosts_used',
+        'keys': 'keys',
+        'latency': 'latency',
+        'metrics_used': 'metrics_used',
+        'points': 'points',
+        'queries': 'queries',
+        'query_tasks': 'query_tasks',
+        's3_keys': 's3_keys',
+        'skipped_compacted_keys': 'skipped_compacted_keys',
+        'summaries': 'summaries'
+    }
+
+    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, hosts_used=None, keys=None, latency=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, summaries=None):  # noqa: E501
+        """StatsModelInternalUse - a model defined in Swagger"""  # noqa: E501
+
+        self._buffer_keys = None
+        self._cached_compacted_keys = None
+        self._compacted_keys = None
+        self._compacted_points = None
+        self._cpu_ns = None
+        self._hosts_used = None
+        self._keys = None
+        self._latency = None
+        self._metrics_used = None
+        self._points = None
+        self._queries = None
+        self._query_tasks = None
+        self._s3_keys = None
+        self._skipped_compacted_keys = None
+        self._summaries = None
+        self.discriminator = None
+
+        if buffer_keys is not None:
+            self.buffer_keys = buffer_keys
+        if cached_compacted_keys is not None:
+            self.cached_compacted_keys = cached_compacted_keys
+        if compacted_keys is not None:
+            self.compacted_keys = compacted_keys
+        if compacted_points is not None:
+            self.compacted_points = compacted_points
+        if cpu_ns is not None:
+            self.cpu_ns = cpu_ns
+        if hosts_used is not None:
+            self.hosts_used = hosts_used
+        if keys is not None:
+            self.keys = keys
+        if latency is not None:
+            self.latency = latency
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        if points is not None:
+            self.points = points
+        if queries is not None:
+            self.queries = queries
+        if query_tasks is not None:
+            self.query_tasks = query_tasks
+        if s3_keys is not None:
+            self.s3_keys = s3_keys
+        if skipped_compacted_keys is not None:
+            self.skipped_compacted_keys = skipped_compacted_keys
+        if summaries is not None:
+            self.summaries = summaries
+
+    @property
+    def buffer_keys(self):
+        """Gets the buffer_keys of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The buffer_keys of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._buffer_keys
+
+    @buffer_keys.setter
+    def buffer_keys(self, buffer_keys):
+        """Sets the buffer_keys of this StatsModelInternalUse.
+
+
+        :param buffer_keys: The buffer_keys of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._buffer_keys = buffer_keys
+
+    @property
+    def cached_compacted_keys(self):
+        """Gets the cached_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The cached_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._cached_compacted_keys
+
+    @cached_compacted_keys.setter
+    def cached_compacted_keys(self, cached_compacted_keys):
+        """Sets the cached_compacted_keys of this StatsModelInternalUse.
+
+
+        :param cached_compacted_keys: The cached_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._cached_compacted_keys = cached_compacted_keys
+
+    @property
+    def compacted_keys(self):
+        """Gets the compacted_keys of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._compacted_keys
+
+    @compacted_keys.setter
+    def compacted_keys(self, compacted_keys):
+        """Sets the compacted_keys of this StatsModelInternalUse.
+
+
+        :param compacted_keys: The compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._compacted_keys = compacted_keys
+
+    @property
+    def compacted_points(self):
+        """Gets the compacted_points of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The compacted_points of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._compacted_points
+
+    @compacted_points.setter
+    def compacted_points(self, compacted_points):
+        """Sets the compacted_points of this StatsModelInternalUse.
+
+
+        :param compacted_points: The compacted_points of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._compacted_points = compacted_points
+
+    @property
+    def cpu_ns(self):
+        """Gets the cpu_ns of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The cpu_ns of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._cpu_ns
+
+    @cpu_ns.setter
+    def cpu_ns(self, cpu_ns):
+        """Sets the cpu_ns of this StatsModelInternalUse.
+
+
+        :param cpu_ns: The cpu_ns of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._cpu_ns = cpu_ns
+
+    @property
+    def hosts_used(self):
+        """Gets the hosts_used of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The hosts_used of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._hosts_used
+
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this StatsModelInternalUse.
+
+
+        :param hosts_used: The hosts_used of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._hosts_used = hosts_used
+
+    @property
+    def keys(self):
+        """Gets the keys of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The keys of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._keys
+
+    @keys.setter
+    def keys(self, keys):
+        """Sets the keys of this StatsModelInternalUse.
+
+
+        :param keys: The keys of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._keys = keys
+
+    @property
+    def latency(self):
+        """Gets the latency of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The latency of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._latency
+
+    @latency.setter
+    def latency(self, latency):
+        """Sets the latency of this StatsModelInternalUse.
+
+
+        :param latency: The latency of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._latency = latency
+
+    @property
+    def metrics_used(self):
+        """Gets the metrics_used of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The metrics_used of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._metrics_used
+
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this StatsModelInternalUse.
+
+
+        :param metrics_used: The metrics_used of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._metrics_used = metrics_used
+
+    @property
+    def points(self):
+        """Gets the points of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The points of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._points
+
+    @points.setter
+    def points(self, points):
+        """Sets the points of this StatsModelInternalUse.
+
+
+        :param points: The points of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._points = points
+
+    @property
+    def queries(self):
+        """Gets the queries of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The queries of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._queries
+
+    @queries.setter
+    def queries(self, queries):
+        """Sets the queries of this StatsModelInternalUse.
+
+
+        :param queries: The queries of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._queries = queries
+
+    @property
+    def query_tasks(self):
+        """Gets the query_tasks of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The query_tasks of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._query_tasks
+
+    @query_tasks.setter
+    def query_tasks(self, query_tasks):
+        """Sets the query_tasks of this StatsModelInternalUse.
+
+
+        :param query_tasks: The query_tasks of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._query_tasks = query_tasks
+
+    @property
+    def s3_keys(self):
+        """Gets the s3_keys of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The s3_keys of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._s3_keys
+
+    @s3_keys.setter
+    def s3_keys(self, s3_keys):
+        """Sets the s3_keys of this StatsModelInternalUse.
+
+
+        :param s3_keys: The s3_keys of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._s3_keys = s3_keys
+
+    @property
+    def skipped_compacted_keys(self):
+        """Gets the skipped_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The skipped_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._skipped_compacted_keys
+
+    @skipped_compacted_keys.setter
+    def skipped_compacted_keys(self, skipped_compacted_keys):
+        """Sets the skipped_compacted_keys of this StatsModelInternalUse.
+
+
+        :param skipped_compacted_keys: The skipped_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._skipped_compacted_keys = skipped_compacted_keys
+
+    @property
+    def summaries(self):
+        """Gets the summaries of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The summaries of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._summaries
+
+    @summaries.setter
+    def summaries(self, summaries):
+        """Sets the summaries of this StatsModelInternalUse.
+
+
+        :param summaries: The summaries of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._summaries = summaries
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(StatsModelInternalUse, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, StatsModelInternalUse):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/trace.py b/wavefront_api_client/models/trace.py
new file mode 100644
index 0000000..f97b166
--- /dev/null
+++ b/wavefront_api_client/models/trace.py
@@ -0,0 +1,231 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.models.span import Span  # noqa: F401,E501
+
+
+class Trace(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'end_ms': 'int',
+        'spans': 'list[Span]',
+        'start_ms': 'int',
+        'total_duration_ms': 'int',
+        'trace_id': 'str'
+    }
+
+    attribute_map = {
+        'end_ms': 'end_ms',
+        'spans': 'spans',
+        'start_ms': 'start_ms',
+        'total_duration_ms': 'total_duration_ms',
+        'trace_id': 'traceId'
+    }
+
+    def __init__(self, end_ms=None, spans=None, start_ms=None, total_duration_ms=None, trace_id=None):  # noqa: E501
+        """Trace - a model defined in Swagger"""  # noqa: E501
+
+        self._end_ms = None
+        self._spans = None
+        self._start_ms = None
+        self._total_duration_ms = None
+        self._trace_id = None
+        self.discriminator = None
+
+        if end_ms is not None:
+            self.end_ms = end_ms
+        if spans is not None:
+            self.spans = spans
+        if start_ms is not None:
+            self.start_ms = start_ms
+        if total_duration_ms is not None:
+            self.total_duration_ms = total_duration_ms
+        if trace_id is not None:
+            self.trace_id = trace_id
+
+    @property
+    def end_ms(self):
+        """Gets the end_ms of this Trace.  # noqa: E501
+
+        Trace end time (in milliseconds)  # noqa: E501
+
+        :return: The end_ms of this Trace.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_ms
+
+    @end_ms.setter
+    def end_ms(self, end_ms):
+        """Sets the end_ms of this Trace.
+
+        Trace end time (in milliseconds)  # noqa: E501
+
+        :param end_ms: The end_ms of this Trace.  # noqa: E501
+        :type: int
+        """
+
+        self._end_ms = end_ms
+
+    @property
+    def spans(self):
+        """Gets the spans of this Trace.  # noqa: E501
+
+        Spans associated with this trace  # noqa: E501
+
+        :return: The spans of this Trace.  # noqa: E501
+        :rtype: list[Span]
+        """
+        return self._spans
+
+    @spans.setter
+    def spans(self, spans):
+        """Sets the spans of this Trace.
+
+        Spans associated with this trace  # noqa: E501
+
+        :param spans: The spans of this Trace.  # noqa: E501
+        :type: list[Span]
+        """
+
+        self._spans = spans
+
+    @property
+    def start_ms(self):
+        """Gets the start_ms of this Trace.  # noqa: E501
+
+        Trace start time (in milliseconds)  # noqa: E501
+
+        :return: The start_ms of this Trace.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_ms
+
+    @start_ms.setter
+    def start_ms(self, start_ms):
+        """Sets the start_ms of this Trace.
+
+        Trace start time (in milliseconds)  # noqa: E501
+
+        :param start_ms: The start_ms of this Trace.  # noqa: E501
+        :type: int
+        """
+
+        self._start_ms = start_ms
+
+    @property
+    def total_duration_ms(self):
+        """Gets the total_duration_ms of this Trace.  # noqa: E501
+
+        Trace total duration (in milliseconds)  # noqa: E501
+
+        :return: The total_duration_ms of this Trace.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_duration_ms
+
+    @total_duration_ms.setter
+    def total_duration_ms(self, total_duration_ms):
+        """Sets the total_duration_ms of this Trace.
+
+        Trace total duration (in milliseconds)  # noqa: E501
+
+        :param total_duration_ms: The total_duration_ms of this Trace.  # noqa: E501
+        :type: int
+        """
+
+        self._total_duration_ms = total_duration_ms
+
+    @property
+    def trace_id(self):
+        """Gets the trace_id of this Trace.  # noqa: E501
+
+        Trace ID  # noqa: E501
+
+        :return: The trace_id of this Trace.  # noqa: E501
+        :rtype: str
+        """
+        return self._trace_id
+
+    @trace_id.setter
+    def trace_id(self, trace_id):
+        """Sets the trace_id of this Trace.
+
+        Trace ID  # noqa: E501
+
+        :param trace_id: The trace_id of this Trace.  # noqa: E501
+        :type: str
+        """
+
+        self._trace_id = trace_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Trace, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Trace):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
index 0ed70c3..cf88d20 100644
--- a/wavefront_api_client/models/user.py
+++ b/wavefront_api_client/models/user.py
@@ -33,16 +33,19 @@ class User(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'account_type': 'str',
         'api_token': 'str',
         'api_token2': 'str',
         'credential': 'str',
         'customer': 'str',
+        'description': 'str',
         'extra_api_tokens': 'list[str]',
         'groups': 'list[str]',
         'identifier': 'str',
         'invalid_password_attempts': 'int',
         'last_logout': 'int',
         'last_successful_login': 'int',
+        'last_used': 'int',
         'old_passwords': 'list[str]',
         'onboarding_state': 'str',
         'provider': 'str',
@@ -55,16 +58,19 @@ class User(object):
     }
 
     attribute_map = {
+        'account_type': 'accountType',
         'api_token': 'apiToken',
         'api_token2': 'apiToken2',
         'credential': 'credential',
         'customer': 'customer',
+        'description': 'description',
         'extra_api_tokens': 'extraApiTokens',
         'groups': 'groups',
         'identifier': 'identifier',
         'invalid_password_attempts': 'invalidPasswordAttempts',
         'last_logout': 'lastLogout',
         'last_successful_login': 'lastSuccessfulLogin',
+        'last_used': 'lastUsed',
         'old_passwords': 'oldPasswords',
         'onboarding_state': 'onboardingState',
         'provider': 'provider',
@@ -76,19 +82,22 @@ class User(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, api_token=None, api_token2=None, credential=None, customer=None, extra_api_tokens=None, groups=None, identifier=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, old_passwords=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
+    def __init__(self, account_type=None, api_token=None, api_token2=None, credential=None, customer=None, description=None, extra_api_tokens=None, groups=None, identifier=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, last_used=None, old_passwords=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
         """User - a model defined in Swagger"""  # noqa: E501
 
+        self._account_type = None
         self._api_token = None
         self._api_token2 = None
         self._credential = None
         self._customer = None
+        self._description = None
         self._extra_api_tokens = None
         self._groups = None
         self._identifier = None
         self._invalid_password_attempts = None
         self._last_logout = None
         self._last_successful_login = None
+        self._last_used = None
         self._old_passwords = None
         self._onboarding_state = None
         self._provider = None
@@ -100,6 +109,8 @@ def __init__(self, api_token=None, api_token2=None, credential=None, customer=No
         self._user_groups = None
         self.discriminator = None
 
+        if account_type is not None:
+            self.account_type = account_type
         if api_token is not None:
             self.api_token = api_token
         if api_token2 is not None:
@@ -108,6 +119,8 @@ def __init__(self, api_token=None, api_token2=None, credential=None, customer=No
             self.credential = credential
         if customer is not None:
             self.customer = customer
+        if description is not None:
+            self.description = description
         if extra_api_tokens is not None:
             self.extra_api_tokens = extra_api_tokens
         if groups is not None:
@@ -120,6 +133,8 @@ def __init__(self, api_token=None, api_token2=None, credential=None, customer=No
             self.last_logout = last_logout
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
+        if last_used is not None:
+            self.last_used = last_used
         if old_passwords is not None:
             self.old_passwords = old_passwords
         if onboarding_state is not None:
@@ -139,6 +154,33 @@ def __init__(self, api_token=None, api_token2=None, credential=None, customer=No
         if user_groups is not None:
             self.user_groups = user_groups
 
+    @property
+    def account_type(self):
+        """Gets the account_type of this User.  # noqa: E501
+
+
+        :return: The account_type of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._account_type
+
+    @account_type.setter
+    def account_type(self, account_type):
+        """Sets the account_type of this User.
+
+
+        :param account_type: The account_type of this User.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT"]  # noqa: E501
+        if account_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `account_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(account_type, allowed_values)
+            )
+
+        self._account_type = account_type
+
     @property
     def api_token(self):
         """Gets the api_token of this User.  # noqa: E501
@@ -223,6 +265,27 @@ def customer(self, customer):
 
         self._customer = customer
 
+    @property
+    def description(self):
+        """Gets the description of this User.  # noqa: E501
+
+
+        :return: The description of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this User.
+
+
+        :param description: The description of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
     @property
     def extra_api_tokens(self):
         """Gets the extra_api_tokens of this User.  # noqa: E501
@@ -349,6 +412,27 @@ def last_successful_login(self, last_successful_login):
 
         self._last_successful_login = last_successful_login
 
+    @property
+    def last_used(self):
+        """Gets the last_used of this User.  # noqa: E501
+
+
+        :return: The last_used of this User.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_used
+
+    @last_used.setter
+    def last_used(self, last_used):
+        """Sets the last_used of this User.
+
+
+        :param last_used: The last_used of this User.  # noqa: E501
+        :type: int
+        """
+
+        self._last_used = last_used
+
     @property
     def old_passwords(self):
         """Gets the old_passwords of this User.  # noqa: E501
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index c8dc7aa..dfc90c9 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -31,26 +31,54 @@ class UserApiToken(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'last_used': 'int',
         'token_id': 'str',
         'token_name': 'str'
     }
 
     attribute_map = {
+        'last_used': 'lastUsed',
         'token_id': 'tokenID',
         'token_name': 'tokenName'
     }
 
-    def __init__(self, token_id=None, token_name=None):  # noqa: E501
+    def __init__(self, last_used=None, token_id=None, token_name=None):  # noqa: E501
         """UserApiToken - a model defined in Swagger"""  # noqa: E501
 
+        self._last_used = None
         self._token_id = None
         self._token_name = None
         self.discriminator = None
 
+        if last_used is not None:
+            self.last_used = last_used
         self.token_id = token_id
         if token_name is not None:
             self.token_name = token_name
 
+    @property
+    def last_used(self):
+        """Gets the last_used of this UserApiToken.  # noqa: E501
+
+        The last time this token was used  # noqa: E501
+
+        :return: The last_used of this UserApiToken.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_used
+
+    @last_used.setter
+    def last_used(self, last_used):
+        """Sets the last_used of this UserApiToken.
+
+        The last time this token was used  # noqa: E501
+
+        :param last_used: The last_used of this UserApiToken.  # noqa: E501
+        :type: int
+        """
+
+        self._last_used = last_used
+
     @property
     def token_id(self):
         """Gets the token_id of this UserApiToken.  # noqa: E501

From 945b4267b81c654fe31e814ce017bf25acda6a99 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 6 Sep 2019 08:16:39 -0700
Subject: [PATCH 035/161] Autogenerated Update v2.36.18.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   4 +-
 docs/Alert.md                                 |   1 +
 docs/AlertRoute.md                            |  12 ++
 docs/Event.md                                 |   1 +
 docs/Notificant.md                            |   1 +
 docs/Proxy.md                                 |   3 +
 docs/QueryApi.md                              |   6 +-
 docs/UserApi.md                               |  55 ++++++
 docs/UserRequestDTO.md                        |   1 +
 setup.py                                      |   2 +-
 test/test_alert_route.py                      |  40 ++++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api/query_api.py         |   6 +-
 wavefront_api_client/api/user_api.py          |  95 +++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 wavefront_api_client/models/alert.py          |  30 ++-
 wavefront_api_client/models/alert_route.py    | 182 ++++++++++++++++++
 wavefront_api_client/models/event.py          |  30 ++-
 wavefront_api_client/models/notificant.py     |  32 ++-
 wavefront_api_client/models/proxy.py          |  86 ++++++++-
 .../models/user_request_dto.py                |  28 ++-
 25 files changed, 611 insertions(+), 14 deletions(-)
 create mode 100644 docs/AlertRoute.md
 create mode 100644 test/test_alert_route.py
 create mode 100644 wavefront_api_client/models/alert_route.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index b5db134..ff85822 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.35.25"
+    "packageVersion": "2.36.18"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6a92165..b5db134 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.33.15"
+    "packageVersion": "2.35.25"
 }
diff --git a/README.md b/README.md
index 0b65c1c..bd9bfee 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.35.25
+- Package version: 2.36.18
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -285,6 +285,7 @@ Class | Method | HTTP request | Description
 *UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 *UserApi* | [**get_all_users**](docs/UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
 *UserApi* | [**get_user**](docs/UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
+*UserApi* | [**get_user_business_functions**](docs/UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user.
 *UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
@@ -318,6 +319,7 @@ Class | Method | HTTP request | Description
  - [AccessControlListWriteDTO](docs/AccessControlListWriteDTO.md)
  - [Account](docs/Account.md)
  - [Alert](docs/Alert.md)
+ - [AlertRoute](docs/AlertRoute.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
diff --git a/docs/Alert.md b/docs/Alert.md
index b43538b..b35d614 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -22,6 +22,7 @@ Name | Type | Description | Notes
 **display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
 **display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
+**evaluate_realtime_data** | **bool** | Whether to alert on the real-time ingestion stream (may be noisy due to late data) | [optional] 
 **event** | [**Event**](Event.md) |  | [optional] 
 **failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
 **hidden** | **bool** |  | [optional] 
diff --git a/docs/AlertRoute.md b/docs/AlertRoute.md
new file mode 100644
index 0000000..de57c23
--- /dev/null
+++ b/docs/AlertRoute.md
@@ -0,0 +1,12 @@
+# AlertRoute
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**filter** | **str** | String that filters the route. Space delimited. Currently only allows single key value pair.  filter: env* prod* | 
+**method** | **str** | The end point for the alert route.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
+**target** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Event.md b/docs/Event.md
index ba62f75..b2dc995 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -15,6 +15,7 @@ Name | Type | Description | Notes
 **id** | **str** |  | [optional] 
 **is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
 **is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
+**metrics_used** | **list[str]** | A list of metrics affected by the event | [optional] 
 **name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
 **running_state** | **str** |  | [optional] 
 **start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
diff --git a/docs/Notificant.md b/docs/Notificant.md
index bc010d1..2c2694c 100644
--- a/docs/Notificant.md
+++ b/docs/Notificant.md
@@ -14,6 +14,7 @@ Name | Type | Description | Notes
 **is_html_content** | **bool** | Determine whether the email alert target content is sent as html or text. | [optional] 
 **method** | **str** | The notification method used for notification target. | 
 **recipient** | **str** | The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point | 
+**routes** | [**list[AlertRoute]**](AlertRoute.md) | List of routing targets that this notificant will notify. | [optional] 
 **template** | **str** | A mustache template that will form the body of the POST request, email and summary of the PagerDuty. | 
 **title** | **str** | Title | 
 **triggers** | **list[str]** | A list of occurrences on which this webhook will be fired.  Valid values are ALERT_OPENED, ALERT_UPDATED, ALERT_RESOLVED, ALERT_MAINTENANCE, ALERT_SNOOZED | 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index fb08217..ad53b11 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bytes_left_for_buffer** | **int** | Number of bytes of space remaining in the persistent disk queue of this proxy | [optional] 
 **bytes_per_minute_for_buffer** | **int** | Bytes used per minute by the persistent disk queue of this proxy | [optional] 
+**collector_rate_limit** | **int** | Proxy&#39;s rate limit | [optional] 
+**collector_sets_rate_limit** | **bool** | When true, this proxy&#39;s rate limit is controlled remotely | [optional] 
 **customer_id** | **str** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 **ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
@@ -17,6 +19,7 @@ Name | Type | Description | Notes
 **last_known_error** | **str** | deprecated | [optional] 
 **local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
 **name** | **str** | Proxy name (modifiable) | 
+**shutdown** | **bool** | When true, attempt to shut down this proxy remotely | [optional] 
 **ssh_agent** | **bool** | deprecated | [optional] 
 **status** | **str** | the proxy&#39;s status | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
diff --git a/docs/QueryApi.md b/docs/QueryApi.md
index f454add..4aae5dd 100644
--- a/docs/QueryApi.md
+++ b/docs/QueryApi.md
@@ -9,7 +9,7 @@ Method | HTTP request | Description
 
 
 # **query_api**
-> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
+> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
 
 Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
 
@@ -42,13 +42,14 @@ auto_events = true # bool | whether events for sources included in the query wil
 summarization = 'summarization_example' # str | summarization strategy to use when bucketing points together (optional)
 list_mode = true # bool | retrieve events more optimally displayed for a list (optional)
 strict = true # bool | do not return points outside the query window [s;e), defaults to false (optional)
+view = 'METRIC' # str | view of the query result, metric or histogram, defaults to metric (optional) (default to METRIC)
 include_obsolete_metrics = true # bool | include metrics that have not been reporting recently, defaults to false (optional)
 sorted = false # bool | sorts the output so that returned series are in order, defaults to false (optional) (default to false)
 cached = true # bool | whether the query cache is used, defaults to true (optional) (default to true)
 
 try:
     # Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
-    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
+    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling QueryApi->query_api: %s\n" % e)
@@ -69,6 +70,7 @@ Name | Type | Description  | Notes
  **summarization** | **str**| summarization strategy to use when bucketing points together | [optional] 
  **list_mode** | **bool**| retrieve events more optimally displayed for a list | [optional] 
  **strict** | **bool**| do not return points outside the query window [s;e), defaults to false | [optional] 
+ **view** | **str**| view of the query result, metric or histogram, defaults to metric | [optional] [default to METRIC]
  **include_obsolete_metrics** | **bool**| include metrics that have not been reporting recently, defaults to false | [optional] 
  **sorted** | **bool**| sorts the output so that returned series are in order, defaults to false | [optional] [default to false]
  **cached** | **bool**| whether the query cache is used, defaults to true | [optional] [default to true]
diff --git a/docs/UserApi.md b/docs/UserApi.md
index e33332a..93a67a6 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -10,6 +10,7 @@ Method | HTTP request | Description
 [**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 [**get_all_users**](UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
 [**get_user**](UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
+[**get_user_business_functions**](UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user.
 [**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
@@ -343,6 +344,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_user_business_functions**
+> UserModel get_user_business_functions(id)
+
+Returns business functions of a specific user.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Returns business functions of a specific user.
+    api_response = api_instance.get_user_business_functions(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->get_user_business_functions: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **grant_permission_to_users**
 > UserModel grant_permission_to_users(permission, body=body)
 
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
index 283caf9..2c88ddc 100644
--- a/docs/UserRequestDTO.md
+++ b/docs/UserRequestDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**credential** | **str** |  | [optional] 
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index 72f1aab..9942135 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.35.25"
+VERSION = "2.36.18"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_alert_route.py b/test/test_alert_route.py
new file mode 100644
index 0000000..14d75ac
--- /dev/null
+++ b/test/test_alert_route.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_route import AlertRoute  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertRoute(unittest.TestCase):
+    """AlertRoute unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertRoute(self):
+        """Test AlertRoute"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_route.AlertRoute()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index aa36eee..94b99b9 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -51,6 +51,7 @@
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_route import AlertRoute
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index 9f733c9..dd393f4 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -54,6 +54,7 @@ def query_api(self, q, s, g, **kwargs):  # noqa: E501
         :param str summarization: summarization strategy to use when bucketing points together
         :param bool list_mode: retrieve events more optimally displayed for a list
         :param bool strict: do not return points outside the query window [s;e), defaults to false
+        :param str view: view of the query result, metric or histogram, defaults to metric
         :param bool include_obsolete_metrics: include metrics that have not been reporting recently, defaults to false
         :param bool sorted: sorts the output so that returned series are in order, defaults to false
         :param bool cached: whether the query cache is used, defaults to true
@@ -89,6 +90,7 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
         :param str summarization: summarization strategy to use when bucketing points together
         :param bool list_mode: retrieve events more optimally displayed for a list
         :param bool strict: do not return points outside the query window [s;e), defaults to false
+        :param str view: view of the query result, metric or histogram, defaults to metric
         :param bool include_obsolete_metrics: include metrics that have not been reporting recently, defaults to false
         :param bool sorted: sorts the output so that returned series are in order, defaults to false
         :param bool cached: whether the query cache is used, defaults to true
@@ -97,7 +99,7 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
                  returns the request thread.
         """
 
-        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'include_obsolete_metrics', 'sorted', 'cached']  # noqa: E501
+        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'view', 'include_obsolete_metrics', 'sorted', 'cached']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -152,6 +154,8 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
             query_params.append(('listMode', params['list_mode']))  # noqa: E501
         if 'strict' in params:
             query_params.append(('strict', params['strict']))  # noqa: E501
+        if 'view' in params:
+            query_params.append(('view', params['view']))  # noqa: E501
         if 'include_obsolete_metrics' in params:
             query_params.append(('includeObsoleteMetrics', params['include_obsolete_metrics']))  # noqa: E501
         if 'sorted' in params:
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 3305613..050739e 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -607,6 +607,101 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_user_business_functions(self, id, **kwargs):  # noqa: E501
+        """Returns business functions of a specific user.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_business_functions(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_user_business_functions_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_user_business_functions_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_user_business_functions_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Returns business functions of a specific user.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_business_functions_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_user_business_functions" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_user_business_functions`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/user/{id}/businessFunctions', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 53a88ec..8ea2cd9 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.35.25/python'
+        self.user_agent = 'Swagger-Codegen/2.36.18/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index ceb1864..5cba4ea 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.35.25".\
+               "SDK Package Version: 2.36.18".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 4f4341d..79e86a4 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -22,6 +22,7 @@
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_route import AlertRoute
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index eef651e..b336ead 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -56,6 +56,7 @@ class Alert(object):
         'display_expression': 'str',
         'display_expression_qb_enabled': 'bool',
         'display_expression_qb_serialization': 'str',
+        'evaluate_realtime_data': 'bool',
         'event': 'Event',
         'failing_host_label_pairs': 'list[SourceLabelPair]',
         'hidden': 'bool',
@@ -120,6 +121,7 @@ class Alert(object):
         'display_expression': 'displayExpression',
         'display_expression_qb_enabled': 'displayExpressionQBEnabled',
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
+        'evaluate_realtime_data': 'evaluateRealtimeData',
         'event': 'event',
         'failing_host_label_pairs': 'failingHostLabelPairs',
         'hidden': 'hidden',
@@ -164,7 +166,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -186,6 +188,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._display_expression = None
         self._display_expression_qb_enabled = None
         self._display_expression_qb_serialization = None
+        self._evaluate_realtime_data = None
         self._event = None
         self._failing_host_label_pairs = None
         self._hidden = None
@@ -267,6 +270,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.display_expression_qb_enabled = display_expression_qb_enabled
         if display_expression_qb_serialization is not None:
             self.display_expression_qb_serialization = display_expression_qb_serialization
+        if evaluate_realtime_data is not None:
+            self.evaluate_realtime_data = evaluate_realtime_data
         if event is not None:
             self.event = event
         if failing_host_label_pairs is not None:
@@ -779,6 +784,29 @@ def display_expression_qb_serialization(self, display_expression_qb_serializatio
 
         self._display_expression_qb_serialization = display_expression_qb_serialization
 
+    @property
+    def evaluate_realtime_data(self):
+        """Gets the evaluate_realtime_data of this Alert.  # noqa: E501
+
+        Whether to alert on the real-time ingestion stream (may be noisy due to late data)  # noqa: E501
+
+        :return: The evaluate_realtime_data of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._evaluate_realtime_data
+
+    @evaluate_realtime_data.setter
+    def evaluate_realtime_data(self, evaluate_realtime_data):
+        """Sets the evaluate_realtime_data of this Alert.
+
+        Whether to alert on the real-time ingestion stream (may be noisy due to late data)  # noqa: E501
+
+        :param evaluate_realtime_data: The evaluate_realtime_data of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._evaluate_realtime_data = evaluate_realtime_data
+
     @property
     def event(self):
         """Gets the event of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/alert_route.py b/wavefront_api_client/models/alert_route.py
new file mode 100644
index 0000000..d7af86f
--- /dev/null
+++ b/wavefront_api_client/models/alert_route.py
@@ -0,0 +1,182 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AlertRoute(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'filter': 'str',
+        'method': 'str',
+        'target': 'str'
+    }
+
+    attribute_map = {
+        'filter': 'filter',
+        'method': 'method',
+        'target': 'target'
+    }
+
+    def __init__(self, filter=None, method=None, target=None):  # noqa: E501
+        """AlertRoute - a model defined in Swagger"""  # noqa: E501
+
+        self._filter = None
+        self._method = None
+        self._target = None
+        self.discriminator = None
+
+        self.filter = filter
+        self.method = method
+        self.target = target
+
+    @property
+    def filter(self):
+        """Gets the filter of this AlertRoute.  # noqa: E501
+
+        String that filters the route. Space delimited. Currently only allows single key value pair.  filter: env* prod*  # noqa: E501
+
+        :return: The filter of this AlertRoute.  # noqa: E501
+        :rtype: str
+        """
+        return self._filter
+
+    @filter.setter
+    def filter(self, filter):
+        """Sets the filter of this AlertRoute.
+
+        String that filters the route. Space delimited. Currently only allows single key value pair.  filter: env* prod*  # noqa: E501
+
+        :param filter: The filter of this AlertRoute.  # noqa: E501
+        :type: str
+        """
+        if filter is None:
+            raise ValueError("Invalid value for `filter`, must not be `None`")  # noqa: E501
+
+        self._filter = filter
+
+    @property
+    def method(self):
+        """Gets the method of this AlertRoute.  # noqa: E501
+
+        The end point for the alert route.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
+
+        :return: The method of this AlertRoute.  # noqa: E501
+        :rtype: str
+        """
+        return self._method
+
+    @method.setter
+    def method(self, method):
+        """Sets the method of this AlertRoute.
+
+        The end point for the alert route.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
+
+        :param method: The method of this AlertRoute.  # noqa: E501
+        :type: str
+        """
+        if method is None:
+            raise ValueError("Invalid value for `method`, must not be `None`")  # noqa: E501
+        allowed_values = ["WEBHOOK", "PAGERDUTY", "EMAIL"]  # noqa: E501
+        if method not in allowed_values:
+            raise ValueError(
+                "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
+                .format(method, allowed_values)
+            )
+
+        self._method = method
+
+    @property
+    def target(self):
+        """Gets the target of this AlertRoute.  # noqa: E501
+
+        The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
+
+        :return: The target of this AlertRoute.  # noqa: E501
+        :rtype: str
+        """
+        return self._target
+
+    @target.setter
+    def target(self, target):
+        """Sets the target of this AlertRoute.
+
+        The end point for the notification target.EMAIL: email address.  PAGERDUTY: PagerDuty routing Key.  WEBHOOK: URL end point  # noqa: E501
+
+        :param target: The target of this AlertRoute.  # noqa: E501
+        :type: str
+        """
+        if target is None:
+            raise ValueError("Invalid value for `target`, must not be `None`")  # noqa: E501
+
+        self._target = target
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertRoute, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertRoute):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index d1a08c6..5dba91c 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -43,6 +43,7 @@ class Event(object):
         'id': 'str',
         'is_ephemeral': 'bool',
         'is_user_event': 'bool',
+        'metrics_used': 'list[str]',
         'name': 'str',
         'running_state': 'str',
         'start_time': 'int',
@@ -67,6 +68,7 @@ class Event(object):
         'id': 'id',
         'is_ephemeral': 'isEphemeral',
         'is_user_event': 'isUserEvent',
+        'metrics_used': 'metricsUsed',
         'name': 'name',
         'running_state': 'runningState',
         'start_time': 'startTime',
@@ -78,7 +80,7 @@ class Event(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
         self._annotations = None
@@ -93,6 +95,7 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
         self._id = None
         self._is_ephemeral = None
         self._is_user_event = None
+        self._metrics_used = None
         self._name = None
         self._running_state = None
         self._start_time = None
@@ -127,6 +130,8 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
             self.is_ephemeral = is_ephemeral
         if is_user_event is not None:
             self.is_user_event = is_user_event
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
         self.name = name
         if running_state is not None:
             self.running_state = running_state
@@ -415,6 +420,29 @@ def is_user_event(self, is_user_event):
 
         self._is_user_event = is_user_event
 
+    @property
+    def metrics_used(self):
+        """Gets the metrics_used of this Event.  # noqa: E501
+
+        A list of metrics affected by the event  # noqa: E501
+
+        :return: The metrics_used of this Event.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._metrics_used
+
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this Event.
+
+        A list of metrics affected by the event  # noqa: E501
+
+        :param metrics_used: The metrics_used of this Event.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._metrics_used = metrics_used
+
     @property
     def name(self):
         """Gets the name of this Event.  # noqa: E501
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index e63102a..8efc9a6 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.models.alert_route import AlertRoute  # noqa: F401,E501
+
 
 class Notificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,6 +44,7 @@ class Notificant(object):
         'is_html_content': 'bool',
         'method': 'str',
         'recipient': 'str',
+        'routes': 'list[AlertRoute]',
         'template': 'str',
         'title': 'str',
         'triggers': 'list[str]',
@@ -61,6 +64,7 @@ class Notificant(object):
         'is_html_content': 'isHtmlContent',
         'method': 'method',
         'recipient': 'recipient',
+        'routes': 'routes',
         'template': 'template',
         'title': 'title',
         'triggers': 'triggers',
@@ -68,7 +72,7 @@ class Notificant(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None, custom_http_headers=None, customer_id=None, description=None, email_subject=None, id=None, is_html_content=None, method=None, recipient=None, template=None, title=None, triggers=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None, custom_http_headers=None, customer_id=None, description=None, email_subject=None, id=None, is_html_content=None, method=None, recipient=None, routes=None, template=None, title=None, triggers=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Notificant - a model defined in Swagger"""  # noqa: E501
 
         self._content_type = None
@@ -82,6 +86,7 @@ def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None
         self._is_html_content = None
         self._method = None
         self._recipient = None
+        self._routes = None
         self._template = None
         self._title = None
         self._triggers = None
@@ -108,6 +113,8 @@ def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None
             self.is_html_content = is_html_content
         self.method = method
         self.recipient = recipient
+        if routes is not None:
+            self.routes = routes
         self.template = template
         self.title = title
         self.triggers = triggers
@@ -379,6 +386,29 @@ def recipient(self, recipient):
 
         self._recipient = recipient
 
+    @property
+    def routes(self):
+        """Gets the routes of this Notificant.  # noqa: E501
+
+        List of routing targets that this notificant will notify.  # noqa: E501
+
+        :return: The routes of this Notificant.  # noqa: E501
+        :rtype: list[AlertRoute]
+        """
+        return self._routes
+
+    @routes.setter
+    def routes(self, routes):
+        """Sets the routes of this Notificant.
+
+        List of routing targets that this notificant will notify.  # noqa: E501
+
+        :param routes: The routes of this Notificant.  # noqa: E501
+        :type: list[AlertRoute]
+        """
+
+        self._routes = routes
+
     @property
     def template(self):
         """Gets the template of this Notificant.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 742ee2c..6b099a9 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -35,6 +35,8 @@ class Proxy(object):
     swagger_types = {
         'bytes_left_for_buffer': 'int',
         'bytes_per_minute_for_buffer': 'int',
+        'collector_rate_limit': 'int',
+        'collector_sets_rate_limit': 'bool',
         'customer_id': 'str',
         'deleted': 'bool',
         'ephemeral': 'bool',
@@ -47,6 +49,7 @@ class Proxy(object):
         'last_known_error': 'str',
         'local_queue_size': 'int',
         'name': 'str',
+        'shutdown': 'bool',
         'ssh_agent': 'bool',
         'status': 'str',
         'status_cause': 'str',
@@ -57,6 +60,8 @@ class Proxy(object):
     attribute_map = {
         'bytes_left_for_buffer': 'bytesLeftForBuffer',
         'bytes_per_minute_for_buffer': 'bytesPerMinuteForBuffer',
+        'collector_rate_limit': 'collectorRateLimit',
+        'collector_sets_rate_limit': 'collectorSetsRateLimit',
         'customer_id': 'customerId',
         'deleted': 'deleted',
         'ephemeral': 'ephemeral',
@@ -69,6 +74,7 @@ class Proxy(object):
         'last_known_error': 'lastKnownError',
         'local_queue_size': 'localQueueSize',
         'name': 'name',
+        'shutdown': 'shutdown',
         'ssh_agent': 'sshAgent',
         'status': 'status',
         'status_cause': 'statusCause',
@@ -76,11 +82,13 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, version=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, shutdown=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, version=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
         self._bytes_left_for_buffer = None
         self._bytes_per_minute_for_buffer = None
+        self._collector_rate_limit = None
+        self._collector_sets_rate_limit = None
         self._customer_id = None
         self._deleted = None
         self._ephemeral = None
@@ -93,6 +101,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._last_known_error = None
         self._local_queue_size = None
         self._name = None
+        self._shutdown = None
         self._ssh_agent = None
         self._status = None
         self._status_cause = None
@@ -104,6 +113,10 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.bytes_left_for_buffer = bytes_left_for_buffer
         if bytes_per_minute_for_buffer is not None:
             self.bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
+        if collector_rate_limit is not None:
+            self.collector_rate_limit = collector_rate_limit
+        if collector_sets_rate_limit is not None:
+            self.collector_sets_rate_limit = collector_sets_rate_limit
         if customer_id is not None:
             self.customer_id = customer_id
         if deleted is not None:
@@ -127,6 +140,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         if local_queue_size is not None:
             self.local_queue_size = local_queue_size
         self.name = name
+        if shutdown is not None:
+            self.shutdown = shutdown
         if ssh_agent is not None:
             self.ssh_agent = ssh_agent
         if status is not None:
@@ -184,6 +199,52 @@ def bytes_per_minute_for_buffer(self, bytes_per_minute_for_buffer):
 
         self._bytes_per_minute_for_buffer = bytes_per_minute_for_buffer
 
+    @property
+    def collector_rate_limit(self):
+        """Gets the collector_rate_limit of this Proxy.  # noqa: E501
+
+        Proxy's rate limit  # noqa: E501
+
+        :return: The collector_rate_limit of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._collector_rate_limit
+
+    @collector_rate_limit.setter
+    def collector_rate_limit(self, collector_rate_limit):
+        """Sets the collector_rate_limit of this Proxy.
+
+        Proxy's rate limit  # noqa: E501
+
+        :param collector_rate_limit: The collector_rate_limit of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._collector_rate_limit = collector_rate_limit
+
+    @property
+    def collector_sets_rate_limit(self):
+        """Gets the collector_sets_rate_limit of this Proxy.  # noqa: E501
+
+        When true, this proxy's rate limit is controlled remotely  # noqa: E501
+
+        :return: The collector_sets_rate_limit of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._collector_sets_rate_limit
+
+    @collector_sets_rate_limit.setter
+    def collector_sets_rate_limit(self, collector_sets_rate_limit):
+        """Sets the collector_sets_rate_limit of this Proxy.
+
+        When true, this proxy's rate limit is controlled remotely  # noqa: E501
+
+        :param collector_sets_rate_limit: The collector_sets_rate_limit of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._collector_sets_rate_limit = collector_sets_rate_limit
+
     @property
     def customer_id(self):
         """Gets the customer_id of this Proxy.  # noqa: E501
@@ -452,6 +513,29 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def shutdown(self):
+        """Gets the shutdown of this Proxy.  # noqa: E501
+
+        When true, attempt to shut down this proxy remotely  # noqa: E501
+
+        :return: The shutdown of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._shutdown
+
+    @shutdown.setter
+    def shutdown(self, shutdown):
+        """Sets the shutdown of this Proxy.
+
+        When true, attempt to shut down this proxy remotely  # noqa: E501
+
+        :param shutdown: The shutdown of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._shutdown = shutdown
+
     @property
     def ssh_agent(self):
         """Gets the ssh_agent of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 5b6de13..de5120f 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -31,6 +31,7 @@ class UserRequestDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'credential': 'str',
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
@@ -39,6 +40,7 @@ class UserRequestDTO(object):
     }
 
     attribute_map = {
+        'credential': 'credential',
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
@@ -46,9 +48,10 @@ class UserRequestDTO(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, credential=None, customer=None, groups=None, identifier=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
 
+        self._credential = None
         self._customer = None
         self._groups = None
         self._identifier = None
@@ -56,6 +59,8 @@ def __init__(self, customer=None, groups=None, identifier=None, sso_id=None, use
         self._user_groups = None
         self.discriminator = None
 
+        if credential is not None:
+            self.credential = credential
         if customer is not None:
             self.customer = customer
         if groups is not None:
@@ -67,6 +72,27 @@ def __init__(self, customer=None, groups=None, identifier=None, sso_id=None, use
         if user_groups is not None:
             self.user_groups = user_groups
 
+    @property
+    def credential(self):
+        """Gets the credential of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The credential of this UserRequestDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._credential
+
+    @credential.setter
+    def credential(self, credential):
+        """Sets the credential of this UserRequestDTO.
+
+
+        :param credential: The credential of this UserRequestDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._credential = credential
+
     @property
     def customer(self):
         """Gets the customer of this UserRequestDTO.  # noqa: E501

From 8b09a14afeed43ad51ca55852c9e65466ac896e5 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Thu, 26 Sep 2019 11:21:32 -0700
Subject: [PATCH 036/161] Update Swagger Codegen Version to 2.4.8 (#57)

The `swagger-codegen` version has been updated to 2.4.8,
and an updated client v2.36.26 has been generated.
---
 .swagger-codegen/VERSION              | 2 +-
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 generate_client                       | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 26f8b8b..752a79e 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.5
\ No newline at end of file
+2.4.8
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ff85822..9ba10b5 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.36.18"
+    "packageVersion": "2.36.26"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index b5db134..ff85822 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.35.25"
+    "packageVersion": "2.36.18"
 }
diff --git a/README.md b/README.md
index bd9bfee..ec450a9 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.36.18
+- Package version: 2.36.26
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 68d5de2..83f9ce7 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.5"  # For 3.x use CGEN_VER="3.0.7"
+CGEN_VER="2.4.8"  # For 3.x use CGEN_VER="3.0.7"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 9942135..410f9af 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.36.18"
+VERSION = "2.36.26"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 8ea2cd9..dd105c9 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.36.18/python'
+        self.user_agent = 'Swagger-Codegen/2.36.26/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 5cba4ea..f217aa6 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.36.18".\
+               "SDK Package Version: 2.36.26".\
                format(env=sys.platform, pyversion=sys.version)

From 7bf1863b8664edef8d5e853a237e682c7db192d7 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 1 Oct 2019 08:16:37 -0700
Subject: [PATCH 037/161] Autogenerated Update v2.37.6.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/Alert.md                                 |  1 +
 docs/IntegrationApi.md                        | 12 ++++++--
 setup.py                                      |  2 +-
 wavefront_api_client/api/integration_api.py   | 10 ++++++-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/alert.py          | 30 ++++++++++++++++++-
 .../models/cloud_integration.py               |  2 +-
 11 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 9ba10b5..b1d33b7 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.36.26"
+    "packageVersion": "2.37.6"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ff85822..9ba10b5 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.36.18"
+    "packageVersion": "2.36.26"
 }
diff --git a/README.md b/README.md
index ec450a9..6123068 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.36.26
+- Package version: 2.37.6
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index b35d614..420b2bb 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -24,6 +24,7 @@ Name | Type | Description | Notes
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
 **evaluate_realtime_data** | **bool** | Whether to alert on the real-time ingestion stream (may be noisy due to late data) | [optional] 
 **event** | [**Event**](Event.md) |  | [optional] 
+**failing_host_label_pair_links** | **list[str]** | List of links to tracing applications that caused a failing series | [optional] 
 **failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
 **hidden** | **bool** |  | [optional] 
 **hosts_used** | **list[str]** | Number of hosts checked by the alert condition | [optional] 
diff --git a/docs/IntegrationApi.md b/docs/IntegrationApi.md
index f96fc3c..6b2c12b 100644
--- a/docs/IntegrationApi.md
+++ b/docs/IntegrationApi.md
@@ -224,7 +224,7 @@ This endpoint does not need any parameter.
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_installed_integration**
-> ResponseContainerListIntegration get_installed_integration()
+> ResponseContainerListIntegration get_installed_integration(has_content=has_content, return_content=return_content)
 
 Gets a flat list of all Integrations that are installed, along with their status
 
@@ -246,17 +246,23 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
+has_content = false # bool |  (optional) (default to false)
+return_content = true # bool |  (optional) (default to true)
 
 try:
     # Gets a flat list of all Integrations that are installed, along with their status
-    api_response = api_instance.get_installed_integration()
+    api_response = api_instance.get_installed_integration(has_content=has_content, return_content=return_content)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling IntegrationApi->get_installed_integration: %s\n" % e)
 ```
 
 ### Parameters
-This endpoint does not need any parameter.
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **has_content** | **bool**|  | [optional] [default to false]
+ **return_content** | **bool**|  | [optional] [default to true]
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index 410f9af..7bec5f5 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.36.26"
+VERSION = "2.37.6"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index 4c9e0b5..72e8d63 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -399,6 +399,8 @@ def get_installed_integration(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
+        :param bool has_content:
+        :param bool return_content:
         :return: ResponseContainerListIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -420,12 +422,14 @@ def get_installed_integration_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
+        :param bool has_content:
+        :param bool return_content:
         :return: ResponseContainerListIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = []  # noqa: E501
+        all_params = ['has_content', 'return_content']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -446,6 +450,10 @@ def get_installed_integration_with_http_info(self, **kwargs):  # noqa: E501
         path_params = {}
 
         query_params = []
+        if 'has_content' in params:
+            query_params.append(('hasContent', params['has_content']))  # noqa: E501
+        if 'return_content' in params:
+            query_params.append(('returnContent', params['return_content']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index dd105c9..e5210c9 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.36.26/python'
+        self.user_agent = 'Swagger-Codegen/2.37.6/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index f217aa6..6bdc9bb 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.36.26".\
+               "SDK Package Version: 2.37.6".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index b336ead..d9fad76 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -58,6 +58,7 @@ class Alert(object):
         'display_expression_qb_serialization': 'str',
         'evaluate_realtime_data': 'bool',
         'event': 'Event',
+        'failing_host_label_pair_links': 'list[str]',
         'failing_host_label_pairs': 'list[SourceLabelPair]',
         'hidden': 'bool',
         'hosts_used': 'list[str]',
@@ -123,6 +124,7 @@ class Alert(object):
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
         'evaluate_realtime_data': 'evaluateRealtimeData',
         'event': 'event',
+        'failing_host_label_pair_links': 'failingHostLabelPairLinks',
         'failing_host_label_pairs': 'failingHostLabelPairs',
         'hidden': 'hidden',
         'hosts_used': 'hostsUsed',
@@ -166,7 +168,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -190,6 +192,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._display_expression_qb_serialization = None
         self._evaluate_realtime_data = None
         self._event = None
+        self._failing_host_label_pair_links = None
         self._failing_host_label_pairs = None
         self._hidden = None
         self._hosts_used = None
@@ -274,6 +277,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.evaluate_realtime_data = evaluate_realtime_data
         if event is not None:
             self.event = event
+        if failing_host_label_pair_links is not None:
+            self.failing_host_label_pair_links = failing_host_label_pair_links
         if failing_host_label_pairs is not None:
             self.failing_host_label_pairs = failing_host_label_pairs
         if hidden is not None:
@@ -828,6 +833,29 @@ def event(self, event):
 
         self._event = event
 
+    @property
+    def failing_host_label_pair_links(self):
+        """Gets the failing_host_label_pair_links of this Alert.  # noqa: E501
+
+        List of links to tracing applications that caused a failing series  # noqa: E501
+
+        :return: The failing_host_label_pair_links of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._failing_host_label_pair_links
+
+    @failing_host_label_pair_links.setter
+    def failing_host_label_pair_links(self, failing_host_label_pair_links):
+        """Sets the failing_host_label_pair_links of this Alert.
+
+        List of links to tracing applications that caused a failing series  # noqa: E501
+
+        :param failing_host_label_pair_links: The failing_host_label_pair_links of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._failing_host_label_pair_links = failing_host_label_pair_links
+
     @property
     def failing_host_label_pairs(self):
         """Gets the failing_host_label_pairs of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 4107754..7102fa9 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -769,7 +769,7 @@ def service(self, service):
         """
         if service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS"]  # noqa: E501
         if service not in allowed_values:
             raise ValueError(
                 "Invalid value for `service` ({0}), must be one of {1}"  # noqa: E501

From c589907cb0a40a0b52bd26b6c82db2ac4a24374d Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 31 Oct 2019 08:16:27 -0700
Subject: [PATCH 038/161] Autogenerated Update v2.37.25.

---
 .swagger-codegen/config.json                     | 2 +-
 .swagger-codegen/config.jsone                    | 2 +-
 README.md                                        | 2 +-
 docs/GCPConfiguration.md                         | 2 +-
 setup.py                                         | 2 +-
 wavefront_api_client/api_client.py               | 2 +-
 wavefront_api_client/configuration.py            | 2 +-
 wavefront_api_client/models/gcp_configuration.py | 6 +++---
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index b1d33b7..acb79fe 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.37.6"
+    "packageVersion": "2.37.25"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9ba10b5..b1d33b7 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.36.26"
+    "packageVersion": "2.37.6"
 }
diff --git a/README.md b/README.md
index 6123068..e1fc1ce 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.37.6
+- Package version: 2.37.25
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index 1d83cee..abb9e20 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN | [optional] 
+**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN | [optional] 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
diff --git a/setup.py b/setup.py
index 7bec5f5..757580f 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.37.6"
+VERSION = "2.37.25"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e5210c9..b1a327d 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.37.6/python'
+        self.user_agent = 'Swagger-Codegen/2.37.25/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 6bdc9bb..9c55dd4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.37.6".\
+               "SDK Package Version: 2.37.25".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 176f5d5..ea250b7 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -64,7 +64,7 @@ def __init__(self, categories_to_fetch=None, gcp_json_key=None, metric_filter_re
     def categories_to_fetch(self):
         """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN  # noqa: E501
 
         :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :rtype: list[str]
@@ -75,12 +75,12 @@ def categories_to_fetch(self):
     def categories_to_fetch(self, categories_to_fetch):
         """Sets the categories_to_fetch of this GCPConfiguration.
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, LOGGING, ML, PUBSUB, ROUTER, SPANNER, STORAGE, VPN  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN  # noqa: E501
 
         :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
         if not set(categories_to_fetch).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501

From 327cb25e4ee181f2a05ba1bdbd1214c834d61141 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Wed, 13 Nov 2019 14:49:08 -0800
Subject: [PATCH 039/161] Autogenerated Update v2.37.33.

---
 .swagger-codegen/VERSION                             |  2 +-
 .swagger-codegen/config.json                         |  2 +-
 .swagger-codegen/config.jsone                        |  2 +-
 .travis.yml                                          |  3 ++-
 README.md                                            |  2 +-
 generate_client                                      |  2 +-
 setup.py                                             |  2 +-
 wavefront_api_client/api_client.py                   |  2 +-
 wavefront_api_client/configuration.py                |  2 +-
 .../models/access_control_list_read_dto.py           |  2 --
 wavefront_api_client/models/alert.py                 |  6 ------
 .../models/azure_activity_log_configuration.py       |  2 --
 wavefront_api_client/models/azure_configuration.py   |  2 --
 wavefront_api_client/models/chart.py                 |  4 ----
 wavefront_api_client/models/cloud_integration.py     | 12 ------------
 .../models/cloud_trail_configuration.py              |  2 --
 .../models/cloud_watch_configuration.py              |  2 --
 wavefront_api_client/models/customer_preferences.py  |  2 --
 wavefront_api_client/models/dashboard.py             |  5 -----
 wavefront_api_client/models/dashboard_section.py     |  2 --
 wavefront_api_client/models/dashboard_section_row.py |  2 --
 .../models/derived_metric_definition.py              |  2 --
 wavefront_api_client/models/ec2_configuration.py     |  2 --
 wavefront_api_client/models/event_search_request.py  |  3 ---
 wavefront_api_client/models/facet_response.py        |  2 --
 .../models/facet_search_request_container.py         |  2 --
 .../models/facets_search_request_container.py        |  2 --
 wavefront_api_client/models/history_response.py      |  3 ---
 wavefront_api_client/models/integration.py           |  6 ------
 wavefront_api_client/models/integration_alert.py     |  2 --
 wavefront_api_client/models/integration_dashboard.py |  2 --
 .../models/integration_manifest_group.py             |  2 --
 wavefront_api_client/models/integration_metrics.py   |  2 --
 wavefront_api_client/models/integration_status.py    |  2 --
 .../models/metric_details_response.py                |  2 --
 .../models/new_relic_configuration.py                |  2 --
 wavefront_api_client/models/notificant.py            |  2 --
 wavefront_api_client/models/paged_account.py         |  3 ---
 wavefront_api_client/models/paged_alert.py           |  3 ---
 .../models/paged_alert_with_stats.py                 |  3 ---
 .../models/paged_cloud_integration.py                |  3 ---
 .../models/paged_customer_facing_user_object.py      |  3 ---
 wavefront_api_client/models/paged_dashboard.py       |  3 ---
 .../models/paged_derived_metric_definition.py        |  3 ---
 .../paged_derived_metric_definition_with_stats.py    |  3 ---
 wavefront_api_client/models/paged_event.py           |  3 ---
 wavefront_api_client/models/paged_external_link.py   |  3 ---
 wavefront_api_client/models/paged_integration.py     |  3 ---
 .../models/paged_maintenance_window.py               |  3 ---
 wavefront_api_client/models/paged_message.py         |  3 ---
 wavefront_api_client/models/paged_notificant.py      |  3 ---
 wavefront_api_client/models/paged_proxy.py           |  3 ---
 wavefront_api_client/models/paged_saved_search.py    |  3 ---
 wavefront_api_client/models/paged_service_account.py |  3 ---
 wavefront_api_client/models/paged_source.py          |  3 ---
 .../models/paged_user_group_model.py                 |  3 ---
 wavefront_api_client/models/proxy.py                 |  2 --
 wavefront_api_client/models/query_result.py          |  6 ------
 wavefront_api_client/models/raw_timeseries.py        |  2 --
 wavefront_api_client/models/response_container.py    |  2 --
 .../models/response_container_alert.py               |  3 ---
 .../models/response_container_cloud_integration.py   |  3 ---
 .../models/response_container_dashboard.py           |  3 ---
 .../response_container_derived_metric_definition.py  |  3 ---
 .../models/response_container_event.py               |  3 ---
 .../models/response_container_external_link.py       |  3 ---
 .../models/response_container_facet_response.py      |  3 ---
 .../response_container_facets_response_container.py  |  3 ---
 .../models/response_container_history_response.py    |  3 ---
 .../models/response_container_integration.py         |  3 ---
 .../models/response_container_integration_status.py  |  3 ---
 ...se_container_list_access_control_list_read_dto.py |  3 ---
 .../models/response_container_list_integration.py    |  3 ---
 ...onse_container_list_integration_manifest_group.py |  3 ---
 .../response_container_list_service_account.py       |  3 ---
 .../models/response_container_list_string.py         |  2 --
 .../models/response_container_list_user_api_token.py |  3 ---
 .../response_container_list_user_group_model.py      |  3 ---
 .../models/response_container_maintenance_window.py  |  3 ---
 .../models/response_container_map_string_integer.py  |  2 --
 ...sponse_container_map_string_integration_status.py |  3 ---
 .../models/response_container_message.py             |  3 ---
 .../models/response_container_notificant.py          |  3 ---
 .../models/response_container_paged_account.py       |  3 ---
 .../models/response_container_paged_alert.py         |  3 ---
 .../response_container_paged_alert_with_stats.py     |  3 ---
 .../response_container_paged_cloud_integration.py    |  3 ---
 ...se_container_paged_customer_facing_user_object.py |  3 ---
 .../models/response_container_paged_dashboard.py     |  3 ---
 ...onse_container_paged_derived_metric_definition.py |  3 ---
 ...ner_paged_derived_metric_definition_with_stats.py |  3 ---
 .../models/response_container_paged_event.py         |  3 ---
 .../models/response_container_paged_external_link.py |  3 ---
 .../models/response_container_paged_integration.py   |  3 ---
 .../response_container_paged_maintenance_window.py   |  3 ---
 .../models/response_container_paged_message.py       |  3 ---
 .../models/response_container_paged_notificant.py    |  3 ---
 .../models/response_container_paged_proxy.py         |  3 ---
 .../models/response_container_paged_saved_search.py  |  3 ---
 .../response_container_paged_service_account.py      |  3 ---
 .../models/response_container_paged_source.py        |  3 ---
 .../response_container_paged_user_group_model.py     |  3 ---
 .../models/response_container_proxy.py               |  3 ---
 .../models/response_container_saved_search.py        |  3 ---
 .../models/response_container_service_account.py     |  3 ---
 .../models/response_container_source.py              |  3 ---
 .../models/response_container_tags_response.py       |  3 ---
 .../models/response_container_user_api_token.py      |  3 ---
 .../models/response_container_user_group_model.py    |  3 ---
 .../models/response_container_validated_users_dto.py |  3 ---
 wavefront_api_client/models/service_account.py       |  3 ---
 .../models/sortable_search_request.py                |  3 ---
 .../models/source_search_request_container.py        |  2 --
 wavefront_api_client/models/tags_response.py         |  2 --
 wavefront_api_client/models/trace.py                 |  2 --
 wavefront_api_client/models/user.py                  |  2 --
 wavefront_api_client/models/user_dto.py              |  2 --
 wavefront_api_client/models/user_group.py            |  2 --
 wavefront_api_client/models/user_group_model.py      |  2 --
 wavefront_api_client/models/user_model.py            |  2 --
 wavefront_api_client/models/validated_users_dto.py   |  2 --
 121 files changed, 10 insertions(+), 331 deletions(-)

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 752a79e..1583498 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.8
\ No newline at end of file
+2.4.9
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index acb79fe..5ea793b 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.37.25"
+    "packageVersion": "2.37.33"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index b1d33b7..611d82c 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.37.6"
+    "packageVersion": "2.37.31"
 }
diff --git a/.travis.yml b/.travis.yml
index 860f99c..74cb621 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
-dist: xenial
+dist: bionic
 language: python
 python:
   - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
 install: "pip install -r requirements.txt"
 script: nosetests
 deploy:
diff --git a/README.md b/README.md
index e1fc1ce..686c211 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.37.25
+- Package version: 2.37.33
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 83f9ce7..4d64b01 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.8"  # For 3.x use CGEN_VER="3.0.7"
+CGEN_VER="2.4.9"  # For 3.x use CGEN_VER="3.0.13"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 757580f..29bb483 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.37.25"
+VERSION = "2.37.33"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b1a327d..fbbb740 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.37.25/python'
+        self.user_agent = 'Swagger-Codegen/2.37.33/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 9c55dd4..2507331 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.37.25".\
+               "SDK Package Version: 2.37.33".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/access_control_list_read_dto.py b/wavefront_api_client/models/access_control_list_read_dto.py
index 90f0fc0..6da025c 100644
--- a/wavefront_api_client/models/access_control_list_read_dto.py
+++ b/wavefront_api_client/models/access_control_list_read_dto.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.access_control_element import AccessControlElement  # noqa: F401,E501
-
 
 class AccessControlListReadDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index d9fad76..cc4182b 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -16,12 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple  # noqa: F401,E501
-from wavefront_api_client.models.event import Event  # noqa: F401,E501
-from wavefront_api_client.models.source_label_pair import SourceLabelPair  # noqa: F401,E501
-from wavefront_api_client.models.target_info import TargetInfo  # noqa: F401,E501
-from wavefront_api_client.models.wf_tags import WFTags  # noqa: F401,E501
-
 
 class Alert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index 6be8231..6d7d989 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials  # noqa: F401,E501
-
 
 class AzureActivityLogConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index b9b66e3..ca92d8e 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials  # noqa: F401,E501
-
 
 class AzureConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index e62ee26..97536cb 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -16,10 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.chart_settings import ChartSettings  # noqa: F401,E501
-from wavefront_api_client.models.chart_source_query import ChartSourceQuery  # noqa: F401,E501
-from wavefront_api_client.models.json_node import JsonNode  # noqa: F401,E501
-
 
 class Chart(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 7102fa9..258ecf1 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -16,18 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.azure_configuration import AzureConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.ec2_configuration import EC2Configuration  # noqa: F401,E501
-from wavefront_api_client.models.event import Event  # noqa: F401,E501
-from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.gcp_configuration import GCPConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration  # noqa: F401,E501
-from wavefront_api_client.models.tesla_configuration import TeslaConfiguration  # noqa: F401,E501
-
 
 class CloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index 2cc9f37..51ed7be 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials  # noqa: F401,E501
-
 
 class CloudTrailConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 0a47eb8..f236c51 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials  # noqa: F401,E501
-
 
 class CloudWatchConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
index 4e4cde1..ad445ec 100644
--- a/wavefront_api_client/models/customer_preferences.py
+++ b/wavefront_api_client/models/customer_preferences.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
-
 
 class CustomerPreferences(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index c8afcc9..643435e 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -16,11 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple  # noqa: F401,E501
-from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue  # noqa: F401,E501
-from wavefront_api_client.models.dashboard_section import DashboardSection  # noqa: F401,E501
-from wavefront_api_client.models.wf_tags import WFTags  # noqa: F401,E501
-
 
 class Dashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index aed68a4..ac4a2aa 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow  # noqa: F401,E501
-
 
 class DashboardSection(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index b57b846..c2f2b2d 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.chart import Chart  # noqa: F401,E501
-
 
 class DashboardSectionRow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 1face76..f65fe88 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.wf_tags import WFTags  # noqa: F401,E501
-
 
 class DerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 1c837ca..f5fc333 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.aws_base_credentials import AWSBaseCredentials  # noqa: F401,E501
-
 
 class EC2Configuration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 362a078..115bb3c 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.event_time_range import EventTimeRange  # noqa: F401,E501
-from wavefront_api_client.models.search_query import SearchQuery  # noqa: F401,E501
-
 
 class EventSearchRequest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index 2d6ad58..b28bef9 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class FacetResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index e711b3c..5e4c417 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.search_query import SearchQuery  # noqa: F401,E501
-
 
 class FacetSearchRequestContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index 7211a06..0afc644 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.search_query import SearchQuery  # noqa: F401,E501
-
 
 class FacetsSearchRequestContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index 6cb6a7f..15e5231 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.history_entry import HistoryEntry  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class HistoryResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 6769f9f..2a35b4e 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -16,12 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration_alert import IntegrationAlert  # noqa: F401,E501
-from wavefront_api_client.models.integration_alias import IntegrationAlias  # noqa: F401,E501
-from wavefront_api_client.models.integration_dashboard import IntegrationDashboard  # noqa: F401,E501
-from wavefront_api_client.models.integration_metrics import IntegrationMetrics  # noqa: F401,E501
-from wavefront_api_client.models.integration_status import IntegrationStatus  # noqa: F401,E501
-
 
 class Integration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index 86b4395..eef064a 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.alert import Alert  # noqa: F401,E501
-
 
 class IntegrationAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 6ff2cf2..4f79b30 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.dashboard import Dashboard  # noqa: F401,E501
-
 
 class IntegrationDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 396204e..9095d59 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration import Integration  # noqa: F401,E501
-
 
 class IntegrationManifestGroup(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index 74022fe..2b1db64 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.chart import Chart  # noqa: F401,E501
-
 
 class IntegrationMetrics(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index 696be17..58b66f4 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.metric_status import MetricStatus  # noqa: F401,E501
-
 
 class IntegrationStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index 687d5e0..484d368 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.metric_details import MetricDetails  # noqa: F401,E501
-
 
 class MetricDetailsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index 83e0c7f..a16bdbf 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters  # noqa: F401,E501
-
 
 class NewRelicConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index 8efc9a6..5eb685c 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.alert_route import AlertRoute  # noqa: F401,E501
-
 
 class Notificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_account.py b/wavefront_api_client/models/paged_account.py
index eabf2f3..1035cec 100644
--- a/wavefront_api_client/models/paged_account.py
+++ b/wavefront_api_client/models/paged_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.account import Account  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index 4f6235c..7cad4a0 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.alert import Alert  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index 6bde6fe..816d6ad 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.alert import Alert  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedAlertWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index a39caf8..a74759a 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.cloud_integration import CloudIntegration  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedCloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index 9b14b74..3b5150e 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedCustomerFacingUserObject(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index de12e70..5888a71 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.dashboard import Dashboard  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index 5d1f744..aab4d3a 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedDerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index 5d49e2f..c18e788 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedDerivedMetricDefinitionWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index c724b8a..2575593 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.event import Event  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index e5a2299..6da5855 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.external_link import ExternalLink  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index aa98497..1bdfdff 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration import Integration  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index 083c47f..db78294 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.maintenance_window import MaintenanceWindow  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedMaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index f974970..ea79c9f 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.message import Message  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedMessage(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 1ec6e98..79b79a8 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.notificant import Notificant  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedNotificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index a01cf21..e70f17c 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.proxy import Proxy  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedProxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index 9d88ca2..b6d3737 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.saved_search import SavedSearch  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedSavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_service_account.py b/wavefront_api_client/models/paged_service_account.py
index c64d15e..0a34c0e 100644
--- a/wavefront_api_client/models/paged_service_account.py
+++ b/wavefront_api_client/models/paged_service_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.service_account import ServiceAccount  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class PagedServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index 203944d..fabc5f9 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-from wavefront_api_client.models.source import Source  # noqa: F401,E501
-
 
 class PagedSource(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/paged_user_group_model.py b/wavefront_api_client/models/paged_user_group_model.py
index 9f1db48..e441dda 100644
--- a/wavefront_api_client/models/paged_user_group_model.py
+++ b/wavefront_api_client/models/paged_user_group_model.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
-
 
 class PagedUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 6b099a9..ad39302 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.event import Event  # noqa: F401,E501
-
 
 class Proxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index ded795f..d94a0ee 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -16,12 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.query_event import QueryEvent  # noqa: F401,E501
-from wavefront_api_client.models.span import Span  # noqa: F401,E501
-from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse  # noqa: F401,E501
-from wavefront_api_client.models.timeseries import Timeseries  # noqa: F401,E501
-from wavefront_api_client.models.trace import Trace  # noqa: F401,E501
-
 
 class QueryResult(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index 2999267..55e1e89 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.point import Point  # noqa: F401,E501
-
 
 class RawTimeseries(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index 249a499..9459f57 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index 6f8ca58..664fa82 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.alert import Alert  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 132ac6e..117823f 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.cloud_integration import CloudIntegration  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerCloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index 673911a..799aaa0 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.dashboard import Dashboard  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 953516f..faa68b7 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerDerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index b4fc52a..8a76b26 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.event import Event  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index 9351e88..6fbfec1 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.external_link import ExternalLink  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 6d4657c..a028b74 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.facet_response import FacetResponse  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerFacetResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 49486a4..9ba77ab 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.facets_response_container import FacetsResponseContainer  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerFacetsResponseContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 8c4ad8e..757a2a2 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.history_response import HistoryResponse  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerHistoryResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index 350c851..1f4b5ac 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration import Integration  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 60cb7ac..811f242 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration_status import IntegrationStatus  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerIntegrationStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
index 69fbd33..eb44a09 100644
--- a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerListAccessControlListReadDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index a26ecb6..cb412ba 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration import Integration  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerListIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index cbb2c9c..7fa28a2 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerListIntegrationManifestGroup(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
index 58bf937..ef3e23f 100644
--- a/wavefront_api_client/models/response_container_list_service_account.py
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.service_account import ServiceAccount  # noqa: F401,E501
-
 
 class ResponseContainerListServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index 83445d2..b6c68c3 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerListString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
index 3e33ad0..3aacbf9 100644
--- a/wavefront_api_client/models/response_container_list_user_api_token.py
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: F401,E501
-
 
 class ResponseContainerListUserApiToken(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_list_user_group_model.py b/wavefront_api_client/models/response_container_list_user_group_model.py
index 7b0ad7b..3f9a07d 100644
--- a/wavefront_api_client/models/response_container_list_user_group_model.py
+++ b/wavefront_api_client/models/response_container_list_user_group_model.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
-
 
 class ResponseContainerListUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index 8aaeb7d..736dee9 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.maintenance_window import MaintenanceWindow  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerMaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 6f8253a..b92a9fd 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerMapStringInteger(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index db9169d..d12104d 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.integration_status import IntegrationStatus  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerMapStringIntegrationStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index 00e1c03..ba09a7d 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.message import Message  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerMessage(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index fdd4111..6c0a6b9 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.notificant import Notificant  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerNotificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
index a791348..1c0289e 100644
--- a/wavefront_api_client/models/response_container_paged_account.py
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_account import PagedAccount  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index b145604..bac3524 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_alert import PagedAlert  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index 2956631..8a666ee 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedAlertWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index 8200d05..a3bca26 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedCloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 38746fc..e1e5b27 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_customer_facing_user_object import PagedCustomerFacingUserObject  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedCustomerFacingUserObject(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index 9afa94c..7c54e64 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_dashboard import PagedDashboard  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index f583c92..408534c 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_derived_metric_definition import PagedDerivedMetricDefinition  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedDerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 3fe05a2..52cdea4 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedDerivedMetricDefinitionWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index a2fcf69..fa8b2d8 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_event import PagedEvent  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index c9d27da..1e0b8d7 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_external_link import PagedExternalLink  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 4fd533b..084a775 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_integration import PagedIntegration  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index 5dfbf3d..6a67c02 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedMaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index 0bbd80a..1faf24f 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_message import PagedMessage  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedMessage(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index 24c1651..01c3f45 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_notificant import PagedNotificant  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedNotificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index a94bbcf..a9a7830 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_proxy import PagedProxy  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedProxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 1ad7a98..20ca491 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_saved_search import PagedSavedSearch  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedSavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
index c853b36..8f73cdf 100644
--- a/wavefront_api_client/models/response_container_paged_service_account.py
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_service_account import PagedServiceAccount  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index ec1979c..94106a8 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_source import PagedSource  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedSource(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
index 57c32af..6e7dc82 100644
--- a/wavefront_api_client/models/response_container_paged_user_group_model.py
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerPagedUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index c41bfc3..36b851f 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.proxy import Proxy  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
 
 class ResponseContainerProxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index 0075b1d..3957e19 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.saved_search import SavedSearch  # noqa: F401,E501
-
 
 class ResponseContainerSavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
index 8736100..b2a9367 100644
--- a/wavefront_api_client/models/response_container_service_account.py
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.service_account import ServiceAccount  # noqa: F401,E501
-
 
 class ResponseContainerServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 69b14e7..1711221 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.source import Source  # noqa: F401,E501
-
 
 class ResponseContainerSource(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index b3260e8..317b49a 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.tags_response import TagsResponse  # noqa: F401,E501
-
 
 class ResponseContainerTagsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
index 4712811..c2c3016 100644
--- a/wavefront_api_client/models/response_container_user_api_token.py
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: F401,E501
-
 
 class ResponseContainerUserApiToken(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
index 7b0e2c4..b716904 100644
--- a/wavefront_api_client/models/response_container_user_group_model.py
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.user_group_model import UserGroupModel  # noqa: F401,E501
-
 
 class ResponseContainerUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index 36d137c..0e6dae4 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO  # noqa: F401,E501
-
 
 class ResponseContainerValidatedUsersDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index 8deae9b..5f1e5b9 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_api_token import UserApiToken  # noqa: F401,E501
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
-
 
 class ServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 1eb4e59..63a3a5a 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -16,9 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.search_query import SearchQuery  # noqa: F401,E501
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class SortableSearchRequest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index 6df86c4..b6dd4d0 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.search_query import SearchQuery  # noqa: F401,E501
-
 
 class SourceSearchRequestContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 4dbb103..5ef14b9 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-
 
 class TagsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/trace.py b/wavefront_api_client/models/trace.py
index f97b166..aa28a33 100644
--- a/wavefront_api_client/models/trace.py
+++ b/wavefront_api_client/models/trace.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.span import Span  # noqa: F401,E501
-
 
 class Trace(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
index cf88d20..a9afcd2 100644
--- a/wavefront_api_client/models/user.py
+++ b/wavefront_api_client/models/user.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_settings import UserSettings  # noqa: F401,E501
-
 
 class User(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 9d19911..693c41f 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
-
 
 class UserDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index a770cdd..1c48d30 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO  # noqa: F401,E501
-
 
 class UserGroup(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 696624d..795b817 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO  # noqa: F401,E501
-
 
 class UserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index d69c31f..9d9a247 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
-
 
 class UserModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
index a07b70b..89facca 100644
--- a/wavefront_api_client/models/validated_users_dto.py
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -16,8 +16,6 @@
 
 import six
 
-from wavefront_api_client.models.user_dto import UserDTO  # noqa: F401,E501
-
 
 class ValidatedUsersDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.

From 78d19b8c628772e8f3d3ef1e26629fffc43bfc05 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 16 Nov 2019 08:16:38 -0800
Subject: [PATCH 040/161] Autogenerated Update v2.38.19.

---
 .swagger-codegen/config.json                  |    2 +-
 .swagger-codegen/config.jsone                 |    2 +-
 README.md                                     |   76 +-
 docs/Account.md                               |    1 +
 docs/AccountUserAndServiceAccountApi.md       | 1395 ++++++++++
 docs/AlertApi.md                              |   68 +-
 docs/AlertMin.md                              |   11 +
 docs/CustomerFacingUserObject.md              |    1 +
 docs/DashboardApi.md                          |   90 +-
 docs/DashboardMin.md                          |   12 +
 docs/DashboardSection.md                      |    1 +
 docs/EventApi.md                              |   61 +
 docs/IngestionPolicy.md                       |   19 +
 docs/IngestionPolicyMapping.md                |   11 +
 docs/IntegrationAlert.md                      |    1 +
 docs/IntegrationDashboard.md                  |    1 +
 docs/IntegrationStatus.md                     |    8 +-
 docs/PagedIngestionPolicy.md                  |   16 +
 docs/Proxy.md                                 |    1 +
 docs/ResponseContainerAccount.md              |   11 +
 docs/ResponseContainerIngestionPolicy.md      |   11 +
 docs/ResponseContainerPagedIngestionPolicy.md |   11 +
 docs/ResponseContainerSetBusinessFunction.md  |   11 +
 docs/SearchApi.md                             |  167 ++
 docs/ServiceAccount.md                        |    1 +
 docs/ServiceAccountWrite.md                   |    1 +
 docs/UsageApi.md                              |  343 +++
 docs/User.md                                  |    1 +
 docs/UserApi.md                               |   28 +-
 docs/UserDTO.md                               |    1 +
 docs/UserModel.md                             |    1 +
 docs/UserRequestDTO.md                        |    1 +
 docs/UserSettings.md                          |    1 +
 docs/UserToCreate.md                          |    1 +
 setup.py                                      |    2 +-
 ...t_account__user_and_service_account_api.py |  209 ++
 test/test_alert_min.py                        |   40 +
 test/test_dashboard_min.py                    |   40 +
 test/test_ingestion_policy.py                 |   40 +
 test/test_ingestion_policy_mapping.py         |   40 +
 test/test_paged_ingestion_policy.py           |   40 +
 test/test_response_container_account.py       |   40 +
 ...est_response_container_ingestion_policy.py |   40 +
 ...sponse_container_paged_ingestion_policy.py |   40 +
 ...esponse_container_set_business_function.py |   40 +
 test/test_usage_api.py                        |   76 +
 wavefront_api_client/__init__.py              |   12 +-
 wavefront_api_client/api/__init__.py          |    3 +-
 .../account__user_and_service_account_api.py  | 2477 +++++++++++++++++
 wavefront_api_client/api/alert_api.py         |  120 +-
 wavefront_api_client/api/dashboard_api.py     |  166 +-
 wavefront_api_client/api/event_api.py         |  107 +
 wavefront_api_client/api/search_api.py        |  293 ++
 wavefront_api_client/api/usage_api.py         |  616 ++++
 wavefront_api_client/api/user_api.py          |   24 +-
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |    2 +-
 wavefront_api_client/models/__init__.py       |    9 +
 wavefront_api_client/models/account.py        |   30 +-
 wavefront_api_client/models/alert_min.py      |  145 +
 wavefront_api_client/models/chart_settings.py |    2 +-
 .../models/customer_facing_user_object.py     |   30 +-
 wavefront_api_client/models/dashboard_min.py  |  173 ++
 .../models/dashboard_section.py               |   34 +-
 .../models/ingestion_policy.py                |  369 +++
 .../models/ingestion_policy_mapping.py        |  147 +
 .../models/integration_alert.py               |   28 +-
 .../models/integration_dashboard.py           |   28 +-
 .../models/integration_status.py              |   20 +-
 .../models/paged_ingestion_policy.py          |  279 ++
 wavefront_api_client/models/proxy.py          |   30 +-
 .../models/response_container_account.py      |  142 +
 .../response_container_ingestion_policy.py    |  142 +
 ...sponse_container_paged_ingestion_policy.py |  142 +
 ...esponse_container_set_business_function.py |  149 +
 wavefront_api_client/models/saved_search.py   |    2 +-
 .../models/service_account.py                 |   30 +-
 .../models/service_account_write.py           |   30 +-
 wavefront_api_client/models/user.py           |   28 +-
 wavefront_api_client/models/user_dto.py       |   28 +-
 wavefront_api_client/models/user_model.py     |   28 +-
 .../models/user_request_dto.py                |   28 +-
 wavefront_api_client/models/user_settings.py  |   28 +-
 wavefront_api_client/models/user_to_create.py |   30 +-
 84 files changed, 8659 insertions(+), 308 deletions(-)
 create mode 100644 docs/AccountUserAndServiceAccountApi.md
 create mode 100644 docs/AlertMin.md
 create mode 100644 docs/DashboardMin.md
 create mode 100644 docs/IngestionPolicy.md
 create mode 100644 docs/IngestionPolicyMapping.md
 create mode 100644 docs/PagedIngestionPolicy.md
 create mode 100644 docs/ResponseContainerAccount.md
 create mode 100644 docs/ResponseContainerIngestionPolicy.md
 create mode 100644 docs/ResponseContainerPagedIngestionPolicy.md
 create mode 100644 docs/ResponseContainerSetBusinessFunction.md
 create mode 100644 docs/UsageApi.md
 create mode 100644 test/test_account__user_and_service_account_api.py
 create mode 100644 test/test_alert_min.py
 create mode 100644 test/test_dashboard_min.py
 create mode 100644 test/test_ingestion_policy.py
 create mode 100644 test/test_ingestion_policy_mapping.py
 create mode 100644 test/test_paged_ingestion_policy.py
 create mode 100644 test/test_response_container_account.py
 create mode 100644 test/test_response_container_ingestion_policy.py
 create mode 100644 test/test_response_container_paged_ingestion_policy.py
 create mode 100644 test/test_response_container_set_business_function.py
 create mode 100644 test/test_usage_api.py
 create mode 100644 wavefront_api_client/api/account__user_and_service_account_api.py
 create mode 100644 wavefront_api_client/api/usage_api.py
 create mode 100644 wavefront_api_client/models/alert_min.py
 create mode 100644 wavefront_api_client/models/dashboard_min.py
 create mode 100644 wavefront_api_client/models/ingestion_policy.py
 create mode 100644 wavefront_api_client/models/ingestion_policy_mapping.py
 create mode 100644 wavefront_api_client/models/paged_ingestion_policy.py
 create mode 100644 wavefront_api_client/models/response_container_account.py
 create mode 100644 wavefront_api_client/models/response_container_ingestion_policy.py
 create mode 100644 wavefront_api_client/models/response_container_paged_ingestion_policy.py
 create mode 100644 wavefront_api_client/models/response_container_set_business_function.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5ea793b..1d785be 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.37.33"
+    "packageVersion": "2.38.19"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 611d82c..5ea793b 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.37.31"
+    "packageVersion": "2.37.33"
 }
diff --git a/README.md b/README.md
index 686c211..05393ce 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.37.33
+- Package version: 2.38.19
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -58,7 +58,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
 
 try:
@@ -66,7 +66,7 @@ try:
     api_response = api_instance.activate_account(id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->activate_account: %s\n" % e)
+    print("Exception when calling AccountUserAndServiceAccountApi->activate_account: %s\n" % e)
 
 ```
 
@@ -76,28 +76,47 @@ All URIs are relative to *https://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AccountServiceAccountApi* | [**activate_account**](docs/AccountServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
-*AccountServiceAccountApi* | [**create_service_account**](docs/AccountServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
-*AccountServiceAccountApi* | [**deactivate_account**](docs/AccountServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
-*AccountServiceAccountApi* | [**get_all_service_accounts**](docs/AccountServiceAccountApi.md#get_all_service_accounts) | **GET** /api/v2/account/serviceaccount | Get all service accounts
-*AccountServiceAccountApi* | [**get_service_account**](docs/AccountServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
-*AccountServiceAccountApi* | [**update_service_account**](docs/AccountServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
-*AlertApi* | [**add_access**](docs/AlertApi.md#add_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
+*AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
+*AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
+*AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
+*AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
+*AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
+*AccountUserAndServiceAccountApi* | [**delete_account**](docs/AccountUserAndServiceAccountApi.md#delete_account) | **DELETE** /api/v2/account/{id} | Deletes an account (user or service account) identified by id
+*AccountUserAndServiceAccountApi* | [**delete_multiple_accounts**](docs/AccountUserAndServiceAccountApi.md#delete_multiple_accounts) | **POST** /api/v2/account/deleteAccounts | Deletes multiple accounts (users or service accounts)
+*AccountUserAndServiceAccountApi* | [**get_account**](docs/AccountUserAndServiceAccountApi.md#get_account) | **GET** /api/v2/account/{id} | Get a specific account (user or service account)
+*AccountUserAndServiceAccountApi* | [**get_account_business_functions**](docs/AccountUserAndServiceAccountApi.md#get_account_business_functions) | **GET** /api/v2/account/{id}/businessFunctions | Returns business functions of a specific account (user or service account).
+*AccountUserAndServiceAccountApi* | [**get_all_accounts**](docs/AccountUserAndServiceAccountApi.md#get_all_accounts) | **GET** /api/v2/account | Get all accounts (users and service accounts) of a customer
+*AccountUserAndServiceAccountApi* | [**get_all_service_accounts**](docs/AccountUserAndServiceAccountApi.md#get_all_service_accounts) | **GET** /api/v2/account/serviceaccount | Get all service accounts
+*AccountUserAndServiceAccountApi* | [**get_all_user_accounts**](docs/AccountUserAndServiceAccountApi.md#get_all_user_accounts) | **GET** /api/v2/account/user | Get all user accounts
+*AccountUserAndServiceAccountApi* | [**get_service_account**](docs/AccountUserAndServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
+*AccountUserAndServiceAccountApi* | [**get_user_account**](docs/AccountUserAndServiceAccountApi.md#get_user_account) | **GET** /api/v2/account/user/{id} | Retrieves a user by identifier (email address)
+*AccountUserAndServiceAccountApi* | [**grant_account_permission**](docs/AccountUserAndServiceAccountApi.md#grant_account_permission) | **POST** /api/v2/account/{id}/grant/{permission} | Grants a specific permission to account (user or service account)
+*AccountUserAndServiceAccountApi* | [**grant_permission_to_accounts**](docs/AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
+*AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
+*AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific user groups from the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
+*AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
+*AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
+*AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
+*AccountUserAndServiceAccountApi* | [**update_user_account**](docs/AccountUserAndServiceAccountApi.md#update_user_account) | **PUT** /api/v2/account/user/{id} | Update user with given user groups, permissions and ingestion policy.
+*AccountUserAndServiceAccountApi* | [**validate_accounts**](docs/AccountUserAndServiceAccountApi.md#validate_accounts) | **POST** /api/v2/account/validateAccounts | Returns valid accounts (users and service accounts), also invalid identifiers from the given list
+*AlertApi* | [**add_alert_access**](docs/AlertApi.md#add_alert_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 *AlertApi* | [**add_alert_tag**](docs/AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
 *AlertApi* | [**clone_alert**](docs/AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 *AlertApi* | [**create_alert**](docs/AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 *AlertApi* | [**delete_alert**](docs/AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
-*AlertApi* | [**get_access_control_list**](docs/AlertApi.md#get_access_control_list) | **GET** /api/v2/alert/acl | Get Access Control Lists&#39; union for the specified alerts
 *AlertApi* | [**get_alert**](docs/AlertApi.md#get_alert) | **GET** /api/v2/alert/{id} | Get a specific alert
+*AlertApi* | [**get_alert_access_control_list**](docs/AlertApi.md#get_alert_access_control_list) | **GET** /api/v2/alert/acl | Get Access Control Lists&#39; union for the specified alerts
 *AlertApi* | [**get_alert_history**](docs/AlertApi.md#get_alert_history) | **GET** /api/v2/alert/{id}/history | Get the version history of a specific alert
 *AlertApi* | [**get_alert_tags**](docs/AlertApi.md#get_alert_tags) | **GET** /api/v2/alert/{id}/tag | Get all tags associated with a specific alert
 *AlertApi* | [**get_alert_version**](docs/AlertApi.md#get_alert_version) | **GET** /api/v2/alert/{id}/history/{version} | Get a specific historical version of a specific alert
 *AlertApi* | [**get_alerts_summary**](docs/AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 *AlertApi* | [**get_all_alert**](docs/AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 *AlertApi* | [**hide_alert**](docs/AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
-*AlertApi* | [**remove_access**](docs/AlertApi.md#remove_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
+*AlertApi* | [**remove_alert_access**](docs/AlertApi.md#remove_alert_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
 *AlertApi* | [**remove_alert_tag**](docs/AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
-*AlertApi* | [**set_acl**](docs/AlertApi.md#set_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
+*AlertApi* | [**set_alert_acl**](docs/AlertApi.md#set_alert_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
 *AlertApi* | [**set_alert_tags**](docs/AlertApi.md#set_alert_tags) | **POST** /api/v2/alert/{id}/tag | Set all tags associated with a specific alert
 *AlertApi* | [**snooze_alert**](docs/AlertApi.md#snooze_alert) | **POST** /api/v2/alert/{id}/snooze | Snooze a specific alert for some number of seconds
 *AlertApi* | [**undelete_alert**](docs/AlertApi.md#undelete_alert) | **POST** /api/v2/alert/{id}/undelete | Undelete a specific alert
@@ -120,20 +139,20 @@ Class | Method | HTTP request | Description
 *CloudIntegrationApi* | [**get_cloud_integration**](docs/CloudIntegrationApi.md#get_cloud_integration) | **GET** /api/v2/cloudintegration/{id} | Get a specific cloud integration
 *CloudIntegrationApi* | [**undelete_cloud_integration**](docs/CloudIntegrationApi.md#undelete_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/undelete | Undelete a specific cloud integration
 *CloudIntegrationApi* | [**update_cloud_integration**](docs/CloudIntegrationApi.md#update_cloud_integration) | **PUT** /api/v2/cloudintegration/{id} | Update a specific cloud integration
-*DashboardApi* | [**add_access**](docs/DashboardApi.md#add_access) | **POST** /api/v2/dashboard/acl/add | Adds the specified ids to the given dashboards&#39; ACL
+*DashboardApi* | [**add_dashboard_access**](docs/DashboardApi.md#add_dashboard_access) | **POST** /api/v2/dashboard/acl/add | Adds the specified ids to the given dashboards&#39; ACL
 *DashboardApi* | [**add_dashboard_tag**](docs/DashboardApi.md#add_dashboard_tag) | **PUT** /api/v2/dashboard/{id}/tag/{tagValue} | Add a tag to a specific dashboard
 *DashboardApi* | [**create_dashboard**](docs/DashboardApi.md#create_dashboard) | **POST** /api/v2/dashboard | Create a specific dashboard
 *DashboardApi* | [**delete_dashboard**](docs/DashboardApi.md#delete_dashboard) | **DELETE** /api/v2/dashboard/{id} | Delete a specific dashboard
 *DashboardApi* | [**favorite_dashboard**](docs/DashboardApi.md#favorite_dashboard) | **POST** /api/v2/dashboard/{id}/favorite | Mark a dashboard as favorite
-*DashboardApi* | [**get_access_control_list**](docs/DashboardApi.md#get_access_control_list) | **GET** /api/v2/dashboard/acl | Get list of Access Control Lists for the specified dashboards
 *DashboardApi* | [**get_all_dashboard**](docs/DashboardApi.md#get_all_dashboard) | **GET** /api/v2/dashboard | Get all dashboards for a customer
 *DashboardApi* | [**get_dashboard**](docs/DashboardApi.md#get_dashboard) | **GET** /api/v2/dashboard/{id} | Get a specific dashboard
+*DashboardApi* | [**get_dashboard_access_control_list**](docs/DashboardApi.md#get_dashboard_access_control_list) | **GET** /api/v2/dashboard/acl | Get list of Access Control Lists for the specified dashboards
 *DashboardApi* | [**get_dashboard_history**](docs/DashboardApi.md#get_dashboard_history) | **GET** /api/v2/dashboard/{id}/history | Get the version history of a specific dashboard
 *DashboardApi* | [**get_dashboard_tags**](docs/DashboardApi.md#get_dashboard_tags) | **GET** /api/v2/dashboard/{id}/tag | Get all tags associated with a specific dashboard
 *DashboardApi* | [**get_dashboard_version**](docs/DashboardApi.md#get_dashboard_version) | **GET** /api/v2/dashboard/{id}/history/{version} | Get a specific version of a specific dashboard
-*DashboardApi* | [**remove_access**](docs/DashboardApi.md#remove_access) | **POST** /api/v2/dashboard/acl/remove | Removes the specified ids from the given dashboards&#39; ACL
+*DashboardApi* | [**remove_dashboard_access**](docs/DashboardApi.md#remove_dashboard_access) | **POST** /api/v2/dashboard/acl/remove | Removes the specified ids from the given dashboards&#39; ACL
 *DashboardApi* | [**remove_dashboard_tag**](docs/DashboardApi.md#remove_dashboard_tag) | **DELETE** /api/v2/dashboard/{id}/tag/{tagValue} | Remove a tag from a specific dashboard
-*DashboardApi* | [**set_acl**](docs/DashboardApi.md#set_acl) | **PUT** /api/v2/dashboard/acl/set | Set ACL for the specified dashboards
+*DashboardApi* | [**set_dashboard_acl**](docs/DashboardApi.md#set_dashboard_acl) | **PUT** /api/v2/dashboard/acl/set | Set ACL for the specified dashboards
 *DashboardApi* | [**set_dashboard_tags**](docs/DashboardApi.md#set_dashboard_tags) | **POST** /api/v2/dashboard/{id}/tag | Set all tags associated with a specific dashboard
 *DashboardApi* | [**undelete_dashboard**](docs/DashboardApi.md#undelete_dashboard) | **POST** /api/v2/dashboard/{id}/undelete | Undelete a specific dashboard
 *DashboardApi* | [**unfavorite_dashboard**](docs/DashboardApi.md#unfavorite_dashboard) | **POST** /api/v2/dashboard/{id}/unfavorite | Unmark a dashboard as favorite
@@ -158,6 +177,7 @@ Class | Method | HTTP request | Description
 *EventApi* | [**get_all_events_with_time_range**](docs/EventApi.md#get_all_events_with_time_range) | **GET** /api/v2/event | List all the events for a customer within a time range
 *EventApi* | [**get_event**](docs/EventApi.md#get_event) | **GET** /api/v2/event/{id} | Get a specific event
 *EventApi* | [**get_event_tags**](docs/EventApi.md#get_event_tags) | **GET** /api/v2/event/{id}/tag | Get all tags associated with a specific event
+*EventApi* | [**get_related_events_with_time_span**](docs/EventApi.md#get_related_events_with_time_span) | **GET** /api/v2/event/{id}/events | List all related events for a specific firing event with a time span of one hour
 *EventApi* | [**remove_event_tag**](docs/EventApi.md#remove_event_tag) | **DELETE** /api/v2/event/{id}/tag/{tagValue} | Remove a tag from a specific event
 *EventApi* | [**set_event_tags**](docs/EventApi.md#set_event_tags) | **POST** /api/v2/event/{id}/tag | Set all tags associated with a specific event
 *EventApi* | [**update_event**](docs/EventApi.md#update_event) | **PUT** /api/v2/event/{id} | Update a specific event
@@ -228,6 +248,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_external_link_entities**](docs/SearchApi.md#search_external_link_entities) | **POST** /api/v2/search/extlink | Search over a customer&#39;s external links
 *SearchApi* | [**search_external_links_for_facet**](docs/SearchApi.md#search_external_links_for_facet) | **POST** /api/v2/search/extlink/{facet} | Lists the values of a specific facet over the customer&#39;s external links
 *SearchApi* | [**search_external_links_for_facets**](docs/SearchApi.md#search_external_links_for_facets) | **POST** /api/v2/search/extlink/facets | Lists the values of one or more facets over the customer&#39;s external links
+*SearchApi* | [**search_ingestion_policy_entities**](docs/SearchApi.md#search_ingestion_policy_entities) | **POST** /api/v2/search/ingestionpolicy | Search over a customer&#39;s ingestion policies
+*SearchApi* | [**search_ingestion_policy_for_facet**](docs/SearchApi.md#search_ingestion_policy_for_facet) | **POST** /api/v2/search/ingestionpolicy/{facet} | Lists the values of a specific facet over the customer&#39;s ingestion policies
+*SearchApi* | [**search_ingestion_policy_for_facets**](docs/SearchApi.md#search_ingestion_policy_for_facets) | **POST** /api/v2/search/ingestionpolicy/facets | Lists the values of one or more facets over the customer&#39;s ingestion policies
 *SearchApi* | [**search_maintenance_window_entities**](docs/SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facet**](docs/SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facets**](docs/SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
@@ -279,20 +302,26 @@ Class | Method | HTTP request | Description
 *SourceApi* | [**set_description**](docs/SourceApi.md#set_description) | **POST** /api/v2/source/{id}/description | Set description associated with a specific source
 *SourceApi* | [**set_source_tags**](docs/SourceApi.md#set_source_tags) | **POST** /api/v2/source/{id}/tag | Set all tags associated with a specific source
 *SourceApi* | [**update_source**](docs/SourceApi.md#update_source) | **PUT** /api/v2/source/{id} | Update metadata (description or tags) for a specific source.
+*UsageApi* | [**create_ingestion_policy**](docs/UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
+*UsageApi* | [**delete_ingestion_policy**](docs/UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
+*UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
+*UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
+*UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 *UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
 *UserApi* | [**create_or_update_user**](docs/UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
 *UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
 *UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 *UserApi* | [**get_all_users**](docs/UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
 *UserApi* | [**get_user**](docs/UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
-*UserApi* | [**get_user_business_functions**](docs/UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user.
+*UserApi* | [**get_user_business_functions**](docs/UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user or service account.
 *UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
 *UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
 *UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
-*UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
+*UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
 *UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
 *UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 *UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
@@ -319,6 +348,7 @@ Class | Method | HTTP request | Description
  - [AccessControlListWriteDTO](docs/AccessControlListWriteDTO.md)
  - [Account](docs/Account.md)
  - [Alert](docs/Alert.md)
+ - [AlertMin](docs/AlertMin.md)
  - [AlertRoute](docs/AlertRoute.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
@@ -336,6 +366,7 @@ Class | Method | HTTP request | Description
  - [CustomerPreferences](docs/CustomerPreferences.md)
  - [CustomerPreferencesUpdating](docs/CustomerPreferencesUpdating.md)
  - [Dashboard](docs/Dashboard.md)
+ - [DashboardMin](docs/DashboardMin.md)
  - [DashboardParameterValue](docs/DashboardParameterValue.md)
  - [DashboardSection](docs/DashboardSection.md)
  - [DashboardSectionRow](docs/DashboardSectionRow.md)
@@ -353,6 +384,8 @@ Class | Method | HTTP request | Description
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
+ - [IngestionPolicy](docs/IngestionPolicy.md)
+ - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
  - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
  - [IntegrationAlert](docs/IntegrationAlert.md)
@@ -385,6 +418,7 @@ Class | Method | HTTP request | Description
  - [PagedDerivedMetricDefinitionWithStats](docs/PagedDerivedMetricDefinitionWithStats.md)
  - [PagedEvent](docs/PagedEvent.md)
  - [PagedExternalLink](docs/PagedExternalLink.md)
+ - [PagedIngestionPolicy](docs/PagedIngestionPolicy.md)
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
@@ -400,6 +434,7 @@ Class | Method | HTTP request | Description
  - [QueryResult](docs/QueryResult.md)
  - [RawTimeseries](docs/RawTimeseries.md)
  - [ResponseContainer](docs/ResponseContainer.md)
+ - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
  - [ResponseContainerCloudIntegration](docs/ResponseContainerCloudIntegration.md)
  - [ResponseContainerDashboard](docs/ResponseContainerDashboard.md)
@@ -409,6 +444,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerFacetResponse](docs/ResponseContainerFacetResponse.md)
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
+ - [ResponseContainerIngestionPolicy](docs/ResponseContainerIngestionPolicy.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
@@ -433,6 +469,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedDerivedMetricDefinitionWithStats](docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md)
  - [ResponseContainerPagedEvent](docs/ResponseContainerPagedEvent.md)
  - [ResponseContainerPagedExternalLink](docs/ResponseContainerPagedExternalLink.md)
+ - [ResponseContainerPagedIngestionPolicy](docs/ResponseContainerPagedIngestionPolicy.md)
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
@@ -445,6 +482,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
  - [ResponseContainerServiceAccount](docs/ResponseContainerServiceAccount.md)
+ - [ResponseContainerSetBusinessFunction](docs/ResponseContainerSetBusinessFunction.md)
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
diff --git a/docs/Account.md b/docs/Account.md
index d0122b1..e563692 100644
--- a/docs/Account.md
+++ b/docs/Account.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **groups** | **list[str]** | The list of account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of an account. | 
+**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with account. | [optional] 
 **user_groups** | **list[str]** | The list of account&#39;s user groups. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
new file mode 100644
index 0000000..b377233
--- /dev/null
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -0,0 +1,1395 @@
+# wavefront_api_client.AccountUserAndServiceAccountApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
+[**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
+[**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
+[**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
+[**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
+[**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
+[**delete_account**](AccountUserAndServiceAccountApi.md#delete_account) | **DELETE** /api/v2/account/{id} | Deletes an account (user or service account) identified by id
+[**delete_multiple_accounts**](AccountUserAndServiceAccountApi.md#delete_multiple_accounts) | **POST** /api/v2/account/deleteAccounts | Deletes multiple accounts (users or service accounts)
+[**get_account**](AccountUserAndServiceAccountApi.md#get_account) | **GET** /api/v2/account/{id} | Get a specific account (user or service account)
+[**get_account_business_functions**](AccountUserAndServiceAccountApi.md#get_account_business_functions) | **GET** /api/v2/account/{id}/businessFunctions | Returns business functions of a specific account (user or service account).
+[**get_all_accounts**](AccountUserAndServiceAccountApi.md#get_all_accounts) | **GET** /api/v2/account | Get all accounts (users and service accounts) of a customer
+[**get_all_service_accounts**](AccountUserAndServiceAccountApi.md#get_all_service_accounts) | **GET** /api/v2/account/serviceaccount | Get all service accounts
+[**get_all_user_accounts**](AccountUserAndServiceAccountApi.md#get_all_user_accounts) | **GET** /api/v2/account/user | Get all user accounts
+[**get_service_account**](AccountUserAndServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
+[**get_user_account**](AccountUserAndServiceAccountApi.md#get_user_account) | **GET** /api/v2/account/user/{id} | Retrieves a user by identifier (email address)
+[**grant_account_permission**](AccountUserAndServiceAccountApi.md#grant_account_permission) | **POST** /api/v2/account/{id}/grant/{permission} | Grants a specific permission to account (user or service account)
+[**grant_permission_to_accounts**](AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
+[**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
+[**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific user groups from the account (user or service account)
+[**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
+[**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
+[**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
+[**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
+[**update_user_account**](AccountUserAndServiceAccountApi.md#update_user_account) | **PUT** /api/v2/account/user/{id} | Update user with given user groups, permissions and ingestion policy.
+[**validate_accounts**](AccountUserAndServiceAccountApi.md#validate_accounts) | **POST** /api/v2/account/validateAccounts | Returns valid accounts (users and service accounts), also invalid identifiers from the given list
+
+
+# **activate_account**
+> ResponseContainerServiceAccount activate_account(id)
+
+Activates the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Activates the given service account
+    api_response = api_instance.activate_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->activate_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **add_account_to_user_groups**
+> UserModel add_account_to_user_groups(id, body=body)
+
+Adds specific user groups to the account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be added to the account (optional)
+
+try:
+    # Adds specific user groups to the account (user or service account)
+    api_response = api_instance.add_account_to_user_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->add_account_to_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| The list of user groups that should be added to the account | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **add_ingestion_policy**
+> ResponseContainer add_ingestion_policy(body=body)
+
+Add a specific ingestion policy to multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ], }</pre> (optional)
+
+try:
+    # Add a specific ingestion policy to multiple accounts
+    api_response = api_instance.add_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->add_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ], }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_or_update_user_account**
+> UserModel create_or_update_user_account(send_email=send_email, body=body)
+
+Creates or updates a user account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
+
+try:
+    # Creates or updates a user account
+    api_response = api_instance.create_or_update_user_account(send_email=send_email, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->create_or_update_user_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_service_account**
+> ResponseContainerServiceAccount create_service_account(body=body)
+
+Creates a service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.ServiceAccountWrite() # ServiceAccountWrite |  (optional)
+
+try:
+    # Creates a service account
+    api_response = api_instance.create_service_account(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->create_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**ServiceAccountWrite**](ServiceAccountWrite.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deactivate_account**
+> ResponseContainerServiceAccount deactivate_account(id)
+
+Deactivates the given service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Deactivates the given service account
+    api_response = api_instance.deactivate_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->deactivate_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_account**
+> ResponseContainerAccount delete_account(id)
+
+Deletes an account (user or service account) identified by id
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Deletes an account (user or service account) identified by id
+    api_response = api_instance.delete_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->delete_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerAccount**](ResponseContainerAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_multiple_accounts**
+> ResponseContainerListString delete_multiple_accounts(body=body)
+
+Deletes multiple accounts (users or service accounts)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] | list of accounts' identifiers to be deleted (optional)
+
+try:
+    # Deletes multiple accounts (users or service accounts)
+    api_response = api_instance.delete_multiple_accounts(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->delete_multiple_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**| list of accounts&#39; identifiers to be deleted | [optional] 
+
+### Return type
+
+[**ResponseContainerListString**](ResponseContainerListString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_account**
+> ResponseContainerAccount get_account(id)
+
+Get a specific account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific account (user or service account)
+    api_response = api_instance.get_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerAccount**](ResponseContainerAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_account_business_functions**
+> ResponseContainerSetBusinessFunction get_account_business_functions(id)
+
+Returns business functions of a specific account (user or service account).
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Returns business functions of a specific account (user or service account).
+    api_response = api_instance.get_account_business_functions(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_account_business_functions: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSetBusinessFunction**](ResponseContainerSetBusinessFunction.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_accounts**
+> ResponseContainerPagedAccount get_all_accounts(offset=offset, limit=limit)
+
+Get all accounts (users and service accounts) of a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all accounts (users and service accounts) of a customer
+    api_response = api_instance.get_all_accounts(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_all_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedAccount**](ResponseContainerPagedAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_service_accounts**
+> ResponseContainerListServiceAccount get_all_service_accounts()
+
+Get all service accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all service accounts
+    api_response = api_instance.get_all_service_accounts()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_all_service_accounts: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListServiceAccount**](ResponseContainerListServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_user_accounts**
+> list[UserModel] get_all_user_accounts()
+
+Get all user accounts
+
+Returns all user accounts
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all user accounts
+    api_response = api_instance.get_all_user_accounts()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_all_user_accounts: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**list[UserModel]**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_service_account**
+> ResponseContainerServiceAccount get_service_account(id)
+
+Retrieves a service account by identifier
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Retrieves a service account by identifier
+    api_response = api_instance.get_service_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_user_account**
+> UserModel get_user_account(id)
+
+Retrieves a user by identifier (email address)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Retrieves a user by identifier (email address)
+    api_response = api_instance.get_user_account(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_user_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **grant_account_permission**
+> UserModel grant_account_permission(id, permission)
+
+Grants a specific permission to account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+permission = 'permission_example' # str | Permission to grant to the account. Please note that'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+
+try:
+    # Grants a specific permission to account (user or service account)
+    api_response = api_instance.grant_account_permission(id, permission)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->grant_account_permission: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **permission** | **str**| Permission to grant to the account. Please note that&#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **grant_permission_to_accounts**
+> UserModel grant_permission_to_accounts(permission, body=body)
+
+Grants a specific permission to multiple accounts (users or service accounts)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to grant to the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+body = [wavefront_api_client.list[str]()] # list[str] | List of accounts the specified permission to be granted to (optional)
+
+try:
+    # Grants a specific permission to multiple accounts (users or service accounts)
+    api_response = api_instance.grant_permission_to_accounts(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->grant_permission_to_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to grant to the accounts. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **body** | **list[str]**| List of accounts the specified permission to be granted to | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **invite_user_accounts**
+> UserModel invite_user_accounts(body=body)
+
+Invite user accounts with given user groups and permissions.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre> (optional)
+
+try:
+    # Invite user accounts with given user groups and permissions.
+    api_response = api_instance.invite_user_accounts(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->invite_user_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; } ]&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_account_from_user_groups**
+> UserModel remove_account_from_user_groups(id, body=body)
+
+Removes specific user groups from the account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be removed from the account (optional)
+
+try:
+    # Removes specific user groups from the account (user or service account)
+    api_response = api_instance.remove_account_from_user_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->remove_account_from_user_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| The list of user groups that should be removed from the account | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_ingestion_policies**
+> ResponseContainer remove_ingestion_policies(body=body)
+
+Removes ingestion policies from multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of accounts from which ingestion policies should be removed (optional)
+
+try:
+    # Removes ingestion policies from multiple accounts
+    api_response = api_instance.remove_ingestion_policies(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->remove_ingestion_policies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**| identifiers of list of accounts from which ingestion policies should be removed | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revoke_account_permission**
+> UserModel revoke_account_permission(id, permission)
+
+Revokes a specific permission from account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+permission = 'permission_example' # str | 
+
+try:
+    # Revokes a specific permission from account (user or service account)
+    api_response = api_instance.revoke_account_permission(id, permission)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->revoke_account_permission: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **permission** | **str**|  | 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revoke_permission_from_accounts**
+> UserModel revoke_permission_from_accounts(permission, body=body)
+
+Revokes a specific permission from multiple accounts (users or service accounts)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+body = [wavefront_api_client.list[str]()] # list[str] | List of accounts the specified permission to be revoked from (optional)
+
+try:
+    # Revokes a specific permission from multiple accounts (users or service accounts)
+    api_response = api_instance.revoke_permission_from_accounts(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->revoke_permission_from_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to revoke from the accounts. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **body** | **list[str]**| List of accounts the specified permission to be revoked from | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_service_account**
+> ResponseContainerServiceAccount update_service_account(id, body=body)
+
+Updates the service account
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.ServiceAccountWrite() # ServiceAccountWrite |  (optional)
+
+try:
+    # Updates the service account
+    api_response = api_instance.update_service_account(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->update_service_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**ServiceAccountWrite**](ServiceAccountWrite.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_user_account**
+> UserModel update_user_account(id, body=body)
+
+Update user with given user groups, permissions and ingestion policy.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
+
+try:
+    # Update user with given user groups, permissions and ingestion policy.
+    api_response = api_instance.update_user_account(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->update_user_account: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **validate_accounts**
+> ResponseContainerValidatedUsersDTO validate_accounts(body=body)
+
+Returns valid accounts (users and service accounts), also invalid identifiers from the given list
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
+
+try:
+    # Returns valid accounts (users and service accounts), also invalid identifiers from the given list
+    api_response = api_instance.validate_accounts(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->validate_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerValidatedUsersDTO**](ResponseContainerValidatedUsersDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index d4c8632..50b74ea 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -4,22 +4,22 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_access**](AlertApi.md#add_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
+[**add_alert_access**](AlertApi.md#add_alert_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 [**add_alert_tag**](AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
 [**clone_alert**](AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 [**create_alert**](AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 [**delete_alert**](AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
-[**get_access_control_list**](AlertApi.md#get_access_control_list) | **GET** /api/v2/alert/acl | Get Access Control Lists&#39; union for the specified alerts
 [**get_alert**](AlertApi.md#get_alert) | **GET** /api/v2/alert/{id} | Get a specific alert
+[**get_alert_access_control_list**](AlertApi.md#get_alert_access_control_list) | **GET** /api/v2/alert/acl | Get Access Control Lists&#39; union for the specified alerts
 [**get_alert_history**](AlertApi.md#get_alert_history) | **GET** /api/v2/alert/{id}/history | Get the version history of a specific alert
 [**get_alert_tags**](AlertApi.md#get_alert_tags) | **GET** /api/v2/alert/{id}/tag | Get all tags associated with a specific alert
 [**get_alert_version**](AlertApi.md#get_alert_version) | **GET** /api/v2/alert/{id}/history/{version} | Get a specific historical version of a specific alert
 [**get_alerts_summary**](AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 [**get_all_alert**](AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 [**hide_alert**](AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
-[**remove_access**](AlertApi.md#remove_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
+[**remove_alert_access**](AlertApi.md#remove_alert_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
 [**remove_alert_tag**](AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
-[**set_acl**](AlertApi.md#set_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
+[**set_alert_acl**](AlertApi.md#set_alert_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
 [**set_alert_tags**](AlertApi.md#set_alert_tags) | **POST** /api/v2/alert/{id}/tag | Set all tags associated with a specific alert
 [**snooze_alert**](AlertApi.md#snooze_alert) | **POST** /api/v2/alert/{id}/snooze | Snooze a specific alert for some number of seconds
 [**undelete_alert**](AlertApi.md#undelete_alert) | **POST** /api/v2/alert/{id}/undelete | Undelete a specific alert
@@ -28,8 +28,8 @@ Method | HTTP request | Description
 [**update_alert**](AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 
 
-# **add_access**
-> add_access(body=body)
+# **add_alert_access**
+> add_alert_access(body=body)
 
 Adds the specified ids to the given alerts' ACL
 
@@ -55,9 +55,9 @@ body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlLi
 
 try:
     # Adds the specified ids to the given alerts' ACL
-    api_instance.add_access(body=body)
+    api_instance.add_alert_access(body=body)
 except ApiException as e:
-    print("Exception when calling AlertApi->add_access: %s\n" % e)
+    print("Exception when calling AlertApi->add_alert_access: %s\n" % e)
 ```
 
 ### Parameters
@@ -303,10 +303,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_access_control_list**
-> ResponseContainerListAccessControlListReadDTO get_access_control_list(id=id)
+# **get_alert**
+> ResponseContainerAlert get_alert(id)
 
-Get Access Control Lists' union for the specified alerts
+Get a specific alert
 
 
 
@@ -326,25 +326,25 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-id = ['id_example'] # list[str] |  (optional)
+id = 'id_example' # str | 
 
 try:
-    # Get Access Control Lists' union for the specified alerts
-    api_response = api_instance.get_access_control_list(id=id)
+    # Get a specific alert
+    api_response = api_instance.get_alert(id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AlertApi->get_access_control_list: %s\n" % e)
+    print("Exception when calling AlertApi->get_alert: %s\n" % e)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | [**list[str]**](str.md)|  | [optional] 
+ **id** | **str**|  | 
 
 ### Return type
 
-[**ResponseContainerListAccessControlListReadDTO**](ResponseContainerListAccessControlListReadDTO.md)
+[**ResponseContainerAlert**](ResponseContainerAlert.md)
 
 ### Authorization
 
@@ -357,10 +357,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_alert**
-> ResponseContainerAlert get_alert(id)
+# **get_alert_access_control_list**
+> ResponseContainerListAccessControlListReadDTO get_alert_access_control_list(id=id)
 
-Get a specific alert
+Get Access Control Lists' union for the specified alerts
 
 
 
@@ -380,25 +380,25 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+id = ['id_example'] # list[str] |  (optional)
 
 try:
-    # Get a specific alert
-    api_response = api_instance.get_alert(id)
+    # Get Access Control Lists' union for the specified alerts
+    api_response = api_instance.get_alert_access_control_list(id=id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AlertApi->get_alert: %s\n" % e)
+    print("Exception when calling AlertApi->get_alert_access_control_list: %s\n" % e)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
+ **id** | [**list[str]**](str.md)|  | [optional] 
 
 ### Return type
 
-[**ResponseContainerAlert**](ResponseContainerAlert.md)
+[**ResponseContainerListAccessControlListReadDTO**](ResponseContainerListAccessControlListReadDTO.md)
 
 ### Authorization
 
@@ -739,8 +739,8 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_access**
-> remove_access(body=body)
+# **remove_alert_access**
+> remove_alert_access(body=body)
 
 Removes the specified ids from the given alerts' ACL
 
@@ -766,9 +766,9 @@ body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlLi
 
 try:
     # Removes the specified ids from the given alerts' ACL
-    api_instance.remove_access(body=body)
+    api_instance.remove_alert_access(body=body)
 except ApiException as e:
-    print("Exception when calling AlertApi->remove_access: %s\n" % e)
+    print("Exception when calling AlertApi->remove_alert_access: %s\n" % e)
 ```
 
 ### Parameters
@@ -848,8 +848,8 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **set_acl**
-> set_acl(body=body)
+# **set_alert_acl**
+> set_alert_acl(body=body)
 
 Set ACL for the specified alerts
 
@@ -875,9 +875,9 @@ body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlLi
 
 try:
     # Set ACL for the specified alerts
-    api_instance.set_acl(body=body)
+    api_instance.set_alert_acl(body=body)
 except ApiException as e:
-    print("Exception when calling AlertApi->set_acl: %s\n" % e)
+    print("Exception when calling AlertApi->set_alert_acl: %s\n" % e)
 ```
 
 ### Parameters
diff --git a/docs/AlertMin.md b/docs/AlertMin.md
new file mode 100644
index 0000000..99b0696
--- /dev/null
+++ b/docs/AlertMin.md
@@ -0,0 +1,11 @@
+# AlertMin
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **str** | Unique identifier, also created epoch millis, of the alert | [optional] 
+**name** | **str** | Name of the alert | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index ce116a6..385a4e7 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
 **id** | **str** | The unique identifier of this user, which should be their valid email address | 
 **identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
+**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
 **_self** | **bool** | Whether this user is the one calling the API | 
 **user_groups** | **list[str]** | List of user group identifiers this user belongs to | [optional] 
diff --git a/docs/DashboardApi.md b/docs/DashboardApi.md
index 018c9cd..c8f6ad4 100644
--- a/docs/DashboardApi.md
+++ b/docs/DashboardApi.md
@@ -4,28 +4,28 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_access**](DashboardApi.md#add_access) | **POST** /api/v2/dashboard/acl/add | Adds the specified ids to the given dashboards&#39; ACL
+[**add_dashboard_access**](DashboardApi.md#add_dashboard_access) | **POST** /api/v2/dashboard/acl/add | Adds the specified ids to the given dashboards&#39; ACL
 [**add_dashboard_tag**](DashboardApi.md#add_dashboard_tag) | **PUT** /api/v2/dashboard/{id}/tag/{tagValue} | Add a tag to a specific dashboard
 [**create_dashboard**](DashboardApi.md#create_dashboard) | **POST** /api/v2/dashboard | Create a specific dashboard
 [**delete_dashboard**](DashboardApi.md#delete_dashboard) | **DELETE** /api/v2/dashboard/{id} | Delete a specific dashboard
 [**favorite_dashboard**](DashboardApi.md#favorite_dashboard) | **POST** /api/v2/dashboard/{id}/favorite | Mark a dashboard as favorite
-[**get_access_control_list**](DashboardApi.md#get_access_control_list) | **GET** /api/v2/dashboard/acl | Get list of Access Control Lists for the specified dashboards
 [**get_all_dashboard**](DashboardApi.md#get_all_dashboard) | **GET** /api/v2/dashboard | Get all dashboards for a customer
 [**get_dashboard**](DashboardApi.md#get_dashboard) | **GET** /api/v2/dashboard/{id} | Get a specific dashboard
+[**get_dashboard_access_control_list**](DashboardApi.md#get_dashboard_access_control_list) | **GET** /api/v2/dashboard/acl | Get list of Access Control Lists for the specified dashboards
 [**get_dashboard_history**](DashboardApi.md#get_dashboard_history) | **GET** /api/v2/dashboard/{id}/history | Get the version history of a specific dashboard
 [**get_dashboard_tags**](DashboardApi.md#get_dashboard_tags) | **GET** /api/v2/dashboard/{id}/tag | Get all tags associated with a specific dashboard
 [**get_dashboard_version**](DashboardApi.md#get_dashboard_version) | **GET** /api/v2/dashboard/{id}/history/{version} | Get a specific version of a specific dashboard
-[**remove_access**](DashboardApi.md#remove_access) | **POST** /api/v2/dashboard/acl/remove | Removes the specified ids from the given dashboards&#39; ACL
+[**remove_dashboard_access**](DashboardApi.md#remove_dashboard_access) | **POST** /api/v2/dashboard/acl/remove | Removes the specified ids from the given dashboards&#39; ACL
 [**remove_dashboard_tag**](DashboardApi.md#remove_dashboard_tag) | **DELETE** /api/v2/dashboard/{id}/tag/{tagValue} | Remove a tag from a specific dashboard
-[**set_acl**](DashboardApi.md#set_acl) | **PUT** /api/v2/dashboard/acl/set | Set ACL for the specified dashboards
+[**set_dashboard_acl**](DashboardApi.md#set_dashboard_acl) | **PUT** /api/v2/dashboard/acl/set | Set ACL for the specified dashboards
 [**set_dashboard_tags**](DashboardApi.md#set_dashboard_tags) | **POST** /api/v2/dashboard/{id}/tag | Set all tags associated with a specific dashboard
 [**undelete_dashboard**](DashboardApi.md#undelete_dashboard) | **POST** /api/v2/dashboard/{id}/undelete | Undelete a specific dashboard
 [**unfavorite_dashboard**](DashboardApi.md#unfavorite_dashboard) | **POST** /api/v2/dashboard/{id}/unfavorite | Unmark a dashboard as favorite
 [**update_dashboard**](DashboardApi.md#update_dashboard) | **PUT** /api/v2/dashboard/{id} | Update a specific dashboard
 
 
-# **add_access**
-> add_access(body=body)
+# **add_dashboard_access**
+> add_dashboard_access(body=body)
 
 Adds the specified ids to the given dashboards' ACL
 
@@ -51,9 +51,9 @@ body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlLi
 
 try:
     # Adds the specified ids to the given dashboards' ACL
-    api_instance.add_access(body=body)
+    api_instance.add_dashboard_access(body=body)
 except ApiException as e:
-    print("Exception when calling DashboardApi->add_access: %s\n" % e)
+    print("Exception when calling DashboardApi->add_dashboard_access: %s\n" % e)
 ```
 
 ### Parameters
@@ -295,10 +295,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_access_control_list**
-> ResponseContainerListAccessControlListReadDTO get_access_control_list(id=id)
+# **get_all_dashboard**
+> ResponseContainerPagedDashboard get_all_dashboard(offset=offset, limit=limit)
 
-Get list of Access Control Lists for the specified dashboards
+Get all dashboards for a customer
 
 
 
@@ -318,25 +318,27 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
-id = ['id_example'] # list[str] |  (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
 
 try:
-    # Get list of Access Control Lists for the specified dashboards
-    api_response = api_instance.get_access_control_list(id=id)
+    # Get all dashboards for a customer
+    api_response = api_instance.get_all_dashboard(offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling DashboardApi->get_access_control_list: %s\n" % e)
+    print("Exception when calling DashboardApi->get_all_dashboard: %s\n" % e)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | [**list[str]**](str.md)|  | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
 
 ### Return type
 
-[**ResponseContainerListAccessControlListReadDTO**](ResponseContainerListAccessControlListReadDTO.md)
+[**ResponseContainerPagedDashboard**](ResponseContainerPagedDashboard.md)
 
 ### Authorization
 
@@ -349,10 +351,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_all_dashboard**
-> ResponseContainerPagedDashboard get_all_dashboard(offset=offset, limit=limit)
+# **get_dashboard**
+> ResponseContainerDashboard get_dashboard(id)
 
-Get all dashboards for a customer
+Get a specific dashboard
 
 
 
@@ -372,27 +374,25 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
+id = 'id_example' # str | 
 
 try:
-    # Get all dashboards for a customer
-    api_response = api_instance.get_all_dashboard(offset=offset, limit=limit)
+    # Get a specific dashboard
+    api_response = api_instance.get_dashboard(id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling DashboardApi->get_all_dashboard: %s\n" % e)
+    print("Exception when calling DashboardApi->get_dashboard: %s\n" % e)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
+ **id** | **str**|  | 
 
 ### Return type
 
-[**ResponseContainerPagedDashboard**](ResponseContainerPagedDashboard.md)
+[**ResponseContainerDashboard**](ResponseContainerDashboard.md)
 
 ### Authorization
 
@@ -405,10 +405,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_dashboard**
-> ResponseContainerDashboard get_dashboard(id)
+# **get_dashboard_access_control_list**
+> ResponseContainerListAccessControlListReadDTO get_dashboard_access_control_list(id=id)
 
-Get a specific dashboard
+Get list of Access Control Lists for the specified dashboards
 
 
 
@@ -428,25 +428,25 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+id = ['id_example'] # list[str] |  (optional)
 
 try:
-    # Get a specific dashboard
-    api_response = api_instance.get_dashboard(id)
+    # Get list of Access Control Lists for the specified dashboards
+    api_response = api_instance.get_dashboard_access_control_list(id=id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling DashboardApi->get_dashboard: %s\n" % e)
+    print("Exception when calling DashboardApi->get_dashboard_access_control_list: %s\n" % e)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
+ **id** | [**list[str]**](str.md)|  | [optional] 
 
 ### Return type
 
-[**ResponseContainerDashboard**](ResponseContainerDashboard.md)
+[**ResponseContainerListAccessControlListReadDTO**](ResponseContainerListAccessControlListReadDTO.md)
 
 ### Authorization
 
@@ -627,8 +627,8 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_access**
-> remove_access(body=body)
+# **remove_dashboard_access**
+> remove_dashboard_access(body=body)
 
 Removes the specified ids from the given dashboards' ACL
 
@@ -654,9 +654,9 @@ body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlLi
 
 try:
     # Removes the specified ids from the given dashboards' ACL
-    api_instance.remove_access(body=body)
+    api_instance.remove_dashboard_access(body=body)
 except ApiException as e:
-    print("Exception when calling DashboardApi->remove_access: %s\n" % e)
+    print("Exception when calling DashboardApi->remove_dashboard_access: %s\n" % e)
 ```
 
 ### Parameters
@@ -736,8 +736,8 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **set_acl**
-> set_acl(body=body)
+# **set_dashboard_acl**
+> set_dashboard_acl(body=body)
 
 Set ACL for the specified dashboards
 
@@ -763,9 +763,9 @@ body = [wavefront_api_client.AccessControlListWriteDTO()] # list[AccessControlLi
 
 try:
     # Set ACL for the specified dashboards
-    api_instance.set_acl(body=body)
+    api_instance.set_dashboard_acl(body=body)
 except ApiException as e:
-    print("Exception when calling DashboardApi->set_acl: %s\n" % e)
+    print("Exception when calling DashboardApi->set_dashboard_acl: %s\n" % e)
 ```
 
 ### Parameters
diff --git a/docs/DashboardMin.md b/docs/DashboardMin.md
new file mode 100644
index 0000000..08c689c
--- /dev/null
+++ b/docs/DashboardMin.md
@@ -0,0 +1,12 @@
+# DashboardMin
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** | Human-readable description of the dashboard | [optional] 
+**id** | **str** | Unique identifier, also URL slug, of the dashboard | [optional] 
+**name** | **str** | Name of the dashboard | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/DashboardSection.md b/docs/DashboardSection.md
index 3fe84cc..63fc605 100644
--- a/docs/DashboardSection.md
+++ b/docs/DashboardSection.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** | Name of this section | 
 **rows** | [**list[DashboardSectionRow]**](DashboardSectionRow.md) | Rows of this section | 
+**section_filter** | [**JsonNode**](JsonNode.md) | Display filter for conditional dashboard section | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EventApi.md b/docs/EventApi.md
index cd3d7e1..7caf683 100644
--- a/docs/EventApi.md
+++ b/docs/EventApi.md
@@ -11,6 +11,7 @@ Method | HTTP request | Description
 [**get_all_events_with_time_range**](EventApi.md#get_all_events_with_time_range) | **GET** /api/v2/event | List all the events for a customer within a time range
 [**get_event**](EventApi.md#get_event) | **GET** /api/v2/event/{id} | Get a specific event
 [**get_event_tags**](EventApi.md#get_event_tags) | **GET** /api/v2/event/{id}/tag | Get all tags associated with a specific event
+[**get_related_events_with_time_span**](EventApi.md#get_related_events_with_time_span) | **GET** /api/v2/event/{id}/events | List all related events for a specific firing event with a time span of one hour
 [**remove_event_tag**](EventApi.md#remove_event_tag) | **DELETE** /api/v2/event/{id}/tag/{tagValue} | Remove a tag from a specific event
 [**set_event_tags**](EventApi.md#set_event_tags) | **POST** /api/v2/event/{id}/tag | Set all tags associated with a specific event
 [**update_event**](EventApi.md#update_event) | **PUT** /api/v2/event/{id} | Update a specific event
@@ -402,6 +403,66 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_related_events_with_time_span**
+> ResponseContainerPagedEvent get_related_events_with_time_span(id, is_overlapped=is_overlapped, rendering_method=rendering_method, limit=limit)
+
+List all related events for a specific firing event with a time span of one hour
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+is_overlapped = true # bool |  (optional)
+rendering_method = 'rendering_method_example' # str |  (optional)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # List all related events for a specific firing event with a time span of one hour
+    api_response = api_instance.get_related_events_with_time_span(id, is_overlapped=is_overlapped, rendering_method=rendering_method, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling EventApi->get_related_events_with_time_span: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **is_overlapped** | **bool**|  | [optional] 
+ **rendering_method** | **str**|  | [optional] 
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedEvent**](ResponseContainerPagedEvent.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **remove_event_tag**
 > ResponseContainer remove_event_tag(id, tag_value)
 
diff --git a/docs/IngestionPolicy.md b/docs/IngestionPolicy.md
new file mode 100644
index 0000000..3cf9002
--- /dev/null
+++ b/docs/IngestionPolicy.md
@@ -0,0 +1,19 @@
+# IngestionPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
+**description** | **str** | The description of the ingestion policy | [optional] 
+**id** | **str** | The unique ID for the ingestion policy | [optional] 
+**last_updated_account_id** | **str** | The account that updated this ingestion policy last time | [optional] 
+**last_updated_ms** | **int** | The last time when the ingestion policy is updated, in epoch milliseconds | [optional] 
+**name** | **str** | The name of the ingestion policy | [optional] 
+**sampled_service_accounts** | **list[str]** | A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy | [optional] 
+**sampled_user_accounts** | **list[str]** | A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy | [optional] 
+**service_account_count** | **int** | Total number of service accounts that are linked to the ingestion policy | [optional] 
+**user_account_count** | **int** | Total number of user accounts that are linked to the ingestion policy | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IngestionPolicyMapping.md b/docs/IngestionPolicyMapping.md
new file mode 100644
index 0000000..5be111e
--- /dev/null
+++ b/docs/IngestionPolicyMapping.md
@@ -0,0 +1,11 @@
+# IngestionPolicyMapping
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**accounts** | **list[str]** | The list of accounts that should be linked to the ingestion policy | 
+**ingestion_policy_id** | **str** | The unique identifier of the ingestion policy | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IntegrationAlert.md b/docs/IntegrationAlert.md
index ca9caed..d3f9b26 100644
--- a/docs/IntegrationAlert.md
+++ b/docs/IntegrationAlert.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**alert_min_obj** | [**AlertMin**](AlertMin.md) |  | [optional] 
 **alert_obj** | [**Alert**](Alert.md) |  | [optional] 
 **description** | **str** | Alert description | 
 **name** | **str** | Alert name | 
diff --git a/docs/IntegrationDashboard.md b/docs/IntegrationDashboard.md
index 8eaa59f..b1e08bc 100644
--- a/docs/IntegrationDashboard.md
+++ b/docs/IntegrationDashboard.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**dashboard_min_obj** | [**DashboardMin**](DashboardMin.md) |  | [optional] 
 **dashboard_obj** | [**Dashboard**](Dashboard.md) |  | [optional] 
 **description** | **str** | Dashboard description | 
 **name** | **str** | Dashboard name | 
diff --git a/docs/IntegrationStatus.md b/docs/IntegrationStatus.md
index 6f2a05e..5c07bb7 100644
--- a/docs/IntegrationStatus.md
+++ b/docs/IntegrationStatus.md
@@ -3,10 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**alert_statuses** | **dict(str, str)** | A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, &#x60;VISIBLE&#x60;, &#x60;HIDDEN&#x60;, and &#x60;NOT_LOADED&#x60; | 
-**content_status** | **str** | Status of integration content, e.g. dashboards | 
-**install_status** | **str** | Whether the customer or an automated process has installed the dashboards for this integration | 
-**metric_statuses** | [**dict(str, MetricStatus)**](MetricStatus.md) | A Map from names of the required metrics to an object representing their reporting status.  The reporting status object has 3 boolean fields denoting whether the metric has been received during the corresponding time period: &#x60;ever&#x60;, &#x60;recentExceptNow&#x60;, and &#x60;now&#x60;.  &#x60;now&#x60; is on the order of a few hours, and &#x60;recentExceptNow&#x60; is on the order of the past few days, excluding the period considered to be &#x60;now&#x60;. | 
+**alert_statuses** | **dict(str, str)** | A Map from the ids of the alerts contained in this integration to their install status.  The install status can take on one of three values, &#x60;VISIBLE&#x60;, &#x60;HIDDEN&#x60;, and &#x60;NOT_LOADED&#x60; | [optional] 
+**content_status** | **str** | Status of integration content, e.g. dashboards | [optional] 
+**install_status** | **str** | Whether the customer or an automated process has installed the dashboards for this integration | [optional] 
+**metric_statuses** | [**dict(str, MetricStatus)**](MetricStatus.md) | A Map from names of the required metrics to an object representing their reporting status.  The reporting status object has 3 boolean fields denoting whether the metric has been received during the corresponding time period: &#x60;ever&#x60;, &#x60;recentExceptNow&#x60;, and &#x60;now&#x60;.  &#x60;now&#x60; is on the order of a few hours, and &#x60;recentExceptNow&#x60; is on the order of the past few days, excluding the period considered to be &#x60;now&#x60;. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PagedIngestionPolicy.md b/docs/PagedIngestionPolicy.md
new file mode 100644
index 0000000..7ca12ef
--- /dev/null
+++ b/docs/PagedIngestionPolicy.md
@@ -0,0 +1,16 @@
+# PagedIngestionPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[IngestionPolicy]**](IngestionPolicy.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Proxy.md b/docs/Proxy.md
index ad53b11..180687e 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
diff --git a/docs/ResponseContainerAccount.md b/docs/ResponseContainerAccount.md
new file mode 100644
index 0000000..76bb26b
--- /dev/null
+++ b/docs/ResponseContainerAccount.md
@@ -0,0 +1,11 @@
+# ResponseContainerAccount
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**Account**](Account.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerIngestionPolicy.md b/docs/ResponseContainerIngestionPolicy.md
new file mode 100644
index 0000000..985820f
--- /dev/null
+++ b/docs/ResponseContainerIngestionPolicy.md
@@ -0,0 +1,11 @@
+# ResponseContainerIngestionPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedIngestionPolicy.md b/docs/ResponseContainerPagedIngestionPolicy.md
new file mode 100644
index 0000000..e1afff8
--- /dev/null
+++ b/docs/ResponseContainerPagedIngestionPolicy.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedIngestionPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedIngestionPolicy**](PagedIngestionPolicy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSetBusinessFunction.md b/docs/ResponseContainerSetBusinessFunction.md
new file mode 100644
index 0000000..f08f5e8
--- /dev/null
+++ b/docs/ResponseContainerSetBusinessFunction.md
@@ -0,0 +1,11 @@
+# ResponseContainerSetBusinessFunction
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | **list[str]** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index cd81a2d..fb65ef8 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -28,6 +28,9 @@ Method | HTTP request | Description
 [**search_external_link_entities**](SearchApi.md#search_external_link_entities) | **POST** /api/v2/search/extlink | Search over a customer&#39;s external links
 [**search_external_links_for_facet**](SearchApi.md#search_external_links_for_facet) | **POST** /api/v2/search/extlink/{facet} | Lists the values of a specific facet over the customer&#39;s external links
 [**search_external_links_for_facets**](SearchApi.md#search_external_links_for_facets) | **POST** /api/v2/search/extlink/facets | Lists the values of one or more facets over the customer&#39;s external links
+[**search_ingestion_policy_entities**](SearchApi.md#search_ingestion_policy_entities) | **POST** /api/v2/search/ingestionpolicy | Search over a customer&#39;s ingestion policies
+[**search_ingestion_policy_for_facet**](SearchApi.md#search_ingestion_policy_for_facet) | **POST** /api/v2/search/ingestionpolicy/{facet} | Lists the values of a specific facet over the customer&#39;s ingestion policies
+[**search_ingestion_policy_for_facets**](SearchApi.md#search_ingestion_policy_for_facets) | **POST** /api/v2/search/ingestionpolicy/facets | Lists the values of one or more facets over the customer&#39;s ingestion policies
 [**search_maintenance_window_entities**](SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 [**search_maintenance_window_for_facet**](SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 [**search_maintenance_window_for_facets**](SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
@@ -1378,6 +1381,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_ingestion_policy_entities**
+> ResponseContainerPagedIngestionPolicy search_ingestion_policy_entities(body=body)
+
+Search over a customer's ingestion policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's ingestion policies
+    api_response = api_instance.search_ingestion_policy_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_ingestion_policy_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_ingestion_policy_for_facet**
+> ResponseContainerFacetResponse search_ingestion_policy_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's ingestion policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's ingestion policies
+    api_response = api_instance.search_ingestion_policy_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_ingestion_policy_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_ingestion_policy_for_facets**
+> ResponseContainerFacetsResponseContainer search_ingestion_policy_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's ingestion policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's ingestion policies
+    api_response = api_instance.search_ingestion_policy_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_ingestion_policy_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_maintenance_window_entities**
 > ResponseContainerPagedMaintenanceWindow search_maintenance_window_entities(body=body)
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index d2480d5..301f577 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of service account&#39;s user groups. | [optional] 
diff --git a/docs/ServiceAccountWrite.md b/docs/ServiceAccountWrite.md
index 7207cc6..e58b80e 100644
--- a/docs/ServiceAccountWrite.md
+++ b/docs/ServiceAccountWrite.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account to be created. | [optional] 
 **groups** | **list[str]** | The list of permissions, the service account will be granted. | [optional] 
 **identifier** | **str** | The unique identifier for a service account. | 
+**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with service account. | [optional] 
 **tokens** | **list[str]** | The service account&#39;s API tokens. | [optional] 
 **user_groups** | **list[str]** | The list of user group ids, the service account will be added to. | [optional] 
 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
new file mode 100644
index 0000000..16270f1
--- /dev/null
+++ b/docs/UsageApi.md
@@ -0,0 +1,343 @@
+# wavefront_api_client.UsageApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_ingestion_policy**](UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
+[**delete_ingestion_policy**](UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
+[**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
+[**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
+[**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
+
+
+# **create_ingestion_policy**
+> ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
+
+Create a specific ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre> (optional)
+
+try:
+    # Create a specific ingestion policy
+    api_response = api_instance.create_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->create_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_ingestion_policy**
+> ResponseContainerIngestionPolicy delete_ingestion_policy(id)
+
+Delete a specific ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a specific ingestion policy
+    api_response = api_instance.delete_ingestion_policy(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->delete_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **export_csv**
+> export_csv(start_time, end_time=end_time)
+
+Export a CSV report
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+start_time = 789 # int | start time in epoch seconds
+end_time = 789 # int | end time in epoch seconds, null to use now (optional)
+
+try:
+    # Export a CSV report
+    api_instance.export_csv(start_time, end_time=end_time)
+except ApiException as e:
+    print("Exception when calling UsageApi->export_csv: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start_time** | **int**| start time in epoch seconds | 
+ **end_time** | **int**| end time in epoch seconds, null to use now | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/csv
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_ingestion_policies**
+> ResponseContainerPagedIngestionPolicy get_all_ingestion_policies(offset=offset, limit=limit)
+
+Get all ingestion policies for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all ingestion policies for a customer
+    api_response = api_instance.get_all_ingestion_policies(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->get_all_ingestion_policies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_ingestion_policy**
+> ResponseContainerIngestionPolicy get_ingestion_policy(id)
+
+Get a specific ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific ingestion policy
+    api_response = api_instance.get_ingestion_policy(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->get_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_ingestion_policy**
+> ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
+
+Update a specific ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre> (optional)
+
+try:
+    # Update a specific ingestion policy
+    api_response = api_instance.update_ingestion_policy(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->update_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/User.md b/docs/User.md
index c6b8e3b..c2ad860 100644
--- a/docs/User.md
+++ b/docs/User.md
@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **extra_api_tokens** | **list[str]** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
+**ingestion_policy_id** | **str** |  | [optional] 
 **invalid_password_attempts** | **int** |  | [optional] 
 **last_logout** | **int** |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 93a67a6..1948e74 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -10,14 +10,14 @@ Method | HTTP request | Description
 [**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 [**get_all_users**](UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
 [**get_user**](UserApi.md#get_user) | **GET** /api/v2/user/{id} | Retrieves a user by identifier (email address)
-[**get_user_business_functions**](UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user.
+[**get_user_business_functions**](UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user or service account.
 [**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
 [**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
 [**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
 [**revoke_user_permission**](UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
-[**update_user**](UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups and permissions.
+[**update_user**](UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
 [**validate_users**](UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
 
 
@@ -101,7 +101,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
 
 try:
     # Creates or updates a user
@@ -116,7 +116,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -347,7 +347,7 @@ Name | Type | Description  | Notes
 # **get_user_business_functions**
 > UserModel get_user_business_functions(id)
 
-Returns business functions of a specific user.
+Returns business functions of a specific user or service account.
 
 
 
@@ -370,7 +370,7 @@ api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(confi
 id = 'id_example' # str | 
 
 try:
-    # Returns business functions of a specific user.
+    # Returns business functions of a specific user or service account.
     api_response = api_instance.get_user_business_functions(id)
     pprint(api_response)
 except ApiException as e:
@@ -533,7 +533,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre> (optional)
 
 try:
     # Invite users with given user groups and permissions.
@@ -547,7 +547,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; } ]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -643,7 +643,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+permission = 'permission_example' # str | Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
 body = [wavefront_api_client.list[str]()] # list[str] | List of users or service accounts which should be revoked by specified permission (optional)
 
 try:
@@ -658,7 +658,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to grant to the account. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **permission** | **str**| Permission to revoke from the accounts. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
  **body** | **list[str]**| List of users or service accounts which should be revoked by specified permission | [optional] 
 
 ### Return type
@@ -735,7 +735,7 @@ Name | Type | Description  | Notes
 # **update_user**
 > UserModel update_user(id, body=body)
 
-Update user with given user groups and permissions.
+Update user with given user groups, permissions and ingestion policy.
 
 
 
@@ -756,10 +756,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
 
 try:
-    # Update user with given user groups and permissions.
+    # Update user with given user groups, permissions and ingestion policy.
     api_response = api_instance.update_user(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -771,7 +771,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index 9e22696..dc6d810 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) |  | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index b9e88ff..0e430e4 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of user groups the user belongs to | 
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
index 2c88ddc..41f9d4a 100644
--- a/docs/UserRequestDTO.md
+++ b/docs/UserRequestDTO.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
+**ingestion_policy_id** | **str** |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | **list[str]** |  | [optional] 
 
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
index 3008130..148c1df 100644
--- a/docs/UserSettings.md
+++ b/docs/UserSettings.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **hide_ts_when_querybuilder_shown** | **bool** |  | [optional] 
 **landing_dashboard_slug** | **str** |  | [optional] 
 **preferred_time_zone** | **str** |  | [optional] 
+**sample_query_results_by_default** | **bool** |  | [optional] 
 **show_onboarding** | **bool** |  | [optional] 
 **show_querybuilder_by_default** | **bool** |  | [optional] 
 **ui_default** | **str** |  | [optional] 
diff --git a/docs/UserToCreate.md b/docs/UserToCreate.md
index ef66784..5a04613 100644
--- a/docs/UserToCreate.md
+++ b/docs/UserToCreate.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **email_address** | **str** | The (unique) identifier of the user to create. Must be a valid email address | 
 **groups** | **list[str]** | List of permission groups to grant to this user. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management | 
+**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
 **user_groups** | **list[str]** | List of user groups to this user.  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/setup.py b/setup.py
index 29bb483..4976fa1 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.37.33"
+VERSION = "2.38.19"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_account__user_and_service_account_api.py b/test/test_account__user_and_service_account_api.py
new file mode 100644
index 0000000..0eda4c4
--- /dev/null
+++ b/test/test_account__user_and_service_account_api.py
@@ -0,0 +1,209 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccountUserAndServiceAccountApi(unittest.TestCase):
+    """AccountUserAndServiceAccountApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.account__user_and_service_account_api.AccountUserAndServiceAccountApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_activate_account(self):
+        """Test case for activate_account
+
+        Activates the given service account  # noqa: E501
+        """
+        pass
+
+    def test_add_account_to_user_groups(self):
+        """Test case for add_account_to_user_groups
+
+        Adds specific user groups to the account (user or service account)  # noqa: E501
+        """
+        pass
+
+    def test_add_ingestion_policy(self):
+        """Test case for add_ingestion_policy
+
+        Add a specific ingestion policy to multiple accounts  # noqa: E501
+        """
+        pass
+
+    def test_create_or_update_user_account(self):
+        """Test case for create_or_update_user_account
+
+        Creates or updates a user account  # noqa: E501
+        """
+        pass
+
+    def test_create_service_account(self):
+        """Test case for create_service_account
+
+        Creates a service account  # noqa: E501
+        """
+        pass
+
+    def test_deactivate_account(self):
+        """Test case for deactivate_account
+
+        Deactivates the given service account  # noqa: E501
+        """
+        pass
+
+    def test_delete_account(self):
+        """Test case for delete_account
+
+        Deletes an account (user or service account) identified by id  # noqa: E501
+        """
+        pass
+
+    def test_delete_multiple_accounts(self):
+        """Test case for delete_multiple_accounts
+
+        Deletes multiple accounts (users or service accounts)  # noqa: E501
+        """
+        pass
+
+    def test_get_account(self):
+        """Test case for get_account
+
+        Get a specific account (user or service account)  # noqa: E501
+        """
+        pass
+
+    def test_get_account_business_functions(self):
+        """Test case for get_account_business_functions
+
+        Returns business functions of a specific account (user or service account).  # noqa: E501
+        """
+        pass
+
+    def test_get_all_accounts(self):
+        """Test case for get_all_accounts
+
+        Get all accounts (users and service accounts) of a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_all_service_accounts(self):
+        """Test case for get_all_service_accounts
+
+        Get all service accounts  # noqa: E501
+        """
+        pass
+
+    def test_get_all_user_accounts(self):
+        """Test case for get_all_user_accounts
+
+        Get all user accounts  # noqa: E501
+        """
+        pass
+
+    def test_get_service_account(self):
+        """Test case for get_service_account
+
+        Retrieves a service account by identifier  # noqa: E501
+        """
+        pass
+
+    def test_get_user_account(self):
+        """Test case for get_user_account
+
+        Retrieves a user by identifier (email address)  # noqa: E501
+        """
+        pass
+
+    def test_grant_account_permission(self):
+        """Test case for grant_account_permission
+
+        Grants a specific permission to account (user or service account)  # noqa: E501
+        """
+        pass
+
+    def test_grant_permission_to_accounts(self):
+        """Test case for grant_permission_to_accounts
+
+        Grants a specific permission to multiple accounts (users or service accounts)  # noqa: E501
+        """
+        pass
+
+    def test_invite_user_accounts(self):
+        """Test case for invite_user_accounts
+
+        Invite user accounts with given user groups and permissions.  # noqa: E501
+        """
+        pass
+
+    def test_remove_account_from_user_groups(self):
+        """Test case for remove_account_from_user_groups
+
+        Removes specific user groups from the account (user or service account)  # noqa: E501
+        """
+        pass
+
+    def test_remove_ingestion_policies(self):
+        """Test case for remove_ingestion_policies
+
+        Removes ingestion policies from multiple accounts  # noqa: E501
+        """
+        pass
+
+    def test_revoke_account_permission(self):
+        """Test case for revoke_account_permission
+
+        Revokes a specific permission from account (user or service account)  # noqa: E501
+        """
+        pass
+
+    def test_revoke_permission_from_accounts(self):
+        """Test case for revoke_permission_from_accounts
+
+        Revokes a specific permission from multiple accounts (users or service accounts)  # noqa: E501
+        """
+        pass
+
+    def test_update_service_account(self):
+        """Test case for update_service_account
+
+        Updates the service account  # noqa: E501
+        """
+        pass
+
+    def test_update_user_account(self):
+        """Test case for update_user_account
+
+        Update user with given user groups, permissions and ingestion policy.  # noqa: E501
+        """
+        pass
+
+    def test_validate_accounts(self):
+        """Test case for validate_accounts
+
+        Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_min.py b/test/test_alert_min.py
new file mode 100644
index 0000000..9b768d3
--- /dev/null
+++ b/test/test_alert_min.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_min import AlertMin  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertMin(unittest.TestCase):
+    """AlertMin unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertMin(self):
+        """Test AlertMin"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_min.AlertMin()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_dashboard_min.py b/test/test_dashboard_min.py
new file mode 100644
index 0000000..9e01403
--- /dev/null
+++ b/test/test_dashboard_min.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.dashboard_min import DashboardMin  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDashboardMin(unittest.TestCase):
+    """DashboardMin unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDashboardMin(self):
+        """Test DashboardMin"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.dashboard_min.DashboardMin()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_ingestion_policy.py b/test/test_ingestion_policy.py
new file mode 100644
index 0000000..0f80ee3
--- /dev/null
+++ b/test/test_ingestion_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionPolicy(unittest.TestCase):
+    """IngestionPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIngestionPolicy(self):
+        """Test IngestionPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ingestion_policy.IngestionPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_ingestion_policy_mapping.py b/test/test_ingestion_policy_mapping.py
new file mode 100644
index 0000000..013b6b3
--- /dev/null
+++ b/test/test_ingestion_policy_mapping.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionPolicyMapping(unittest.TestCase):
+    """IngestionPolicyMapping unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIngestionPolicyMapping(self):
+        """Test IngestionPolicyMapping"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ingestion_policy_mapping.IngestionPolicyMapping()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_ingestion_policy.py b/test/test_paged_ingestion_policy.py
new file mode 100644
index 0000000..1e3bcda
--- /dev/null
+++ b/test/test_paged_ingestion_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedIngestionPolicy(unittest.TestCase):
+    """PagedIngestionPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedIngestionPolicy(self):
+        """Test PagedIngestionPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_ingestion_policy.PagedIngestionPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_account.py b/test/test_response_container_account.py
new file mode 100644
index 0000000..5995139
--- /dev/null
+++ b/test/test_response_container_account.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_account import ResponseContainerAccount  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerAccount(unittest.TestCase):
+    """ResponseContainerAccount unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerAccount(self):
+        """Test ResponseContainerAccount"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_account.ResponseContainerAccount()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_ingestion_policy.py b/test/test_response_container_ingestion_policy.py
new file mode 100644
index 0000000..70f79f8
--- /dev/null
+++ b/test/test_response_container_ingestion_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerIngestionPolicy(unittest.TestCase):
+    """ResponseContainerIngestionPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerIngestionPolicy(self):
+        """Test ResponseContainerIngestionPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_ingestion_policy.ResponseContainerIngestionPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_ingestion_policy.py b/test/test_response_container_paged_ingestion_policy.py
new file mode 100644
index 0000000..b58f66d
--- /dev/null
+++ b/test/test_response_container_paged_ingestion_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedIngestionPolicy(unittest.TestCase):
+    """ResponseContainerPagedIngestionPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedIngestionPolicy(self):
+        """Test ResponseContainerPagedIngestionPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_ingestion_policy.ResponseContainerPagedIngestionPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_set_business_function.py b/test/test_response_container_set_business_function.py
new file mode 100644
index 0000000..1fd806e
--- /dev/null
+++ b/test/test_response_container_set_business_function.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSetBusinessFunction(unittest.TestCase):
+    """ResponseContainerSetBusinessFunction unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSetBusinessFunction(self):
+        """Test ResponseContainerSetBusinessFunction"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_set_business_function.ResponseContainerSetBusinessFunction()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_usage_api.py b/test/test_usage_api.py
new file mode 100644
index 0000000..ae19aef
--- /dev/null
+++ b/test/test_usage_api.py
@@ -0,0 +1,76 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.usage_api import UsageApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUsageApi(unittest.TestCase):
+    """UsageApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.usage_api.UsageApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_ingestion_policy(self):
+        """Test case for create_ingestion_policy
+
+        Create a specific ingestion policy  # noqa: E501
+        """
+        pass
+
+    def test_delete_ingestion_policy(self):
+        """Test case for delete_ingestion_policy
+
+        Delete a specific ingestion policy  # noqa: E501
+        """
+        pass
+
+    def test_export_csv(self):
+        """Test case for export_csv
+
+        Export a CSV report  # noqa: E501
+        """
+        pass
+
+    def test_get_all_ingestion_policies(self):
+        """Test case for get_all_ingestion_policies
+
+        Get all ingestion policies for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_ingestion_policy(self):
+        """Test case for get_ingestion_policy
+
+        Get a specific ingestion policy  # noqa: E501
+        """
+        pass
+
+    def test_update_ingestion_policy(self):
+        """Test case for update_ingestion_policy
+
+        Update a specific ingestion policy  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 94b99b9..145e090 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -16,7 +16,7 @@
 from __future__ import absolute_import
 
 # import apis into sdk package
-from wavefront_api_client.api.account__service_account_api import AccountServiceAccountApi
+from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
@@ -36,6 +36,7 @@
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.settings_api import SettingsApi
 from wavefront_api_client.api.source_api import SourceApi
+from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
 from wavefront_api_client.api.user_group_api import UserGroupApi
 from wavefront_api_client.api.webhook_api import WebhookApi
@@ -51,6 +52,7 @@
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
@@ -68,6 +70,7 @@
 from wavefront_api_client.models.customer_preferences import CustomerPreferences
 from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating
 from wavefront_api_client.models.dashboard import Dashboard
+from wavefront_api_client.models.dashboard_min import DashboardMin
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
 from wavefront_api_client.models.dashboard_section import DashboardSection
 from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow
@@ -85,6 +88,8 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy
+from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -117,6 +122,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -132,6 +138,7 @@
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
 from wavefront_api_client.models.response_container import ResponseContainer
+from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
 from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard
@@ -141,6 +148,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -165,6 +173,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -177,6 +186,7 @@
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
+from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index dd6df96..ea1f7ef 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -3,7 +3,7 @@
 # flake8: noqa
 
 # import apis into api package
-from wavefront_api_client.api.account__service_account_api import AccountServiceAccountApi
+from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
@@ -23,6 +23,7 @@
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.settings_api import SettingsApi
 from wavefront_api_client.api.source_api import SourceApi
+from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
 from wavefront_api_client.api.user_group_api import UserGroupApi
 from wavefront_api_client.api.webhook_api import WebhookApi
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
new file mode 100644
index 0000000..7408062
--- /dev/null
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -0,0 +1,2477 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class AccountUserAndServiceAccountApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def activate_account(self, id, **kwargs):  # noqa: E501
+        """Activates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.activate_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.activate_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.activate_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Activates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.activate_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method activate_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `activate_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}/activate', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
+        """Adds specific user groups to the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_account_to_user_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be added to the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_account_to_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_account_to_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Adds specific user groups to the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_account_to_user_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be added to the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_account_to_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_account_to_user_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/addUserGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def add_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Add a specific ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ], }</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Add a specific ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ], }</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/addingestionpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_or_update_user_account(self, **kwargs):  # noqa: E501
+        """Creates or updates a user account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_or_update_user_account(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param bool send_email: Whether to send email notification to the user, if created.  Default: false
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_or_update_user_account_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_or_update_user_account_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
+        """Creates or updates a user account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_or_update_user_account_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param bool send_email: Whether to send email notification to the user, if created.  Default: false
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['send_email', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_or_update_user_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'send_email' in params:
+            query_params.append(('sendEmail', params['send_email']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/user', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_service_account(self, **kwargs):  # noqa: E501
+        """Creates a service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_service_account(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_service_account_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_service_account_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
+        """Creates a service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_service_account_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def deactivate_account(self, id, **kwargs):  # noqa: E501
+        """Deactivates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.deactivate_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.deactivate_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.deactivate_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Deactivates the given service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.deactivate_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method deactivate_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `deactivate_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}/deactivate', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_account(self, id, **kwargs):  # noqa: E501
+        """Deletes an account (user or service account) identified by id  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Deletes an account (user or service account) identified by id  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_multiple_accounts(self, **kwargs):  # noqa: E501
+        """Deletes multiple accounts (users or service accounts)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_multiple_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: list of accounts' identifiers to be deleted
+        :return: ResponseContainerListString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_multiple_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_multiple_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Deletes multiple accounts (users or service accounts)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_multiple_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: list of accounts' identifiers to be deleted
+        :return: ResponseContainerListString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_multiple_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/deleteAccounts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_account(self, id, **kwargs):  # noqa: E501
+        """Get a specific account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_account_business_functions(self, id, **kwargs):  # noqa: E501
+        """Returns business functions of a specific account (user or service account).  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_account_business_functions(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSetBusinessFunction
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_account_business_functions_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_account_business_functions_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Returns business functions of a specific account (user or service account).  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_account_business_functions_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSetBusinessFunction
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_account_business_functions" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_account_business_functions`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/businessFunctions', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSetBusinessFunction',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_accounts(self, **kwargs):  # noqa: E501
+        """Get all accounts (users and service accounts) of a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all accounts (users and service accounts) of a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_service_accounts(self, **kwargs):  # noqa: E501
+        """Get all service accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_service_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_service_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_service_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all service accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_service_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_service_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_user_accounts(self, **kwargs):  # noqa: E501
+        """Get all user accounts  # noqa: E501
+
+        Returns all user accounts  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_user_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: list[UserModel]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_user_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_user_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all user accounts  # noqa: E501
+
+        Returns all user accounts  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_user_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: list[UserModel]
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_user_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/user', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='list[UserModel]',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_service_account(self, id, **kwargs):  # noqa: E501
+        """Retrieves a service account by identifier  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_service_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_service_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_service_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Retrieves a service account by identifier  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_service_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_user_account(self, id, **kwargs):  # noqa: E501
+        """Retrieves a user by identifier (email address)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_user_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_user_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Retrieves a user by identifier (email address)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_user_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_user_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_user_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/user/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
+        """Grants a specific permission to account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_account_permission(id, permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str permission: Permission to grant to the account. Please note that'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.grant_account_permission_with_http_info(id, permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.grant_account_permission_with_http_info(id, permission, **kwargs)  # noqa: E501
+            return data
+
+    def grant_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
+        """Grants a specific permission to account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_account_permission_with_http_info(id, permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str permission: Permission to grant to the account. Please note that'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'permission']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method grant_account_permission" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `grant_account_permission`")  # noqa: E501
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `grant_account_permission`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/grant/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
+        """Grants a specific permission to multiple accounts (users or service accounts)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_permission_to_accounts(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: List of accounts the specified permission to be granted to
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.grant_permission_to_accounts_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.grant_permission_to_accounts_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Grants a specific permission to multiple accounts (users or service accounts)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_permission_to_accounts_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: List of accounts the specified permission to be granted to
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method grant_permission_to_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_accounts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/grant/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def invite_user_accounts(self, **kwargs):  # noqa: E501
+        """Invite user accounts with given user groups and permissions.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.invite_user_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.invite_user_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.invite_user_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Invite user accounts with given user groups and permissions.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.invite_user_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method invite_user_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/user/invite', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
+        """Removes specific user groups from the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_account_from_user_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be removed from the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_account_from_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_account_from_user_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Removes specific user groups from the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_account_from_user_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of user groups that should be removed from the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_account_from_user_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_account_from_user_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/removeUserGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_ingestion_policies(self, **kwargs):  # noqa: E501
+        """Removes ingestion policies from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policies(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes ingestion policies from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policies_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_ingestion_policies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/removeingestionpolicies', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
+        """Revokes a specific permission from account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_account_permission(id, permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str permission: (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revoke_account_permission_with_http_info(id, permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revoke_account_permission_with_http_info(id, permission, **kwargs)  # noqa: E501
+            return data
+
+    def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
+        """Revokes a specific permission from account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_account_permission_with_http_info(id, permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str permission: (required)
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'permission']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revoke_account_permission" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `revoke_account_permission`")  # noqa: E501
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `revoke_account_permission`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/revoke/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
+        """Revokes a specific permission from multiple accounts (users or service accounts)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_accounts(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: List of accounts the specified permission to be revoked from
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revoke_permission_from_accounts_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revoke_permission_from_accounts_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Revokes a specific permission from multiple accounts (users or service accounts)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_accounts_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param list[str] body: List of accounts the specified permission to be revoked from
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revoke_permission_from_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_accounts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/revoke/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_service_account(self, id, **kwargs):  # noqa: E501
+        """Updates the service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_service_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_service_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Updates the service account  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param ServiceAccountWrite body:
+        :return: ResponseContainerServiceAccount
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_service_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_service_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/serviceaccount/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerServiceAccount',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_user_account(self, id, **kwargs):  # noqa: E501
+        """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_user_account(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_user_account_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_user_account_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_user_account_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_user_account" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_user_account`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/user/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def validate_accounts(self, **kwargs):  # noqa: E501
+        """Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.validate_accounts(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body:
+        :return: ResponseContainerValidatedUsersDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.validate_accounts_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.validate_accounts_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def validate_accounts_with_http_info(self, **kwargs):  # noqa: E501
+        """Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.validate_accounts_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body:
+        :return: ResponseContainerValidatedUsersDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method validate_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/validateAccounts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerValidatedUsersDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 1c6e955..2610bc8 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -33,13 +33,13 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def add_access(self, **kwargs):  # noqa: E501
+    def add_alert_access(self, **kwargs):  # noqa: E501
         """Adds the specified ids to the given alerts' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_access(async_req=True)
+        >>> thread = api.add_alert_access(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -50,18 +50,18 @@ def add_access(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.add_access_with_http_info(**kwargs)  # noqa: E501
+            return self.add_alert_access_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.add_access_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.add_alert_access_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def add_access_with_http_info(self, **kwargs):  # noqa: E501
+    def add_alert_access_with_http_info(self, **kwargs):  # noqa: E501
         """Adds the specified ids to the given alerts' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_access_with_http_info(async_req=True)
+        >>> thread = api.add_alert_access_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -82,7 +82,7 @@ def add_access_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method add_access" % key
+                    " to method add_alert_access" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -532,40 +532,40 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_access_control_list(self, **kwargs):  # noqa: E501
-        """Get Access Control Lists' union for the specified alerts  # noqa: E501
+    def get_alert(self, id, **kwargs):  # noqa: E501
+        """Get a specific alert  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_access_control_list(async_req=True)
+        >>> thread = api.get_alert(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[str] id:
-        :return: ResponseContainerListAccessControlListReadDTO
+        :param str id: (required)
+        :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+            return self.get_alert_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.get_alert_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
-        """Get Access Control Lists' union for the specified alerts  # noqa: E501
+    def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific alert  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_access_control_list_with_http_info(async_req=True)
+        >>> thread = api.get_alert_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[str] id:
-        :return: ResponseContainerListAccessControlListReadDTO
+        :param str id: (required)
+        :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -581,19 +581,22 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_access_control_list" % key
+                    " to method get_alert" % key
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_alert`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
-        if 'id' in params:
-            query_params.append(('id', params['id']))  # noqa: E501
-            collection_formats['id'] = 'multi'  # noqa: E501
 
         header_params = {}
 
@@ -609,14 +612,14 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/alert/acl', 'GET',
+            '/api/v2/alert/{id}', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerListAccessControlListReadDTO',  # noqa: E501
+            response_type='ResponseContainerAlert',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -624,40 +627,40 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_alert(self, id, **kwargs):  # noqa: E501
-        """Get a specific alert  # noqa: E501
+    def get_alert_access_control_list(self, **kwargs):  # noqa: E501
+        """Get Access Control Lists' union for the specified alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_alert(id, async_req=True)
+        >>> thread = api.get_alert_access_control_list(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerAlert
+        :param list[str] id:
+        :return: ResponseContainerListAccessControlListReadDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_alert_with_http_info(id, **kwargs)  # noqa: E501
+            return self.get_alert_access_control_list_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.get_alert_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.get_alert_access_control_list_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get a specific alert  # noqa: E501
+    def get_alert_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
+        """Get Access Control Lists' union for the specified alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_alert_with_http_info(id, async_req=True)
+        >>> thread = api.get_alert_access_control_list_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerAlert
+        :param list[str] id:
+        :return: ResponseContainerListAccessControlListReadDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -673,22 +676,19 @@ def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_alert" % key
+                    " to method get_alert_access_control_list" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_alert`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'id' in params:
+            query_params.append(('id', params['id']))  # noqa: E501
+            collection_formats['id'] = 'multi'  # noqa: E501
 
         header_params = {}
 
@@ -704,14 +704,14 @@ def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/alert/{id}', 'GET',
+            '/api/v2/alert/acl', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerAlert',  # noqa: E501
+            response_type='ResponseContainerListAccessControlListReadDTO',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1297,13 +1297,13 @@ def hide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_access(self, **kwargs):  # noqa: E501
+    def remove_alert_access(self, **kwargs):  # noqa: E501
         """Removes the specified ids from the given alerts' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_access(async_req=True)
+        >>> thread = api.remove_alert_access(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1314,18 +1314,18 @@ def remove_access(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.remove_access_with_http_info(**kwargs)  # noqa: E501
+            return self.remove_alert_access_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.remove_access_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.remove_alert_access_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def remove_access_with_http_info(self, **kwargs):  # noqa: E501
+    def remove_alert_access_with_http_info(self, **kwargs):  # noqa: E501
         """Removes the specified ids from the given alerts' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_access_with_http_info(async_req=True)
+        >>> thread = api.remove_alert_access_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1346,7 +1346,7 @@ def remove_access_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method remove_access" % key
+                    " to method remove_alert_access" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1495,13 +1495,13 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def set_acl(self, **kwargs):  # noqa: E501
+    def set_alert_acl(self, **kwargs):  # noqa: E501
         """Set ACL for the specified alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_acl(async_req=True)
+        >>> thread = api.set_alert_acl(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1512,18 +1512,18 @@ def set_acl(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.set_acl_with_http_info(**kwargs)  # noqa: E501
+            return self.set_alert_acl_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.set_acl_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.set_alert_acl_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def set_acl_with_http_info(self, **kwargs):  # noqa: E501
+    def set_alert_acl_with_http_info(self, **kwargs):  # noqa: E501
         """Set ACL for the specified alerts  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_acl_with_http_info(async_req=True)
+        >>> thread = api.set_alert_acl_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1544,7 +1544,7 @@ def set_acl_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method set_acl" % key
+                    " to method set_alert_acl" % key
                 )
             params[key] = val
         del params['kwargs']
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index fa98e62..957e764 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -33,13 +33,13 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def add_access(self, **kwargs):  # noqa: E501
+    def add_dashboard_access(self, **kwargs):  # noqa: E501
         """Adds the specified ids to the given dashboards' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_access(async_req=True)
+        >>> thread = api.add_dashboard_access(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -50,18 +50,18 @@ def add_access(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.add_access_with_http_info(**kwargs)  # noqa: E501
+            return self.add_dashboard_access_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.add_access_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.add_dashboard_access_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def add_access_with_http_info(self, **kwargs):  # noqa: E501
+    def add_dashboard_access_with_http_info(self, **kwargs):  # noqa: E501
         """Adds the specified ids to the given dashboards' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_access_with_http_info(async_req=True)
+        >>> thread = api.add_dashboard_access_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -82,7 +82,7 @@ def add_access_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method add_access" % key
+                    " to method add_dashboard_access" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -520,45 +520,47 @@ def favorite_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_access_control_list(self, **kwargs):  # noqa: E501
-        """Get list of Access Control Lists for the specified dashboards  # noqa: E501
+    def get_all_dashboard(self, **kwargs):  # noqa: E501
+        """Get all dashboards for a customer  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_access_control_list(async_req=True)
+        >>> thread = api.get_all_dashboard(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[str] id:
-        :return: ResponseContainerListAccessControlListReadDTO
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+            return self.get_all_dashboard_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.get_access_control_list_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.get_all_dashboard_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
-        """Get list of Access Control Lists for the specified dashboards  # noqa: E501
+    def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all dashboards for a customer  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_access_control_list_with_http_info(async_req=True)
+        >>> thread = api.get_all_dashboard_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[str] id:
-        :return: ResponseContainerListAccessControlListReadDTO
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['offset', 'limit']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -569,7 +571,7 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_access_control_list" % key
+                    " to method get_all_dashboard" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -579,9 +581,10 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
         path_params = {}
 
         query_params = []
-        if 'id' in params:
-            query_params.append(('id', params['id']))  # noqa: E501
-            collection_formats['id'] = 'multi'  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -597,14 +600,14 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/dashboard/acl', 'GET',
+            '/api/v2/dashboard', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerListAccessControlListReadDTO',  # noqa: E501
+            response_type='ResponseContainerPagedDashboard',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -612,47 +615,45 @@ def get_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_all_dashboard(self, **kwargs):  # noqa: E501
-        """Get all dashboards for a customer  # noqa: E501
+    def get_dashboard(self, id, **kwargs):  # noqa: E501
+        """Get a specific dashboard  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_dashboard(async_req=True)
+        >>> thread = api.get_dashboard(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedDashboard
+        :param str id: (required)
+        :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_all_dashboard_with_http_info(**kwargs)  # noqa: E501
+            return self.get_dashboard_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_all_dashboard_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.get_dashboard_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all dashboards for a customer  # noqa: E501
+    def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific dashboard  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_dashboard_with_http_info(async_req=True)
+        >>> thread = api.get_dashboard_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedDashboard
+        :param str id: (required)
+        :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['offset', 'limit']  # noqa: E501
+        all_params = ['id']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -663,20 +664,22 @@ def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_all_dashboard" % key
+                    " to method get_dashboard" % key
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_dashboard`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -692,14 +695,14 @@ def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/dashboard', 'GET',
+            '/api/v2/dashboard/{id}', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedDashboard',  # noqa: E501
+            response_type='ResponseContainerDashboard',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -707,40 +710,40 @@ def get_all_dashboard_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_dashboard(self, id, **kwargs):  # noqa: E501
-        """Get a specific dashboard  # noqa: E501
+    def get_dashboard_access_control_list(self, **kwargs):  # noqa: E501
+        """Get list of Access Control Lists for the specified dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_dashboard(id, async_req=True)
+        >>> thread = api.get_dashboard_access_control_list(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDashboard
+        :param list[str] id:
+        :return: ResponseContainerListAccessControlListReadDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_dashboard_with_http_info(id, **kwargs)  # noqa: E501
+            return self.get_dashboard_access_control_list_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.get_dashboard_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.get_dashboard_access_control_list_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get a specific dashboard  # noqa: E501
+    def get_dashboard_access_control_list_with_http_info(self, **kwargs):  # noqa: E501
+        """Get list of Access Control Lists for the specified dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_dashboard_with_http_info(id, async_req=True)
+        >>> thread = api.get_dashboard_access_control_list_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerDashboard
+        :param list[str] id:
+        :return: ResponseContainerListAccessControlListReadDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -756,22 +759,19 @@ def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_dashboard" % key
+                    " to method get_dashboard_access_control_list" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_dashboard`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'id' in params:
+            query_params.append(('id', params['id']))  # noqa: E501
+            collection_formats['id'] = 'multi'  # noqa: E501
 
         header_params = {}
 
@@ -787,14 +787,14 @@ def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/dashboard/{id}', 'GET',
+            '/api/v2/dashboard/acl', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerDashboard',  # noqa: E501
+            response_type='ResponseContainerListAccessControlListReadDTO',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1103,13 +1103,13 @@ def get_dashboard_version_with_http_info(self, id, version, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_access(self, **kwargs):  # noqa: E501
+    def remove_dashboard_access(self, **kwargs):  # noqa: E501
         """Removes the specified ids from the given dashboards' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_access(async_req=True)
+        >>> thread = api.remove_dashboard_access(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1120,18 +1120,18 @@ def remove_access(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.remove_access_with_http_info(**kwargs)  # noqa: E501
+            return self.remove_dashboard_access_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.remove_access_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.remove_dashboard_access_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def remove_access_with_http_info(self, **kwargs):  # noqa: E501
+    def remove_dashboard_access_with_http_info(self, **kwargs):  # noqa: E501
         """Removes the specified ids from the given dashboards' ACL  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_access_with_http_info(async_req=True)
+        >>> thread = api.remove_dashboard_access_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1152,7 +1152,7 @@ def remove_access_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method remove_access" % key
+                    " to method remove_dashboard_access" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -1301,13 +1301,13 @@ def remove_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def set_acl(self, **kwargs):  # noqa: E501
+    def set_dashboard_acl(self, **kwargs):  # noqa: E501
         """Set ACL for the specified dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_acl(async_req=True)
+        >>> thread = api.set_dashboard_acl(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1318,18 +1318,18 @@ def set_acl(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.set_acl_with_http_info(**kwargs)  # noqa: E501
+            return self.set_dashboard_acl_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.set_acl_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.set_dashboard_acl_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def set_acl_with_http_info(self, **kwargs):  # noqa: E501
+    def set_dashboard_acl_with_http_info(self, **kwargs):  # noqa: E501
         """Set ACL for the specified dashboards  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_acl_with_http_info(async_req=True)
+        >>> thread = api.set_dashboard_acl_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1350,7 +1350,7 @@ def set_acl_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method set_acl" % key
+                    " to method set_dashboard_acl" % key
                 )
             params[key] = val
         del params['kwargs']
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index 3542c1b..bd46ca1 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -718,6 +718,113 @@ def get_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_related_events_with_time_span(self, id, **kwargs):  # noqa: E501
+        """List all related events for a specific firing event with a time span of one hour  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_related_events_with_time_span(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param bool is_overlapped:
+        :param str rendering_method:
+        :param int limit:
+        :return: ResponseContainerPagedEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_related_events_with_time_span_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_related_events_with_time_span_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_related_events_with_time_span_with_http_info(self, id, **kwargs):  # noqa: E501
+        """List all related events for a specific firing event with a time span of one hour  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_related_events_with_time_span_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param bool is_overlapped:
+        :param str rendering_method:
+        :param int limit:
+        :return: ResponseContainerPagedEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'is_overlapped', 'rendering_method', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_related_events_with_time_span" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_related_events_with_time_span`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'is_overlapped' in params:
+            query_params.append(('isOverlapped', params['is_overlapped']))  # noqa: E501
+        if 'rendering_method' in params:
+            query_params.append(('renderingMethod', params['rendering_method']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/event/{id}/events', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedEvent',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_event_tag(self, id, tag_value, **kwargs):  # noqa: E501
         """Remove a tag from a specific event  # noqa: E501
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index ac026d3..81c5409 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2377,6 +2377,299 @@ def search_external_links_for_facets_with_http_info(self, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_ingestion_policy_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's ingestion policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_ingestion_policy_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_ingestion_policy_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_ingestion_policy_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's ingestion policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_ingestion_policy_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_ingestion_policy_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/ingestionpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_ingestion_policy_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's ingestion policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_ingestion_policy_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_ingestion_policy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_ingestion_policy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_ingestion_policy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's ingestion policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_ingestion_policy_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_ingestion_policy_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_ingestion_policy_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/ingestionpolicy/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_ingestion_policy_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's ingestion policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_ingestion_policy_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_ingestion_policy_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_ingestion_policy_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_ingestion_policy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's ingestion policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_ingestion_policy_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_ingestion_policy_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/ingestionpolicy/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_maintenance_window_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's maintenance windows  # noqa: E501
 
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
new file mode 100644
index 0000000..a32a671
--- /dev/null
+++ b/wavefront_api_client/api/usage_api.py
@@ -0,0 +1,616 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class UsageApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Create a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_ingestion_policy(self, id, **kwargs):  # noqa: E501
+        """Delete a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_ingestion_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_ingestion_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_ingestion_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_ingestion_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_ingestion_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def export_csv(self, start_time, **kwargs):  # noqa: E501
+        """Export a CSV report  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.export_csv(start_time, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start_time: start time in epoch seconds (required)
+        :param int end_time: end time in epoch seconds, null to use now
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.export_csv_with_http_info(start_time, **kwargs)  # noqa: E501
+        else:
+            (data) = self.export_csv_with_http_info(start_time, **kwargs)  # noqa: E501
+            return data
+
+    def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
+        """Export a CSV report  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.export_csv_with_http_info(start_time, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start_time: start time in epoch seconds (required)
+        :param int end_time: end time in epoch seconds, null to use now
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start_time', 'end_time']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method export_csv" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start_time' is set
+        if ('start_time' not in params or
+                params['start_time'] is None):
+            raise ValueError("Missing the required parameter `start_time` when calling `export_csv`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start_time' in params:
+            query_params.append(('startTime', params['start_time']))  # noqa: E501
+        if 'end_time' in params:
+            query_params.append(('endTime', params['end_time']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/csv'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/exportcsv', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_ingestion_policies(self, **kwargs):  # noqa: E501
+        """Get all ingestion policies for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_ingestion_policies(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all ingestion policies for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_ingestion_policies_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_ingestion_policies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_ingestion_policy(self, id, **kwargs):  # noqa: E501
+        """Get a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_ingestion_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_ingestion_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
+        """Update a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_ingestion_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_ingestion_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_ingestion_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_ingestion_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_ingestion_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 050739e..a7877d8 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -147,7 +147,7 @@ def create_or_update_user(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -170,7 +170,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -608,7 +608,7 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_user_business_functions(self, id, **kwargs):  # noqa: E501
-        """Returns business functions of a specific user.  # noqa: E501
+        """Returns business functions of a specific user or service account.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -630,7 +630,7 @@ def get_user_business_functions(self, id, **kwargs):  # noqa: E501
             return data
 
     def get_user_business_functions_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Returns business functions of a specific user.  # noqa: E501
+        """Returns business functions of a specific user or service account.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -918,7 +918,7 @@ def invite_users(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -940,7 +940,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1116,7 +1116,7 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param str permission: Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
         :param list[str] body: List of users or service accounts which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
@@ -1139,7 +1139,7 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to the account. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param str permission: Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
         :param list[str] body: List of users or service accounts which should be revoked by specified permission
         :return: UserModel
                  If the method is called asynchronously,
@@ -1313,7 +1313,7 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def update_user(self, id, **kwargs):  # noqa: E501
-        """Update user with given user groups and permissions.  # noqa: E501
+        """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1323,7 +1323,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1336,7 +1336,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
             return data
 
     def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Update user with given user groups and permissions.  # noqa: E501
+        """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1346,7 +1346,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index fbbb740..3e122d7 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.37.33/python'
+        self.user_agent = 'Swagger-Codegen/2.38.19/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 2507331..ea63752 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.37.33".\
+               "SDK Package Version: 2.38.19".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 79e86a4..3c59286 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -22,6 +22,7 @@
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
@@ -39,6 +40,7 @@
 from wavefront_api_client.models.customer_preferences import CustomerPreferences
 from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating
 from wavefront_api_client.models.dashboard import Dashboard
+from wavefront_api_client.models.dashboard_min import DashboardMin
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
 from wavefront_api_client.models.dashboard_section import DashboardSection
 from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow
@@ -56,6 +58,8 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy
+from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -88,6 +92,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -103,6 +108,7 @@
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
 from wavefront_api_client.models.response_container import ResponseContainer
+from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
 from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard
@@ -112,6 +118,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -136,6 +143,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -148,6 +156,7 @@
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
+from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index f5c388d..3184c9d 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -33,26 +33,31 @@ class Account(object):
     swagger_types = {
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy_id': 'str',
         'user_groups': 'list[str]'
     }
 
     attribute_map = {
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, groups=None, identifier=None, user_groups=None):  # noqa: E501
+    def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, user_groups=None):  # noqa: E501
         """Account - a model defined in Swagger"""  # noqa: E501
 
         self._groups = None
         self._identifier = None
+        self._ingestion_policy_id = None
         self._user_groups = None
         self.discriminator = None
 
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         if user_groups is not None:
             self.user_groups = user_groups
 
@@ -104,6 +109,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this Account.  # noqa: E501
+
+        The identifier of the ingestion policy linked with account.  # noqa: E501
+
+        :return: The ingestion_policy_id of this Account.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this Account.
+
+        The identifier of the ingestion policy linked with account.  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this Account.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def user_groups(self):
         """Gets the user_groups of this Account.  # noqa: E501
diff --git a/wavefront_api_client/models/alert_min.py b/wavefront_api_client/models/alert_min.py
new file mode 100644
index 0000000..e9638f3
--- /dev/null
+++ b/wavefront_api_client/models/alert_min.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AlertMin(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'id': 'str',
+        'name': 'str'
+    }
+
+    attribute_map = {
+        'id': 'id',
+        'name': 'name'
+    }
+
+    def __init__(self, id=None, name=None):  # noqa: E501
+        """AlertMin - a model defined in Swagger"""  # noqa: E501
+
+        self._id = None
+        self._name = None
+        self.discriminator = None
+
+        if id is not None:
+            self.id = id
+        if name is not None:
+            self.name = name
+
+    @property
+    def id(self):
+        """Gets the id of this AlertMin.  # noqa: E501
+
+        Unique identifier, also created epoch millis, of the alert  # noqa: E501
+
+        :return: The id of this AlertMin.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this AlertMin.
+
+        Unique identifier, also created epoch millis, of the alert  # noqa: E501
+
+        :param id: The id of this AlertMin.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this AlertMin.  # noqa: E501
+
+        Name of the alert  # noqa: E501
+
+        :return: The name of this AlertMin.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this AlertMin.
+
+        Name of the alert  # noqa: E501
+
+        :param name: The name of this AlertMin.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertMin, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertMin):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index d0377b0..613c8c1 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1397,7 +1397,7 @@ def type(self, type):
         """
         if type is None:
             raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
-        allowed_values = ["line", "scatterplot", "stacked-area", "table", "scatterplot-xy", "markdown-widget", "sparkline"]  # noqa: E501
+        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list"]  # noqa: E501
         if type not in allowed_values:
             raise ValueError(
                 "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index dd2b0d4..43d700e 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -37,6 +37,7 @@ class CustomerFacingUserObject(object):
         'groups': 'list[str]',
         'id': 'str',
         'identifier': 'str',
+        'ingestion_policy_id': 'str',
         'last_successful_login': 'int',
         '_self': 'bool',
         'user_groups': 'list[str]'
@@ -49,12 +50,13 @@ class CustomerFacingUserObject(object):
         'groups': 'groups',
         'id': 'id',
         'identifier': 'identifier',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'last_successful_login': 'lastSuccessfulLogin',
         '_self': 'self',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, last_successful_login=None, _self=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, ingestion_policy_id=None, last_successful_login=None, _self=None, user_groups=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
@@ -63,6 +65,7 @@ def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, gr
         self._groups = None
         self._id = None
         self._identifier = None
+        self._ingestion_policy_id = None
         self._last_successful_login = None
         self.__self = None
         self._user_groups = None
@@ -77,6 +80,8 @@ def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, gr
             self.groups = groups
         self.id = id
         self.identifier = identifier
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         self._self = _self
@@ -227,6 +232,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this CustomerFacingUserObject.  # noqa: E501
+
+        The identifier of the ingestion policy linked with user.  # noqa: E501
+
+        :return: The ingestion_policy_id of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this CustomerFacingUserObject.
+
+        The identifier of the ingestion policy linked with user.  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this CustomerFacingUserObject.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this CustomerFacingUserObject.  # noqa: E501
diff --git a/wavefront_api_client/models/dashboard_min.py b/wavefront_api_client/models/dashboard_min.py
new file mode 100644
index 0000000..a4dc115
--- /dev/null
+++ b/wavefront_api_client/models/dashboard_min.py
@@ -0,0 +1,173 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class DashboardMin(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'id': 'str',
+        'name': 'str'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'id': 'id',
+        'name': 'name'
+    }
+
+    def __init__(self, description=None, id=None, name=None):  # noqa: E501
+        """DashboardMin - a model defined in Swagger"""  # noqa: E501
+
+        self._description = None
+        self._id = None
+        self._name = None
+        self.discriminator = None
+
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        if name is not None:
+            self.name = name
+
+    @property
+    def description(self):
+        """Gets the description of this DashboardMin.  # noqa: E501
+
+        Human-readable description of the dashboard  # noqa: E501
+
+        :return: The description of this DashboardMin.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DashboardMin.
+
+        Human-readable description of the dashboard  # noqa: E501
+
+        :param description: The description of this DashboardMin.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this DashboardMin.  # noqa: E501
+
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+
+        :return: The id of this DashboardMin.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DashboardMin.
+
+        Unique identifier, also URL slug, of the dashboard  # noqa: E501
+
+        :param id: The id of this DashboardMin.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this DashboardMin.  # noqa: E501
+
+        Name of the dashboard  # noqa: E501
+
+        :return: The name of this DashboardMin.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DashboardMin.
+
+        Name of the dashboard  # noqa: E501
+
+        :param name: The name of this DashboardMin.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(DashboardMin, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, DashboardMin):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index ac4a2aa..560bad4 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -32,23 +32,28 @@ class DashboardSection(object):
     """
     swagger_types = {
         'name': 'str',
-        'rows': 'list[DashboardSectionRow]'
+        'rows': 'list[DashboardSectionRow]',
+        'section_filter': 'JsonNode'
     }
 
     attribute_map = {
         'name': 'name',
-        'rows': 'rows'
+        'rows': 'rows',
+        'section_filter': 'sectionFilter'
     }
 
-    def __init__(self, name=None, rows=None):  # noqa: E501
+    def __init__(self, name=None, rows=None, section_filter=None):  # noqa: E501
         """DashboardSection - a model defined in Swagger"""  # noqa: E501
 
         self._name = None
         self._rows = None
+        self._section_filter = None
         self.discriminator = None
 
         self.name = name
         self.rows = rows
+        if section_filter is not None:
+            self.section_filter = section_filter
 
     @property
     def name(self):
@@ -100,6 +105,29 @@ def rows(self, rows):
 
         self._rows = rows
 
+    @property
+    def section_filter(self):
+        """Gets the section_filter of this DashboardSection.  # noqa: E501
+
+        Display filter for conditional dashboard section  # noqa: E501
+
+        :return: The section_filter of this DashboardSection.  # noqa: E501
+        :rtype: JsonNode
+        """
+        return self._section_filter
+
+    @section_filter.setter
+    def section_filter(self, section_filter):
+        """Sets the section_filter of this DashboardSection.
+
+        Display filter for conditional dashboard section  # noqa: E501
+
+        :param section_filter: The section_filter of this DashboardSection.  # noqa: E501
+        :type: JsonNode
+        """
+
+        self._section_filter = section_filter
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/ingestion_policy.py b/wavefront_api_client/models/ingestion_policy.py
new file mode 100644
index 0000000..a0e0862
--- /dev/null
+++ b/wavefront_api_client/models/ingestion_policy.py
@@ -0,0 +1,369 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class IngestionPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer': 'str',
+        'description': 'str',
+        'id': 'str',
+        'last_updated_account_id': 'str',
+        'last_updated_ms': 'int',
+        'name': 'str',
+        'sampled_service_accounts': 'list[str]',
+        'sampled_user_accounts': 'list[str]',
+        'service_account_count': 'int',
+        'user_account_count': 'int'
+    }
+
+    attribute_map = {
+        'customer': 'customer',
+        'description': 'description',
+        'id': 'id',
+        'last_updated_account_id': 'lastUpdatedAccountId',
+        'last_updated_ms': 'lastUpdatedMs',
+        'name': 'name',
+        'sampled_service_accounts': 'sampledServiceAccounts',
+        'sampled_user_accounts': 'sampledUserAccounts',
+        'service_account_count': 'serviceAccountCount',
+        'user_account_count': 'userAccountCount'
+    }
+
+    def __init__(self, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, name=None, sampled_service_accounts=None, sampled_user_accounts=None, service_account_count=None, user_account_count=None):  # noqa: E501
+        """IngestionPolicy - a model defined in Swagger"""  # noqa: E501
+
+        self._customer = None
+        self._description = None
+        self._id = None
+        self._last_updated_account_id = None
+        self._last_updated_ms = None
+        self._name = None
+        self._sampled_service_accounts = None
+        self._sampled_user_accounts = None
+        self._service_account_count = None
+        self._user_account_count = None
+        self.discriminator = None
+
+        if customer is not None:
+            self.customer = customer
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        if last_updated_account_id is not None:
+            self.last_updated_account_id = last_updated_account_id
+        if last_updated_ms is not None:
+            self.last_updated_ms = last_updated_ms
+        if name is not None:
+            self.name = name
+        if sampled_service_accounts is not None:
+            self.sampled_service_accounts = sampled_service_accounts
+        if sampled_user_accounts is not None:
+            self.sampled_user_accounts = sampled_user_accounts
+        if service_account_count is not None:
+            self.service_account_count = service_account_count
+        if user_account_count is not None:
+            self.user_account_count = user_account_count
+
+    @property
+    def customer(self):
+        """Gets the customer of this IngestionPolicy.  # noqa: E501
+
+        ID of the customer to which the ingestion policy belongs  # noqa: E501
+
+        :return: The customer of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this IngestionPolicy.
+
+        ID of the customer to which the ingestion policy belongs  # noqa: E501
+
+        :param customer: The customer of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def description(self):
+        """Gets the description of this IngestionPolicy.  # noqa: E501
+
+        The description of the ingestion policy  # noqa: E501
+
+        :return: The description of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this IngestionPolicy.
+
+        The description of the ingestion policy  # noqa: E501
+
+        :param description: The description of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this IngestionPolicy.  # noqa: E501
+
+        The unique ID for the ingestion policy  # noqa: E501
+
+        :return: The id of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this IngestionPolicy.
+
+        The unique ID for the ingestion policy  # noqa: E501
+
+        :param id: The id of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def last_updated_account_id(self):
+        """Gets the last_updated_account_id of this IngestionPolicy.  # noqa: E501
+
+        The account that updated this ingestion policy last time  # noqa: E501
+
+        :return: The last_updated_account_id of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_updated_account_id
+
+    @last_updated_account_id.setter
+    def last_updated_account_id(self, last_updated_account_id):
+        """Sets the last_updated_account_id of this IngestionPolicy.
+
+        The account that updated this ingestion policy last time  # noqa: E501
+
+        :param last_updated_account_id: The last_updated_account_id of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._last_updated_account_id = last_updated_account_id
+
+    @property
+    def last_updated_ms(self):
+        """Gets the last_updated_ms of this IngestionPolicy.  # noqa: E501
+
+        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
+
+        :return: The last_updated_ms of this IngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated_ms
+
+    @last_updated_ms.setter
+    def last_updated_ms(self, last_updated_ms):
+        """Sets the last_updated_ms of this IngestionPolicy.
+
+        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
+
+        :param last_updated_ms: The last_updated_ms of this IngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated_ms = last_updated_ms
+
+    @property
+    def name(self):
+        """Gets the name of this IngestionPolicy.  # noqa: E501
+
+        The name of the ingestion policy  # noqa: E501
+
+        :return: The name of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IngestionPolicy.
+
+        The name of the ingestion policy  # noqa: E501
+
+        :param name: The name of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def sampled_service_accounts(self):
+        """Gets the sampled_service_accounts of this IngestionPolicy.  # noqa: E501
+
+        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
+
+        :return: The sampled_service_accounts of this IngestionPolicy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sampled_service_accounts
+
+    @sampled_service_accounts.setter
+    def sampled_service_accounts(self, sampled_service_accounts):
+        """Sets the sampled_service_accounts of this IngestionPolicy.
+
+        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
+
+        :param sampled_service_accounts: The sampled_service_accounts of this IngestionPolicy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sampled_service_accounts = sampled_service_accounts
+
+    @property
+    def sampled_user_accounts(self):
+        """Gets the sampled_user_accounts of this IngestionPolicy.  # noqa: E501
+
+        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
+
+        :return: The sampled_user_accounts of this IngestionPolicy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sampled_user_accounts
+
+    @sampled_user_accounts.setter
+    def sampled_user_accounts(self, sampled_user_accounts):
+        """Sets the sampled_user_accounts of this IngestionPolicy.
+
+        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
+
+        :param sampled_user_accounts: The sampled_user_accounts of this IngestionPolicy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sampled_user_accounts = sampled_user_accounts
+
+    @property
+    def service_account_count(self):
+        """Gets the service_account_count of this IngestionPolicy.  # noqa: E501
+
+        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
+
+        :return: The service_account_count of this IngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._service_account_count
+
+    @service_account_count.setter
+    def service_account_count(self, service_account_count):
+        """Sets the service_account_count of this IngestionPolicy.
+
+        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
+
+        :param service_account_count: The service_account_count of this IngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._service_account_count = service_account_count
+
+    @property
+    def user_account_count(self):
+        """Gets the user_account_count of this IngestionPolicy.  # noqa: E501
+
+        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
+
+        :return: The user_account_count of this IngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._user_account_count
+
+    @user_account_count.setter
+    def user_account_count(self, user_account_count):
+        """Sets the user_account_count of this IngestionPolicy.
+
+        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
+
+        :param user_account_count: The user_account_count of this IngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._user_account_count = user_account_count
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IngestionPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IngestionPolicy):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/ingestion_policy_mapping.py b/wavefront_api_client/models/ingestion_policy_mapping.py
new file mode 100644
index 0000000..7d87529
--- /dev/null
+++ b/wavefront_api_client/models/ingestion_policy_mapping.py
@@ -0,0 +1,147 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class IngestionPolicyMapping(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'accounts': 'list[str]',
+        'ingestion_policy_id': 'str'
+    }
+
+    attribute_map = {
+        'accounts': 'accounts',
+        'ingestion_policy_id': 'ingestionPolicyId'
+    }
+
+    def __init__(self, accounts=None, ingestion_policy_id=None):  # noqa: E501
+        """IngestionPolicyMapping - a model defined in Swagger"""  # noqa: E501
+
+        self._accounts = None
+        self._ingestion_policy_id = None
+        self.discriminator = None
+
+        self.accounts = accounts
+        self.ingestion_policy_id = ingestion_policy_id
+
+    @property
+    def accounts(self):
+        """Gets the accounts of this IngestionPolicyMapping.  # noqa: E501
+
+        The list of accounts that should be linked to the ingestion policy  # noqa: E501
+
+        :return: The accounts of this IngestionPolicyMapping.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._accounts
+
+    @accounts.setter
+    def accounts(self, accounts):
+        """Sets the accounts of this IngestionPolicyMapping.
+
+        The list of accounts that should be linked to the ingestion policy  # noqa: E501
+
+        :param accounts: The accounts of this IngestionPolicyMapping.  # noqa: E501
+        :type: list[str]
+        """
+        if accounts is None:
+            raise ValueError("Invalid value for `accounts`, must not be `None`")  # noqa: E501
+
+        self._accounts = accounts
+
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
+
+        The unique identifier of the ingestion policy  # noqa: E501
+
+        :return: The ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this IngestionPolicyMapping.
+
+        The unique identifier of the ingestion policy  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
+        :type: str
+        """
+        if ingestion_policy_id is None:
+            raise ValueError("Invalid value for `ingestion_policy_id`, must not be `None`")  # noqa: E501
+
+        self._ingestion_policy_id = ingestion_policy_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IngestionPolicyMapping, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IngestionPolicyMapping):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index eef064a..b5b09d0 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -31,6 +31,7 @@ class IntegrationAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'alert_min_obj': 'AlertMin',
         'alert_obj': 'Alert',
         'description': 'str',
         'name': 'str',
@@ -38,27 +39,52 @@ class IntegrationAlert(object):
     }
 
     attribute_map = {
+        'alert_min_obj': 'alertMinObj',
         'alert_obj': 'alertObj',
         'description': 'description',
         'name': 'name',
         'url': 'url'
     }
 
-    def __init__(self, alert_obj=None, description=None, name=None, url=None):  # noqa: E501
+    def __init__(self, alert_min_obj=None, alert_obj=None, description=None, name=None, url=None):  # noqa: E501
         """IntegrationAlert - a model defined in Swagger"""  # noqa: E501
 
+        self._alert_min_obj = None
         self._alert_obj = None
         self._description = None
         self._name = None
         self._url = None
         self.discriminator = None
 
+        if alert_min_obj is not None:
+            self.alert_min_obj = alert_min_obj
         if alert_obj is not None:
             self.alert_obj = alert_obj
         self.description = description
         self.name = name
         self.url = url
 
+    @property
+    def alert_min_obj(self):
+        """Gets the alert_min_obj of this IntegrationAlert.  # noqa: E501
+
+
+        :return: The alert_min_obj of this IntegrationAlert.  # noqa: E501
+        :rtype: AlertMin
+        """
+        return self._alert_min_obj
+
+    @alert_min_obj.setter
+    def alert_min_obj(self, alert_min_obj):
+        """Sets the alert_min_obj of this IntegrationAlert.
+
+
+        :param alert_min_obj: The alert_min_obj of this IntegrationAlert.  # noqa: E501
+        :type: AlertMin
+        """
+
+        self._alert_min_obj = alert_min_obj
+
     @property
     def alert_obj(self):
         """Gets the alert_obj of this IntegrationAlert.  # noqa: E501
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 4f79b30..1fc1f24 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -31,6 +31,7 @@ class IntegrationDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'dashboard_min_obj': 'DashboardMin',
         'dashboard_obj': 'Dashboard',
         'description': 'str',
         'name': 'str',
@@ -38,27 +39,52 @@ class IntegrationDashboard(object):
     }
 
     attribute_map = {
+        'dashboard_min_obj': 'dashboardMinObj',
         'dashboard_obj': 'dashboardObj',
         'description': 'description',
         'name': 'name',
         'url': 'url'
     }
 
-    def __init__(self, dashboard_obj=None, description=None, name=None, url=None):  # noqa: E501
+    def __init__(self, dashboard_min_obj=None, dashboard_obj=None, description=None, name=None, url=None):  # noqa: E501
         """IntegrationDashboard - a model defined in Swagger"""  # noqa: E501
 
+        self._dashboard_min_obj = None
         self._dashboard_obj = None
         self._description = None
         self._name = None
         self._url = None
         self.discriminator = None
 
+        if dashboard_min_obj is not None:
+            self.dashboard_min_obj = dashboard_min_obj
         if dashboard_obj is not None:
             self.dashboard_obj = dashboard_obj
         self.description = description
         self.name = name
         self.url = url
 
+    @property
+    def dashboard_min_obj(self):
+        """Gets the dashboard_min_obj of this IntegrationDashboard.  # noqa: E501
+
+
+        :return: The dashboard_min_obj of this IntegrationDashboard.  # noqa: E501
+        :rtype: DashboardMin
+        """
+        return self._dashboard_min_obj
+
+    @dashboard_min_obj.setter
+    def dashboard_min_obj(self, dashboard_min_obj):
+        """Sets the dashboard_min_obj of this IntegrationDashboard.
+
+
+        :param dashboard_min_obj: The dashboard_min_obj of this IntegrationDashboard.  # noqa: E501
+        :type: DashboardMin
+        """
+
+        self._dashboard_min_obj = dashboard_min_obj
+
     @property
     def dashboard_obj(self):
         """Gets the dashboard_obj of this IntegrationDashboard.  # noqa: E501
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index 58b66f4..da62b50 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -53,10 +53,14 @@ def __init__(self, alert_statuses=None, content_status=None, install_status=None
         self._metric_statuses = None
         self.discriminator = None
 
-        self.alert_statuses = alert_statuses
-        self.content_status = content_status
-        self.install_status = install_status
-        self.metric_statuses = metric_statuses
+        if alert_statuses is not None:
+            self.alert_statuses = alert_statuses
+        if content_status is not None:
+            self.content_status = content_status
+        if install_status is not None:
+            self.install_status = install_status
+        if metric_statuses is not None:
+            self.metric_statuses = metric_statuses
 
     @property
     def alert_statuses(self):
@@ -78,8 +82,6 @@ def alert_statuses(self, alert_statuses):
         :param alert_statuses: The alert_statuses of this IntegrationStatus.  # noqa: E501
         :type: dict(str, str)
         """
-        if alert_statuses is None:
-            raise ValueError("Invalid value for `alert_statuses`, must not be `None`")  # noqa: E501
         allowed_values = ["VISIBLE", "HIDDEN", "NOT_LOADED"]  # noqa: E501
         if not set(alert_statuses.keys()).issubset(set(allowed_values)):
             raise ValueError(
@@ -110,8 +112,6 @@ def content_status(self, content_status):
         :param content_status: The content_status of this IntegrationStatus.  # noqa: E501
         :type: str
         """
-        if content_status is None:
-            raise ValueError("Invalid value for `content_status`, must not be `None`")  # noqa: E501
         allowed_values = ["INVALID", "NOT_LOADED", "HIDDEN", "VISIBLE"]  # noqa: E501
         if content_status not in allowed_values:
             raise ValueError(
@@ -141,8 +141,6 @@ def install_status(self, install_status):
         :param install_status: The install_status of this IntegrationStatus.  # noqa: E501
         :type: str
         """
-        if install_status is None:
-            raise ValueError("Invalid value for `install_status`, must not be `None`")  # noqa: E501
         allowed_values = ["UNDECIDED", "UNINSTALLED", "INSTALLED"]  # noqa: E501
         if install_status not in allowed_values:
             raise ValueError(
@@ -172,8 +170,6 @@ def metric_statuses(self, metric_statuses):
         :param metric_statuses: The metric_statuses of this IntegrationStatus.  # noqa: E501
         :type: dict(str, MetricStatus)
         """
-        if metric_statuses is None:
-            raise ValueError("Invalid value for `metric_statuses`, must not be `None`")  # noqa: E501
 
         self._metric_statuses = metric_statuses
 
diff --git a/wavefront_api_client/models/paged_ingestion_policy.py b/wavefront_api_client/models/paged_ingestion_policy.py
new file mode 100644
index 0000000..5044ac5
--- /dev/null
+++ b/wavefront_api_client/models/paged_ingestion_policy.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedIngestionPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[IngestionPolicy]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedIngestionPolicy - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedIngestionPolicy.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedIngestionPolicy.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedIngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedIngestionPolicy.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: list[IngestionPolicy]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedIngestionPolicy.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedIngestionPolicy.  # noqa: E501
+        :type: list[IngestionPolicy]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedIngestionPolicy.  # noqa: E501
+
+
+        :return: The limit of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedIngestionPolicy.
+
+
+        :param limit: The limit of this PagedIngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedIngestionPolicy.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedIngestionPolicy.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedIngestionPolicy.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedIngestionPolicy.  # noqa: E501
+
+
+        :return: The offset of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedIngestionPolicy.
+
+
+        :param offset: The offset of this PagedIngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedIngestionPolicy.  # noqa: E501
+
+
+        :return: The sort of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedIngestionPolicy.
+
+
+        :param sort: The sort of this PagedIngestionPolicy.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedIngestionPolicy.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedIngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedIngestionPolicy.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedIngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedIngestionPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedIngestionPolicy):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index ad39302..e812be3 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -41,6 +41,7 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
+        'ingestion_policy': 'IngestionPolicy',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
@@ -66,6 +67,7 @@ class Proxy(object):
         'hostname': 'hostname',
         'id': 'id',
         'in_trash': 'inTrash',
+        'ingestion_policy': 'ingestionPolicy',
         'last_check_in_time': 'lastCheckInTime',
         'last_error_event': 'lastErrorEvent',
         'last_error_time': 'lastErrorTime',
@@ -80,7 +82,7 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, shutdown=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, version=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, shutdown=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, version=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
         self._bytes_left_for_buffer = None
@@ -93,6 +95,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._hostname = None
         self._id = None
         self._in_trash = None
+        self._ingestion_policy = None
         self._last_check_in_time = None
         self._last_error_event = None
         self._last_error_time = None
@@ -127,6 +130,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.id = id
         if in_trash is not None:
             self.in_trash = in_trash
+        if ingestion_policy is not None:
+            self.ingestion_policy = ingestion_policy
         if last_check_in_time is not None:
             self.last_check_in_time = last_check_in_time
         if last_error_event is not None:
@@ -373,6 +378,29 @@ def in_trash(self, in_trash):
 
         self._in_trash = in_trash
 
+    @property
+    def ingestion_policy(self):
+        """Gets the ingestion_policy of this Proxy.  # noqa: E501
+
+        Ingestion policy associated with the proxy  # noqa: E501
+
+        :return: The ingestion_policy of this Proxy.  # noqa: E501
+        :rtype: IngestionPolicy
+        """
+        return self._ingestion_policy
+
+    @ingestion_policy.setter
+    def ingestion_policy(self, ingestion_policy):
+        """Sets the ingestion_policy of this Proxy.
+
+        Ingestion policy associated with the proxy  # noqa: E501
+
+        :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
+        :type: IngestionPolicy
+        """
+
+        self._ingestion_policy = ingestion_policy
+
     @property
     def last_check_in_time(self):
         """Gets the last_check_in_time of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_account.py b/wavefront_api_client/models/response_container_account.py
new file mode 100644
index 0000000..b974eee
--- /dev/null
+++ b/wavefront_api_client/models/response_container_account.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerAccount(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'Account',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerAccount - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerAccount.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerAccount.  # noqa: E501
+        :rtype: Account
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerAccount.
+
+
+        :param response: The response of this ResponseContainerAccount.  # noqa: E501
+        :type: Account
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerAccount.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerAccount.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerAccount.
+
+
+        :param status: The status of this ResponseContainerAccount.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerAccount, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerAccount):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_ingestion_policy.py b/wavefront_api_client/models/response_container_ingestion_policy.py
new file mode 100644
index 0000000..da5748a
--- /dev/null
+++ b/wavefront_api_client/models/response_container_ingestion_policy.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerIngestionPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'IngestionPolicy',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerIngestionPolicy - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerIngestionPolicy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerIngestionPolicy.  # noqa: E501
+        :rtype: IngestionPolicy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerIngestionPolicy.
+
+
+        :param response: The response of this ResponseContainerIngestionPolicy.  # noqa: E501
+        :type: IngestionPolicy
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerIngestionPolicy.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerIngestionPolicy.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerIngestionPolicy.
+
+
+        :param status: The status of this ResponseContainerIngestionPolicy.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerIngestionPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerIngestionPolicy):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy.py b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
new file mode 100644
index 0000000..76613dd
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedIngestionPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedIngestionPolicy',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedIngestionPolicy - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
+        :rtype: PagedIngestionPolicy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedIngestionPolicy.
+
+
+        :param response: The response of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
+        :type: PagedIngestionPolicy
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedIngestionPolicy.
+
+
+        :param status: The status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedIngestionPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedIngestionPolicy):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
new file mode 100644
index 0000000..3befd79
--- /dev/null
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerSetBusinessFunction(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[str]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerSetBusinessFunction - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSetBusinessFunction.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSetBusinessFunction.
+
+
+        :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        if not set(response).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(response) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSetBusinessFunction.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSetBusinessFunction.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSetBusinessFunction.
+
+
+        :param status: The status of this ResponseContainerSetBusinessFunction.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSetBusinessFunction, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSetBusinessFunction):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index c85ae11..df18b70 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -144,7 +144,7 @@ def entity_type(self, entity_type):
         """
         if entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY"]  # noqa: E501
         if entity_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index 5f1e5b9..a6344ab 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -35,6 +35,7 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy': 'IngestionPolicy',
         'last_used': 'int',
         'tokens': 'list[UserApiToken]',
         'user_groups': 'list[UserGroup]'
@@ -45,18 +46,20 @@ class ServiceAccount(object):
         'description': 'description',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy': 'ingestionPolicy',
         'last_used': 'lastUsed',
         'tokens': 'tokens',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, last_used=None, tokens=None, user_groups=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy=None, last_used=None, tokens=None, user_groups=None):  # noqa: E501
         """ServiceAccount - a model defined in Swagger"""  # noqa: E501
 
         self._active = None
         self._description = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policy = None
         self._last_used = None
         self._tokens = None
         self._user_groups = None
@@ -68,6 +71,8 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
+        if ingestion_policy is not None:
+            self.ingestion_policy = ingestion_policy
         if last_used is not None:
             self.last_used = last_used
         if tokens is not None:
@@ -171,6 +176,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy(self):
+        """Gets the ingestion_policy of this ServiceAccount.  # noqa: E501
+
+        The ingestion policy object linked with service account.  # noqa: E501
+
+        :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
+        :rtype: IngestionPolicy
+        """
+        return self._ingestion_policy
+
+    @ingestion_policy.setter
+    def ingestion_policy(self, ingestion_policy):
+        """Sets the ingestion_policy of this ServiceAccount.
+
+        The ingestion policy object linked with service account.  # noqa: E501
+
+        :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
+        :type: IngestionPolicy
+        """
+
+        self._ingestion_policy = ingestion_policy
+
     @property
     def last_used(self):
         """Gets the last_used of this ServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index 868722e..cbec34e 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -35,6 +35,7 @@ class ServiceAccountWrite(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy_id': 'str',
         'tokens': 'list[str]',
         'user_groups': 'list[str]'
     }
@@ -44,17 +45,19 @@ class ServiceAccountWrite(object):
         'description': 'description',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'tokens': 'tokens',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, tokens=None, user_groups=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy_id=None, tokens=None, user_groups=None):  # noqa: E501
         """ServiceAccountWrite - a model defined in Swagger"""  # noqa: E501
 
         self._active = None
         self._description = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policy_id = None
         self._tokens = None
         self._user_groups = None
         self.discriminator = None
@@ -66,6 +69,8 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         if tokens is not None:
             self.tokens = tokens
         if user_groups is not None:
@@ -165,6 +170,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
+
+        The identifier of the ingestion policy linked with service account.  # noqa: E501
+
+        :return: The ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this ServiceAccountWrite.
+
+        The identifier of the ingestion policy linked with service account.  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def tokens(self):
         """Gets the tokens of this ServiceAccountWrite.  # noqa: E501
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
index a9afcd2..eb46489 100644
--- a/wavefront_api_client/models/user.py
+++ b/wavefront_api_client/models/user.py
@@ -40,6 +40,7 @@ class User(object):
         'extra_api_tokens': 'list[str]',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy_id': 'str',
         'invalid_password_attempts': 'int',
         'last_logout': 'int',
         'last_successful_login': 'int',
@@ -65,6 +66,7 @@ class User(object):
         'extra_api_tokens': 'extraApiTokens',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'invalid_password_attempts': 'invalidPasswordAttempts',
         'last_logout': 'lastLogout',
         'last_successful_login': 'lastSuccessfulLogin',
@@ -80,7 +82,7 @@ class User(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, account_type=None, api_token=None, api_token2=None, credential=None, customer=None, description=None, extra_api_tokens=None, groups=None, identifier=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, last_used=None, old_passwords=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
+    def __init__(self, account_type=None, api_token=None, api_token2=None, credential=None, customer=None, description=None, extra_api_tokens=None, groups=None, identifier=None, ingestion_policy_id=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, last_used=None, old_passwords=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
         """User - a model defined in Swagger"""  # noqa: E501
 
         self._account_type = None
@@ -92,6 +94,7 @@ def __init__(self, account_type=None, api_token=None, api_token2=None, credentia
         self._extra_api_tokens = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policy_id = None
         self._invalid_password_attempts = None
         self._last_logout = None
         self._last_successful_login = None
@@ -125,6 +128,8 @@ def __init__(self, account_type=None, api_token=None, api_token2=None, credentia
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         if invalid_password_attempts is not None:
             self.invalid_password_attempts = invalid_password_attempts
         if last_logout is not None:
@@ -347,6 +352,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this User.  # noqa: E501
+
+
+        :return: The ingestion_policy_id of this User.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this User.
+
+
+        :param ingestion_policy_id: The ingestion_policy_id of this User.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def invalid_password_attempts(self):
         """Gets the invalid_password_attempts of this User.  # noqa: E501
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 693c41f..25e5124 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -34,6 +34,7 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'sso_id': 'str',
         'user_groups': 'list[UserGroup]'
@@ -43,17 +44,19 @@ class UserDTO(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserDTO - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policy = None
         self._last_successful_login = None
         self._sso_id = None
         self._user_groups = None
@@ -65,6 +68,8 @@ def __init__(self, customer=None, groups=None, identifier=None, last_successful_
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
+        if ingestion_policy is not None:
+            self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         if sso_id is not None:
@@ -135,6 +140,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy(self):
+        """Gets the ingestion_policy of this UserDTO.  # noqa: E501
+
+
+        :return: The ingestion_policy of this UserDTO.  # noqa: E501
+        :rtype: IngestionPolicy
+        """
+        return self._ingestion_policy
+
+    @ingestion_policy.setter
+    def ingestion_policy(self, ingestion_policy):
+        """Sets the ingestion_policy of this UserDTO.
+
+
+        :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
+        :type: IngestionPolicy
+        """
+
+        self._ingestion_policy = ingestion_policy
+
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this UserDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 9d9a247..8aaa457 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -34,6 +34,7 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'sso_id': 'str',
         'user_groups': 'list[UserGroup]'
@@ -43,17 +44,19 @@ class UserModel(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policy = None
         self._last_successful_login = None
         self._sso_id = None
         self._user_groups = None
@@ -62,6 +65,8 @@ def __init__(self, customer=None, groups=None, identifier=None, last_successful_
         self.customer = customer
         self.groups = groups
         self.identifier = identifier
+        if ingestion_policy is not None:
+            self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         if sso_id is not None:
@@ -143,6 +148,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy(self):
+        """Gets the ingestion_policy of this UserModel.  # noqa: E501
+
+
+        :return: The ingestion_policy of this UserModel.  # noqa: E501
+        :rtype: IngestionPolicy
+        """
+        return self._ingestion_policy
+
+    @ingestion_policy.setter
+    def ingestion_policy(self, ingestion_policy):
+        """Sets the ingestion_policy of this UserModel.
+
+
+        :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
+        :type: IngestionPolicy
+        """
+
+        self._ingestion_policy = ingestion_policy
+
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this UserModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index de5120f..60cbe37 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -35,6 +35,7 @@ class UserRequestDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policy_id': 'str',
         'sso_id': 'str',
         'user_groups': 'list[str]'
     }
@@ -44,17 +45,19 @@ class UserRequestDTO(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, credential=None, customer=None, groups=None, identifier=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policy_id=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
 
         self._credential = None
         self._customer = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policy_id = None
         self._sso_id = None
         self._user_groups = None
         self.discriminator = None
@@ -67,6 +70,8 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         if sso_id is not None:
             self.sso_id = sso_id
         if user_groups is not None:
@@ -156,6 +161,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The ingestion_policy_id of this UserRequestDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this UserRequestDTO.
+
+
+        :param ingestion_policy_id: The ingestion_policy_id of this UserRequestDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def sso_id(self):
         """Gets the sso_id of this UserRequestDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
index 9c70813..ae7b220 100644
--- a/wavefront_api_client/models/user_settings.py
+++ b/wavefront_api_client/models/user_settings.py
@@ -37,6 +37,7 @@ class UserSettings(object):
         'hide_ts_when_querybuilder_shown': 'bool',
         'landing_dashboard_slug': 'str',
         'preferred_time_zone': 'str',
+        'sample_query_results_by_default': 'bool',
         'show_onboarding': 'bool',
         'show_querybuilder_by_default': 'bool',
         'ui_default': 'str',
@@ -51,6 +52,7 @@ class UserSettings(object):
         'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
         'landing_dashboard_slug': 'landingDashboardSlug',
         'preferred_time_zone': 'preferredTimeZone',
+        'sample_query_results_by_default': 'sampleQueryResultsByDefault',
         'show_onboarding': 'showOnboarding',
         'show_querybuilder_by_default': 'showQuerybuilderByDefault',
         'ui_default': 'uiDefault',
@@ -58,7 +60,7 @@ class UserSettings(object):
         'use_dark_theme': 'useDarkTheme'
     }
 
-    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, show_onboarding=None, show_querybuilder_by_default=None, ui_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
+    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, sample_query_results_by_default=None, show_onboarding=None, show_querybuilder_by_default=None, ui_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
         """UserSettings - a model defined in Swagger"""  # noqa: E501
 
         self._always_hide_querybuilder = None
@@ -67,6 +69,7 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
         self._hide_ts_when_querybuilder_shown = None
         self._landing_dashboard_slug = None
         self._preferred_time_zone = None
+        self._sample_query_results_by_default = None
         self._show_onboarding = None
         self._show_querybuilder_by_default = None
         self._ui_default = None
@@ -86,6 +89,8 @@ def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favor
             self.landing_dashboard_slug = landing_dashboard_slug
         if preferred_time_zone is not None:
             self.preferred_time_zone = preferred_time_zone
+        if sample_query_results_by_default is not None:
+            self.sample_query_results_by_default = sample_query_results_by_default
         if show_onboarding is not None:
             self.show_onboarding = show_onboarding
         if show_querybuilder_by_default is not None:
@@ -223,6 +228,27 @@ def preferred_time_zone(self, preferred_time_zone):
 
         self._preferred_time_zone = preferred_time_zone
 
+    @property
+    def sample_query_results_by_default(self):
+        """Gets the sample_query_results_by_default of this UserSettings.  # noqa: E501
+
+
+        :return: The sample_query_results_by_default of this UserSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._sample_query_results_by_default
+
+    @sample_query_results_by_default.setter
+    def sample_query_results_by_default(self, sample_query_results_by_default):
+        """Sets the sample_query_results_by_default of this UserSettings.
+
+
+        :param sample_query_results_by_default: The sample_query_results_by_default of this UserSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._sample_query_results_by_default = sample_query_results_by_default
+
     @property
     def show_onboarding(self):
         """Gets the show_onboarding of this UserSettings.  # noqa: E501
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index 62c30cf..83417fd 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -33,25 +33,30 @@ class UserToCreate(object):
     swagger_types = {
         'email_address': 'str',
         'groups': 'list[str]',
+        'ingestion_policy_id': 'str',
         'user_groups': 'list[str]'
     }
 
     attribute_map = {
         'email_address': 'emailAddress',
         'groups': 'groups',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, email_address=None, groups=None, user_groups=None):  # noqa: E501
+    def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, user_groups=None):  # noqa: E501
         """UserToCreate - a model defined in Swagger"""  # noqa: E501
 
         self._email_address = None
         self._groups = None
+        self._ingestion_policy_id = None
         self._user_groups = None
         self.discriminator = None
 
         self.email_address = email_address
         self.groups = groups
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         self.user_groups = user_groups
 
     @property
@@ -104,6 +109,29 @@ def groups(self, groups):
 
         self._groups = groups
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this UserToCreate.  # noqa: E501
+
+        The identifier of the ingestion policy linked with user.  # noqa: E501
+
+        :return: The ingestion_policy_id of this UserToCreate.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this UserToCreate.
+
+        The identifier of the ingestion policy linked with user.  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this UserToCreate.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def user_groups(self):
         """Gets the user_groups of this UserToCreate.  # noqa: E501

From cd42e86f91aad73b2283331d6d8fb61e002ff797 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 28 Nov 2019 08:16:40 -0800
Subject: [PATCH 041/161] Autogenerated Update v2.38.24.

---
 .swagger-codegen/config.json          |  2 +-
 .swagger-codegen/config.jsone         |  2 +-
 README.md                             |  2 +-
 docs/Alert.md                         |  1 +
 setup.py                              |  2 +-
 wavefront_api_client/api_client.py    |  2 +-
 wavefront_api_client/configuration.py |  2 +-
 wavefront_api_client/models/alert.py  | 30 ++++++++++++++++++++++++++-
 8 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 1d785be..2ef8b0d 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.38.19"
+    "packageVersion": "2.38.24"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5ea793b..1d785be 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.37.33"
+    "packageVersion": "2.38.19"
 }
diff --git a/README.md b/README.md
index 05393ce..c35b42f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.38.19
+- Package version: 2.38.24
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index 420b2bb..b05b4d5 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -57,6 +57,7 @@ Name | Type | Description | Notes
 **snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
 **sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
 **status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
+**system_alert_version** | **int** | If this is a system alert, the version of it | [optional] 
 **system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
diff --git a/setup.py b/setup.py
index 4976fa1..2a4538e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.38.19"
+VERSION = "2.38.24"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3e122d7..4b143e8 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.38.19/python'
+        self.user_agent = 'Swagger-Codegen/2.38.24/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index ea63752..e2419a3 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -240,5 +240,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.38.19".\
+               "SDK Package Version: 2.38.24".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index cc4182b..bf4859b 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -85,6 +85,7 @@ class Alert(object):
         'snoozed': 'int',
         'sort_attr': 'int',
         'status': 'list[str]',
+        'system_alert_version': 'int',
         'system_owned': 'bool',
         'tags': 'WFTags',
         'target': 'str',
@@ -151,6 +152,7 @@ class Alert(object):
         'snoozed': 'snoozed',
         'sort_attr': 'sortAttr',
         'status': 'status',
+        'system_alert_version': 'systemAlertVersion',
         'system_owned': 'systemOwned',
         'tags': 'tags',
         'target': 'target',
@@ -162,7 +164,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -219,6 +221,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._snoozed = None
         self._sort_attr = None
         self._status = None
+        self._system_alert_version = None
         self._system_owned = None
         self._tags = None
         self._target = None
@@ -335,6 +338,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.sort_attr = sort_attr
         if status is not None:
             self.status = status
+        if system_alert_version is not None:
+            self.system_alert_version = system_alert_version
         if system_owned is not None:
             self.system_owned = system_owned
         if tags is not None:
@@ -1593,6 +1598,29 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def system_alert_version(self):
+        """Gets the system_alert_version of this Alert.  # noqa: E501
+
+        If this is a system alert, the version of it  # noqa: E501
+
+        :return: The system_alert_version of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._system_alert_version
+
+    @system_alert_version.setter
+    def system_alert_version(self, system_alert_version):
+        """Sets the system_alert_version of this Alert.
+
+        If this is a system alert, the version of it  # noqa: E501
+
+        :param system_alert_version: The system_alert_version of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._system_alert_version = system_alert_version
+
     @property
     def system_owned(self):
         """Gets the system_owned of this Alert.  # noqa: E501

From 871e4697f7558379831c67c6618b4101ba992159 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Wed, 5 Feb 2020 17:07:25 -0800
Subject: [PATCH 042/161] Autogenerated Update v2.40.22.

---
 .swagger-codegen/config.json  | 2 +-
 .swagger-codegen/config.jsone | 2 +-
 generate_client               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 2ef8b0d..00596e1 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.38.24"
+    "packageVersion": "2.40.22"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 1d785be..2ef8b0d 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.38.19"
+    "packageVersion": "2.38.24"
 }
diff --git a/generate_client b/generate_client
index 4d64b01..2af8c58 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.9"  # For 3.x use CGEN_VER="3.0.13"
+CGEN_VER="2.4.12"  # For 3.x use CGEN_VER="3.0.16"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"

From 58197455aedd7d249404cddbf2c612ac8b7b5cb4 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Thu, 6 Feb 2020 14:30:40 -0800
Subject: [PATCH 043/161] Follow Up Update v2.40.22.

---
 .swagger-codegen/VERSION                      |    2 +-
 .travis.yml                                   |    4 +-
 README.md                                     |   38 +-
 docs/Alert.md                                 |    1 +
 docs/Anomaly.md                               |   33 +
 docs/Dashboard.md                             |    2 +
 docs/Event.md                                 |    1 +
 docs/EventApi.md                              |  171 +++
 docs/EventSearchRequest.md                    |    1 +
 docs/GCPConfiguration.md                      |    1 +
 docs/Iterable.md                              |    9 +
 docs/KubernetesComponent.md                   |   11 +
 docs/MonitoredCluster.md                      |   20 +
 docs/MonitoredClusterApi.md                   |  570 +++++++++
 docs/PagedAnomaly.md                          |   16 +
 docs/PagedMonitoredCluster.md                 |   16 +
 docs/PagedRelatedEvent.md                     |   16 +
 docs/Proxy.md                                 |    1 +
 docs/RelatedData.md                           |   15 +
 docs/RelatedEvent.md                          |   33 +
 docs/ResponseContainerMonitoredCluster.md     |   11 +
 docs/ResponseContainerPagedAnomaly.md         |   11 +
 .../ResponseContainerPagedMonitoredCluster.md |   11 +
 docs/ResponseContainerPagedRelatedEvent.md    |   11 +
 docs/ResponseContainerSetSourceLabelPair.md   |   11 +
 docs/ResponseContainerString.md               |   11 +
 docs/ResponseContainerUserHardDelete.md       |   11 +
 docs/SearchApi.md                             |  224 ++++
 docs/SearchQuery.md                           |    3 +-
 docs/Stripe.md                                |   13 +
 docs/UserApi.md                               |   54 +
 docs/UserHardDelete.md                        |   12 +
 generate_client                               |    2 +-
 setup.py                                      |    2 +-
 test/test_anomaly.py                          |   40 +
 test/test_iterable.py                         |   40 +
 test/test_kubernetes_component.py             |   40 +
 test/test_monitored_cluster.py                |   40 +
 test/test_monitored_cluster_api.py            |  104 ++
 test/test_paged_anomaly.py                    |   40 +
 test/test_paged_monitored_cluster.py          |   40 +
 test/test_paged_related_event.py              |   40 +
 test/test_related_data.py                     |   40 +
 test/test_related_event.py                    |   40 +
 ...st_response_container_monitored_cluster.py |   40 +
 test/test_response_container_paged_anomaly.py |   40 +
 ...ponse_container_paged_monitored_cluster.py |   40 +
 ..._response_container_paged_related_event.py |   40 +
 ...esponse_container_set_source_label_pair.py |   40 +
 test/test_response_container_string.py        |   40 +
 ...est_response_container_user_hard_delete.py |   40 +
 test/test_stripe.py                           |   40 +
 test/test_user_hard_delete.py                 |   40 +
 wavefront_api_client/__init__.py              |   19 +
 wavefront_api_client/api/__init__.py          |    1 +
 wavefront_api_client/api/event_api.py         |  297 +++++
 .../api/monitored_cluster_api.py              | 1028 +++++++++++++++++
 wavefront_api_client/api/search_api.py        |  396 +++++++
 wavefront_api_client/api/user_api.py          |  101 ++
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |   20 +-
 wavefront_api_client/models/__init__.py       |   18 +
 wavefront_api_client/models/alert.py          |   28 +-
 wavefront_api_client/models/anomaly.py        |  762 ++++++++++++
 wavefront_api_client/models/dashboard.py      |   58 +-
 wavefront_api_client/models/event.py          |   30 +-
 .../models/event_search_request.py            |   36 +-
 .../models/gcp_configuration.py               |   30 +-
 wavefront_api_client/models/iterable.py       |   87 ++
 .../models/kubernetes_component.py            |  141 +++
 .../models/monitored_cluster.py               |  387 +++++++
 wavefront_api_client/models/paged_anomaly.py  |  279 +++++
 .../models/paged_monitored_cluster.py         |  279 +++++
 .../models/paged_related_event.py             |  279 +++++
 wavefront_api_client/models/proxy.py          |   30 +-
 wavefront_api_client/models/related_data.py   |  257 +++++
 wavefront_api_client/models/related_event.py  |  755 ++++++++++++
 .../response_container_monitored_cluster.py   |  142 +++
 .../response_container_paged_anomaly.py       |  142 +++
 ...ponse_container_paged_monitored_cluster.py |  142 +++
 .../response_container_paged_related_event.py |  142 +++
 ...esponse_container_set_business_function.py |    2 +-
 ...esponse_container_set_source_label_pair.py |  142 +++
 .../models/response_container_string.py       |  142 +++
 .../response_container_user_hard_delete.py    |  142 +++
 wavefront_api_client/models/search_query.py   |   43 +-
 wavefront_api_client/models/stripe.py         |  205 ++++
 .../models/user_hard_delete.py                |  167 +++
 88 files changed, 8874 insertions(+), 29 deletions(-)
 create mode 100644 docs/Anomaly.md
 create mode 100644 docs/Iterable.md
 create mode 100644 docs/KubernetesComponent.md
 create mode 100644 docs/MonitoredCluster.md
 create mode 100644 docs/MonitoredClusterApi.md
 create mode 100644 docs/PagedAnomaly.md
 create mode 100644 docs/PagedMonitoredCluster.md
 create mode 100644 docs/PagedRelatedEvent.md
 create mode 100644 docs/RelatedData.md
 create mode 100644 docs/RelatedEvent.md
 create mode 100644 docs/ResponseContainerMonitoredCluster.md
 create mode 100644 docs/ResponseContainerPagedAnomaly.md
 create mode 100644 docs/ResponseContainerPagedMonitoredCluster.md
 create mode 100644 docs/ResponseContainerPagedRelatedEvent.md
 create mode 100644 docs/ResponseContainerSetSourceLabelPair.md
 create mode 100644 docs/ResponseContainerString.md
 create mode 100644 docs/ResponseContainerUserHardDelete.md
 create mode 100644 docs/Stripe.md
 create mode 100644 docs/UserHardDelete.md
 create mode 100644 test/test_anomaly.py
 create mode 100644 test/test_iterable.py
 create mode 100644 test/test_kubernetes_component.py
 create mode 100644 test/test_monitored_cluster.py
 create mode 100644 test/test_monitored_cluster_api.py
 create mode 100644 test/test_paged_anomaly.py
 create mode 100644 test/test_paged_monitored_cluster.py
 create mode 100644 test/test_paged_related_event.py
 create mode 100644 test/test_related_data.py
 create mode 100644 test/test_related_event.py
 create mode 100644 test/test_response_container_monitored_cluster.py
 create mode 100644 test/test_response_container_paged_anomaly.py
 create mode 100644 test/test_response_container_paged_monitored_cluster.py
 create mode 100644 test/test_response_container_paged_related_event.py
 create mode 100644 test/test_response_container_set_source_label_pair.py
 create mode 100644 test/test_response_container_string.py
 create mode 100644 test/test_response_container_user_hard_delete.py
 create mode 100644 test/test_stripe.py
 create mode 100644 test/test_user_hard_delete.py
 create mode 100644 wavefront_api_client/api/monitored_cluster_api.py
 create mode 100644 wavefront_api_client/models/anomaly.py
 create mode 100644 wavefront_api_client/models/iterable.py
 create mode 100644 wavefront_api_client/models/kubernetes_component.py
 create mode 100644 wavefront_api_client/models/monitored_cluster.py
 create mode 100644 wavefront_api_client/models/paged_anomaly.py
 create mode 100644 wavefront_api_client/models/paged_monitored_cluster.py
 create mode 100644 wavefront_api_client/models/paged_related_event.py
 create mode 100644 wavefront_api_client/models/related_data.py
 create mode 100644 wavefront_api_client/models/related_event.py
 create mode 100644 wavefront_api_client/models/response_container_monitored_cluster.py
 create mode 100644 wavefront_api_client/models/response_container_paged_anomaly.py
 create mode 100644 wavefront_api_client/models/response_container_paged_monitored_cluster.py
 create mode 100644 wavefront_api_client/models/response_container_paged_related_event.py
 create mode 100644 wavefront_api_client/models/response_container_set_source_label_pair.py
 create mode 100644 wavefront_api_client/models/response_container_string.py
 create mode 100644 wavefront_api_client/models/response_container_user_hard_delete.py
 create mode 100644 wavefront_api_client/models/stripe.py
 create mode 100644 wavefront_api_client/models/user_hard_delete.py

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 1583498..b385137 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.9
\ No newline at end of file
+2.4.12
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 74cb621..cd8c625 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,11 @@ deploy:
   password:
     secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
   on:
-    python: 3.7
+    python: 3.8
 - provider: pypi
   user: wavefront-cs
   password:
     secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
   on:
-    python: 3.7
+    python: 3.8
     tags: true
diff --git a/README.md b/README.md
index c35b42f..b245b5a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.38.24
+- Package version: 2.40.22
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -174,6 +174,9 @@ Class | Method | HTTP request | Description
 *EventApi* | [**close_event**](docs/EventApi.md#close_event) | **POST** /api/v2/event/{id}/close | Close a specific event
 *EventApi* | [**create_event**](docs/EventApi.md#create_event) | **POST** /api/v2/event | Create a specific event
 *EventApi* | [**delete_event**](docs/EventApi.md#delete_event) | **DELETE** /api/v2/event/{id} | Delete a specific event
+*EventApi* | [**get_alert_event_queries_slug**](docs/EventApi.md#get_alert_event_queries_slug) | **GET** /api/v2/event/{id}/alertQueriesSlug | If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution
+*EventApi* | [**get_alert_firing_details**](docs/EventApi.md#get_alert_firing_details) | **GET** /api/v2/event/{id}/alertFiringDetails | Return details of a particular alert firing, including all the series that fired during the referred alert firing
+*EventApi* | [**get_alert_firing_events**](docs/EventApi.md#get_alert_firing_events) | **GET** /api/v2/event/alertFirings | Get firings events of an alert within a time range
 *EventApi* | [**get_all_events_with_time_range**](docs/EventApi.md#get_all_events_with_time_range) | **GET** /api/v2/event | List all the events for a customer within a time range
 *EventApi* | [**get_event**](docs/EventApi.md#get_event) | **GET** /api/v2/event/{id} | Get a specific event
 *EventApi* | [**get_event_tags**](docs/EventApi.md#get_event_tags) | **GET** /api/v2/event/{id}/tag | Get all tags associated with a specific event
@@ -205,6 +208,16 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
+*MonitoredClusterApi* | [**add_cluster_tag**](docs/MonitoredClusterApi.md#add_cluster_tag) | **PUT** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Add a tag to a specific cluster
+*MonitoredClusterApi* | [**create_cluster**](docs/MonitoredClusterApi.md#create_cluster) | **POST** /api/v2/monitoredcluster | Create a specific cluster
+*MonitoredClusterApi* | [**delete_cluster**](docs/MonitoredClusterApi.md#delete_cluster) | **DELETE** /api/v2/monitoredcluster/{id} | Delete a specific cluster
+*MonitoredClusterApi* | [**get_all_cluster**](docs/MonitoredClusterApi.md#get_all_cluster) | **GET** /api/v2/monitoredcluster | Get all monitored clusters
+*MonitoredClusterApi* | [**get_cluster**](docs/MonitoredClusterApi.md#get_cluster) | **GET** /api/v2/monitoredcluster/{id} | Get a specific cluster
+*MonitoredClusterApi* | [**get_cluster_tags**](docs/MonitoredClusterApi.md#get_cluster_tags) | **GET** /api/v2/monitoredcluster/{id}/tag | Get all tags associated with a specific cluster
+*MonitoredClusterApi* | [**merge_clusters**](docs/MonitoredClusterApi.md#merge_clusters) | **PUT** /api/v2/monitoredcluster/merge/{id1}/{id2} | Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
+*MonitoredClusterApi* | [**remove_cluster_tag**](docs/MonitoredClusterApi.md#remove_cluster_tag) | **DELETE** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Remove a tag from a specific cluster
+*MonitoredClusterApi* | [**set_cluster_tags**](docs/MonitoredClusterApi.md#set_cluster_tags) | **POST** /api/v2/monitoredcluster/{id}/tag | Set all tags associated with a specific cluster
+*MonitoredClusterApi* | [**update_cluster**](docs/MonitoredClusterApi.md#update_cluster) | **PUT** /api/v2/monitoredcluster/{id} | Update a specific cluster
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
 *NotificantApi* | [**get_all_notificants**](docs/NotificantApi.md#get_all_notificants) | **GET** /api/v2/notificant | Get all notification targets for a customer
@@ -254,6 +267,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_maintenance_window_entities**](docs/SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facet**](docs/SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facets**](docs/SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
+*SearchApi* | [**search_monitored_cluster_entities**](docs/SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
+*SearchApi* | [**search_monitored_cluster_for_facet**](docs/SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
+*SearchApi* | [**search_monitored_cluster_for_facets**](docs/SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 *SearchApi* | [**search_notficant_for_facets**](docs/SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 *SearchApi* | [**search_notificant_entities**](docs/SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 *SearchApi* | [**search_notificant_for_facet**](docs/SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -269,6 +285,7 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_registered_query_entities**](docs/SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetric | Search over a customer&#39;s non-deleted derived metric definitions
 *SearchApi* | [**search_registered_query_for_facet**](docs/SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetric/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
 *SearchApi* | [**search_registered_query_for_facets**](docs/SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetric/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
+*SearchApi* | [**search_related_report_event_entities**](docs/SearchApi.md#search_related_report_event_entities) | **POST** /api/v2/search/event/related/{eventId} | List the related events over a firing event
 *SearchApi* | [**search_report_event_entities**](docs/SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 *SearchApi* | [**search_report_event_for_facet**](docs/SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 *SearchApi* | [**search_report_event_for_facets**](docs/SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
@@ -317,6 +334,7 @@ Class | Method | HTTP request | Description
 *UserApi* | [**get_user_business_functions**](docs/UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user or service account.
 *UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
+*UserApi* | [**hard_delete_user**](docs/UserApi.md#hard_delete_user) | **DELETE** /admin/api/v2/user/{id}/{customerId} | 
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
 *UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
 *UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
@@ -350,6 +368,7 @@ Class | Method | HTTP request | Description
  - [Alert](docs/Alert.md)
  - [AlertMin](docs/AlertMin.md)
  - [AlertRoute](docs/AlertRoute.md)
+ - [Anomaly](docs/Anomaly.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
@@ -394,16 +413,19 @@ Class | Method | HTTP request | Description
  - [IntegrationManifestGroup](docs/IntegrationManifestGroup.md)
  - [IntegrationMetrics](docs/IntegrationMetrics.md)
  - [IntegrationStatus](docs/IntegrationStatus.md)
+ - [Iterable](docs/Iterable.md)
  - [IteratorEntryStringJsonNode](docs/IteratorEntryStringJsonNode.md)
  - [IteratorJsonNode](docs/IteratorJsonNode.md)
  - [IteratorString](docs/IteratorString.md)
  - [JsonNode](docs/JsonNode.md)
+ - [KubernetesComponent](docs/KubernetesComponent.md)
  - [LogicalType](docs/LogicalType.md)
  - [MaintenanceWindow](docs/MaintenanceWindow.md)
  - [Message](docs/Message.md)
  - [MetricDetails](docs/MetricDetails.md)
  - [MetricDetailsResponse](docs/MetricDetailsResponse.md)
  - [MetricStatus](docs/MetricStatus.md)
+ - [MonitoredCluster](docs/MonitoredCluster.md)
  - [NewRelicConfiguration](docs/NewRelicConfiguration.md)
  - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
@@ -411,6 +433,7 @@ Class | Method | HTTP request | Description
  - [PagedAccount](docs/PagedAccount.md)
  - [PagedAlert](docs/PagedAlert.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
+ - [PagedAnomaly](docs/PagedAnomaly.md)
  - [PagedCloudIntegration](docs/PagedCloudIntegration.md)
  - [PagedCustomerFacingUserObject](docs/PagedCustomerFacingUserObject.md)
  - [PagedDashboard](docs/PagedDashboard.md)
@@ -422,8 +445,10 @@ Class | Method | HTTP request | Description
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
+ - [PagedMonitoredCluster](docs/PagedMonitoredCluster.md)
  - [PagedNotificant](docs/PagedNotificant.md)
  - [PagedProxy](docs/PagedProxy.md)
+ - [PagedRelatedEvent](docs/PagedRelatedEvent.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
  - [PagedServiceAccount](docs/PagedServiceAccount.md)
  - [PagedSource](docs/PagedSource.md)
@@ -433,6 +458,8 @@ Class | Method | HTTP request | Description
  - [QueryEvent](docs/QueryEvent.md)
  - [QueryResult](docs/QueryResult.md)
  - [RawTimeseries](docs/RawTimeseries.md)
+ - [RelatedData](docs/RelatedData.md)
+ - [RelatedEvent](docs/RelatedEvent.md)
  - [ResponseContainer](docs/ResponseContainer.md)
  - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
@@ -458,10 +485,12 @@ Class | Method | HTTP request | Description
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
  - [ResponseContainerMessage](docs/ResponseContainerMessage.md)
+ - [ResponseContainerMonitoredCluster](docs/ResponseContainerMonitoredCluster.md)
  - [ResponseContainerNotificant](docs/ResponseContainerNotificant.md)
  - [ResponseContainerPagedAccount](docs/ResponseContainerPagedAccount.md)
  - [ResponseContainerPagedAlert](docs/ResponseContainerPagedAlert.md)
  - [ResponseContainerPagedAlertWithStats](docs/ResponseContainerPagedAlertWithStats.md)
+ - [ResponseContainerPagedAnomaly](docs/ResponseContainerPagedAnomaly.md)
  - [ResponseContainerPagedCloudIntegration](docs/ResponseContainerPagedCloudIntegration.md)
  - [ResponseContainerPagedCustomerFacingUserObject](docs/ResponseContainerPagedCustomerFacingUserObject.md)
  - [ResponseContainerPagedDashboard](docs/ResponseContainerPagedDashboard.md)
@@ -473,8 +502,10 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
+ - [ResponseContainerPagedMonitoredCluster](docs/ResponseContainerPagedMonitoredCluster.md)
  - [ResponseContainerPagedNotificant](docs/ResponseContainerPagedNotificant.md)
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
+ - [ResponseContainerPagedRelatedEvent](docs/ResponseContainerPagedRelatedEvent.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
  - [ResponseContainerPagedServiceAccount](docs/ResponseContainerPagedServiceAccount.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
@@ -483,10 +514,13 @@ Class | Method | HTTP request | Description
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
  - [ResponseContainerServiceAccount](docs/ResponseContainerServiceAccount.md)
  - [ResponseContainerSetBusinessFunction](docs/ResponseContainerSetBusinessFunction.md)
+ - [ResponseContainerSetSourceLabelPair](docs/ResponseContainerSetSourceLabelPair.md)
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
+ - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
+ - [ResponseContainerUserHardDelete](docs/ResponseContainerUserHardDelete.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [SavedSearch](docs/SavedSearch.md)
@@ -500,6 +534,7 @@ Class | Method | HTTP request | Description
  - [SourceSearchRequestContainer](docs/SourceSearchRequestContainer.md)
  - [Span](docs/Span.md)
  - [StatsModelInternalUse](docs/StatsModelInternalUse.md)
+ - [Stripe](docs/Stripe.md)
  - [TagsResponse](docs/TagsResponse.md)
  - [TargetInfo](docs/TargetInfo.md)
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
@@ -512,6 +547,7 @@ Class | Method | HTTP request | Description
  - [UserGroupModel](docs/UserGroupModel.md)
  - [UserGroupPropertiesDTO](docs/UserGroupPropertiesDTO.md)
  - [UserGroupWrite](docs/UserGroupWrite.md)
+ - [UserHardDelete](docs/UserHardDelete.md)
  - [UserModel](docs/UserModel.md)
  - [UserRequestDTO](docs/UserRequestDTO.md)
  - [UserSettings](docs/UserSettings.md)
diff --git a/docs/Alert.md b/docs/Alert.md
index b05b4d5..1ade5e1 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -61,6 +61,7 @@ Name | Type | Description | Notes
 **system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
+**target_endpoints** | **list[str]** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **targets** | **dict(str, str)** | Targets for severity. | [optional] 
 **update_user_id** | **str** | The user that last updated this alert | [optional] 
diff --git a/docs/Anomaly.md b/docs/Anomaly.md
new file mode 100644
index 0000000..857f655
--- /dev/null
+++ b/docs/Anomaly.md
@@ -0,0 +1,33 @@
+# Anomaly
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**chart_hash** | **str** | chart hash(as unique identifier) for this anomaly | 
+**chart_link** | **str** | chart link for this anomaly | [optional] 
+**col** | **int** | column number for this anomaly | 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**customer** | **str** | id of the customer to which this anomaly belongs | [optional] 
+**dashboard_id** | **str** | dashboard id for this anomaly | 
+**deleted** | **bool** |  | [optional] 
+**end_ms** | **int** | endMs for this anomaly | 
+**hosts_used** | **list[str]** | list of hosts affected of this anomaly | [optional] 
+**id** | **str** | unique id that defines this anomaly | [optional] 
+**image_link** | **str** | image link for this anomaly | [optional] 
+**metrics_used** | **list[str]** | list of metrics used of this anomaly | [optional] 
+**model** | **str** | model for this anomaly | [optional] 
+**original_stripes** | [**list[Stripe]**](Stripe.md) | list of originalStripe belongs to this anomaly | [optional] 
+**param_hash** | **str** | param hash for this anomaly | 
+**query_hash** | **str** | query hash for this anomaly | 
+**_query_params** | **dict(str, str)** | map of query params belongs to this anomaly | 
+**row** | **int** | row number for this anomaly | 
+**section** | **int** | section number for this anomaly | 
+**start_ms** | **int** | startMs for this anomaly | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updated_ms** | **int** | updateMs for this anomaly | 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index 8ddc8e9..9d3e93b 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
 **customer** | **str** | id of the customer to which this dashboard belongs | [optional] 
+**dashboard_attributes** | [**JsonNode**](JsonNode.md) | Experimental Dashboard Attributes | [optional] 
 **default_end_time** | **int** | Default end time in milliseconds to query charts | [optional] 
 **default_start_time** | **int** | Default start time in milliseconds to query charts | [optional] 
 **default_time_window** | **str** | Default time window to query charts | [optional] 
@@ -21,6 +22,7 @@ Name | Type | Description | Notes
 **event_filter_type** | **str** | How charts belonging to this dashboard should display events.  BYCHART is default if unspecified | [optional] 
 **event_query** | **str** | Event query to run on dashboard charts | [optional] 
 **favorite** | **bool** |  | [optional] 
+**force_v2_ui** | **bool** | Whether to force this dashboard to use the V2 UI | [optional] 
 **hidden** | **bool** |  | [optional] 
 **id** | **str** | Unique identifier, also URL slug, of the dashboard | 
 **modify_acl_access** | **bool** | Whether the user has modify ACL access to the dashboard. | [optional] 
diff --git a/docs/Event.md b/docs/Event.md
index b2dc995..ce425e6 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
 **creator_type** | **list[str]** |  | [optional] 
+**dimensions** | **dict(str, list[str])** | A string-&gt;&lt;list of strings&gt; map of additional dimension info on the event | [optional] 
 **end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
 **hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
 **id** | **str** |  | [optional] 
diff --git a/docs/EventApi.md b/docs/EventApi.md
index 7caf683..30c870e 100644
--- a/docs/EventApi.md
+++ b/docs/EventApi.md
@@ -8,6 +8,9 @@ Method | HTTP request | Description
 [**close_event**](EventApi.md#close_event) | **POST** /api/v2/event/{id}/close | Close a specific event
 [**create_event**](EventApi.md#create_event) | **POST** /api/v2/event | Create a specific event
 [**delete_event**](EventApi.md#delete_event) | **DELETE** /api/v2/event/{id} | Delete a specific event
+[**get_alert_event_queries_slug**](EventApi.md#get_alert_event_queries_slug) | **GET** /api/v2/event/{id}/alertQueriesSlug | If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution
+[**get_alert_firing_details**](EventApi.md#get_alert_firing_details) | **GET** /api/v2/event/{id}/alertFiringDetails | Return details of a particular alert firing, including all the series that fired during the referred alert firing
+[**get_alert_firing_events**](EventApi.md#get_alert_firing_events) | **GET** /api/v2/event/alertFirings | Get firings events of an alert within a time range
 [**get_all_events_with_time_range**](EventApi.md#get_all_events_with_time_range) | **GET** /api/v2/event | List all the events for a customer within a time range
 [**get_event**](EventApi.md#get_event) | **GET** /api/v2/event/{id} | Get a specific event
 [**get_event_tags**](EventApi.md#get_event_tags) | **GET** /api/v2/event/{id}/tag | Get all tags associated with a specific event
@@ -235,6 +238,174 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_alert_event_queries_slug**
+> ResponseContainerString get_alert_event_queries_slug(id)
+
+If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution
+    api_response = api_instance.get_alert_event_queries_slug(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling EventApi->get_alert_event_queries_slug: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_alert_firing_details**
+> ResponseContainerSetSourceLabelPair get_alert_firing_details(id)
+
+Return details of a particular alert firing, including all the series that fired during the referred alert firing
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | id of an event of type alert or alert-detail, used to lookup the particular alert firing
+
+try:
+    # Return details of a particular alert firing, including all the series that fired during the referred alert firing
+    api_response = api_instance.get_alert_firing_details(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling EventApi->get_alert_firing_details: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**| id of an event of type alert or alert-detail, used to lookup the particular alert firing | 
+
+### Return type
+
+[**ResponseContainerSetSourceLabelPair**](ResponseContainerSetSourceLabelPair.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_alert_firing_events**
+> ResponseContainerPagedEvent get_alert_firing_events(alert_id, earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, limit=limit)
+
+Get firings events of an alert within a time range
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(configuration))
+alert_id = 'alert_id_example' # str | 
+earliest_start_time_epoch_millis = 789 # int |  (optional)
+latest_start_time_epoch_millis = 789 # int |  (optional)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get firings events of an alert within a time range
+    api_response = api_instance.get_alert_firing_events(alert_id, earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling EventApi->get_alert_firing_events: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **alert_id** | **str**|  | 
+ **earliest_start_time_epoch_millis** | **int**|  | [optional] 
+ **latest_start_time_epoch_millis** | **int**|  | [optional] 
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedEvent**](ResponseContainerPagedEvent.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_events_with_time_range**
 > ResponseContainerPagedEvent get_all_events_with_time_range(earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, cursor=cursor, limit=limit)
 
diff --git a/docs/EventSearchRequest.md b/docs/EventSearchRequest.md
index 892e504..b502767 100644
--- a/docs/EventSearchRequest.md
+++ b/docs/EventSearchRequest.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **cursor** | **str** | The id (exclusive) from which search results resume returning.  Users should supply an entity &#39;id&#39; to this property.  Its main purpose is to resume where a previous search left off because of the &#39;limit&#39; parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results | [optional] 
 **limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results | [optional] 
+**sort_score_method** | **str** | Whether to sort events on similarity score : {NONE, SCORE_ASC, SCORE_DES}. Default: NONE. If sortScoreMethod is set to SCORE_ASC or SCORE_DES, it will override time sort | [optional] 
 **sort_time_ascending** | **bool** | Whether to sort event results ascending in start time.  Default: false | [optional] 
 **time_range** | [**EventTimeRange**](EventTimeRange.md) |  | [optional] 
 
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index abb9e20..47adce0 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN | [optional] 
+**custom_metric_prefix** | **list[str]** | List of custom metric prefix to fetch the data from | [optional] 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
diff --git a/docs/Iterable.md b/docs/Iterable.md
new file mode 100644
index 0000000..80c9ae1
--- /dev/null
+++ b/docs/Iterable.md
@@ -0,0 +1,9 @@
+# Iterable
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/KubernetesComponent.md b/docs/KubernetesComponent.md
new file mode 100644
index 0000000..f1f5dea
--- /dev/null
+++ b/docs/KubernetesComponent.md
@@ -0,0 +1,11 @@
+# KubernetesComponent
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**last_updated** | **int** |  | [optional] 
+**name** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/MonitoredCluster.md b/docs/MonitoredCluster.md
new file mode 100644
index 0000000..0fbf0c1
--- /dev/null
+++ b/docs/MonitoredCluster.md
@@ -0,0 +1,20 @@
+# MonitoredCluster
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additional_tags** | **dict(str, str)** |  | [optional] 
+**alias** | **str** | ID of a monitored cluster that was merged into this one. | [optional] 
+**components** | [**list[KubernetesComponent]**](KubernetesComponent.md) |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**id** | **str** | Id of monitored cluster which is same as actual cluster id | 
+**last_updated** | **int** |  | [optional] 
+**monitored** | **bool** |  | [optional] 
+**name** | **str** | Name of the monitored cluster | 
+**platform** | **str** | Monitored cluster type | [optional] 
+**tags** | **list[str]** |  | [optional] 
+**version** | **str** | Version of monitored cluster | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/MonitoredClusterApi.md b/docs/MonitoredClusterApi.md
new file mode 100644
index 0000000..5674f12
--- /dev/null
+++ b/docs/MonitoredClusterApi.md
@@ -0,0 +1,570 @@
+# wavefront_api_client.MonitoredClusterApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_cluster_tag**](MonitoredClusterApi.md#add_cluster_tag) | **PUT** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Add a tag to a specific cluster
+[**create_cluster**](MonitoredClusterApi.md#create_cluster) | **POST** /api/v2/monitoredcluster | Create a specific cluster
+[**delete_cluster**](MonitoredClusterApi.md#delete_cluster) | **DELETE** /api/v2/monitoredcluster/{id} | Delete a specific cluster
+[**get_all_cluster**](MonitoredClusterApi.md#get_all_cluster) | **GET** /api/v2/monitoredcluster | Get all monitored clusters
+[**get_cluster**](MonitoredClusterApi.md#get_cluster) | **GET** /api/v2/monitoredcluster/{id} | Get a specific cluster
+[**get_cluster_tags**](MonitoredClusterApi.md#get_cluster_tags) | **GET** /api/v2/monitoredcluster/{id}/tag | Get all tags associated with a specific cluster
+[**merge_clusters**](MonitoredClusterApi.md#merge_clusters) | **PUT** /api/v2/monitoredcluster/merge/{id1}/{id2} | Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
+[**remove_cluster_tag**](MonitoredClusterApi.md#remove_cluster_tag) | **DELETE** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Remove a tag from a specific cluster
+[**set_cluster_tags**](MonitoredClusterApi.md#set_cluster_tags) | **POST** /api/v2/monitoredcluster/{id}/tag | Set all tags associated with a specific cluster
+[**update_cluster**](MonitoredClusterApi.md#update_cluster) | **PUT** /api/v2/monitoredcluster/{id} | Update a specific cluster
+
+
+# **add_cluster_tag**
+> ResponseContainer add_cluster_tag(id, tag_value)
+
+Add a tag to a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+tag_value = 'tag_value_example' # str | 
+
+try:
+    # Add a tag to a specific cluster
+    api_response = api_instance.add_cluster_tag(id, tag_value)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->add_cluster_tag: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **tag_value** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_cluster**
+> ResponseContainerMonitoredCluster create_cluster(body=body)
+
+Create a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.MonitoredCluster() # MonitoredCluster | Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre> (optional)
+
+try:
+    # Create a specific cluster
+    api_response = api_instance.create_cluster(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->create_cluster: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**MonitoredCluster**](MonitoredCluster.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;k8s-sample\&quot;,   \&quot;name\&quot;: \&quot;Sample cluster\&quot;,   \&quot;platform\&quot;: \&quot;EKS\&quot;,   \&quot;version\&quot;: \&quot;1.2\&quot;,   \&quot;additionalTags\&quot;: {      \&quot;region\&quot; : \&quot;us-west-2\&quot;,      \&quot;az\&quot; : \&quot;testing\&quot;    },   \&quot;tags\&quot;: [      \&quot;alertTag1\&quot;    ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_cluster**
+> ResponseContainerMonitoredCluster delete_cluster(id)
+
+Delete a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a specific cluster
+    api_response = api_instance.delete_cluster(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->delete_cluster: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_cluster**
+> ResponseContainerPagedMonitoredCluster get_all_cluster(offset=offset, limit=limit)
+
+Get all monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all monitored clusters
+    api_response = api_instance.get_all_cluster(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->get_all_cluster: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedMonitoredCluster**](ResponseContainerPagedMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_cluster**
+> ResponseContainerMonitoredCluster get_cluster(id)
+
+Get a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific cluster
+    api_response = api_instance.get_cluster(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->get_cluster: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_cluster_tags**
+> ResponseContainerTagsResponse get_cluster_tags(id)
+
+Get all tags associated with a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get all tags associated with a specific cluster
+    api_response = api_instance.get_cluster_tags(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->get_cluster_tags: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerTagsResponse**](ResponseContainerTagsResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **merge_clusters**
+> ResponseContainer merge_clusters(id1, id2)
+
+Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id1 = 'id1_example' # str | 
+id2 = 'id2_example' # str | 
+
+try:
+    # Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
+    api_response = api_instance.merge_clusters(id1, id2)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->merge_clusters: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id1** | **str**|  | 
+ **id2** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_cluster_tag**
+> ResponseContainer remove_cluster_tag(id, tag_value)
+
+Remove a tag from a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+tag_value = 'tag_value_example' # str | 
+
+try:
+    # Remove a tag from a specific cluster
+    api_response = api_instance.remove_cluster_tag(id, tag_value)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->remove_cluster_tag: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **tag_value** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **set_cluster_tags**
+> ResponseContainer set_cluster_tags(id, body=body)
+
+Set all tags associated with a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
+
+try:
+    # Set all tags associated with a specific cluster
+    api_response = api_instance.set_cluster_tags(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->set_cluster_tags: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**|  | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_cluster**
+> ResponseContainerMonitoredCluster update_cluster(id, body=body)
+
+Update a specific cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.MonitoredCluster() # MonitoredCluster | Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre> (optional)
+
+try:
+    # Update a specific cluster
+    api_response = api_instance.update_cluster(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredClusterApi->update_cluster: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**MonitoredCluster**](MonitoredCluster.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;k8s-sample\&quot;,   \&quot;name\&quot;: \&quot;Sample cluster\&quot;,   \&quot;platform\&quot;: \&quot;EKS\&quot;,   \&quot;version\&quot;: \&quot;1.2\&quot;,   \&quot;additionalTags\&quot;: {      \&quot;region\&quot; : \&quot;us-west-2\&quot;,      \&quot;az\&quot; : \&quot;testing\&quot;    },   \&quot;tags\&quot;: [      \&quot;alertTag1\&quot;    ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/PagedAnomaly.md b/docs/PagedAnomaly.md
new file mode 100644
index 0000000..638370a
--- /dev/null
+++ b/docs/PagedAnomaly.md
@@ -0,0 +1,16 @@
+# PagedAnomaly
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[Anomaly]**](Anomaly.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedMonitoredCluster.md b/docs/PagedMonitoredCluster.md
new file mode 100644
index 0000000..4321c41
--- /dev/null
+++ b/docs/PagedMonitoredCluster.md
@@ -0,0 +1,16 @@
+# PagedMonitoredCluster
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[MonitoredCluster]**](MonitoredCluster.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedRelatedEvent.md b/docs/PagedRelatedEvent.md
new file mode 100644
index 0000000..b70f6c4
--- /dev/null
+++ b/docs/PagedRelatedEvent.md
@@ -0,0 +1,16 @@
+# PagedRelatedEvent
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[RelatedEvent]**](RelatedEvent.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 180687e..ba5484f 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -25,6 +25,7 @@ Name | Type | Description | Notes
 **status** | **str** | the proxy&#39;s status | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
 **time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
+**user_id** | **str** | The user associated with this proxy | [optional] 
 **version** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/RelatedData.md b/docs/RelatedData.md
new file mode 100644
index 0000000..9f10863
--- /dev/null
+++ b/docs/RelatedData.md
@@ -0,0 +1,15 @@
+# RelatedData
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**alert_description** | **str** | If this event is generated by an alert, the description of that alert. | [optional] 
+**common_dimensions** | **list[str]** | Set of common dimensions between the 2 events, presented in key&#x3D;value format | [optional] 
+**common_metrics** | **list[str]** | Set of common metrics/labels between the 2 events | [optional] 
+**common_sources** | **list[str]** | Set of common sources between the 2 events | [optional] 
+**related_id** | **str** | ID of the event to which this event is related | [optional] 
+**summary** | **str** | Text summary of why the two events are relateds | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RelatedEvent.md b/docs/RelatedEvent.md
new file mode 100644
index 0000000..4d3100f
--- /dev/null
+++ b/docs/RelatedEvent.md
@@ -0,0 +1,33 @@
+# RelatedEvent
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
+**can_close** | **bool** |  | [optional] 
+**can_delete** | **bool** |  | [optional] 
+**created_at** | **int** |  | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**creator_type** | **list[str]** |  | [optional] 
+**dimensions** | **dict(str, list[str])** | A string-&gt;&lt;list of strings&gt; map of additional dimension info on the event | [optional] 
+**end_time** | **int** | End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event | [optional] 
+**hosts** | **list[str]** | A list of sources/hosts affected by the event | [optional] 
+**id** | **str** |  | [optional] 
+**is_ephemeral** | **bool** | Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend | [optional] 
+**is_user_event** | **bool** | Whether this event was created by a user, versus the system.  Default: system | [optional] 
+**metrics_used** | **list[str]** | A list of metrics affected by the event | [optional] 
+**name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
+**related_data** | [**RelatedData**](RelatedData.md) | Data concerning how this event is related to the event in the request | [optional] 
+**running_state** | **str** |  | [optional] 
+**start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
+**summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
+**table** | **str** | The customer to which the event belongs | [optional] 
+**tags** | **list[str]** | A list of event tags | [optional] 
+**updated_at** | **int** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerMonitoredCluster.md b/docs/ResponseContainerMonitoredCluster.md
new file mode 100644
index 0000000..f997c58
--- /dev/null
+++ b/docs/ResponseContainerMonitoredCluster.md
@@ -0,0 +1,11 @@
+# ResponseContainerMonitoredCluster
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**MonitoredCluster**](MonitoredCluster.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedAnomaly.md b/docs/ResponseContainerPagedAnomaly.md
new file mode 100644
index 0000000..d3799ef
--- /dev/null
+++ b/docs/ResponseContainerPagedAnomaly.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedAnomaly
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedAnomaly**](PagedAnomaly.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedMonitoredCluster.md b/docs/ResponseContainerPagedMonitoredCluster.md
new file mode 100644
index 0000000..ebfcfa8
--- /dev/null
+++ b/docs/ResponseContainerPagedMonitoredCluster.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedMonitoredCluster
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedMonitoredCluster**](PagedMonitoredCluster.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedRelatedEvent.md b/docs/ResponseContainerPagedRelatedEvent.md
new file mode 100644
index 0000000..d72a5e0
--- /dev/null
+++ b/docs/ResponseContainerPagedRelatedEvent.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedRelatedEvent
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedRelatedEvent**](PagedRelatedEvent.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSetSourceLabelPair.md b/docs/ResponseContainerSetSourceLabelPair.md
new file mode 100644
index 0000000..6857d28
--- /dev/null
+++ b/docs/ResponseContainerSetSourceLabelPair.md
@@ -0,0 +1,11 @@
+# ResponseContainerSetSourceLabelPair
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[SourceLabelPair]**](SourceLabelPair.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerString.md b/docs/ResponseContainerString.md
new file mode 100644
index 0000000..582dc2a
--- /dev/null
+++ b/docs/ResponseContainerString.md
@@ -0,0 +1,11 @@
+# ResponseContainerString
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | **str** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerUserHardDelete.md b/docs/ResponseContainerUserHardDelete.md
new file mode 100644
index 0000000..a46a090
--- /dev/null
+++ b/docs/ResponseContainerUserHardDelete.md
@@ -0,0 +1,11 @@
+# ResponseContainerUserHardDelete
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**UserHardDelete**](UserHardDelete.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index fb65ef8..1eb8a17 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -34,6 +34,9 @@ Method | HTTP request | Description
 [**search_maintenance_window_entities**](SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 [**search_maintenance_window_for_facet**](SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 [**search_maintenance_window_for_facets**](SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
+[**search_monitored_cluster_entities**](SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
+[**search_monitored_cluster_for_facet**](SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
+[**search_monitored_cluster_for_facets**](SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 [**search_notficant_for_facets**](SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 [**search_notificant_entities**](SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 [**search_notificant_for_facet**](SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -49,6 +52,7 @@ Method | HTTP request | Description
 [**search_registered_query_entities**](SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetric | Search over a customer&#39;s non-deleted derived metric definitions
 [**search_registered_query_for_facet**](SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetric/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
 [**search_registered_query_for_facets**](SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetric/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
+[**search_related_report_event_entities**](SearchApi.md#search_related_report_event_entities) | **POST** /api/v2/search/event/related/{eventId} | List the related events over a firing event
 [**search_report_event_entities**](SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 [**search_report_event_for_facet**](SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 [**search_report_event_for_facets**](SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
@@ -1709,6 +1713,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_monitored_cluster_entities**
+> ResponseContainerPagedMonitoredCluster search_monitored_cluster_entities(body=body)
+
+Search over all the customer's non-deleted monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over all the customer's non-deleted monitored clusters
+    api_response = api_instance.search_monitored_cluster_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_cluster_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedMonitoredCluster**](ResponseContainerPagedMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_cluster_for_facet**
+> ResponseContainerFacetResponse search_monitored_cluster_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted monitored cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted monitored cluster
+    api_response = api_instance.search_monitored_cluster_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_cluster_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_cluster_for_facets**
+> ResponseContainerFacetsResponseContainer search_monitored_cluster_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted monitored clusters
+    api_response = api_instance.search_monitored_cluster_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_cluster_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_notficant_for_facets**
 > ResponseContainerFacetsResponseContainer search_notficant_for_facets(body=body)
 
@@ -2529,6 +2697,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_related_report_event_entities**
+> ResponseContainerPagedRelatedEvent search_related_report_event_entities(event_id, body=body)
+
+List the related events over a firing event
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+event_id = 'event_id_example' # str | 
+body = wavefront_api_client.EventSearchRequest() # EventSearchRequest |  (optional)
+
+try:
+    # List the related events over a firing event
+    api_response = api_instance.search_related_report_event_entities(event_id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_related_report_event_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **event_id** | **str**|  | 
+ **body** | [**EventSearchRequest**](EventSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedRelatedEvent**](ResponseContainerPagedRelatedEvent.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_report_event_entities**
 > ResponseContainerPagedEvent search_report_event_entities(body=body)
 
diff --git a/docs/SearchQuery.md b/docs/SearchQuery.md
index a6c7596..02c7943 100644
--- a/docs/SearchQuery.md
+++ b/docs/SearchQuery.md
@@ -6,7 +6,8 @@ Name | Type | Description | Notes
 **key** | **str** | The entity facet (key) by which to search.  Valid keys are any property keys returned by the JSON representation of the entity.  Examples are &#39;creatorId&#39;, &#39;name&#39;, etc.  The following special key keywords are also valid:  &#39;tags&#39; performs a search on entity tags, &#39;tagpath&#39; performs a hierarchical search on tags, with  periods (.) as path level separators.  &#39;freetext&#39; performs a free text search across many fields of the entity | 
 **matching_method** | **str** | The method by which search matching is performed.  Default: CONTAINS | [optional] 
 **negated** | **bool** | The flag to create a NOT operation. Default: false | [optional] 
-**value** | **str** | The entity facet value for which to search | 
+**value** | **str** | The entity facet value for which to search. Either value or values field is required. If both are set, values takes precedence. | [optional] 
+**values** | **list[str]** | The entity facet values for which to search based on OR operation. Either value or values field is required. If both are set, values takes precedence. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Stripe.md b/docs/Stripe.md
new file mode 100644
index 0000000..b6991c4
--- /dev/null
+++ b/docs/Stripe.md
@@ -0,0 +1,13 @@
+# Stripe
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**end_ms** | **int** | endMs for this stripe | 
+**image_link** | **str** | image link for this stripe | 
+**model** | **str** | model for this stripe | 
+**start_ms** | **int** | startMs for this stripe | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 1948e74..8dfeaf9 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -13,6 +13,7 @@ Method | HTTP request | Description
 [**get_user_business_functions**](UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user or service account.
 [**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
+[**hard_delete_user**](UserApi.md#hard_delete_user) | **DELETE** /admin/api/v2/user/{id}/{customerId} | 
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
 [**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
 [**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
@@ -510,6 +511,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **hard_delete_user**
+> ResponseContainerUserHardDelete hard_delete_user(id, customer_id)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+customer_id = 'customer_id_example' # str | 
+
+try:
+    api_response = api_instance.hard_delete_user(id, customer_id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserApi->hard_delete_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **customer_id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerUserHardDelete**](ResponseContainerUserHardDelete.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **invite_users**
 > UserModel invite_users(body=body)
 
diff --git a/docs/UserHardDelete.md b/docs/UserHardDelete.md
new file mode 100644
index 0000000..826a472
--- /dev/null
+++ b/docs/UserHardDelete.md
@@ -0,0 +1,12 @@
+# UserHardDelete
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer_id** | **str** |  | [optional] 
+**existing** | [**dict(str, Iterable)**](Iterable.md) |  | [optional] 
+**user_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/generate_client b/generate_client
index 2af8c58..0ce1e9e 100755
--- a/generate_client
+++ b/generate_client
@@ -56,7 +56,7 @@ else
   CGEN_JAR_BINARY="${TEMP_DIR_NAME}/${CGEN_JAR_NAME}"
 
   echo "Step 1: Fetching the latest swagger-codegen..."
-  curl -s "${CGEN_JAR_URL}" -o "${CGEN_JAR_BINARY}"
+  curl -Ls "${CGEN_JAR_URL}" -o "${CGEN_JAR_BINARY}"
 
   echo "Step 2: Fetching the config from '${SWGR_URL}'..."
   curl -s "${SWGR_URL}" | $PYTHON -m json.tool --sort-keys > "${SWAGGER_FILE}"
diff --git a/setup.py b/setup.py
index 2a4538e..9d0fe44 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.38.24"
+VERSION = "2.40.22"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_anomaly.py b/test/test_anomaly.py
new file mode 100644
index 0000000..305a957
--- /dev/null
+++ b/test/test_anomaly.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.anomaly import Anomaly  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAnomaly(unittest.TestCase):
+    """Anomaly unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAnomaly(self):
+        """Test Anomaly"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.anomaly.Anomaly()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_iterable.py b/test/test_iterable.py
new file mode 100644
index 0000000..2885f63
--- /dev/null
+++ b/test/test_iterable.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.iterable import Iterable  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIterable(unittest.TestCase):
+    """Iterable unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIterable(self):
+        """Test Iterable"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.iterable.Iterable()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_kubernetes_component.py b/test/test_kubernetes_component.py
new file mode 100644
index 0000000..d12bc85
--- /dev/null
+++ b/test/test_kubernetes_component.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.kubernetes_component import KubernetesComponent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestKubernetesComponent(unittest.TestCase):
+    """KubernetesComponent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testKubernetesComponent(self):
+        """Test KubernetesComponent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.kubernetes_component.KubernetesComponent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_monitored_cluster.py b/test/test_monitored_cluster.py
new file mode 100644
index 0000000..b444177
--- /dev/null
+++ b/test/test_monitored_cluster.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.monitored_cluster import MonitoredCluster  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMonitoredCluster(unittest.TestCase):
+    """MonitoredCluster unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMonitoredCluster(self):
+        """Test MonitoredCluster"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.monitored_cluster.MonitoredCluster()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_monitored_cluster_api.py b/test/test_monitored_cluster_api.py
new file mode 100644
index 0000000..b216142
--- /dev/null
+++ b/test/test_monitored_cluster_api.py
@@ -0,0 +1,104 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMonitoredClusterApi(unittest.TestCase):
+    """MonitoredClusterApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.monitored_cluster_api.MonitoredClusterApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_cluster_tag(self):
+        """Test case for add_cluster_tag
+
+        Add a tag to a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_create_cluster(self):
+        """Test case for create_cluster
+
+        Create a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_delete_cluster(self):
+        """Test case for delete_cluster
+
+        Delete a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_get_all_cluster(self):
+        """Test case for get_all_cluster
+
+        Get all monitored clusters  # noqa: E501
+        """
+        pass
+
+    def test_get_cluster(self):
+        """Test case for get_cluster
+
+        Get a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_get_cluster_tags(self):
+        """Test case for get_cluster_tags
+
+        Get all tags associated with a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_merge_clusters(self):
+        """Test case for merge_clusters
+
+        Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.  # noqa: E501
+        """
+        pass
+
+    def test_remove_cluster_tag(self):
+        """Test case for remove_cluster_tag
+
+        Remove a tag from a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_set_cluster_tags(self):
+        """Test case for set_cluster_tags
+
+        Set all tags associated with a specific cluster  # noqa: E501
+        """
+        pass
+
+    def test_update_cluster(self):
+        """Test case for update_cluster
+
+        Update a specific cluster  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_anomaly.py b/test/test_paged_anomaly.py
new file mode 100644
index 0000000..96fab40
--- /dev/null
+++ b/test/test_paged_anomaly.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_anomaly import PagedAnomaly  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedAnomaly(unittest.TestCase):
+    """PagedAnomaly unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedAnomaly(self):
+        """Test PagedAnomaly"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_anomaly.PagedAnomaly()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_monitored_cluster.py b/test/test_paged_monitored_cluster.py
new file mode 100644
index 0000000..22b717e
--- /dev/null
+++ b/test/test_paged_monitored_cluster.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_monitored_cluster import PagedMonitoredCluster  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedMonitoredCluster(unittest.TestCase):
+    """PagedMonitoredCluster unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedMonitoredCluster(self):
+        """Test PagedMonitoredCluster"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_monitored_cluster.PagedMonitoredCluster()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_related_event.py b/test/test_paged_related_event.py
new file mode 100644
index 0000000..32373f5
--- /dev/null
+++ b/test/test_paged_related_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_related_event import PagedRelatedEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedRelatedEvent(unittest.TestCase):
+    """PagedRelatedEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedRelatedEvent(self):
+        """Test PagedRelatedEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_related_event.PagedRelatedEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_related_data.py b/test/test_related_data.py
new file mode 100644
index 0000000..fd1dc9c
--- /dev/null
+++ b/test/test_related_data.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.related_data import RelatedData  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRelatedData(unittest.TestCase):
+    """RelatedData unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRelatedData(self):
+        """Test RelatedData"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.related_data.RelatedData()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_related_event.py b/test/test_related_event.py
new file mode 100644
index 0000000..02903d9
--- /dev/null
+++ b/test/test_related_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.related_event import RelatedEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRelatedEvent(unittest.TestCase):
+    """RelatedEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRelatedEvent(self):
+        """Test RelatedEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.related_event.RelatedEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_monitored_cluster.py b/test/test_response_container_monitored_cluster.py
new file mode 100644
index 0000000..6d47181
--- /dev/null
+++ b/test/test_response_container_monitored_cluster.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMonitoredCluster(unittest.TestCase):
+    """ResponseContainerMonitoredCluster unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMonitoredCluster(self):
+        """Test ResponseContainerMonitoredCluster"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_monitored_cluster.ResponseContainerMonitoredCluster()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_anomaly.py b/test/test_response_container_paged_anomaly.py
new file mode 100644
index 0000000..8dfa9ac
--- /dev/null
+++ b/test/test_response_container_paged_anomaly.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedAnomaly(unittest.TestCase):
+    """ResponseContainerPagedAnomaly unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedAnomaly(self):
+        """Test ResponseContainerPagedAnomaly"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_anomaly.ResponseContainerPagedAnomaly()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_monitored_cluster.py b/test/test_response_container_paged_monitored_cluster.py
new file mode 100644
index 0000000..f47645b
--- /dev/null
+++ b/test/test_response_container_paged_monitored_cluster.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_monitored_cluster import ResponseContainerPagedMonitoredCluster  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedMonitoredCluster(unittest.TestCase):
+    """ResponseContainerPagedMonitoredCluster unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedMonitoredCluster(self):
+        """Test ResponseContainerPagedMonitoredCluster"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_monitored_cluster.ResponseContainerPagedMonitoredCluster()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_related_event.py b/test/test_response_container_paged_related_event.py
new file mode 100644
index 0000000..508484e
--- /dev/null
+++ b/test/test_response_container_paged_related_event.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedRelatedEvent(unittest.TestCase):
+    """ResponseContainerPagedRelatedEvent unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedRelatedEvent(self):
+        """Test ResponseContainerPagedRelatedEvent"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_related_event.ResponseContainerPagedRelatedEvent()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_set_source_label_pair.py b/test/test_response_container_set_source_label_pair.py
new file mode 100644
index 0000000..3ac9092
--- /dev/null
+++ b/test/test_response_container_set_source_label_pair.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSetSourceLabelPair(unittest.TestCase):
+    """ResponseContainerSetSourceLabelPair unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSetSourceLabelPair(self):
+        """Test ResponseContainerSetSourceLabelPair"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_set_source_label_pair.ResponseContainerSetSourceLabelPair()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_string.py b/test/test_response_container_string.py
new file mode 100644
index 0000000..ae0e25a
--- /dev/null
+++ b/test/test_response_container_string.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_string import ResponseContainerString  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerString(unittest.TestCase):
+    """ResponseContainerString unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerString(self):
+        """Test ResponseContainerString"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_string.ResponseContainerString()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_user_hard_delete.py b/test/test_response_container_user_hard_delete.py
new file mode 100644
index 0000000..3ed8f1d
--- /dev/null
+++ b/test/test_response_container_user_hard_delete.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_user_hard_delete import ResponseContainerUserHardDelete  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerUserHardDelete(unittest.TestCase):
+    """ResponseContainerUserHardDelete unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerUserHardDelete(self):
+        """Test ResponseContainerUserHardDelete"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_user_hard_delete.ResponseContainerUserHardDelete()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_stripe.py b/test/test_stripe.py
new file mode 100644
index 0000000..ccf3e9b
--- /dev/null
+++ b/test/test_stripe.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.stripe import Stripe  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestStripe(unittest.TestCase):
+    """Stripe unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testStripe(self):
+        """Test Stripe"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.stripe.Stripe()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_user_hard_delete.py b/test/test_user_hard_delete.py
new file mode 100644
index 0000000..af1c2de
--- /dev/null
+++ b/test/test_user_hard_delete.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.user_hard_delete import UserHardDelete  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestUserHardDelete(unittest.TestCase):
+    """UserHardDelete unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testUserHardDelete(self):
+        """Test UserHardDelete"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.user_hard_delete.UserHardDelete()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 145e090..ab9e222 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -29,6 +29,7 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
+from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
@@ -54,6 +55,7 @@
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
+from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
@@ -98,16 +100,19 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
+from wavefront_api_client.models.iterable import Iterable
 from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
 from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
 from wavefront_api_client.models.iterator_string import IteratorString
 from wavefront_api_client.models.json_node import JsonNode
+from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.logical_type import LogicalType
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.monitored_cluster import MonitoredCluster
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
@@ -115,6 +120,7 @@
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
+from wavefront_api_client.models.paged_anomaly import PagedAnomaly
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
 from wavefront_api_client.models.paged_customer_facing_user_object import PagedCustomerFacingUserObject
 from wavefront_api_client.models.paged_dashboard import PagedDashboard
@@ -126,8 +132,10 @@
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
+from wavefront_api_client.models.paged_monitored_cluster import PagedMonitoredCluster
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
+from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
@@ -137,6 +145,8 @@
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
+from wavefront_api_client.models.related_data import RelatedData
+from wavefront_api_client.models.related_event import RelatedEvent
 from wavefront_api_client.models.response_container import ResponseContainer
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
@@ -162,10 +172,12 @@
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
+from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
+from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly
 from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration
 from wavefront_api_client.models.response_container_paged_customer_facing_user_object import ResponseContainerPagedCustomerFacingUserObject
 from wavefront_api_client.models.response_container_paged_dashboard import ResponseContainerPagedDashboard
@@ -177,8 +189,10 @@
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
+from wavefront_api_client.models.response_container_paged_monitored_cluster import ResponseContainerPagedMonitoredCluster
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
+from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
@@ -187,10 +201,13 @@
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
+from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
+from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
+from wavefront_api_client.models.response_container_user_hard_delete import ResponseContainerUserHardDelete
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -204,6 +221,7 @@
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
 from wavefront_api_client.models.span import Span
 from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
+from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
@@ -216,6 +234,7 @@
 from wavefront_api_client.models.user_group_model import UserGroupModel
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
+from wavefront_api_client.models.user_hard_delete import UserHardDelete
 from wavefront_api_client.models.user_model import UserModel
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_settings import UserSettings
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index ea1f7ef..91dfae3 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -16,6 +16,7 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
+from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index bd46ca1..e74c2e2 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -425,6 +425,303 @@ def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_alert_event_queries_slug(self, id, **kwargs):  # noqa: E501
+        """If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_event_queries_slug(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_alert_event_queries_slug_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_alert_event_queries_slug_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_alert_event_queries_slug_with_http_info(self, id, **kwargs):  # noqa: E501
+        """If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_event_queries_slug_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_alert_event_queries_slug" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_alert_event_queries_slug`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/event/{id}/alertQueriesSlug', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_alert_firing_details(self, id, **kwargs):  # noqa: E501
+        """Return details of a particular alert firing, including all the series that fired during the referred alert firing  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_firing_details(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: id of an event of type alert or alert-detail, used to lookup the particular alert firing (required)
+        :return: ResponseContainerSetSourceLabelPair
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_alert_firing_details_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_alert_firing_details_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_alert_firing_details_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Return details of a particular alert firing, including all the series that fired during the referred alert firing  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_firing_details_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: id of an event of type alert or alert-detail, used to lookup the particular alert firing (required)
+        :return: ResponseContainerSetSourceLabelPair
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_alert_firing_details" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_alert_firing_details`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/event/{id}/alertFiringDetails', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSetSourceLabelPair',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_alert_firing_events(self, alert_id, **kwargs):  # noqa: E501
+        """Get firings events of an alert within a time range  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_firing_events(alert_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str alert_id: (required)
+        :param int earliest_start_time_epoch_millis:
+        :param int latest_start_time_epoch_millis:
+        :param int limit:
+        :return: ResponseContainerPagedEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_alert_firing_events_with_http_info(alert_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_alert_firing_events_with_http_info(alert_id, **kwargs)  # noqa: E501
+            return data
+
+    def get_alert_firing_events_with_http_info(self, alert_id, **kwargs):  # noqa: E501
+        """Get firings events of an alert within a time range  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_firing_events_with_http_info(alert_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str alert_id: (required)
+        :param int earliest_start_time_epoch_millis:
+        :param int latest_start_time_epoch_millis:
+        :param int limit:
+        :return: ResponseContainerPagedEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['alert_id', 'earliest_start_time_epoch_millis', 'latest_start_time_epoch_millis', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_alert_firing_events" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'alert_id' is set
+        if ('alert_id' not in params or
+                params['alert_id'] is None):
+            raise ValueError("Missing the required parameter `alert_id` when calling `get_alert_firing_events`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'alert_id' in params:
+            query_params.append(('alertId', params['alert_id']))  # noqa: E501
+        if 'earliest_start_time_epoch_millis' in params:
+            query_params.append(('earliestStartTimeEpochMillis', params['earliest_start_time_epoch_millis']))  # noqa: E501
+        if 'latest_start_time_epoch_millis' in params:
+            query_params.append(('latestStartTimeEpochMillis', params['latest_start_time_epoch_millis']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/event/alertFirings', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedEvent',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_events_with_time_range(self, **kwargs):  # noqa: E501
         """List all the events for a customer within a time range  # noqa: E501
 
diff --git a/wavefront_api_client/api/monitored_cluster_api.py b/wavefront_api_client/api/monitored_cluster_api.py
new file mode 100644
index 0000000..ee84d3b
--- /dev/null
+++ b/wavefront_api_client/api/monitored_cluster_api.py
@@ -0,0 +1,1028 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class MonitoredClusterApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def add_cluster_tag(self, id, tag_value, **kwargs):  # noqa: E501
+        """Add a tag to a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_cluster_tag(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+            return data
+
+    def add_cluster_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
+        """Add a tag to a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_cluster_tag_with_http_info(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'tag_value']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_cluster_tag" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_cluster_tag`")  # noqa: E501
+        # verify the required parameter 'tag_value' is set
+        if ('tag_value' not in params or
+                params['tag_value'] is None):
+            raise ValueError("Missing the required parameter `tag_value` when calling `add_cluster_tag`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'tag_value' in params:
+            path_params['tagValue'] = params['tag_value']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}/tag/{tagValue}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_cluster(self, **kwargs):  # noqa: E501
+        """Create a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_cluster(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_cluster_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_cluster_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_cluster_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_cluster_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_cluster" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_cluster(self, id, **kwargs):  # noqa: E501
+        """Delete a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_cluster(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_cluster_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_cluster_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_cluster_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_cluster_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_cluster" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_cluster`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_cluster(self, **kwargs):  # noqa: E501
+        """Get all monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_cluster(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_cluster_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_cluster_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_cluster_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_cluster_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_cluster" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_cluster(self, id, **kwargs):  # noqa: E501
+        """Get a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cluster(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_cluster_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_cluster_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_cluster_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cluster_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_cluster" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_cluster`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_cluster_tags(self, id, **kwargs):  # noqa: E501
+        """Get all tags associated with a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cluster_tags(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerTagsResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_cluster_tags_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get all tags associated with a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cluster_tags_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerTagsResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_cluster_tags" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_cluster_tags`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}/tag', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerTagsResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def merge_clusters(self, id1, id2, **kwargs):  # noqa: E501
+        """Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.merge_clusters(id1, id2, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id1: (required)
+        :param str id2: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.merge_clusters_with_http_info(id1, id2, **kwargs)  # noqa: E501
+        else:
+            (data) = self.merge_clusters_with_http_info(id1, id2, **kwargs)  # noqa: E501
+            return data
+
+    def merge_clusters_with_http_info(self, id1, id2, **kwargs):  # noqa: E501
+        """Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.merge_clusters_with_http_info(id1, id2, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id1: (required)
+        :param str id2: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id1', 'id2']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method merge_clusters" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id1' is set
+        if ('id1' not in params or
+                params['id1'] is None):
+            raise ValueError("Missing the required parameter `id1` when calling `merge_clusters`")  # noqa: E501
+        # verify the required parameter 'id2' is set
+        if ('id2' not in params or
+                params['id2'] is None):
+            raise ValueError("Missing the required parameter `id2` when calling `merge_clusters`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id1' in params:
+            path_params['id1'] = params['id1']  # noqa: E501
+        if 'id2' in params:
+            path_params['id2'] = params['id2']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/merge/{id1}/{id2}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_cluster_tag(self, id, tag_value, **kwargs):  # noqa: E501
+        """Remove a tag from a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_cluster_tag(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
+            return data
+
+    def remove_cluster_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
+        """Remove a tag from a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_cluster_tag_with_http_info(id, tag_value, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str tag_value: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'tag_value']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_cluster_tag" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_cluster_tag`")  # noqa: E501
+        # verify the required parameter 'tag_value' is set
+        if ('tag_value' not in params or
+                params['tag_value'] is None):
+            raise ValueError("Missing the required parameter `tag_value` when calling `remove_cluster_tag`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'tag_value' in params:
+            path_params['tagValue'] = params['tag_value']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}/tag/{tagValue}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def set_cluster_tags(self, id, **kwargs):  # noqa: E501
+        """Set all tags associated with a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_cluster_tags(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body:
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.set_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.set_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def set_cluster_tags_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Set all tags associated with a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.set_cluster_tags_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body:
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method set_cluster_tags" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `set_cluster_tags`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}/tag', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_cluster(self, id, **kwargs):  # noqa: E501
+        """Update a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_cluster(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_cluster_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_cluster_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_cluster_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_cluster_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
+        :return: ResponseContainerMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_cluster" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_cluster`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredcluster/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 81c5409..2cb3791 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2963,6 +2963,299 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_monitored_cluster_entities(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_cluster_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_cluster_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredcluster', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_cluster_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_cluster_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_cluster_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_monitored_cluster_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredcluster/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_cluster_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_cluster_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_cluster_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredcluster/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_notficant_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
@@ -4428,6 +4721,109 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_related_report_event_entities(self, event_id, **kwargs):  # noqa: E501
+        """List the related events over a firing event  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_related_report_event_entities(event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str event_id: (required)
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedRelatedEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_related_report_event_entities_with_http_info(event_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_related_report_event_entities_with_http_info(event_id, **kwargs)  # noqa: E501
+            return data
+
+    def search_related_report_event_entities_with_http_info(self, event_id, **kwargs):  # noqa: E501
+        """List the related events over a firing event  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_related_report_event_entities_with_http_info(event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str event_id: (required)
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedRelatedEvent
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['event_id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_related_report_event_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'event_id' is set
+        if ('event_id' not in params or
+                params['event_id'] is None):
+            raise ValueError("Missing the required parameter `event_id` when calling `search_related_report_event_entities`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'event_id' in params:
+            path_params['eventId'] = params['event_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/event/related/{eventId}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedRelatedEvent',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_report_event_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's events  # noqa: E501
 
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index a7877d8..7a89242 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -908,6 +908,107 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def hard_delete_user(self, id, customer_id, **kwargs):  # noqa: E501
+        """hard_delete_user  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.hard_delete_user(id, customer_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str customer_id: (required)
+        :return: ResponseContainerUserHardDelete
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.hard_delete_user_with_http_info(id, customer_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.hard_delete_user_with_http_info(id, customer_id, **kwargs)  # noqa: E501
+            return data
+
+    def hard_delete_user_with_http_info(self, id, customer_id, **kwargs):  # noqa: E501
+        """hard_delete_user  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.hard_delete_user_with_http_info(id, customer_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str customer_id: (required)
+        :return: ResponseContainerUserHardDelete
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'customer_id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method hard_delete_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `hard_delete_user`")  # noqa: E501
+        # verify the required parameter 'customer_id' is set
+        if ('customer_id' not in params or
+                params['customer_id'] is None):
+            raise ValueError("Missing the required parameter `customer_id` when calling `hard_delete_user`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'customer_id' in params:
+            path_params['customerId'] = params['customer_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/admin/api/v2/user/{id}/{customerId}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserHardDelete',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def invite_users(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4b143e8..647adbd 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.38.24/python'
+        self.user_agent = 'Swagger-Codegen/2.40.22/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e2419a3..cf6f6b3 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -49,6 +49,8 @@ def __init__(self):
         self.api_key = {}
         # dict to store API prefix (e.g. Bearer)
         self.api_key_prefix = {}
+        # function to refresh API key if expired
+        self.refresh_api_key_hook = None
         # Username for HTTP basic authentication
         self.username = ""
         # Password for HTTP basic authentication
@@ -200,11 +202,17 @@ def get_api_key_with_prefix(self, identifier):
         :param identifier: The identifier of apiKey.
         :return: The token for api key authentication.
         """
-        if (self.api_key.get(identifier) and
-                self.api_key_prefix.get(identifier)):
-            return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier]  # noqa: E501
-        elif self.api_key.get(identifier):
-            return self.api_key[identifier]
+
+        if self.refresh_api_key_hook:
+            self.refresh_api_key_hook(self)
+        
+        key = self.api_key.get(identifier)
+        if key:
+            prefix = self.api_key_prefix.get(identifier)
+            if prefix:
+                return "%s %s" % (prefix, key)
+            else:
+                return key
 
     def get_basic_auth_token(self):
         """Gets HTTP basic authentication header (string).
@@ -240,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.38.24".\
+               "SDK Package Version: 2.40.22".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 3c59286..6cc4b33 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -24,6 +24,7 @@
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
+from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
@@ -68,16 +69,19 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
+from wavefront_api_client.models.iterable import Iterable
 from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
 from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
 from wavefront_api_client.models.iterator_string import IteratorString
 from wavefront_api_client.models.json_node import JsonNode
+from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.logical_type import LogicalType
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.monitored_cluster import MonitoredCluster
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
@@ -85,6 +89,7 @@
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
+from wavefront_api_client.models.paged_anomaly import PagedAnomaly
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
 from wavefront_api_client.models.paged_customer_facing_user_object import PagedCustomerFacingUserObject
 from wavefront_api_client.models.paged_dashboard import PagedDashboard
@@ -96,8 +101,10 @@
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
+from wavefront_api_client.models.paged_monitored_cluster import PagedMonitoredCluster
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
+from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
@@ -107,6 +114,8 @@
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
+from wavefront_api_client.models.related_data import RelatedData
+from wavefront_api_client.models.related_event import RelatedEvent
 from wavefront_api_client.models.response_container import ResponseContainer
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
@@ -132,10 +141,12 @@
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
+from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
+from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly
 from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration
 from wavefront_api_client.models.response_container_paged_customer_facing_user_object import ResponseContainerPagedCustomerFacingUserObject
 from wavefront_api_client.models.response_container_paged_dashboard import ResponseContainerPagedDashboard
@@ -147,8 +158,10 @@
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
+from wavefront_api_client.models.response_container_paged_monitored_cluster import ResponseContainerPagedMonitoredCluster
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
+from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
@@ -157,10 +170,13 @@
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
+from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
+from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
+from wavefront_api_client.models.response_container_user_hard_delete import ResponseContainerUserHardDelete
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -174,6 +190,7 @@
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
 from wavefront_api_client.models.span import Span
 from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
+from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
@@ -186,6 +203,7 @@
 from wavefront_api_client.models.user_group_model import UserGroupModel
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
+from wavefront_api_client.models.user_hard_delete import UserHardDelete
 from wavefront_api_client.models.user_model import UserModel
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_settings import UserSettings
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index bf4859b..ee339be 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -89,6 +89,7 @@ class Alert(object):
         'system_owned': 'bool',
         'tags': 'WFTags',
         'target': 'str',
+        'target_endpoints': 'list[str]',
         'target_info': 'list[TargetInfo]',
         'targets': 'dict(str, str)',
         'update_user_id': 'str',
@@ -156,6 +157,7 @@ class Alert(object):
         'system_owned': 'systemOwned',
         'tags': 'tags',
         'target': 'target',
+        'target_endpoints': 'targetEndpoints',
         'target_info': 'targetInfo',
         'targets': 'targets',
         'update_user_id': 'updateUserId',
@@ -164,7 +166,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -225,6 +227,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._system_owned = None
         self._tags = None
         self._target = None
+        self._target_endpoints = None
         self._target_info = None
         self._targets = None
         self._update_user_id = None
@@ -346,6 +349,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.tags = tags
         if target is not None:
             self.target = target
+        if target_endpoints is not None:
+            self.target_endpoints = target_endpoints
         if target_info is not None:
             self.target_info = target_info
         if targets is not None:
@@ -1688,6 +1693,27 @@ def target(self, target):
 
         self._target = target
 
+    @property
+    def target_endpoints(self):
+        """Gets the target_endpoints of this Alert.  # noqa: E501
+
+
+        :return: The target_endpoints of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._target_endpoints
+
+    @target_endpoints.setter
+    def target_endpoints(self, target_endpoints):
+        """Sets the target_endpoints of this Alert.
+
+
+        :param target_endpoints: The target_endpoints of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._target_endpoints = target_endpoints
+
     @property
     def target_info(self):
         """Gets the target_info of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/anomaly.py b/wavefront_api_client/models/anomaly.py
new file mode 100644
index 0000000..a5b8d38
--- /dev/null
+++ b/wavefront_api_client/models/anomaly.py
@@ -0,0 +1,762 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Anomaly(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'chart_hash': 'str',
+        'chart_link': 'str',
+        'col': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'customer': 'str',
+        'dashboard_id': 'str',
+        'deleted': 'bool',
+        'end_ms': 'int',
+        'hosts_used': 'list[str]',
+        'id': 'str',
+        'image_link': 'str',
+        'metrics_used': 'list[str]',
+        'model': 'str',
+        'original_stripes': 'list[Stripe]',
+        'param_hash': 'str',
+        'query_hash': 'str',
+        '_query_params': 'dict(str, str)',
+        'row': 'int',
+        'section': 'int',
+        'start_ms': 'int',
+        'updated_epoch_millis': 'int',
+        'updated_ms': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'chart_hash': 'chartHash',
+        'chart_link': 'chartLink',
+        'col': 'col',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'customer': 'customer',
+        'dashboard_id': 'dashboardId',
+        'deleted': 'deleted',
+        'end_ms': 'endMs',
+        'hosts_used': 'hostsUsed',
+        'id': 'id',
+        'image_link': 'imageLink',
+        'metrics_used': 'metricsUsed',
+        'model': 'model',
+        'original_stripes': 'originalStripes',
+        'param_hash': 'paramHash',
+        'query_hash': 'queryHash',
+        '_query_params': 'queryParams',
+        'row': 'row',
+        'section': 'section',
+        'start_ms': 'startMs',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updated_ms': 'updatedMs',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, chart_hash=None, chart_link=None, col=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_id=None, deleted=None, end_ms=None, hosts_used=None, id=None, image_link=None, metrics_used=None, model=None, original_stripes=None, param_hash=None, query_hash=None, _query_params=None, row=None, section=None, start_ms=None, updated_epoch_millis=None, updated_ms=None, updater_id=None):  # noqa: E501
+        """Anomaly - a model defined in Swagger"""  # noqa: E501
+
+        self._chart_hash = None
+        self._chart_link = None
+        self._col = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._customer = None
+        self._dashboard_id = None
+        self._deleted = None
+        self._end_ms = None
+        self._hosts_used = None
+        self._id = None
+        self._image_link = None
+        self._metrics_used = None
+        self._model = None
+        self._original_stripes = None
+        self._param_hash = None
+        self._query_hash = None
+        self.__query_params = None
+        self._row = None
+        self._section = None
+        self._start_ms = None
+        self._updated_epoch_millis = None
+        self._updated_ms = None
+        self._updater_id = None
+        self.discriminator = None
+
+        self.chart_hash = chart_hash
+        if chart_link is not None:
+            self.chart_link = chart_link
+        self.col = col
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if customer is not None:
+            self.customer = customer
+        self.dashboard_id = dashboard_id
+        if deleted is not None:
+            self.deleted = deleted
+        self.end_ms = end_ms
+        if hosts_used is not None:
+            self.hosts_used = hosts_used
+        if id is not None:
+            self.id = id
+        if image_link is not None:
+            self.image_link = image_link
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        if model is not None:
+            self.model = model
+        if original_stripes is not None:
+            self.original_stripes = original_stripes
+        self.param_hash = param_hash
+        self.query_hash = query_hash
+        self._query_params = _query_params
+        self.row = row
+        self.section = section
+        self.start_ms = start_ms
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        self.updated_ms = updated_ms
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def chart_hash(self):
+        """Gets the chart_hash of this Anomaly.  # noqa: E501
+
+        chart hash(as unique identifier) for this anomaly  # noqa: E501
+
+        :return: The chart_hash of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._chart_hash
+
+    @chart_hash.setter
+    def chart_hash(self, chart_hash):
+        """Sets the chart_hash of this Anomaly.
+
+        chart hash(as unique identifier) for this anomaly  # noqa: E501
+
+        :param chart_hash: The chart_hash of this Anomaly.  # noqa: E501
+        :type: str
+        """
+        if chart_hash is None:
+            raise ValueError("Invalid value for `chart_hash`, must not be `None`")  # noqa: E501
+
+        self._chart_hash = chart_hash
+
+    @property
+    def chart_link(self):
+        """Gets the chart_link of this Anomaly.  # noqa: E501
+
+        chart link for this anomaly  # noqa: E501
+
+        :return: The chart_link of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._chart_link
+
+    @chart_link.setter
+    def chart_link(self, chart_link):
+        """Sets the chart_link of this Anomaly.
+
+        chart link for this anomaly  # noqa: E501
+
+        :param chart_link: The chart_link of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._chart_link = chart_link
+
+    @property
+    def col(self):
+        """Gets the col of this Anomaly.  # noqa: E501
+
+        column number for this anomaly  # noqa: E501
+
+        :return: The col of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._col
+
+    @col.setter
+    def col(self, col):
+        """Sets the col of this Anomaly.
+
+        column number for this anomaly  # noqa: E501
+
+        :param col: The col of this Anomaly.  # noqa: E501
+        :type: int
+        """
+        if col is None:
+            raise ValueError("Invalid value for `col`, must not be `None`")  # noqa: E501
+
+        self._col = col
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this Anomaly.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this Anomaly.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this Anomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this Anomaly.  # noqa: E501
+
+
+        :return: The creator_id of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this Anomaly.
+
+
+        :param creator_id: The creator_id of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this Anomaly.  # noqa: E501
+
+        id of the customer to which this anomaly belongs  # noqa: E501
+
+        :return: The customer of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this Anomaly.
+
+        id of the customer to which this anomaly belongs  # noqa: E501
+
+        :param customer: The customer of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def dashboard_id(self):
+        """Gets the dashboard_id of this Anomaly.  # noqa: E501
+
+        dashboard id for this anomaly  # noqa: E501
+
+        :return: The dashboard_id of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._dashboard_id
+
+    @dashboard_id.setter
+    def dashboard_id(self, dashboard_id):
+        """Sets the dashboard_id of this Anomaly.
+
+        dashboard id for this anomaly  # noqa: E501
+
+        :param dashboard_id: The dashboard_id of this Anomaly.  # noqa: E501
+        :type: str
+        """
+        if dashboard_id is None:
+            raise ValueError("Invalid value for `dashboard_id`, must not be `None`")  # noqa: E501
+
+        self._dashboard_id = dashboard_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this Anomaly.  # noqa: E501
+
+
+        :return: The deleted of this Anomaly.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this Anomaly.
+
+
+        :param deleted: The deleted of this Anomaly.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def end_ms(self):
+        """Gets the end_ms of this Anomaly.  # noqa: E501
+
+        endMs for this anomaly  # noqa: E501
+
+        :return: The end_ms of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_ms
+
+    @end_ms.setter
+    def end_ms(self, end_ms):
+        """Sets the end_ms of this Anomaly.
+
+        endMs for this anomaly  # noqa: E501
+
+        :param end_ms: The end_ms of this Anomaly.  # noqa: E501
+        :type: int
+        """
+        if end_ms is None:
+            raise ValueError("Invalid value for `end_ms`, must not be `None`")  # noqa: E501
+
+        self._end_ms = end_ms
+
+    @property
+    def hosts_used(self):
+        """Gets the hosts_used of this Anomaly.  # noqa: E501
+
+        list of hosts affected of this anomaly  # noqa: E501
+
+        :return: The hosts_used of this Anomaly.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._hosts_used
+
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this Anomaly.
+
+        list of hosts affected of this anomaly  # noqa: E501
+
+        :param hosts_used: The hosts_used of this Anomaly.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._hosts_used = hosts_used
+
+    @property
+    def id(self):
+        """Gets the id of this Anomaly.  # noqa: E501
+
+        unique id that defines this anomaly  # noqa: E501
+
+        :return: The id of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this Anomaly.
+
+        unique id that defines this anomaly  # noqa: E501
+
+        :param id: The id of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def image_link(self):
+        """Gets the image_link of this Anomaly.  # noqa: E501
+
+        image link for this anomaly  # noqa: E501
+
+        :return: The image_link of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._image_link
+
+    @image_link.setter
+    def image_link(self, image_link):
+        """Sets the image_link of this Anomaly.
+
+        image link for this anomaly  # noqa: E501
+
+        :param image_link: The image_link of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._image_link = image_link
+
+    @property
+    def metrics_used(self):
+        """Gets the metrics_used of this Anomaly.  # noqa: E501
+
+        list of metrics used of this anomaly  # noqa: E501
+
+        :return: The metrics_used of this Anomaly.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._metrics_used
+
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this Anomaly.
+
+        list of metrics used of this anomaly  # noqa: E501
+
+        :param metrics_used: The metrics_used of this Anomaly.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._metrics_used = metrics_used
+
+    @property
+    def model(self):
+        """Gets the model of this Anomaly.  # noqa: E501
+
+        model for this anomaly  # noqa: E501
+
+        :return: The model of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._model
+
+    @model.setter
+    def model(self, model):
+        """Sets the model of this Anomaly.
+
+        model for this anomaly  # noqa: E501
+
+        :param model: The model of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._model = model
+
+    @property
+    def original_stripes(self):
+        """Gets the original_stripes of this Anomaly.  # noqa: E501
+
+        list of originalStripe belongs to this anomaly  # noqa: E501
+
+        :return: The original_stripes of this Anomaly.  # noqa: E501
+        :rtype: list[Stripe]
+        """
+        return self._original_stripes
+
+    @original_stripes.setter
+    def original_stripes(self, original_stripes):
+        """Sets the original_stripes of this Anomaly.
+
+        list of originalStripe belongs to this anomaly  # noqa: E501
+
+        :param original_stripes: The original_stripes of this Anomaly.  # noqa: E501
+        :type: list[Stripe]
+        """
+
+        self._original_stripes = original_stripes
+
+    @property
+    def param_hash(self):
+        """Gets the param_hash of this Anomaly.  # noqa: E501
+
+        param hash for this anomaly  # noqa: E501
+
+        :return: The param_hash of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._param_hash
+
+    @param_hash.setter
+    def param_hash(self, param_hash):
+        """Sets the param_hash of this Anomaly.
+
+        param hash for this anomaly  # noqa: E501
+
+        :param param_hash: The param_hash of this Anomaly.  # noqa: E501
+        :type: str
+        """
+        if param_hash is None:
+            raise ValueError("Invalid value for `param_hash`, must not be `None`")  # noqa: E501
+
+        self._param_hash = param_hash
+
+    @property
+    def query_hash(self):
+        """Gets the query_hash of this Anomaly.  # noqa: E501
+
+        query hash for this anomaly  # noqa: E501
+
+        :return: The query_hash of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._query_hash
+
+    @query_hash.setter
+    def query_hash(self, query_hash):
+        """Sets the query_hash of this Anomaly.
+
+        query hash for this anomaly  # noqa: E501
+
+        :param query_hash: The query_hash of this Anomaly.  # noqa: E501
+        :type: str
+        """
+        if query_hash is None:
+            raise ValueError("Invalid value for `query_hash`, must not be `None`")  # noqa: E501
+
+        self._query_hash = query_hash
+
+    @property
+    def _query_params(self):
+        """Gets the _query_params of this Anomaly.  # noqa: E501
+
+        map of query params belongs to this anomaly  # noqa: E501
+
+        :return: The _query_params of this Anomaly.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self.__query_params
+
+    @_query_params.setter
+    def _query_params(self, _query_params):
+        """Sets the _query_params of this Anomaly.
+
+        map of query params belongs to this anomaly  # noqa: E501
+
+        :param _query_params: The _query_params of this Anomaly.  # noqa: E501
+        :type: dict(str, str)
+        """
+        if _query_params is None:
+            raise ValueError("Invalid value for `_query_params`, must not be `None`")  # noqa: E501
+
+        self.__query_params = _query_params
+
+    @property
+    def row(self):
+        """Gets the row of this Anomaly.  # noqa: E501
+
+        row number for this anomaly  # noqa: E501
+
+        :return: The row of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._row
+
+    @row.setter
+    def row(self, row):
+        """Sets the row of this Anomaly.
+
+        row number for this anomaly  # noqa: E501
+
+        :param row: The row of this Anomaly.  # noqa: E501
+        :type: int
+        """
+        if row is None:
+            raise ValueError("Invalid value for `row`, must not be `None`")  # noqa: E501
+
+        self._row = row
+
+    @property
+    def section(self):
+        """Gets the section of this Anomaly.  # noqa: E501
+
+        section number for this anomaly  # noqa: E501
+
+        :return: The section of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._section
+
+    @section.setter
+    def section(self, section):
+        """Sets the section of this Anomaly.
+
+        section number for this anomaly  # noqa: E501
+
+        :param section: The section of this Anomaly.  # noqa: E501
+        :type: int
+        """
+        if section is None:
+            raise ValueError("Invalid value for `section`, must not be `None`")  # noqa: E501
+
+        self._section = section
+
+    @property
+    def start_ms(self):
+        """Gets the start_ms of this Anomaly.  # noqa: E501
+
+        startMs for this anomaly  # noqa: E501
+
+        :return: The start_ms of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_ms
+
+    @start_ms.setter
+    def start_ms(self, start_ms):
+        """Sets the start_ms of this Anomaly.
+
+        startMs for this anomaly  # noqa: E501
+
+        :param start_ms: The start_ms of this Anomaly.  # noqa: E501
+        :type: int
+        """
+        if start_ms is None:
+            raise ValueError("Invalid value for `start_ms`, must not be `None`")  # noqa: E501
+
+        self._start_ms = start_ms
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this Anomaly.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this Anomaly.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this Anomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updated_ms(self):
+        """Gets the updated_ms of this Anomaly.  # noqa: E501
+
+        updateMs for this anomaly  # noqa: E501
+
+        :return: The updated_ms of this Anomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_ms
+
+    @updated_ms.setter
+    def updated_ms(self, updated_ms):
+        """Sets the updated_ms of this Anomaly.
+
+        updateMs for this anomaly  # noqa: E501
+
+        :param updated_ms: The updated_ms of this Anomaly.  # noqa: E501
+        :type: int
+        """
+        if updated_ms is None:
+            raise ValueError("Invalid value for `updated_ms`, must not be `None`")  # noqa: E501
+
+        self._updated_ms = updated_ms
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this Anomaly.  # noqa: E501
+
+
+        :return: The updater_id of this Anomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this Anomaly.
+
+
+        :param updater_id: The updater_id of this Anomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Anomaly, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Anomaly):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 643435e..1f5ae5e 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -38,6 +38,7 @@ class Dashboard(object):
         'created_epoch_millis': 'int',
         'creator_id': 'str',
         'customer': 'str',
+        'dashboard_attributes': 'JsonNode',
         'default_end_time': 'int',
         'default_start_time': 'int',
         'default_time_window': 'str',
@@ -49,6 +50,7 @@ class Dashboard(object):
         'event_filter_type': 'str',
         'event_query': 'str',
         'favorite': 'bool',
+        'force_v2_ui': 'bool',
         'hidden': 'bool',
         'id': 'str',
         'modify_acl_access': 'bool',
@@ -77,6 +79,7 @@ class Dashboard(object):
         'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
         'customer': 'customer',
+        'dashboard_attributes': 'dashboardAttributes',
         'default_end_time': 'defaultEndTime',
         'default_start_time': 'defaultStartTime',
         'default_time_window': 'defaultTimeWindow',
@@ -88,6 +91,7 @@ class Dashboard(object):
         'event_filter_type': 'eventFilterType',
         'event_query': 'eventQuery',
         'favorite': 'favorite',
+        'force_v2_ui': 'forceV2UI',
         'hidden': 'hidden',
         'id': 'id',
         'modify_acl_access': 'modifyAclAccess',
@@ -108,7 +112,7 @@ class Dashboard(object):
         'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, hidden=None, id=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None):  # noqa: E501
+    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -118,6 +122,7 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
         self._created_epoch_millis = None
         self._creator_id = None
         self._customer = None
+        self._dashboard_attributes = None
         self._default_end_time = None
         self._default_start_time = None
         self._default_time_window = None
@@ -129,6 +134,7 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
         self._event_filter_type = None
         self._event_query = None
         self._favorite = None
+        self._force_v2_ui = None
         self._hidden = None
         self._id = None
         self._modify_acl_access = None
@@ -163,6 +169,8 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
             self.creator_id = creator_id
         if customer is not None:
             self.customer = customer
+        if dashboard_attributes is not None:
+            self.dashboard_attributes = dashboard_attributes
         if default_end_time is not None:
             self.default_end_time = default_end_time
         if default_start_time is not None:
@@ -185,6 +193,8 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
             self.event_query = event_query
         if favorite is not None:
             self.favorite = favorite
+        if force_v2_ui is not None:
+            self.force_v2_ui = force_v2_ui
         if hidden is not None:
             self.hidden = hidden
         self.id = id
@@ -373,6 +383,29 @@ def customer(self, customer):
 
         self._customer = customer
 
+    @property
+    def dashboard_attributes(self):
+        """Gets the dashboard_attributes of this Dashboard.  # noqa: E501
+
+        Experimental Dashboard Attributes  # noqa: E501
+
+        :return: The dashboard_attributes of this Dashboard.  # noqa: E501
+        :rtype: JsonNode
+        """
+        return self._dashboard_attributes
+
+    @dashboard_attributes.setter
+    def dashboard_attributes(self, dashboard_attributes):
+        """Sets the dashboard_attributes of this Dashboard.
+
+        Experimental Dashboard Attributes  # noqa: E501
+
+        :param dashboard_attributes: The dashboard_attributes of this Dashboard.  # noqa: E501
+        :type: JsonNode
+        """
+
+        self._dashboard_attributes = dashboard_attributes
+
     @property
     def default_end_time(self):
         """Gets the default_end_time of this Dashboard.  # noqa: E501
@@ -628,6 +661,29 @@ def favorite(self, favorite):
 
         self._favorite = favorite
 
+    @property
+    def force_v2_ui(self):
+        """Gets the force_v2_ui of this Dashboard.  # noqa: E501
+
+        Whether to force this dashboard to use the V2 UI  # noqa: E501
+
+        :return: The force_v2_ui of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._force_v2_ui
+
+    @force_v2_ui.setter
+    def force_v2_ui(self, force_v2_ui):
+        """Sets the force_v2_ui of this Dashboard.
+
+        Whether to force this dashboard to use the V2 UI  # noqa: E501
+
+        :param force_v2_ui: The force_v2_ui of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._force_v2_ui = force_v2_ui
+
     @property
     def hidden(self):
         """Gets the hidden of this Dashboard.  # noqa: E501
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 5dba91c..332caa6 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -38,6 +38,7 @@ class Event(object):
         'created_epoch_millis': 'int',
         'creator_id': 'str',
         'creator_type': 'list[str]',
+        'dimensions': 'dict(str, list[str])',
         'end_time': 'int',
         'hosts': 'list[str]',
         'id': 'str',
@@ -63,6 +64,7 @@ class Event(object):
         'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
         'creator_type': 'creatorType',
+        'dimensions': 'dimensions',
         'end_time': 'endTime',
         'hosts': 'hosts',
         'id': 'id',
@@ -80,7 +82,7 @@ class Event(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
         self._annotations = None
@@ -90,6 +92,7 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
         self._created_epoch_millis = None
         self._creator_id = None
         self._creator_type = None
+        self._dimensions = None
         self._end_time = None
         self._hosts = None
         self._id = None
@@ -120,6 +123,8 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
             self.creator_id = creator_id
         if creator_type is not None:
             self.creator_type = creator_type
+        if dimensions is not None:
+            self.dimensions = dimensions
         if end_time is not None:
             self.end_time = end_time
         if hosts is not None:
@@ -307,6 +312,29 @@ def creator_type(self, creator_type):
 
         self._creator_type = creator_type
 
+    @property
+    def dimensions(self):
+        """Gets the dimensions of this Event.  # noqa: E501
+
+        A string-><list of strings> map of additional dimension info on the event  # noqa: E501
+
+        :return: The dimensions of this Event.  # noqa: E501
+        :rtype: dict(str, list[str])
+        """
+        return self._dimensions
+
+    @dimensions.setter
+    def dimensions(self, dimensions):
+        """Sets the dimensions of this Event.
+
+        A string-><list of strings> map of additional dimension info on the event  # noqa: E501
+
+        :param dimensions: The dimensions of this Event.  # noqa: E501
+        :type: dict(str, list[str])
+        """
+
+        self._dimensions = dimensions
+
     @property
     def end_time(self):
         """Gets the end_time of this Event.  # noqa: E501
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 115bb3c..313ef9a 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -34,6 +34,7 @@ class EventSearchRequest(object):
         'cursor': 'str',
         'limit': 'int',
         'query': 'list[SearchQuery]',
+        'sort_score_method': 'str',
         'sort_time_ascending': 'bool',
         'time_range': 'EventTimeRange'
     }
@@ -42,16 +43,18 @@ class EventSearchRequest(object):
         'cursor': 'cursor',
         'limit': 'limit',
         'query': 'query',
+        'sort_score_method': 'sortScoreMethod',
         'sort_time_ascending': 'sortTimeAscending',
         'time_range': 'timeRange'
     }
 
-    def __init__(self, cursor=None, limit=None, query=None, sort_time_ascending=None, time_range=None):  # noqa: E501
+    def __init__(self, cursor=None, limit=None, query=None, sort_score_method=None, sort_time_ascending=None, time_range=None):  # noqa: E501
         """EventSearchRequest - a model defined in Swagger"""  # noqa: E501
 
         self._cursor = None
         self._limit = None
         self._query = None
+        self._sort_score_method = None
         self._sort_time_ascending = None
         self._time_range = None
         self.discriminator = None
@@ -62,6 +65,8 @@ def __init__(self, cursor=None, limit=None, query=None, sort_time_ascending=None
             self.limit = limit
         if query is not None:
             self.query = query
+        if sort_score_method is not None:
+            self.sort_score_method = sort_score_method
         if sort_time_ascending is not None:
             self.sort_time_ascending = sort_time_ascending
         if time_range is not None:
@@ -136,6 +141,35 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def sort_score_method(self):
+        """Gets the sort_score_method of this EventSearchRequest.  # noqa: E501
+
+        Whether to sort events on similarity score : {NONE, SCORE_ASC, SCORE_DES}. Default: NONE. If sortScoreMethod is set to SCORE_ASC or SCORE_DES, it will override time sort  # noqa: E501
+
+        :return: The sort_score_method of this EventSearchRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._sort_score_method
+
+    @sort_score_method.setter
+    def sort_score_method(self, sort_score_method):
+        """Sets the sort_score_method of this EventSearchRequest.
+
+        Whether to sort events on similarity score : {NONE, SCORE_ASC, SCORE_DES}. Default: NONE. If sortScoreMethod is set to SCORE_ASC or SCORE_DES, it will override time sort  # noqa: E501
+
+        :param sort_score_method: The sort_score_method of this EventSearchRequest.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["SCORE_ASC", "SCORE_DES", "NONE"]  # noqa: E501
+        if sort_score_method not in allowed_values:
+            raise ValueError(
+                "Invalid value for `sort_score_method` ({0}), must be one of {1}"  # noqa: E501
+                .format(sort_score_method, allowed_values)
+            )
+
+        self._sort_score_method = sort_score_method
+
     @property
     def sort_time_ascending(self):
         """Gets the sort_time_ascending of this EventSearchRequest.  # noqa: E501
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index ea250b7..2e10c76 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -32,6 +32,7 @@ class GCPConfiguration(object):
     """
     swagger_types = {
         'categories_to_fetch': 'list[str]',
+        'custom_metric_prefix': 'list[str]',
         'gcp_json_key': 'str',
         'metric_filter_regex': 'str',
         'project_id': 'str'
@@ -39,15 +40,17 @@ class GCPConfiguration(object):
 
     attribute_map = {
         'categories_to_fetch': 'categoriesToFetch',
+        'custom_metric_prefix': 'customMetricPrefix',
         'gcp_json_key': 'gcpJsonKey',
         'metric_filter_regex': 'metricFilterRegex',
         'project_id': 'projectId'
     }
 
-    def __init__(self, categories_to_fetch=None, gcp_json_key=None, metric_filter_regex=None, project_id=None):  # noqa: E501
+    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, gcp_json_key=None, metric_filter_regex=None, project_id=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._categories_to_fetch = None
+        self._custom_metric_prefix = None
         self._gcp_json_key = None
         self._metric_filter_regex = None
         self._project_id = None
@@ -55,6 +58,8 @@ def __init__(self, categories_to_fetch=None, gcp_json_key=None, metric_filter_re
 
         if categories_to_fetch is not None:
             self.categories_to_fetch = categories_to_fetch
+        if custom_metric_prefix is not None:
+            self.custom_metric_prefix = custom_metric_prefix
         self.gcp_json_key = gcp_json_key
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
@@ -90,6 +95,29 @@ def categories_to_fetch(self, categories_to_fetch):
 
         self._categories_to_fetch = categories_to_fetch
 
+    @property
+    def custom_metric_prefix(self):
+        """Gets the custom_metric_prefix of this GCPConfiguration.  # noqa: E501
+
+        List of custom metric prefix to fetch the data from  # noqa: E501
+
+        :return: The custom_metric_prefix of this GCPConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._custom_metric_prefix
+
+    @custom_metric_prefix.setter
+    def custom_metric_prefix(self, custom_metric_prefix):
+        """Sets the custom_metric_prefix of this GCPConfiguration.
+
+        List of custom metric prefix to fetch the data from  # noqa: E501
+
+        :param custom_metric_prefix: The custom_metric_prefix of this GCPConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._custom_metric_prefix = custom_metric_prefix
+
     @property
     def gcp_json_key(self):
         """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/iterable.py b/wavefront_api_client/models/iterable.py
new file mode 100644
index 0000000..f57532a
--- /dev/null
+++ b/wavefront_api_client/models/iterable.py
@@ -0,0 +1,87 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Iterable(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """Iterable - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Iterable, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Iterable):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
new file mode 100644
index 0000000..f6d038a
--- /dev/null
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class KubernetesComponent(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'last_updated': 'int',
+        'name': 'str'
+    }
+
+    attribute_map = {
+        'last_updated': 'lastUpdated',
+        'name': 'name'
+    }
+
+    def __init__(self, last_updated=None, name=None):  # noqa: E501
+        """KubernetesComponent - a model defined in Swagger"""  # noqa: E501
+
+        self._last_updated = None
+        self._name = None
+        self.discriminator = None
+
+        if last_updated is not None:
+            self.last_updated = last_updated
+        if name is not None:
+            self.name = name
+
+    @property
+    def last_updated(self):
+        """Gets the last_updated of this KubernetesComponent.  # noqa: E501
+
+
+        :return: The last_updated of this KubernetesComponent.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated
+
+    @last_updated.setter
+    def last_updated(self, last_updated):
+        """Sets the last_updated of this KubernetesComponent.
+
+
+        :param last_updated: The last_updated of this KubernetesComponent.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated = last_updated
+
+    @property
+    def name(self):
+        """Gets the name of this KubernetesComponent.  # noqa: E501
+
+
+        :return: The name of this KubernetesComponent.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this KubernetesComponent.
+
+
+        :param name: The name of this KubernetesComponent.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(KubernetesComponent, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, KubernetesComponent):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/monitored_cluster.py b/wavefront_api_client/models/monitored_cluster.py
new file mode 100644
index 0000000..9bfffed
--- /dev/null
+++ b/wavefront_api_client/models/monitored_cluster.py
@@ -0,0 +1,387 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class MonitoredCluster(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'additional_tags': 'dict(str, str)',
+        'alias': 'str',
+        'components': 'list[KubernetesComponent]',
+        'deleted': 'bool',
+        'id': 'str',
+        'last_updated': 'int',
+        'monitored': 'bool',
+        'name': 'str',
+        'platform': 'str',
+        'tags': 'list[str]',
+        'version': 'str'
+    }
+
+    attribute_map = {
+        'additional_tags': 'additionalTags',
+        'alias': 'alias',
+        'components': 'components',
+        'deleted': 'deleted',
+        'id': 'id',
+        'last_updated': 'lastUpdated',
+        'monitored': 'monitored',
+        'name': 'name',
+        'platform': 'platform',
+        'tags': 'tags',
+        'version': 'version'
+    }
+
+    def __init__(self, additional_tags=None, alias=None, components=None, deleted=None, id=None, last_updated=None, monitored=None, name=None, platform=None, tags=None, version=None):  # noqa: E501
+        """MonitoredCluster - a model defined in Swagger"""  # noqa: E501
+
+        self._additional_tags = None
+        self._alias = None
+        self._components = None
+        self._deleted = None
+        self._id = None
+        self._last_updated = None
+        self._monitored = None
+        self._name = None
+        self._platform = None
+        self._tags = None
+        self._version = None
+        self.discriminator = None
+
+        if additional_tags is not None:
+            self.additional_tags = additional_tags
+        if alias is not None:
+            self.alias = alias
+        if components is not None:
+            self.components = components
+        if deleted is not None:
+            self.deleted = deleted
+        self.id = id
+        if last_updated is not None:
+            self.last_updated = last_updated
+        if monitored is not None:
+            self.monitored = monitored
+        self.name = name
+        if platform is not None:
+            self.platform = platform
+        if tags is not None:
+            self.tags = tags
+        if version is not None:
+            self.version = version
+
+    @property
+    def additional_tags(self):
+        """Gets the additional_tags of this MonitoredCluster.  # noqa: E501
+
+
+        :return: The additional_tags of this MonitoredCluster.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._additional_tags
+
+    @additional_tags.setter
+    def additional_tags(self, additional_tags):
+        """Sets the additional_tags of this MonitoredCluster.
+
+
+        :param additional_tags: The additional_tags of this MonitoredCluster.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._additional_tags = additional_tags
+
+    @property
+    def alias(self):
+        """Gets the alias of this MonitoredCluster.  # noqa: E501
+
+        ID of a monitored cluster that was merged into this one.  # noqa: E501
+
+        :return: The alias of this MonitoredCluster.  # noqa: E501
+        :rtype: str
+        """
+        return self._alias
+
+    @alias.setter
+    def alias(self, alias):
+        """Sets the alias of this MonitoredCluster.
+
+        ID of a monitored cluster that was merged into this one.  # noqa: E501
+
+        :param alias: The alias of this MonitoredCluster.  # noqa: E501
+        :type: str
+        """
+
+        self._alias = alias
+
+    @property
+    def components(self):
+        """Gets the components of this MonitoredCluster.  # noqa: E501
+
+
+        :return: The components of this MonitoredCluster.  # noqa: E501
+        :rtype: list[KubernetesComponent]
+        """
+        return self._components
+
+    @components.setter
+    def components(self, components):
+        """Sets the components of this MonitoredCluster.
+
+
+        :param components: The components of this MonitoredCluster.  # noqa: E501
+        :type: list[KubernetesComponent]
+        """
+
+        self._components = components
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this MonitoredCluster.  # noqa: E501
+
+
+        :return: The deleted of this MonitoredCluster.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this MonitoredCluster.
+
+
+        :param deleted: The deleted of this MonitoredCluster.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def id(self):
+        """Gets the id of this MonitoredCluster.  # noqa: E501
+
+        Id of monitored cluster which is same as actual cluster id  # noqa: E501
+
+        :return: The id of this MonitoredCluster.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this MonitoredCluster.
+
+        Id of monitored cluster which is same as actual cluster id  # noqa: E501
+
+        :param id: The id of this MonitoredCluster.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
+    @property
+    def last_updated(self):
+        """Gets the last_updated of this MonitoredCluster.  # noqa: E501
+
+
+        :return: The last_updated of this MonitoredCluster.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated
+
+    @last_updated.setter
+    def last_updated(self, last_updated):
+        """Sets the last_updated of this MonitoredCluster.
+
+
+        :param last_updated: The last_updated of this MonitoredCluster.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated = last_updated
+
+    @property
+    def monitored(self):
+        """Gets the monitored of this MonitoredCluster.  # noqa: E501
+
+
+        :return: The monitored of this MonitoredCluster.  # noqa: E501
+        :rtype: bool
+        """
+        return self._monitored
+
+    @monitored.setter
+    def monitored(self, monitored):
+        """Sets the monitored of this MonitoredCluster.
+
+
+        :param monitored: The monitored of this MonitoredCluster.  # noqa: E501
+        :type: bool
+        """
+
+        self._monitored = monitored
+
+    @property
+    def name(self):
+        """Gets the name of this MonitoredCluster.  # noqa: E501
+
+        Name of the monitored cluster  # noqa: E501
+
+        :return: The name of this MonitoredCluster.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this MonitoredCluster.
+
+        Name of the monitored cluster  # noqa: E501
+
+        :param name: The name of this MonitoredCluster.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def platform(self):
+        """Gets the platform of this MonitoredCluster.  # noqa: E501
+
+        Monitored cluster type  # noqa: E501
+
+        :return: The platform of this MonitoredCluster.  # noqa: E501
+        :rtype: str
+        """
+        return self._platform
+
+    @platform.setter
+    def platform(self, platform):
+        """Sets the platform of this MonitoredCluster.
+
+        Monitored cluster type  # noqa: E501
+
+        :param platform: The platform of this MonitoredCluster.  # noqa: E501
+        :type: str
+        """
+
+        self._platform = platform
+
+    @property
+    def tags(self):
+        """Gets the tags of this MonitoredCluster.  # noqa: E501
+
+
+        :return: The tags of this MonitoredCluster.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this MonitoredCluster.
+
+
+        :param tags: The tags of this MonitoredCluster.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tags = tags
+
+    @property
+    def version(self):
+        """Gets the version of this MonitoredCluster.  # noqa: E501
+
+        Version of monitored cluster  # noqa: E501
+
+        :return: The version of this MonitoredCluster.  # noqa: E501
+        :rtype: str
+        """
+        return self._version
+
+    @version.setter
+    def version(self, version):
+        """Sets the version of this MonitoredCluster.
+
+        Version of monitored cluster  # noqa: E501
+
+        :param version: The version of this MonitoredCluster.  # noqa: E501
+        :type: str
+        """
+
+        self._version = version
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(MonitoredCluster, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, MonitoredCluster):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged_anomaly.py b/wavefront_api_client/models/paged_anomaly.py
new file mode 100644
index 0000000..942dbc3
--- /dev/null
+++ b/wavefront_api_client/models/paged_anomaly.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedAnomaly(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[Anomaly]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedAnomaly - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedAnomaly.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedAnomaly.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedAnomaly.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedAnomaly.  # noqa: E501
+        :rtype: list[Anomaly]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedAnomaly.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedAnomaly.  # noqa: E501
+        :type: list[Anomaly]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedAnomaly.  # noqa: E501
+
+
+        :return: The limit of this PagedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedAnomaly.
+
+
+        :param limit: The limit of this PagedAnomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedAnomaly.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedAnomaly.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedAnomaly.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedAnomaly.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedAnomaly.  # noqa: E501
+
+
+        :return: The offset of this PagedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedAnomaly.
+
+
+        :param offset: The offset of this PagedAnomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedAnomaly.  # noqa: E501
+
+
+        :return: The sort of this PagedAnomaly.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedAnomaly.
+
+
+        :param sort: The sort of this PagedAnomaly.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedAnomaly.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedAnomaly.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedAnomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedAnomaly, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedAnomaly):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged_monitored_cluster.py b/wavefront_api_client/models/paged_monitored_cluster.py
new file mode 100644
index 0000000..97f7dbf
--- /dev/null
+++ b/wavefront_api_client/models/paged_monitored_cluster.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedMonitoredCluster(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[MonitoredCluster]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedMonitoredCluster - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedMonitoredCluster.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedMonitoredCluster.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedMonitoredCluster.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedMonitoredCluster.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: list[MonitoredCluster]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedMonitoredCluster.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedMonitoredCluster.  # noqa: E501
+        :type: list[MonitoredCluster]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedMonitoredCluster.  # noqa: E501
+
+
+        :return: The limit of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedMonitoredCluster.
+
+
+        :param limit: The limit of this PagedMonitoredCluster.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedMonitoredCluster.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedMonitoredCluster.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedMonitoredCluster.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedMonitoredCluster.  # noqa: E501
+
+
+        :return: The offset of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedMonitoredCluster.
+
+
+        :param offset: The offset of this PagedMonitoredCluster.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedMonitoredCluster.  # noqa: E501
+
+
+        :return: The sort of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedMonitoredCluster.
+
+
+        :param sort: The sort of this PagedMonitoredCluster.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedMonitoredCluster.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedMonitoredCluster.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedMonitoredCluster.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedMonitoredCluster.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedMonitoredCluster, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedMonitoredCluster):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged_related_event.py b/wavefront_api_client/models/paged_related_event.py
new file mode 100644
index 0000000..55881ea
--- /dev/null
+++ b/wavefront_api_client/models/paged_related_event.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedRelatedEvent(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[RelatedEvent]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedRelatedEvent - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedRelatedEvent.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedRelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedRelatedEvent.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedRelatedEvent.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedRelatedEvent.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedRelatedEvent.  # noqa: E501
+        :rtype: list[RelatedEvent]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedRelatedEvent.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedRelatedEvent.  # noqa: E501
+        :type: list[RelatedEvent]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedRelatedEvent.  # noqa: E501
+
+
+        :return: The limit of this PagedRelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedRelatedEvent.
+
+
+        :param limit: The limit of this PagedRelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedRelatedEvent.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedRelatedEvent.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedRelatedEvent.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedRelatedEvent.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedRelatedEvent.  # noqa: E501
+
+
+        :return: The offset of this PagedRelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedRelatedEvent.
+
+
+        :param offset: The offset of this PagedRelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedRelatedEvent.  # noqa: E501
+
+
+        :return: The sort of this PagedRelatedEvent.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedRelatedEvent.
+
+
+        :param sort: The sort of this PagedRelatedEvent.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedRelatedEvent.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedRelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedRelatedEvent.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedRelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedRelatedEvent, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedRelatedEvent):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index e812be3..9a994da 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -53,6 +53,7 @@ class Proxy(object):
         'status': 'str',
         'status_cause': 'str',
         'time_drift': 'int',
+        'user_id': 'str',
         'version': 'str'
     }
 
@@ -79,10 +80,11 @@ class Proxy(object):
         'status': 'status',
         'status_cause': 'statusCause',
         'time_drift': 'timeDrift',
+        'user_id': 'userId',
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, shutdown=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, version=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, shutdown=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
         self._bytes_left_for_buffer = None
@@ -107,6 +109,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._status = None
         self._status_cause = None
         self._time_drift = None
+        self._user_id = None
         self._version = None
         self.discriminator = None
 
@@ -153,6 +156,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.status_cause = status_cause
         if time_drift is not None:
             self.time_drift = time_drift
+        if user_id is not None:
+            self.user_id = user_id
         if version is not None:
             self.version = version
 
@@ -660,6 +665,29 @@ def time_drift(self, time_drift):
 
         self._time_drift = time_drift
 
+    @property
+    def user_id(self):
+        """Gets the user_id of this Proxy.  # noqa: E501
+
+        The user associated with this proxy  # noqa: E501
+
+        :return: The user_id of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._user_id
+
+    @user_id.setter
+    def user_id(self, user_id):
+        """Sets the user_id of this Proxy.
+
+        The user associated with this proxy  # noqa: E501
+
+        :param user_id: The user_id of this Proxy.  # noqa: E501
+        :type: str
+        """
+
+        self._user_id = user_id
+
     @property
     def version(self):
         """Gets the version of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/related_data.py b/wavefront_api_client/models/related_data.py
new file mode 100644
index 0000000..358a6bb
--- /dev/null
+++ b/wavefront_api_client/models/related_data.py
@@ -0,0 +1,257 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class RelatedData(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'alert_description': 'str',
+        'common_dimensions': 'list[str]',
+        'common_metrics': 'list[str]',
+        'common_sources': 'list[str]',
+        'related_id': 'str',
+        'summary': 'str'
+    }
+
+    attribute_map = {
+        'alert_description': 'alertDescription',
+        'common_dimensions': 'commonDimensions',
+        'common_metrics': 'commonMetrics',
+        'common_sources': 'commonSources',
+        'related_id': 'relatedId',
+        'summary': 'summary'
+    }
+
+    def __init__(self, alert_description=None, common_dimensions=None, common_metrics=None, common_sources=None, related_id=None, summary=None):  # noqa: E501
+        """RelatedData - a model defined in Swagger"""  # noqa: E501
+
+        self._alert_description = None
+        self._common_dimensions = None
+        self._common_metrics = None
+        self._common_sources = None
+        self._related_id = None
+        self._summary = None
+        self.discriminator = None
+
+        if alert_description is not None:
+            self.alert_description = alert_description
+        if common_dimensions is not None:
+            self.common_dimensions = common_dimensions
+        if common_metrics is not None:
+            self.common_metrics = common_metrics
+        if common_sources is not None:
+            self.common_sources = common_sources
+        if related_id is not None:
+            self.related_id = related_id
+        if summary is not None:
+            self.summary = summary
+
+    @property
+    def alert_description(self):
+        """Gets the alert_description of this RelatedData.  # noqa: E501
+
+        If this event is generated by an alert, the description of that alert.  # noqa: E501
+
+        :return: The alert_description of this RelatedData.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_description
+
+    @alert_description.setter
+    def alert_description(self, alert_description):
+        """Sets the alert_description of this RelatedData.
+
+        If this event is generated by an alert, the description of that alert.  # noqa: E501
+
+        :param alert_description: The alert_description of this RelatedData.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_description = alert_description
+
+    @property
+    def common_dimensions(self):
+        """Gets the common_dimensions of this RelatedData.  # noqa: E501
+
+        Set of common dimensions between the 2 events, presented in key=value format  # noqa: E501
+
+        :return: The common_dimensions of this RelatedData.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._common_dimensions
+
+    @common_dimensions.setter
+    def common_dimensions(self, common_dimensions):
+        """Sets the common_dimensions of this RelatedData.
+
+        Set of common dimensions between the 2 events, presented in key=value format  # noqa: E501
+
+        :param common_dimensions: The common_dimensions of this RelatedData.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._common_dimensions = common_dimensions
+
+    @property
+    def common_metrics(self):
+        """Gets the common_metrics of this RelatedData.  # noqa: E501
+
+        Set of common metrics/labels between the 2 events  # noqa: E501
+
+        :return: The common_metrics of this RelatedData.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._common_metrics
+
+    @common_metrics.setter
+    def common_metrics(self, common_metrics):
+        """Sets the common_metrics of this RelatedData.
+
+        Set of common metrics/labels between the 2 events  # noqa: E501
+
+        :param common_metrics: The common_metrics of this RelatedData.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._common_metrics = common_metrics
+
+    @property
+    def common_sources(self):
+        """Gets the common_sources of this RelatedData.  # noqa: E501
+
+        Set of common sources between the 2 events  # noqa: E501
+
+        :return: The common_sources of this RelatedData.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._common_sources
+
+    @common_sources.setter
+    def common_sources(self, common_sources):
+        """Sets the common_sources of this RelatedData.
+
+        Set of common sources between the 2 events  # noqa: E501
+
+        :param common_sources: The common_sources of this RelatedData.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._common_sources = common_sources
+
+    @property
+    def related_id(self):
+        """Gets the related_id of this RelatedData.  # noqa: E501
+
+        ID of the event to which this event is related  # noqa: E501
+
+        :return: The related_id of this RelatedData.  # noqa: E501
+        :rtype: str
+        """
+        return self._related_id
+
+    @related_id.setter
+    def related_id(self, related_id):
+        """Sets the related_id of this RelatedData.
+
+        ID of the event to which this event is related  # noqa: E501
+
+        :param related_id: The related_id of this RelatedData.  # noqa: E501
+        :type: str
+        """
+
+        self._related_id = related_id
+
+    @property
+    def summary(self):
+        """Gets the summary of this RelatedData.  # noqa: E501
+
+        Text summary of why the two events are relateds  # noqa: E501
+
+        :return: The summary of this RelatedData.  # noqa: E501
+        :rtype: str
+        """
+        return self._summary
+
+    @summary.setter
+    def summary(self, summary):
+        """Sets the summary of this RelatedData.
+
+        Text summary of why the two events are relateds  # noqa: E501
+
+        :param summary: The summary of this RelatedData.  # noqa: E501
+        :type: str
+        """
+
+        self._summary = summary
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RelatedData, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RelatedData):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
new file mode 100644
index 0000000..c68a861
--- /dev/null
+++ b/wavefront_api_client/models/related_event.py
@@ -0,0 +1,755 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class RelatedEvent(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'annotations': 'dict(str, str)',
+        'can_close': 'bool',
+        'can_delete': 'bool',
+        'created_at': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'creator_type': 'list[str]',
+        'dimensions': 'dict(str, list[str])',
+        'end_time': 'int',
+        'hosts': 'list[str]',
+        'id': 'str',
+        'is_ephemeral': 'bool',
+        'is_user_event': 'bool',
+        'metrics_used': 'list[str]',
+        'name': 'str',
+        'related_data': 'RelatedData',
+        'running_state': 'str',
+        'start_time': 'int',
+        'summarized_events': 'int',
+        'table': 'str',
+        'tags': 'list[str]',
+        'updated_at': 'int',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'annotations': 'annotations',
+        'can_close': 'canClose',
+        'can_delete': 'canDelete',
+        'created_at': 'createdAt',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'creator_type': 'creatorType',
+        'dimensions': 'dimensions',
+        'end_time': 'endTime',
+        'hosts': 'hosts',
+        'id': 'id',
+        'is_ephemeral': 'isEphemeral',
+        'is_user_event': 'isUserEvent',
+        'metrics_used': 'metricsUsed',
+        'name': 'name',
+        'related_data': 'relatedData',
+        'running_state': 'runningState',
+        'start_time': 'startTime',
+        'summarized_events': 'summarizedEvents',
+        'table': 'table',
+        'tags': 'tags',
+        'updated_at': 'updatedAt',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+        """RelatedEvent - a model defined in Swagger"""  # noqa: E501
+
+        self._annotations = None
+        self._can_close = None
+        self._can_delete = None
+        self._created_at = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._creator_type = None
+        self._dimensions = None
+        self._end_time = None
+        self._hosts = None
+        self._id = None
+        self._is_ephemeral = None
+        self._is_user_event = None
+        self._metrics_used = None
+        self._name = None
+        self._related_data = None
+        self._running_state = None
+        self._start_time = None
+        self._summarized_events = None
+        self._table = None
+        self._tags = None
+        self._updated_at = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        self.annotations = annotations
+        if can_close is not None:
+            self.can_close = can_close
+        if can_delete is not None:
+            self.can_delete = can_delete
+        if created_at is not None:
+            self.created_at = created_at
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if creator_type is not None:
+            self.creator_type = creator_type
+        if dimensions is not None:
+            self.dimensions = dimensions
+        if end_time is not None:
+            self.end_time = end_time
+        if hosts is not None:
+            self.hosts = hosts
+        if id is not None:
+            self.id = id
+        if is_ephemeral is not None:
+            self.is_ephemeral = is_ephemeral
+        if is_user_event is not None:
+            self.is_user_event = is_user_event
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        self.name = name
+        if related_data is not None:
+            self.related_data = related_data
+        if running_state is not None:
+            self.running_state = running_state
+        self.start_time = start_time
+        if summarized_events is not None:
+            self.summarized_events = summarized_events
+        if table is not None:
+            self.table = table
+        if tags is not None:
+            self.tags = tags
+        if updated_at is not None:
+            self.updated_at = updated_at
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def annotations(self):
+        """Gets the annotations of this RelatedEvent.  # noqa: E501
+
+        A string->string map of additional annotations on the event  # noqa: E501
+
+        :return: The annotations of this RelatedEvent.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._annotations
+
+    @annotations.setter
+    def annotations(self, annotations):
+        """Sets the annotations of this RelatedEvent.
+
+        A string->string map of additional annotations on the event  # noqa: E501
+
+        :param annotations: The annotations of this RelatedEvent.  # noqa: E501
+        :type: dict(str, str)
+        """
+        if annotations is None:
+            raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
+
+        self._annotations = annotations
+
+    @property
+    def can_close(self):
+        """Gets the can_close of this RelatedEvent.  # noqa: E501
+
+
+        :return: The can_close of this RelatedEvent.  # noqa: E501
+        :rtype: bool
+        """
+        return self._can_close
+
+    @can_close.setter
+    def can_close(self, can_close):
+        """Sets the can_close of this RelatedEvent.
+
+
+        :param can_close: The can_close of this RelatedEvent.  # noqa: E501
+        :type: bool
+        """
+
+        self._can_close = can_close
+
+    @property
+    def can_delete(self):
+        """Gets the can_delete of this RelatedEvent.  # noqa: E501
+
+
+        :return: The can_delete of this RelatedEvent.  # noqa: E501
+        :rtype: bool
+        """
+        return self._can_delete
+
+    @can_delete.setter
+    def can_delete(self, can_delete):
+        """Sets the can_delete of this RelatedEvent.
+
+
+        :param can_delete: The can_delete of this RelatedEvent.  # noqa: E501
+        :type: bool
+        """
+
+        self._can_delete = can_delete
+
+    @property
+    def created_at(self):
+        """Gets the created_at of this RelatedEvent.  # noqa: E501
+
+
+        :return: The created_at of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_at
+
+    @created_at.setter
+    def created_at(self, created_at):
+        """Sets the created_at of this RelatedEvent.
+
+
+        :param created_at: The created_at of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._created_at = created_at
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this RelatedEvent.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this RelatedEvent.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this RelatedEvent.  # noqa: E501
+
+
+        :return: The creator_id of this RelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this RelatedEvent.
+
+
+        :param creator_id: The creator_id of this RelatedEvent.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def creator_type(self):
+        """Gets the creator_type of this RelatedEvent.  # noqa: E501
+
+
+        :return: The creator_type of this RelatedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._creator_type
+
+    @creator_type.setter
+    def creator_type(self, creator_type):
+        """Sets the creator_type of this RelatedEvent.
+
+
+        :param creator_type: The creator_type of this RelatedEvent.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
+        if not set(creator_type).issubset(set(allowed_values)):
+            raise ValueError(
+                "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._creator_type = creator_type
+
+    @property
+    def dimensions(self):
+        """Gets the dimensions of this RelatedEvent.  # noqa: E501
+
+        A string-><list of strings> map of additional dimension info on the event  # noqa: E501
+
+        :return: The dimensions of this RelatedEvent.  # noqa: E501
+        :rtype: dict(str, list[str])
+        """
+        return self._dimensions
+
+    @dimensions.setter
+    def dimensions(self, dimensions):
+        """Sets the dimensions of this RelatedEvent.
+
+        A string-><list of strings> map of additional dimension info on the event  # noqa: E501
+
+        :param dimensions: The dimensions of this RelatedEvent.  # noqa: E501
+        :type: dict(str, list[str])
+        """
+
+        self._dimensions = dimensions
+
+    @property
+    def end_time(self):
+        """Gets the end_time of this RelatedEvent.  # noqa: E501
+
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :return: The end_time of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_time
+
+    @end_time.setter
+    def end_time(self, end_time):
+        """Sets the end_time of this RelatedEvent.
+
+        End time of the event, in epoch millis.  Set to startTime + 1 for an instantaneous event  # noqa: E501
+
+        :param end_time: The end_time of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._end_time = end_time
+
+    @property
+    def hosts(self):
+        """Gets the hosts of this RelatedEvent.  # noqa: E501
+
+        A list of sources/hosts affected by the event  # noqa: E501
+
+        :return: The hosts of this RelatedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._hosts
+
+    @hosts.setter
+    def hosts(self, hosts):
+        """Sets the hosts of this RelatedEvent.
+
+        A list of sources/hosts affected by the event  # noqa: E501
+
+        :param hosts: The hosts of this RelatedEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._hosts = hosts
+
+    @property
+    def id(self):
+        """Gets the id of this RelatedEvent.  # noqa: E501
+
+
+        :return: The id of this RelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this RelatedEvent.
+
+
+        :param id: The id of this RelatedEvent.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def is_ephemeral(self):
+        """Gets the is_ephemeral of this RelatedEvent.  # noqa: E501
+
+        Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend  # noqa: E501
+
+        :return: The is_ephemeral of this RelatedEvent.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_ephemeral
+
+    @is_ephemeral.setter
+    def is_ephemeral(self, is_ephemeral):
+        """Sets the is_ephemeral of this RelatedEvent.
+
+        Whether the event is an artificial event generated by a literal expression or alert backtesting, i.e. not stored in the Wavefront backend  # noqa: E501
+
+        :param is_ephemeral: The is_ephemeral of this RelatedEvent.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_ephemeral = is_ephemeral
+
+    @property
+    def is_user_event(self):
+        """Gets the is_user_event of this RelatedEvent.  # noqa: E501
+
+        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+
+        :return: The is_user_event of this RelatedEvent.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_user_event
+
+    @is_user_event.setter
+    def is_user_event(self, is_user_event):
+        """Sets the is_user_event of this RelatedEvent.
+
+        Whether this event was created by a user, versus the system.  Default: system  # noqa: E501
+
+        :param is_user_event: The is_user_event of this RelatedEvent.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_user_event = is_user_event
+
+    @property
+    def metrics_used(self):
+        """Gets the metrics_used of this RelatedEvent.  # noqa: E501
+
+        A list of metrics affected by the event  # noqa: E501
+
+        :return: The metrics_used of this RelatedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._metrics_used
+
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this RelatedEvent.
+
+        A list of metrics affected by the event  # noqa: E501
+
+        :param metrics_used: The metrics_used of this RelatedEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._metrics_used = metrics_used
+
+    @property
+    def name(self):
+        """Gets the name of this RelatedEvent.  # noqa: E501
+
+        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
+
+        :return: The name of this RelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this RelatedEvent.
+
+        The name of the event.  If 'annotations.prettyName' is present, 'name' will be equivalent to that value  # noqa: E501
+
+        :param name: The name of this RelatedEvent.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def related_data(self):
+        """Gets the related_data of this RelatedEvent.  # noqa: E501
+
+        Data concerning how this event is related to the event in the request  # noqa: E501
+
+        :return: The related_data of this RelatedEvent.  # noqa: E501
+        :rtype: RelatedData
+        """
+        return self._related_data
+
+    @related_data.setter
+    def related_data(self, related_data):
+        """Sets the related_data of this RelatedEvent.
+
+        Data concerning how this event is related to the event in the request  # noqa: E501
+
+        :param related_data: The related_data of this RelatedEvent.  # noqa: E501
+        :type: RelatedData
+        """
+
+        self._related_data = related_data
+
+    @property
+    def running_state(self):
+        """Gets the running_state of this RelatedEvent.  # noqa: E501
+
+
+        :return: The running_state of this RelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._running_state
+
+    @running_state.setter
+    def running_state(self, running_state):
+        """Sets the running_state of this RelatedEvent.
+
+
+        :param running_state: The running_state of this RelatedEvent.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
+        if running_state not in allowed_values:
+            raise ValueError(
+                "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
+                .format(running_state, allowed_values)
+            )
+
+        self._running_state = running_state
+
+    @property
+    def start_time(self):
+        """Gets the start_time of this RelatedEvent.  # noqa: E501
+
+        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
+
+        :return: The start_time of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_time
+
+    @start_time.setter
+    def start_time(self, start_time):
+        """Sets the start_time of this RelatedEvent.
+
+        Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time  # noqa: E501
+
+        :param start_time: The start_time of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+        if start_time is None:
+            raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
+
+        self._start_time = start_time
+
+    @property
+    def summarized_events(self):
+        """Gets the summarized_events of this RelatedEvent.  # noqa: E501
+
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
+
+        :return: The summarized_events of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._summarized_events
+
+    @summarized_events.setter
+    def summarized_events(self, summarized_events):
+        """Sets the summarized_events of this RelatedEvent.
+
+        In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one  # noqa: E501
+
+        :param summarized_events: The summarized_events of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._summarized_events = summarized_events
+
+    @property
+    def table(self):
+        """Gets the table of this RelatedEvent.  # noqa: E501
+
+        The customer to which the event belongs  # noqa: E501
+
+        :return: The table of this RelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._table
+
+    @table.setter
+    def table(self, table):
+        """Sets the table of this RelatedEvent.
+
+        The customer to which the event belongs  # noqa: E501
+
+        :param table: The table of this RelatedEvent.  # noqa: E501
+        :type: str
+        """
+
+        self._table = table
+
+    @property
+    def tags(self):
+        """Gets the tags of this RelatedEvent.  # noqa: E501
+
+        A list of event tags  # noqa: E501
+
+        :return: The tags of this RelatedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this RelatedEvent.
+
+        A list of event tags  # noqa: E501
+
+        :param tags: The tags of this RelatedEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tags = tags
+
+    @property
+    def updated_at(self):
+        """Gets the updated_at of this RelatedEvent.  # noqa: E501
+
+
+        :return: The updated_at of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_at
+
+    @updated_at.setter
+    def updated_at(self, updated_at):
+        """Sets the updated_at of this RelatedEvent.
+
+
+        :param updated_at: The updated_at of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_at = updated_at
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this RelatedEvent.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this RelatedEvent.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this RelatedEvent.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this RelatedEvent.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this RelatedEvent.  # noqa: E501
+
+
+        :return: The updater_id of this RelatedEvent.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this RelatedEvent.
+
+
+        :param updater_id: The updater_id of this RelatedEvent.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RelatedEvent, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RelatedEvent):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_monitored_cluster.py b/wavefront_api_client/models/response_container_monitored_cluster.py
new file mode 100644
index 0000000..4233d6b
--- /dev/null
+++ b/wavefront_api_client/models/response_container_monitored_cluster.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerMonitoredCluster(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'MonitoredCluster',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerMonitoredCluster - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMonitoredCluster.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMonitoredCluster.  # noqa: E501
+        :rtype: MonitoredCluster
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMonitoredCluster.
+
+
+        :param response: The response of this ResponseContainerMonitoredCluster.  # noqa: E501
+        :type: MonitoredCluster
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerMonitoredCluster.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerMonitoredCluster.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerMonitoredCluster.
+
+
+        :param status: The status of this ResponseContainerMonitoredCluster.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerMonitoredCluster, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerMonitoredCluster):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_anomaly.py b/wavefront_api_client/models/response_container_paged_anomaly.py
new file mode 100644
index 0000000..2b90f0f
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_anomaly.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedAnomaly(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedAnomaly',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedAnomaly - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedAnomaly.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedAnomaly.  # noqa: E501
+        :rtype: PagedAnomaly
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedAnomaly.
+
+
+        :param response: The response of this ResponseContainerPagedAnomaly.  # noqa: E501
+        :type: PagedAnomaly
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedAnomaly.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedAnomaly.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedAnomaly.
+
+
+        :param status: The status of this ResponseContainerPagedAnomaly.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedAnomaly, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedAnomaly):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_monitored_cluster.py b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
new file mode 100644
index 0000000..97d36b4
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedMonitoredCluster(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedMonitoredCluster',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedMonitoredCluster - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+        :rtype: PagedMonitoredCluster
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedMonitoredCluster.
+
+
+        :param response: The response of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+        :type: PagedMonitoredCluster
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedMonitoredCluster.
+
+
+        :param status: The status of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedMonitoredCluster, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedMonitoredCluster):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_related_event.py b/wavefront_api_client/models/response_container_paged_related_event.py
new file mode 100644
index 0000000..92bb50c
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_related_event.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedRelatedEvent(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedRelatedEvent',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedRelatedEvent - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+        :rtype: PagedRelatedEvent
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedRelatedEvent.
+
+
+        :param response: The response of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+        :type: PagedRelatedEvent
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedRelatedEvent.
+
+
+        :param status: The status of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedRelatedEvent, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedRelatedEvent):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 3befd79..bc02889 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -69,7 +69,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if not set(response).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_source_label_pair.py b/wavefront_api_client/models/response_container_set_source_label_pair.py
new file mode 100644
index 0000000..cda7e76
--- /dev/null
+++ b/wavefront_api_client/models/response_container_set_source_label_pair.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerSetSourceLabelPair(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[SourceLabelPair]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerSetSourceLabelPair - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSetSourceLabelPair.
+
+
+        :param response: The response of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSetSourceLabelPair.
+
+
+        :param status: The status of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSetSourceLabelPair, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSetSourceLabelPair):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_string.py b/wavefront_api_client/models/response_container_string.py
new file mode 100644
index 0000000..218805d
--- /dev/null
+++ b/wavefront_api_client/models/response_container_string.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerString(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'str',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerString - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerString.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerString.  # noqa: E501
+        :rtype: str
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerString.
+
+
+        :param response: The response of this ResponseContainerString.  # noqa: E501
+        :type: str
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerString.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerString.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerString.
+
+
+        :param status: The status of this ResponseContainerString.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerString, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerString):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_user_hard_delete.py b/wavefront_api_client/models/response_container_user_hard_delete.py
new file mode 100644
index 0000000..421c9a7
--- /dev/null
+++ b/wavefront_api_client/models/response_container_user_hard_delete.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerUserHardDelete(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'UserHardDelete',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerUserHardDelete - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerUserHardDelete.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerUserHardDelete.  # noqa: E501
+        :rtype: UserHardDelete
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerUserHardDelete.
+
+
+        :param response: The response of this ResponseContainerUserHardDelete.  # noqa: E501
+        :type: UserHardDelete
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerUserHardDelete.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerUserHardDelete.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerUserHardDelete.
+
+
+        :param status: The status of this ResponseContainerUserHardDelete.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerUserHardDelete, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerUserHardDelete):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 2cb066e..e8342ad 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -34,23 +34,26 @@ class SearchQuery(object):
         'key': 'str',
         'matching_method': 'str',
         'negated': 'bool',
-        'value': 'str'
+        'value': 'str',
+        'values': 'list[str]'
     }
 
     attribute_map = {
         'key': 'key',
         'matching_method': 'matchingMethod',
         'negated': 'negated',
-        'value': 'value'
+        'value': 'value',
+        'values': 'values'
     }
 
-    def __init__(self, key=None, matching_method=None, negated=None, value=None):  # noqa: E501
+    def __init__(self, key=None, matching_method=None, negated=None, value=None, values=None):  # noqa: E501
         """SearchQuery - a model defined in Swagger"""  # noqa: E501
 
         self._key = None
         self._matching_method = None
         self._negated = None
         self._value = None
+        self._values = None
         self.discriminator = None
 
         self.key = key
@@ -58,7 +61,10 @@ def __init__(self, key=None, matching_method=None, negated=None, value=None):  #
             self.matching_method = matching_method
         if negated is not None:
             self.negated = negated
-        self.value = value
+        if value is not None:
+            self.value = value
+        if values is not None:
+            self.values = values
 
     @property
     def key(self):
@@ -141,7 +147,7 @@ def negated(self, negated):
     def value(self):
         """Gets the value of this SearchQuery.  # noqa: E501
 
-        The entity facet value for which to search  # noqa: E501
+        The entity facet value for which to search. Either value or values field is required. If both are set, values takes precedence.  # noqa: E501
 
         :return: The value of this SearchQuery.  # noqa: E501
         :rtype: str
@@ -152,16 +158,37 @@ def value(self):
     def value(self, value):
         """Sets the value of this SearchQuery.
 
-        The entity facet value for which to search  # noqa: E501
+        The entity facet value for which to search. Either value or values field is required. If both are set, values takes precedence.  # noqa: E501
 
         :param value: The value of this SearchQuery.  # noqa: E501
         :type: str
         """
-        if value is None:
-            raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
 
         self._value = value
 
+    @property
+    def values(self):
+        """Gets the values of this SearchQuery.  # noqa: E501
+
+        The entity facet values for which to search based on OR operation. Either value or values field is required. If both are set, values takes precedence.  # noqa: E501
+
+        :return: The values of this SearchQuery.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._values
+
+    @values.setter
+    def values(self, values):
+        """Sets the values of this SearchQuery.
+
+        The entity facet values for which to search based on OR operation. Either value or values field is required. If both are set, values takes precedence.  # noqa: E501
+
+        :param values: The values of this SearchQuery.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._values = values
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/stripe.py b/wavefront_api_client/models/stripe.py
new file mode 100644
index 0000000..30cff8d
--- /dev/null
+++ b/wavefront_api_client/models/stripe.py
@@ -0,0 +1,205 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Stripe(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'end_ms': 'int',
+        'image_link': 'str',
+        'model': 'str',
+        'start_ms': 'int'
+    }
+
+    attribute_map = {
+        'end_ms': 'endMs',
+        'image_link': 'imageLink',
+        'model': 'model',
+        'start_ms': 'startMs'
+    }
+
+    def __init__(self, end_ms=None, image_link=None, model=None, start_ms=None):  # noqa: E501
+        """Stripe - a model defined in Swagger"""  # noqa: E501
+
+        self._end_ms = None
+        self._image_link = None
+        self._model = None
+        self._start_ms = None
+        self.discriminator = None
+
+        self.end_ms = end_ms
+        self.image_link = image_link
+        self.model = model
+        self.start_ms = start_ms
+
+    @property
+    def end_ms(self):
+        """Gets the end_ms of this Stripe.  # noqa: E501
+
+        endMs for this stripe  # noqa: E501
+
+        :return: The end_ms of this Stripe.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_ms
+
+    @end_ms.setter
+    def end_ms(self, end_ms):
+        """Sets the end_ms of this Stripe.
+
+        endMs for this stripe  # noqa: E501
+
+        :param end_ms: The end_ms of this Stripe.  # noqa: E501
+        :type: int
+        """
+        if end_ms is None:
+            raise ValueError("Invalid value for `end_ms`, must not be `None`")  # noqa: E501
+
+        self._end_ms = end_ms
+
+    @property
+    def image_link(self):
+        """Gets the image_link of this Stripe.  # noqa: E501
+
+        image link for this stripe  # noqa: E501
+
+        :return: The image_link of this Stripe.  # noqa: E501
+        :rtype: str
+        """
+        return self._image_link
+
+    @image_link.setter
+    def image_link(self, image_link):
+        """Sets the image_link of this Stripe.
+
+        image link for this stripe  # noqa: E501
+
+        :param image_link: The image_link of this Stripe.  # noqa: E501
+        :type: str
+        """
+        if image_link is None:
+            raise ValueError("Invalid value for `image_link`, must not be `None`")  # noqa: E501
+
+        self._image_link = image_link
+
+    @property
+    def model(self):
+        """Gets the model of this Stripe.  # noqa: E501
+
+        model for this stripe  # noqa: E501
+
+        :return: The model of this Stripe.  # noqa: E501
+        :rtype: str
+        """
+        return self._model
+
+    @model.setter
+    def model(self, model):
+        """Sets the model of this Stripe.
+
+        model for this stripe  # noqa: E501
+
+        :param model: The model of this Stripe.  # noqa: E501
+        :type: str
+        """
+        if model is None:
+            raise ValueError("Invalid value for `model`, must not be `None`")  # noqa: E501
+
+        self._model = model
+
+    @property
+    def start_ms(self):
+        """Gets the start_ms of this Stripe.  # noqa: E501
+
+        startMs for this stripe  # noqa: E501
+
+        :return: The start_ms of this Stripe.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_ms
+
+    @start_ms.setter
+    def start_ms(self, start_ms):
+        """Sets the start_ms of this Stripe.
+
+        startMs for this stripe  # noqa: E501
+
+        :param start_ms: The start_ms of this Stripe.  # noqa: E501
+        :type: int
+        """
+        if start_ms is None:
+            raise ValueError("Invalid value for `start_ms`, must not be `None`")  # noqa: E501
+
+        self._start_ms = start_ms
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Stripe, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Stripe):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/user_hard_delete.py b/wavefront_api_client/models/user_hard_delete.py
new file mode 100644
index 0000000..315f60a
--- /dev/null
+++ b/wavefront_api_client/models/user_hard_delete.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class UserHardDelete(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer_id': 'str',
+        'existing': 'dict(str, Iterable)',
+        'user_id': 'str'
+    }
+
+    attribute_map = {
+        'customer_id': 'customerId',
+        'existing': 'existing',
+        'user_id': 'userId'
+    }
+
+    def __init__(self, customer_id=None, existing=None, user_id=None):  # noqa: E501
+        """UserHardDelete - a model defined in Swagger"""  # noqa: E501
+
+        self._customer_id = None
+        self._existing = None
+        self._user_id = None
+        self.discriminator = None
+
+        if customer_id is not None:
+            self.customer_id = customer_id
+        if existing is not None:
+            self.existing = existing
+        if user_id is not None:
+            self.user_id = user_id
+
+    @property
+    def customer_id(self):
+        """Gets the customer_id of this UserHardDelete.  # noqa: E501
+
+
+        :return: The customer_id of this UserHardDelete.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer_id
+
+    @customer_id.setter
+    def customer_id(self, customer_id):
+        """Sets the customer_id of this UserHardDelete.
+
+
+        :param customer_id: The customer_id of this UserHardDelete.  # noqa: E501
+        :type: str
+        """
+
+        self._customer_id = customer_id
+
+    @property
+    def existing(self):
+        """Gets the existing of this UserHardDelete.  # noqa: E501
+
+
+        :return: The existing of this UserHardDelete.  # noqa: E501
+        :rtype: dict(str, Iterable)
+        """
+        return self._existing
+
+    @existing.setter
+    def existing(self, existing):
+        """Sets the existing of this UserHardDelete.
+
+
+        :param existing: The existing of this UserHardDelete.  # noqa: E501
+        :type: dict(str, Iterable)
+        """
+
+        self._existing = existing
+
+    @property
+    def user_id(self):
+        """Gets the user_id of this UserHardDelete.  # noqa: E501
+
+
+        :return: The user_id of this UserHardDelete.  # noqa: E501
+        :rtype: str
+        """
+        return self._user_id
+
+    @user_id.setter
+    def user_id(self, user_id):
+        """Sets the user_id of this UserHardDelete.
+
+
+        :param user_id: The user_id of this UserHardDelete.  # noqa: E501
+        :type: str
+        """
+
+        self._user_id = user_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(UserHardDelete, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, UserHardDelete):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 5104efabf44880bb159bf3e8996094b0c18ca253 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 7 Feb 2020 08:16:24 -0800
Subject: [PATCH 044/161] Autogenerated Update v2.55.10.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  32 +-
 docs/AlertApi.md                              |   6 +-
 docs/AnomalyApi.md                            | 390 ++++++++++
 docs/CloudIntegrationApi.md                   |  57 +-
 docs/DashboardApi.md                          |   6 +-
 docs/DerivedMetricApi.md                      |   6 +-
 docs/Integration.md                           |   1 +
 docs/MetricDetailsResponse.md                 |   1 +
 docs/ProxyApi.md                              |   6 +-
 docs/QueryApi.md                              |   8 +-
 docs/SearchApi.md                             | 167 ----
 setup.py                                      |   2 +-
 test/test_anomaly_api.py                      |  76 ++
 wavefront_api_client/__init__.py              |   9 +-
 wavefront_api_client/api/__init__.py          |   3 +-
 wavefront_api_client/api/alert_api.py         |   6 +-
 wavefront_api_client/api/anomaly_api.py       | 720 ++++++++++++++++++
 .../api/cloud_integration_api.py              |  97 ++-
 wavefront_api_client/api/dashboard_api.py     |   6 +-
 .../api/derived_metric_api.py                 |   6 +-
 wavefront_api_client/api/proxy_api.py         |   6 +-
 wavefront_api_client/api/query_api.py         |  11 +-
 wavefront_api_client/api/search_api.py        | 293 -------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   6 -
 wavefront_api_client/models/integration.py    |  31 +-
 .../models/metric_details_response.py         |  30 +-
 30 files changed, 1465 insertions(+), 525 deletions(-)
 create mode 100644 docs/AnomalyApi.md
 create mode 100644 test/test_anomaly_api.py
 create mode 100644 wavefront_api_client/api/anomaly_api.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 00596e1..17a6833 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.40.22"
+    "packageVersion": "2.55.10"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 2ef8b0d..00596e1 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.38.24"
+    "packageVersion": "2.40.22"
 }
diff --git a/README.md b/README.md
index b245b5a..1f9e2d6 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.40.22
+- Package version: 2.55.10
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -123,6 +123,12 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
+*AnomalyApi* | [**get_all_anomalies**](docs/AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
+*AnomalyApi* | [**get_anomalies_for_chart_and_param_hash**](docs/AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
+*AnomalyApi* | [**get_chart_anomalies**](docs/AnomalyApi.md#get_chart_anomalies) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+*AnomalyApi* | [**get_chart_anomalies_0**](docs/AnomalyApi.md#get_chart_anomalies_0) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+*AnomalyApi* | [**get_dashboard_anomalies**](docs/AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
+*AnomalyApi* | [**get_related_anomalies**](docs/AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
 *ApiTokenApi* | [**delete_token_service_account**](docs/ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
@@ -131,6 +137,7 @@ Class | Method | HTTP request | Description
 *ApiTokenApi* | [**get_tokens_service_account**](docs/ApiTokenApi.md#get_tokens_service_account) | **GET** /api/v2/apitoken/serviceaccount/{id} | Get all api tokens for the given service account
 *ApiTokenApi* | [**update_token_name**](docs/ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
 *ApiTokenApi* | [**update_token_name_service_account**](docs/ApiTokenApi.md#update_token_name_service_account) | **PUT** /api/v2/apitoken/serviceaccount/{id}/{token} | Update the name of the specified api token for the given service account
+*CloudIntegrationApi* | [**create_aws_external_id**](docs/CloudIntegrationApi.md#create_aws_external_id) | **POST** /api/v2/cloudintegration/awsExternalId/create | Create an external id
 *CloudIntegrationApi* | [**create_cloud_integration**](docs/CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
 *CloudIntegrationApi* | [**delete_cloud_integration**](docs/CloudIntegrationApi.md#delete_cloud_integration) | **DELETE** /api/v2/cloudintegration/{id} | Delete a specific cloud integration
 *CloudIntegrationApi* | [**disable_cloud_integration**](docs/CloudIntegrationApi.md#disable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/disable | Disable a specific cloud integration
@@ -208,16 +215,6 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
-*MonitoredClusterApi* | [**add_cluster_tag**](docs/MonitoredClusterApi.md#add_cluster_tag) | **PUT** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Add a tag to a specific cluster
-*MonitoredClusterApi* | [**create_cluster**](docs/MonitoredClusterApi.md#create_cluster) | **POST** /api/v2/monitoredcluster | Create a specific cluster
-*MonitoredClusterApi* | [**delete_cluster**](docs/MonitoredClusterApi.md#delete_cluster) | **DELETE** /api/v2/monitoredcluster/{id} | Delete a specific cluster
-*MonitoredClusterApi* | [**get_all_cluster**](docs/MonitoredClusterApi.md#get_all_cluster) | **GET** /api/v2/monitoredcluster | Get all monitored clusters
-*MonitoredClusterApi* | [**get_cluster**](docs/MonitoredClusterApi.md#get_cluster) | **GET** /api/v2/monitoredcluster/{id} | Get a specific cluster
-*MonitoredClusterApi* | [**get_cluster_tags**](docs/MonitoredClusterApi.md#get_cluster_tags) | **GET** /api/v2/monitoredcluster/{id}/tag | Get all tags associated with a specific cluster
-*MonitoredClusterApi* | [**merge_clusters**](docs/MonitoredClusterApi.md#merge_clusters) | **PUT** /api/v2/monitoredcluster/merge/{id1}/{id2} | Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
-*MonitoredClusterApi* | [**remove_cluster_tag**](docs/MonitoredClusterApi.md#remove_cluster_tag) | **DELETE** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Remove a tag from a specific cluster
-*MonitoredClusterApi* | [**set_cluster_tags**](docs/MonitoredClusterApi.md#set_cluster_tags) | **POST** /api/v2/monitoredcluster/{id}/tag | Set all tags associated with a specific cluster
-*MonitoredClusterApi* | [**update_cluster**](docs/MonitoredClusterApi.md#update_cluster) | **PUT** /api/v2/monitoredcluster/{id} | Update a specific cluster
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
 *NotificantApi* | [**get_all_notificants**](docs/NotificantApi.md#get_all_notificants) | **GET** /api/v2/notificant | Get all notification targets for a customer
@@ -267,9 +264,6 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_maintenance_window_entities**](docs/SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facet**](docs/SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facets**](docs/SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
-*SearchApi* | [**search_monitored_cluster_entities**](docs/SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
-*SearchApi* | [**search_monitored_cluster_for_facet**](docs/SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
-*SearchApi* | [**search_monitored_cluster_for_facets**](docs/SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 *SearchApi* | [**search_notficant_for_facets**](docs/SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 *SearchApi* | [**search_notificant_entities**](docs/SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 *SearchApi* | [**search_notificant_for_facet**](docs/SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -304,10 +298,6 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_web_hook_entities**](docs/SearchApi.md#search_web_hook_entities) | **POST** /api/v2/search/webhook | Search over a customer&#39;s webhooks
 *SearchApi* | [**search_web_hook_for_facet**](docs/SearchApi.md#search_web_hook_for_facet) | **POST** /api/v2/search/webhook/{facet} | Lists the values of a specific facet over the customer&#39;s webhooks
 *SearchApi* | [**search_webhook_for_facets**](docs/SearchApi.md#search_webhook_for_facets) | **POST** /api/v2/search/webhook/facets | Lists the values of one or more facets over the customer&#39;s webhooks
-*SettingsApi* | [**get_all_permissions**](docs/SettingsApi.md#get_all_permissions) | **GET** /api/v2/customer/permissions | Get all permissions
-*SettingsApi* | [**get_customer_preferences**](docs/SettingsApi.md#get_customer_preferences) | **GET** /api/v2/customer/preferences | Get customer preferences
-*SettingsApi* | [**get_default_user_groups**](docs/SettingsApi.md#get_default_user_groups) | **GET** /api/v2/customer/preferences/defaultUserGroups | Get default user groups customer preferences
-*SettingsApi* | [**post_customer_preferences**](docs/SettingsApi.md#post_customer_preferences) | **POST** /api/v2/customer/preferences | Update selected fields of customer preferences
 *SourceApi* | [**add_source_tag**](docs/SourceApi.md#add_source_tag) | **PUT** /api/v2/source/{id}/tag/{tagValue} | Add a tag to a specific source
 *SourceApi* | [**create_source**](docs/SourceApi.md#create_source) | **POST** /api/v2/source | Create metadata (description or tags) for a specific source
 *SourceApi* | [**delete_source**](docs/SourceApi.md#delete_source) | **DELETE** /api/v2/source/{id} | Delete metadata (description and tags) for a specific source
@@ -374,7 +364,6 @@ Class | Method | HTTP request | Description
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
  - [AzureBaseCredentials](docs/AzureBaseCredentials.md)
  - [AzureConfiguration](docs/AzureConfiguration.md)
- - [BusinessActionGroupBasicDTO](docs/BusinessActionGroupBasicDTO.md)
  - [Chart](docs/Chart.md)
  - [ChartSettings](docs/ChartSettings.md)
  - [ChartSourceQuery](docs/ChartSourceQuery.md)
@@ -382,8 +371,6 @@ Class | Method | HTTP request | Description
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
- - [CustomerPreferences](docs/CustomerPreferences.md)
- - [CustomerPreferencesUpdating](docs/CustomerPreferencesUpdating.md)
  - [Dashboard](docs/Dashboard.md)
  - [DashboardMin](docs/DashboardMin.md)
  - [DashboardParameterValue](docs/DashboardParameterValue.md)
@@ -480,7 +467,6 @@ Class | Method | HTTP request | Description
  - [ResponseContainerListServiceAccount](docs/ResponseContainerListServiceAccount.md)
  - [ResponseContainerListString](docs/ResponseContainerListString.md)
  - [ResponseContainerListUserApiToken](docs/ResponseContainerListUserApiToken.md)
- - [ResponseContainerListUserGroupModel](docs/ResponseContainerListUserGroupModel.md)
  - [ResponseContainerMaintenanceWindow](docs/ResponseContainerMaintenanceWindow.md)
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
@@ -540,7 +526,6 @@ Class | Method | HTTP request | Description
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
- - [User](docs/User.md)
  - [UserApiToken](docs/UserApiToken.md)
  - [UserDTO](docs/UserDTO.md)
  - [UserGroup](docs/UserGroup.md)
@@ -550,7 +535,6 @@ Class | Method | HTTP request | Description
  - [UserHardDelete](docs/UserHardDelete.md)
  - [UserModel](docs/UserModel.md)
  - [UserRequestDTO](docs/UserRequestDTO.md)
- - [UserSettings](docs/UserSettings.md)
  - [UserToCreate](docs/UserToCreate.md)
  - [ValidatedUsersDTO](docs/ValidatedUsersDTO.md)
  - [WFTags](docs/WFTags.md)
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 50b74ea..68170ae 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -250,7 +250,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_alert**
-> ResponseContainerAlert delete_alert(id)
+> ResponseContainerAlert delete_alert(id, skip_trash=skip_trash)
 
 Delete a specific alert
 
@@ -273,10 +273,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+skip_trash = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific alert
-    api_response = api_instance.delete_alert(id)
+    api_response = api_instance.delete_alert(id, skip_trash=skip_trash)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling AlertApi->delete_alert: %s\n" % e)
@@ -287,6 +288,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **skip_trash** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/AnomalyApi.md b/docs/AnomalyApi.md
new file mode 100644
index 0000000..e896bd9
--- /dev/null
+++ b/docs/AnomalyApi.md
@@ -0,0 +1,390 @@
+# wavefront_api_client.AnomalyApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_all_anomalies**](AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
+[**get_anomalies_for_chart_and_param_hash**](AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
+[**get_chart_anomalies**](AnomalyApi.md#get_chart_anomalies) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+[**get_chart_anomalies_0**](AnomalyApi.md#get_chart_anomalies_0) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+[**get_dashboard_anomalies**](AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
+[**get_related_anomalies**](AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
+
+
+# **get_all_anomalies**
+> ResponseContainerPagedAnomaly get_all_anomalies(start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+
+Get all anomalies for a customer during a time interval
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
+start_ms = 789 # int |  (optional)
+end_ms = 789 # int |  (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 1000 # int |  (optional) (default to 1000)
+
+try:
+    # Get all anomalies for a customer during a time interval
+    api_response = api_instance.get_all_anomalies(start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AnomalyApi->get_all_anomalies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start_ms** | **int**|  | [optional] 
+ **end_ms** | **int**|  | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 1000]
+
+### Return type
+
+[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_anomalies_for_chart_and_param_hash**
+> ResponseContainerPagedAnomaly get_anomalies_for_chart_and_param_hash(dashboard_id, chart_hash, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+
+Get all anomalies for a chart with a set of dashboard parameters during a time interval
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
+dashboard_id = 'dashboard_id_example' # str | 
+chart_hash = 'chart_hash_example' # str | 
+param_hash = 'param_hash_example' # str | 
+start_ms = 789 # int |  (optional)
+end_ms = 789 # int |  (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 1000 # int |  (optional) (default to 1000)
+
+try:
+    # Get all anomalies for a chart with a set of dashboard parameters during a time interval
+    api_response = api_instance.get_anomalies_for_chart_and_param_hash(dashboard_id, chart_hash, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AnomalyApi->get_anomalies_for_chart_and_param_hash: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **dashboard_id** | **str**|  | 
+ **chart_hash** | **str**|  | 
+ **param_hash** | **str**|  | 
+ **start_ms** | **int**|  | [optional] 
+ **end_ms** | **int**|  | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 1000]
+
+### Return type
+
+[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_chart_anomalies**
+> ResponseContainerPagedAnomaly get_chart_anomalies(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+
+Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
+dashboard_id = 'dashboard_id_example' # str | 
+start_ms = 789 # int |  (optional)
+end_ms = 789 # int |  (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 1000 # int |  (optional) (default to 1000)
+
+try:
+    # Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+    api_response = api_instance.get_chart_anomalies(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AnomalyApi->get_chart_anomalies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **dashboard_id** | **str**|  | 
+ **start_ms** | **int**|  | [optional] 
+ **end_ms** | **int**|  | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 1000]
+
+### Return type
+
+[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_chart_anomalies_0**
+> ResponseContainerPagedAnomaly get_chart_anomalies_0(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+
+Get all anomalies for a chart during a time interval
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
+dashboard_id = 'dashboard_id_example' # str | 
+chart_hash = 'chart_hash_example' # str | 
+start_ms = 789 # int |  (optional)
+end_ms = 789 # int |  (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 1000 # int |  (optional) (default to 1000)
+
+try:
+    # Get all anomalies for a chart during a time interval
+    api_response = api_instance.get_chart_anomalies_0(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AnomalyApi->get_chart_anomalies_0: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **dashboard_id** | **str**|  | 
+ **chart_hash** | **str**|  | 
+ **start_ms** | **int**|  | [optional] 
+ **end_ms** | **int**|  | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 1000]
+
+### Return type
+
+[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_dashboard_anomalies**
+> ResponseContainerPagedAnomaly get_dashboard_anomalies(dashboard_id, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+
+Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
+dashboard_id = 'dashboard_id_example' # str | 
+param_hash = 'param_hash_example' # str | 
+start_ms = 789 # int |  (optional)
+end_ms = 789 # int |  (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 1000 # int |  (optional) (default to 1000)
+
+try:
+    # Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
+    api_response = api_instance.get_dashboard_anomalies(dashboard_id, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AnomalyApi->get_dashboard_anomalies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **dashboard_id** | **str**|  | 
+ **param_hash** | **str**|  | 
+ **start_ms** | **int**|  | [optional] 
+ **end_ms** | **int**|  | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 1000]
+
+### Return type
+
+[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_related_anomalies**
+> ResponseContainerPagedAnomaly get_related_anomalies(event_id, rendering_method=rendering_method, is_overlapped=is_overlapped, limit=limit)
+
+Get all related anomalies for a firing event with a time span
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
+event_id = 'event_id_example' # str | 
+rendering_method = 'rendering_method_example' # str |  (optional)
+is_overlapped = false # bool |  (optional) (default to false)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all related anomalies for a firing event with a time span
+    api_response = api_instance.get_related_anomalies(event_id, rendering_method=rendering_method, is_overlapped=is_overlapped, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AnomalyApi->get_related_anomalies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **event_id** | **str**|  | 
+ **rendering_method** | **str**|  | [optional] 
+ **is_overlapped** | **bool**|  | [optional] [default to false]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/CloudIntegrationApi.md b/docs/CloudIntegrationApi.md
index ce3f8d4..ffa8416 100644
--- a/docs/CloudIntegrationApi.md
+++ b/docs/CloudIntegrationApi.md
@@ -4,6 +4,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**create_aws_external_id**](CloudIntegrationApi.md#create_aws_external_id) | **POST** /api/v2/cloudintegration/awsExternalId/create | Create an external id
 [**create_cloud_integration**](CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
 [**delete_cloud_integration**](CloudIntegrationApi.md#delete_cloud_integration) | **DELETE** /api/v2/cloudintegration/{id} | Delete a specific cloud integration
 [**disable_cloud_integration**](CloudIntegrationApi.md#disable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/disable | Disable a specific cloud integration
@@ -14,6 +15,56 @@ Method | HTTP request | Description
 [**update_cloud_integration**](CloudIntegrationApi.md#update_cloud_integration) | **PUT** /api/v2/cloudintegration/{id} | Update a specific cloud integration
 
 
+# **create_aws_external_id**
+> ResponseContainerString create_aws_external_id()
+
+Create an external id
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.CloudIntegrationApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Create an external id
+    api_response = api_instance.create_aws_external_id()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling CloudIntegrationApi->create_aws_external_id: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_cloud_integration**
 > ResponseContainerCloudIntegration create_cloud_integration(body=body)
 
@@ -69,7 +120,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_cloud_integration**
-> ResponseContainerCloudIntegration delete_cloud_integration(id)
+> ResponseContainerCloudIntegration delete_cloud_integration(id, skip_trash=skip_trash)
 
 Delete a specific cloud integration
 
@@ -92,10 +143,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.CloudIntegrationApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+skip_trash = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific cloud integration
-    api_response = api_instance.delete_cloud_integration(id)
+    api_response = api_instance.delete_cloud_integration(id, skip_trash=skip_trash)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling CloudIntegrationApi->delete_cloud_integration: %s\n" % e)
@@ -106,6 +158,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **skip_trash** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/DashboardApi.md b/docs/DashboardApi.md
index c8f6ad4..10650d6 100644
--- a/docs/DashboardApi.md
+++ b/docs/DashboardApi.md
@@ -188,7 +188,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_dashboard**
-> ResponseContainerDashboard delete_dashboard(id)
+> ResponseContainerDashboard delete_dashboard(id, skip_trash=skip_trash)
 
 Delete a specific dashboard
 
@@ -211,10 +211,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.DashboardApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+skip_trash = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific dashboard
-    api_response = api_instance.delete_dashboard(id)
+    api_response = api_instance.delete_dashboard(id, skip_trash=skip_trash)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling DashboardApi->delete_dashboard: %s\n" % e)
@@ -225,6 +226,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **skip_trash** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/DerivedMetricApi.md b/docs/DerivedMetricApi.md
index 31f6e5a..d40fd7c 100644
--- a/docs/DerivedMetricApi.md
+++ b/docs/DerivedMetricApi.md
@@ -129,7 +129,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_derived_metric**
-> ResponseContainerDerivedMetricDefinition delete_derived_metric(id)
+> ResponseContainerDerivedMetricDefinition delete_derived_metric(id, skip_trash=skip_trash)
 
 Delete a specific derived metric definition
 
@@ -152,10 +152,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.DerivedMetricApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+skip_trash = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific derived metric definition
-    api_response = api_instance.delete_derived_metric(id)
+    api_response = api_instance.delete_derived_metric(id, skip_trash=skip_trash)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling DerivedMetricApi->delete_derived_metric: %s\n" % e)
@@ -166,6 +167,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **skip_trash** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/Integration.md b/docs/Integration.md
index b618b11..b2b792a 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **dashboards** | [**list[IntegrationDashboard]**](IntegrationDashboard.md) | A list of dashboards belonging to this integration | [optional] 
 **deleted** | **bool** |  | [optional] 
 **description** | **str** | Integration description | 
+**hidden** | **bool** | Integration is hidden or not | 
 **icon** | **str** | URI path to the integration icon | 
 **id** | **str** |  | [optional] 
 **metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
diff --git a/docs/MetricDetailsResponse.md b/docs/MetricDetailsResponse.md
index e98e855..041a5c4 100644
--- a/docs/MetricDetailsResponse.md
+++ b/docs/MetricDetailsResponse.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**continuation_token** | **str** | Token used for pagination of results | [optional] 
 **hosts** | [**list[MetricDetails]**](MetricDetails.md) | List of sources/hosts reporting this metric | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/ProxyApi.md b/docs/ProxyApi.md
index 2c42a7c..5063e1e 100644
--- a/docs/ProxyApi.md
+++ b/docs/ProxyApi.md
@@ -12,7 +12,7 @@ Method | HTTP request | Description
 
 
 # **delete_proxy**
-> ResponseContainerProxy delete_proxy(id)
+> ResponseContainerProxy delete_proxy(id, skip_trash=skip_trash)
 
 Delete a specific proxy
 
@@ -35,10 +35,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.ProxyApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+skip_trash = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific proxy
-    api_response = api_instance.delete_proxy(id)
+    api_response = api_instance.delete_proxy(id, skip_trash=skip_trash)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling ProxyApi->delete_proxy: %s\n" % e)
@@ -49,6 +50,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **skip_trash** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/QueryApi.md b/docs/QueryApi.md
index 4aae5dd..f40b926 100644
--- a/docs/QueryApi.md
+++ b/docs/QueryApi.md
@@ -9,7 +9,7 @@ Method | HTTP request | Description
 
 
 # **query_api**
-> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
+> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached, dimension_tuples=dimension_tuples, use_raw_qk=use_raw_qk)
 
 Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
 
@@ -46,10 +46,12 @@ view = 'METRIC' # str | view of the query result, metric or histogram, defaults
 include_obsolete_metrics = true # bool | include metrics that have not been reporting recently, defaults to false (optional)
 sorted = false # bool | sorts the output so that returned series are in order, defaults to false (optional) (default to false)
 cached = true # bool | whether the query cache is used, defaults to true (optional) (default to true)
+dimension_tuples = ['dimension_tuples_example'] # list[str] |  (optional)
+use_raw_qk = false # bool |  (optional) (default to false)
 
 try:
     # Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
-    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached)
+    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached, dimension_tuples=dimension_tuples, use_raw_qk=use_raw_qk)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling QueryApi->query_api: %s\n" % e)
@@ -74,6 +76,8 @@ Name | Type | Description  | Notes
  **include_obsolete_metrics** | **bool**| include metrics that have not been reporting recently, defaults to false | [optional] 
  **sorted** | **bool**| sorts the output so that returned series are in order, defaults to false | [optional] [default to false]
  **cached** | **bool**| whether the query cache is used, defaults to true | [optional] [default to true]
+ **dimension_tuples** | [**list[str]**](str.md)|  | [optional] 
+ **use_raw_qk** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 1eb8a17..94cb9e1 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -34,9 +34,6 @@ Method | HTTP request | Description
 [**search_maintenance_window_entities**](SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 [**search_maintenance_window_for_facet**](SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 [**search_maintenance_window_for_facets**](SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
-[**search_monitored_cluster_entities**](SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
-[**search_monitored_cluster_for_facet**](SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
-[**search_monitored_cluster_for_facets**](SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 [**search_notficant_for_facets**](SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 [**search_notificant_entities**](SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 [**search_notificant_for_facet**](SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -1713,170 +1710,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **search_monitored_cluster_entities**
-> ResponseContainerPagedMonitoredCluster search_monitored_cluster_entities(body=body)
-
-Search over all the customer's non-deleted monitored clusters
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
-
-try:
-    # Search over all the customer's non-deleted monitored clusters
-    api_response = api_instance.search_monitored_cluster_entities(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SearchApi->search_monitored_cluster_entities: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerPagedMonitoredCluster**](ResponseContainerPagedMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **search_monitored_cluster_for_facet**
-> ResponseContainerFacetResponse search_monitored_cluster_for_facet(facet, body=body)
-
-Lists the values of a specific facet over the customer's non-deleted monitored cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
-facet = 'facet_example' # str | 
-body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
-
-try:
-    # Lists the values of a specific facet over the customer's non-deleted monitored cluster
-    api_response = api_instance.search_monitored_cluster_for_facet(facet, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SearchApi->search_monitored_cluster_for_facet: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **facet** | **str**|  | 
- **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **search_monitored_cluster_for_facets**
-> ResponseContainerFacetsResponseContainer search_monitored_cluster_for_facets(body=body)
-
-Lists the values of one or more facets over the customer's non-deleted monitored clusters
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
-
-try:
-    # Lists the values of one or more facets over the customer's non-deleted monitored clusters
-    api_response = api_instance.search_monitored_cluster_for_facets(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SearchApi->search_monitored_cluster_for_facets: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **search_notficant_for_facets**
 > ResponseContainerFacetsResponseContainer search_notficant_for_facets(body=body)
 
diff --git a/setup.py b/setup.py
index 9d0fe44..9dff049 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.40.22"
+VERSION = "2.55.10"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_anomaly_api.py b/test/test_anomaly_api.py
new file mode 100644
index 0000000..81554e4
--- /dev/null
+++ b/test/test_anomaly_api.py
@@ -0,0 +1,76 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.anomaly_api import AnomalyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAnomalyApi(unittest.TestCase):
+    """AnomalyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.anomaly_api.AnomalyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_all_anomalies(self):
+        """Test case for get_all_anomalies
+
+        Get all anomalies for a customer during a time interval  # noqa: E501
+        """
+        pass
+
+    def test_get_anomalies_for_chart_and_param_hash(self):
+        """Test case for get_anomalies_for_chart_and_param_hash
+
+        Get all anomalies for a chart with a set of dashboard parameters during a time interval  # noqa: E501
+        """
+        pass
+
+    def test_get_chart_anomalies(self):
+        """Test case for get_chart_anomalies
+
+        Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
+        """
+        pass
+
+    def test_get_chart_anomalies_0(self):
+        """Test case for get_chart_anomalies_0
+
+        Get all anomalies for a chart during a time interval  # noqa: E501
+        """
+        pass
+
+    def test_get_dashboard_anomalies(self):
+        """Test case for get_dashboard_anomalies
+
+        Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval  # noqa: E501
+        """
+        pass
+
+    def test_get_related_anomalies(self):
+        """Test case for get_related_anomalies
+
+        Get all related anomalies for a firing event with a time span  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index ab9e222..e4c7481 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -18,6 +18,7 @@
 # import apis into sdk package
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
@@ -29,13 +30,11 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
-from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
-from wavefront_api_client.api.settings_api import SettingsApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
@@ -61,7 +60,6 @@
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
-from wavefront_api_client.models.business_action_group_basic_dto import BusinessActionGroupBasicDTO
 from wavefront_api_client.models.chart import Chart
 from wavefront_api_client.models.chart_settings import ChartSettings
 from wavefront_api_client.models.chart_source_query import ChartSourceQuery
@@ -69,8 +67,6 @@
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
-from wavefront_api_client.models.customer_preferences import CustomerPreferences
-from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
@@ -167,7 +163,6 @@
 from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
-from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
@@ -227,7 +222,6 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
-from wavefront_api_client.models.user import User
 from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
@@ -237,7 +231,6 @@
 from wavefront_api_client.models.user_hard_delete import UserHardDelete
 from wavefront_api_client.models.user_model import UserModel
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
-from wavefront_api_client.models.user_settings import UserSettings
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 91dfae3..7c84b41 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -5,6 +5,7 @@
 # import apis into api package
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
@@ -16,13 +17,11 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
-from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
-from wavefront_api_client.api.settings_api import SettingsApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 2610bc8..2c263dd 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -448,6 +448,7 @@ def delete_alert(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -470,12 +471,13 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'skip_trash']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -502,6 +504,8 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'skip_trash' in params:
+            query_params.append(('skipTrash', params['skip_trash']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/anomaly_api.py b/wavefront_api_client/api/anomaly_api.py
new file mode 100644
index 0000000..a70c74f
--- /dev/null
+++ b/wavefront_api_client/api/anomaly_api.py
@@ -0,0 +1,720 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class AnomalyApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_all_anomalies(self, **kwargs):  # noqa: E501
+        """Get all anomalies for a customer during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_anomalies(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_anomalies_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_anomalies_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_anomalies_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all anomalies for a customer during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_anomalies_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_anomalies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start_ms' in params:
+            query_params.append(('startMs', params['start_ms']))  # noqa: E501
+        if 'end_ms' in params:
+            query_params.append(('endMs', params['end_ms']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/anomaly', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_anomalies_for_chart_and_param_hash(self, dashboard_id, chart_hash, param_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a chart with a set of dashboard parameters during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_anomalies_for_chart_and_param_hash(dashboard_id, chart_hash, param_hash, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param str chart_hash: (required)
+        :param str param_hash: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_anomalies_for_chart_and_param_hash_with_http_info(dashboard_id, chart_hash, param_hash, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_anomalies_for_chart_and_param_hash_with_http_info(dashboard_id, chart_hash, param_hash, **kwargs)  # noqa: E501
+            return data
+
+    def get_anomalies_for_chart_and_param_hash_with_http_info(self, dashboard_id, chart_hash, param_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a chart with a set of dashboard parameters during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_anomalies_for_chart_and_param_hash_with_http_info(dashboard_id, chart_hash, param_hash, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param str chart_hash: (required)
+        :param str param_hash: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['dashboard_id', 'chart_hash', 'param_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_anomalies_for_chart_and_param_hash" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'dashboard_id' is set
+        if ('dashboard_id' not in params or
+                params['dashboard_id'] is None):
+            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_anomalies_for_chart_and_param_hash`")  # noqa: E501
+        # verify the required parameter 'chart_hash' is set
+        if ('chart_hash' not in params or
+                params['chart_hash'] is None):
+            raise ValueError("Missing the required parameter `chart_hash` when calling `get_anomalies_for_chart_and_param_hash`")  # noqa: E501
+        # verify the required parameter 'param_hash' is set
+        if ('param_hash' not in params or
+                params['param_hash'] is None):
+            raise ValueError("Missing the required parameter `param_hash` when calling `get_anomalies_for_chart_and_param_hash`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'dashboard_id' in params:
+            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
+        if 'chart_hash' in params:
+            path_params['chartHash'] = params['chart_hash']  # noqa: E501
+        if 'param_hash' in params:
+            path_params['paramHash'] = params['param_hash']  # noqa: E501
+
+        query_params = []
+        if 'start_ms' in params:
+            query_params.append(('startMs', params['start_ms']))  # noqa: E501
+        if 'end_ms' in params:
+            query_params.append(('endMs', params['end_ms']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_chart_anomalies(self, dashboard_id, **kwargs):  # noqa: E501
+        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_chart_anomalies(dashboard_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_chart_anomalies_with_http_info(dashboard_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_chart_anomalies_with_http_info(dashboard_id, **kwargs)  # noqa: E501
+            return data
+
+    def get_chart_anomalies_with_http_info(self, dashboard_id, **kwargs):  # noqa: E501
+        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_chart_anomalies_with_http_info(dashboard_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['dashboard_id', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_chart_anomalies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'dashboard_id' is set
+        if ('dashboard_id' not in params or
+                params['dashboard_id'] is None):
+            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'dashboard_id' in params:
+            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
+
+        query_params = []
+        if 'start_ms' in params:
+            query_params.append(('startMs', params['start_ms']))  # noqa: E501
+        if 'end_ms' in params:
+            query_params.append(('endMs', params['end_ms']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/anomaly/{dashboardId}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_chart_anomalies_0(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a chart during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_chart_anomalies_0(dashboard_id, chart_hash, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param str chart_hash: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_chart_anomalies_0_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_chart_anomalies_0_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
+            return data
+
+    def get_chart_anomalies_0_with_http_info(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a chart during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_chart_anomalies_0_with_http_info(dashboard_id, chart_hash, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param str chart_hash: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['dashboard_id', 'chart_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_chart_anomalies_0" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'dashboard_id' is set
+        if ('dashboard_id' not in params or
+                params['dashboard_id'] is None):
+            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies_0`")  # noqa: E501
+        # verify the required parameter 'chart_hash' is set
+        if ('chart_hash' not in params or
+                params['chart_hash'] is None):
+            raise ValueError("Missing the required parameter `chart_hash` when calling `get_chart_anomalies_0`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'dashboard_id' in params:
+            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
+        if 'chart_hash' in params:
+            path_params['chartHash'] = params['chart_hash']  # noqa: E501
+
+        query_params = []
+        if 'start_ms' in params:
+            query_params.append(('startMs', params['start_ms']))  # noqa: E501
+        if 'end_ms' in params:
+            query_params.append(('endMs', params['end_ms']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/anomaly/{dashboardId}/chart/{chartHash}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_dashboard_anomalies(self, dashboard_id, param_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_anomalies(dashboard_id, param_hash, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param str param_hash: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_dashboard_anomalies_with_http_info(dashboard_id, param_hash, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_dashboard_anomalies_with_http_info(dashboard_id, param_hash, **kwargs)  # noqa: E501
+            return data
+
+    def get_dashboard_anomalies_with_http_info(self, dashboard_id, param_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_dashboard_anomalies_with_http_info(dashboard_id, param_hash, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str dashboard_id: (required)
+        :param str param_hash: (required)
+        :param int start_ms:
+        :param int end_ms:
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['dashboard_id', 'param_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_dashboard_anomalies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'dashboard_id' is set
+        if ('dashboard_id' not in params or
+                params['dashboard_id'] is None):
+            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_dashboard_anomalies`")  # noqa: E501
+        # verify the required parameter 'param_hash' is set
+        if ('param_hash' not in params or
+                params['param_hash'] is None):
+            raise ValueError("Missing the required parameter `param_hash` when calling `get_dashboard_anomalies`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'dashboard_id' in params:
+            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
+        if 'param_hash' in params:
+            path_params['paramHash'] = params['param_hash']  # noqa: E501
+
+        query_params = []
+        if 'start_ms' in params:
+            query_params.append(('startMs', params['start_ms']))  # noqa: E501
+        if 'end_ms' in params:
+            query_params.append(('endMs', params['end_ms']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/anomaly/{dashboardId}/{paramHash}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_related_anomalies(self, event_id, **kwargs):  # noqa: E501
+        """Get all related anomalies for a firing event with a time span  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_related_anomalies(event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str event_id: (required)
+        :param str rendering_method:
+        :param bool is_overlapped:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_related_anomalies_with_http_info(event_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_related_anomalies_with_http_info(event_id, **kwargs)  # noqa: E501
+            return data
+
+    def get_related_anomalies_with_http_info(self, event_id, **kwargs):  # noqa: E501
+        """Get all related anomalies for a firing event with a time span  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_related_anomalies_with_http_info(event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str event_id: (required)
+        :param str rendering_method:
+        :param bool is_overlapped:
+        :param int limit:
+        :return: ResponseContainerPagedAnomaly
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['event_id', 'rendering_method', 'is_overlapped', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_related_anomalies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'event_id' is set
+        if ('event_id' not in params or
+                params['event_id'] is None):
+            raise ValueError("Missing the required parameter `event_id` when calling `get_related_anomalies`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'event_id' in params:
+            path_params['eventId'] = params['event_id']  # noqa: E501
+
+        query_params = []
+        if 'rendering_method' in params:
+            query_params.append(('renderingMethod', params['rendering_method']))  # noqa: E501
+        if 'is_overlapped' in params:
+            query_params.append(('isOverlapped', params['is_overlapped']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/anomaly/{eventId}/anomalies', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index abd560f..2daae95 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -33,6 +33,97 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def create_aws_external_id(self, **kwargs):  # noqa: E501
+        """Create an external id  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_aws_external_id(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_aws_external_id_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_aws_external_id_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_aws_external_id_with_http_info(self, **kwargs):  # noqa: E501
+        """Create an external id  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_aws_external_id_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_aws_external_id" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/cloudintegration/awsExternalId/create', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_cloud_integration(self, **kwargs):  # noqa: E501
         """Create a cloud integration  # noqa: E501
 
@@ -139,6 +230,7 @@ def delete_cloud_integration(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -161,12 +253,13 @@ def delete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'skip_trash']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -193,6 +286,8 @@ def delete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'skip_trash' in params:
+            query_params.append(('skipTrash', params['skip_trash']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index 957e764..9e421c2 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -341,6 +341,7 @@ def delete_dashboard(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
@@ -363,12 +364,13 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerDashboard
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'skip_trash']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -395,6 +397,8 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'skip_trash' in params:
+            query_params.append(('skipTrash', params['skip_trash']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index 8c5e4c2..dd7fc2b 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -246,6 +246,7 @@ def delete_derived_metric(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
@@ -268,12 +269,13 @@ def delete_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'skip_trash']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -300,6 +302,8 @@ def delete_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'skip_trash' in params:
+            query_params.append(('skipTrash', params['skip_trash']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index ff5cdf8..4e2addc 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -44,6 +44,7 @@ def delete_proxy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
                  returns the request thread.
@@ -66,12 +67,13 @@ def delete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool skip_trash:
         :return: ResponseContainerProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'skip_trash']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -98,6 +100,8 @@ def delete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'skip_trash' in params:
+            query_params.append(('skipTrash', params['skip_trash']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index dd393f4..acc9a93 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -58,6 +58,8 @@ def query_api(self, q, s, g, **kwargs):  # noqa: E501
         :param bool include_obsolete_metrics: include metrics that have not been reporting recently, defaults to false
         :param bool sorted: sorts the output so that returned series are in order, defaults to false
         :param bool cached: whether the query cache is used, defaults to true
+        :param list[str] dimension_tuples:
+        :param bool use_raw_qk:
         :return: QueryResult
                  If the method is called asynchronously,
                  returns the request thread.
@@ -94,12 +96,14 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
         :param bool include_obsolete_metrics: include metrics that have not been reporting recently, defaults to false
         :param bool sorted: sorts the output so that returned series are in order, defaults to false
         :param bool cached: whether the query cache is used, defaults to true
+        :param list[str] dimension_tuples:
+        :param bool use_raw_qk:
         :return: QueryResult
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'view', 'include_obsolete_metrics', 'sorted', 'cached']  # noqa: E501
+        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'view', 'include_obsolete_metrics', 'sorted', 'cached', 'dimension_tuples', 'use_raw_qk']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -162,6 +166,11 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
             query_params.append(('sorted', params['sorted']))  # noqa: E501
         if 'cached' in params:
             query_params.append(('cached', params['cached']))  # noqa: E501
+        if 'dimension_tuples' in params:
+            query_params.append(('dimensionTuples', params['dimension_tuples']))  # noqa: E501
+            collection_formats['dimensionTuples'] = 'multi'  # noqa: E501
+        if 'use_raw_qk' in params:
+            query_params.append(('useRawQK', params['use_raw_qk']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 2cb3791..7d1f123 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2963,299 +2963,6 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_monitored_cluster_entities(self, **kwargs):  # noqa: E501
-        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_entities(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def search_monitored_cluster_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_entities_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method search_monitored_cluster_entities" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/search/monitoredcluster', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def search_monitored_cluster_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facet(facet, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
-        else:
-            (data) = self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
-            return data
-
-    def search_monitored_cluster_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facet_with_http_info(facet, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method search_monitored_cluster_for_facet" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_monitored_cluster_for_facet`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'facet' in params:
-            path_params['facet'] = params['facet']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/search/monitoredcluster/{facet}', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerFacetResponse',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def search_monitored_cluster_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facets(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def search_monitored_cluster_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facets_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method search_monitored_cluster_for_facets" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/search/monitoredcluster/facets', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def search_notficant_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 647adbd..e3d3dbf 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.40.22/python'
+        self.user_agent = 'Swagger-Codegen/2.55.10/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index cf6f6b3..1106984 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.40.22".\
+               "SDK Package Version: 2.55.10".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 6cc4b33..77fd2c5 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -30,7 +30,6 @@
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
-from wavefront_api_client.models.business_action_group_basic_dto import BusinessActionGroupBasicDTO
 from wavefront_api_client.models.chart import Chart
 from wavefront_api_client.models.chart_settings import ChartSettings
 from wavefront_api_client.models.chart_source_query import ChartSourceQuery
@@ -38,8 +37,6 @@
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
-from wavefront_api_client.models.customer_preferences import CustomerPreferences
-from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
@@ -136,7 +133,6 @@
 from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
-from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
@@ -196,7 +192,6 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
-from wavefront_api_client.models.user import User
 from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
@@ -206,7 +201,6 @@
 from wavefront_api_client.models.user_hard_delete import UserHardDelete
 from wavefront_api_client.models.user_model import UserModel
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
-from wavefront_api_client.models.user_settings import UserSettings
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 2a35b4e..e7dee63 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -40,6 +40,7 @@ class Integration(object):
         'dashboards': 'list[IntegrationDashboard]',
         'deleted': 'bool',
         'description': 'str',
+        'hidden': 'bool',
         'icon': 'str',
         'id': 'str',
         'metrics': 'IntegrationMetrics',
@@ -62,6 +63,7 @@ class Integration(object):
         'dashboards': 'dashboards',
         'deleted': 'deleted',
         'description': 'description',
+        'hidden': 'hidden',
         'icon': 'icon',
         'id': 'id',
         'metrics': 'metrics',
@@ -74,7 +76,7 @@ class Integration(object):
         'version': 'version'
     }
 
-    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, icon=None, id=None, metrics=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None):  # noqa: E501
+    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, hidden=None, icon=None, id=None, metrics=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
 
         self._alerts = None
@@ -86,6 +88,7 @@ def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url
         self._dashboards = None
         self._deleted = None
         self._description = None
+        self._hidden = None
         self._icon = None
         self._id = None
         self._metrics = None
@@ -115,6 +118,7 @@ def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url
         if deleted is not None:
             self.deleted = deleted
         self.description = description
+        self.hidden = hidden
         self.icon = icon
         if id is not None:
             self.id = id
@@ -336,6 +340,31 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def hidden(self):
+        """Gets the hidden of this Integration.  # noqa: E501
+
+        Integration is hidden or not  # noqa: E501
+
+        :return: The hidden of this Integration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this Integration.
+
+        Integration is hidden or not  # noqa: E501
+
+        :param hidden: The hidden of this Integration.  # noqa: E501
+        :type: bool
+        """
+        if hidden is None:
+            raise ValueError("Invalid value for `hidden`, must not be `None`")  # noqa: E501
+
+        self._hidden = hidden
+
     @property
     def icon(self):
         """Gets the icon of this Integration.  # noqa: E501
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index 484d368..9b18115 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -31,22 +31,50 @@ class MetricDetailsResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'continuation_token': 'str',
         'hosts': 'list[MetricDetails]'
     }
 
     attribute_map = {
+        'continuation_token': 'continuationToken',
         'hosts': 'hosts'
     }
 
-    def __init__(self, hosts=None):  # noqa: E501
+    def __init__(self, continuation_token=None, hosts=None):  # noqa: E501
         """MetricDetailsResponse - a model defined in Swagger"""  # noqa: E501
 
+        self._continuation_token = None
         self._hosts = None
         self.discriminator = None
 
+        if continuation_token is not None:
+            self.continuation_token = continuation_token
         if hosts is not None:
             self.hosts = hosts
 
+    @property
+    def continuation_token(self):
+        """Gets the continuation_token of this MetricDetailsResponse.  # noqa: E501
+
+        Token used for pagination of results  # noqa: E501
+
+        :return: The continuation_token of this MetricDetailsResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._continuation_token
+
+    @continuation_token.setter
+    def continuation_token(self, continuation_token):
+        """Sets the continuation_token of this MetricDetailsResponse.
+
+        Token used for pagination of results  # noqa: E501
+
+        :param continuation_token: The continuation_token of this MetricDetailsResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._continuation_token = continuation_token
+
     @property
     def hosts(self):
         """Gets the hosts of this MetricDetailsResponse.  # noqa: E501

From 7cd65201c8dfa403aafd82ab70f626fb8a4e3825 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 19 Feb 2020 08:16:23 -0800
Subject: [PATCH 045/161] Autogenerated Update v2.55.15.

---
 .swagger-codegen/config.json                      | 2 +-
 .swagger-codegen/config.jsone                     | 2 +-
 README.md                                         | 2 +-
 docs/CloudIntegrationApi.md                       | 8 ++++----
 setup.py                                          | 2 +-
 wavefront_api_client/api/cloud_integration_api.py | 8 ++++----
 wavefront_api_client/api_client.py                | 2 +-
 wavefront_api_client/configuration.py             | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 17a6833..6d02a5f 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.55.10"
+    "packageVersion": "2.55.15"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 00596e1..17a6833 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.40.22"
+    "packageVersion": "2.55.10"
 }
diff --git a/README.md b/README.md
index 1f9e2d6..e627815 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.55.10
+- Package version: 2.55.15
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/CloudIntegrationApi.md b/docs/CloudIntegrationApi.md
index ffa8416..e9bda0e 100644
--- a/docs/CloudIntegrationApi.md
+++ b/docs/CloudIntegrationApi.md
@@ -88,7 +88,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.CloudIntegrationApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.CloudIntegration() # CloudIntegration | Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre> (optional)
+body = wavefront_api_client.CloudIntegration() # CloudIntegration | Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre> (optional)
 
 try:
     # Create a cloud integration
@@ -102,7 +102,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**CloudIntegration**](CloudIntegration.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;:\&quot;CloudWatch integration\&quot;,   \&quot;service\&quot;:\&quot;CLOUDWATCH\&quot;,   \&quot;cloudWatch\&quot;:{     \&quot;baseCredentials\&quot;:{       \&quot;roleArn\&quot;:\&quot;arn:aws:iam::&amp;lt;accountid&amp;gt;:role/&amp;lt;rolename&amp;gt;\&quot;,       \&quot;externalId\&quot;:\&quot;wave123\&quot;     },     \&quot;metricFilterRegex\&quot;:\&quot;^aws.(sqs|ec2|ebs|elb).*$\&quot;,     \&quot;pointTagFilterRegex\&quot;:\&quot;(region|name)\&quot;   },   \&quot;serviceRefreshRateInMins\&quot;:5 }&lt;/pre&gt; | [optional] 
+ **body** | [**CloudIntegration**](CloudIntegration.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;:\&quot;CloudWatch integration\&quot;,   \&quot;service\&quot;:\&quot;CLOUDWATCH\&quot;,   \&quot;cloudWatch\&quot;:{     \&quot;baseCredentials\&quot;:{       \&quot;roleArn\&quot;:\&quot;arn:aws:iam::&amp;lt;accountid&amp;gt;:role/&amp;lt;rolename&amp;gt;\&quot;     },     \&quot;metricFilterRegex\&quot;:\&quot;^aws.(sqs|ec2|ebs|elb).*$\&quot;,     \&quot;pointTagFilterRegex\&quot;:\&quot;(region|name)\&quot;   },   \&quot;serviceRefreshRateInMins\&quot;:5 }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -471,7 +471,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.CloudIntegrationApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.CloudIntegration() # CloudIntegration | Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre> (optional)
+body = wavefront_api_client.CloudIntegration() # CloudIntegration | Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre> (optional)
 
 try:
     # Update a specific cloud integration
@@ -486,7 +486,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**CloudIntegration**](CloudIntegration.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;:\&quot;CloudWatch integration\&quot;,   \&quot;service\&quot;:\&quot;CLOUDWATCH\&quot;,   \&quot;cloudWatch\&quot;:{     \&quot;baseCredentials\&quot;:{       \&quot;roleArn\&quot;:\&quot;arn:aws:iam::&amp;lt;accountid&amp;gt;:role/&amp;lt;rolename&amp;gt;\&quot;,       \&quot;externalId\&quot;:\&quot;wave123\&quot;     },     \&quot;metricFilterRegex\&quot;:\&quot;^aws.(sqs|ec2|ebs|elb).*$\&quot;,     \&quot;pointTagFilterRegex\&quot;:\&quot;(region|name)\&quot;   },   \&quot;serviceRefreshRateInMins\&quot;:5 }&lt;/pre&gt; | [optional] 
+ **body** | [**CloudIntegration**](CloudIntegration.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;:\&quot;CloudWatch integration\&quot;,   \&quot;service\&quot;:\&quot;CLOUDWATCH\&quot;,   \&quot;cloudWatch\&quot;:{     \&quot;baseCredentials\&quot;:{       \&quot;roleArn\&quot;:\&quot;arn:aws:iam::&amp;lt;accountid&amp;gt;:role/&amp;lt;rolename&amp;gt;\&quot;     },     \&quot;metricFilterRegex\&quot;:\&quot;^aws.(sqs|ec2|ebs|elb).*$\&quot;,     \&quot;pointTagFilterRegex\&quot;:\&quot;(region|name)\&quot;   },   \&quot;serviceRefreshRateInMins\&quot;:5 }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index 9dff049..f8a8fb5 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.55.10"
+VERSION = "2.55.15"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 2daae95..5a561df 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -134,7 +134,7 @@ def create_cloud_integration(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
+        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -156,7 +156,7 @@ def create_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
+        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -804,7 +804,7 @@ def update_cloud_integration(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
+        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -827,7 +827,7 @@ def update_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\",       \"externalId\":\"wave123\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
+        :param CloudIntegration body: Example Body:  <pre>{   \"name\":\"CloudWatch integration\",   \"service\":\"CLOUDWATCH\",   \"cloudWatch\":{     \"baseCredentials\":{       \"roleArn\":\"arn:aws:iam::&lt;accountid&gt;:role/&lt;rolename&gt;\"     },     \"metricFilterRegex\":\"^aws.(sqs|ec2|ebs|elb).*$\",     \"pointTagFilterRegex\":\"(region|name)\"   },   \"serviceRefreshRateInMins\":5 }</pre>
         :return: ResponseContainerCloudIntegration
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e3d3dbf..d156cf2 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.55.10/python'
+        self.user_agent = 'Swagger-Codegen/2.55.15/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 1106984..3769872 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.55.10".\
+               "SDK Package Version: 2.55.15".\
                format(env=sys.platform, pyversion=sys.version)

From adab7a4d4c7183ca6d239c4587555720557609a3 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 28 Feb 2020 08:16:36 -0800
Subject: [PATCH 046/161] Autogenerated Update v2.55.18.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  10 +-
 docs/CloudIntegrationApi.md                   | 112 +++++++++-
 docs/UserApi.md                               |  54 -----
 setup.py                                      |   2 +-
 wavefront_api_client/__init__.py              |   3 -
 .../api/cloud_integration_api.py              | 200 +++++++++++++++++-
 wavefront_api_client/api/user_api.py          | 101 ---------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   3 -
 12 files changed, 319 insertions(+), 174 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6d02a5f..10dc218 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.55.15"
+    "packageVersion": "2.55.18"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 17a6833..6d02a5f 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.55.10"
+    "packageVersion": "2.55.15"
 }
diff --git a/README.md b/README.md
index e627815..44a2e2f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.55.15
+- Package version: 2.55.18
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -137,12 +137,14 @@ Class | Method | HTTP request | Description
 *ApiTokenApi* | [**get_tokens_service_account**](docs/ApiTokenApi.md#get_tokens_service_account) | **GET** /api/v2/apitoken/serviceaccount/{id} | Get all api tokens for the given service account
 *ApiTokenApi* | [**update_token_name**](docs/ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
 *ApiTokenApi* | [**update_token_name_service_account**](docs/ApiTokenApi.md#update_token_name_service_account) | **PUT** /api/v2/apitoken/serviceaccount/{id}/{token} | Update the name of the specified api token for the given service account
-*CloudIntegrationApi* | [**create_aws_external_id**](docs/CloudIntegrationApi.md#create_aws_external_id) | **POST** /api/v2/cloudintegration/awsExternalId/create | Create an external id
+*CloudIntegrationApi* | [**create_aws_external_id**](docs/CloudIntegrationApi.md#create_aws_external_id) | **POST** /api/v2/cloudintegration/awsExternalId | Create an external id
 *CloudIntegrationApi* | [**create_cloud_integration**](docs/CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
+*CloudIntegrationApi* | [**delete_aws_external_id**](docs/CloudIntegrationApi.md#delete_aws_external_id) | **DELETE** /api/v2/cloudintegration/awsExternalId/{id} | DELETEs an external id that was created by Wavefront
 *CloudIntegrationApi* | [**delete_cloud_integration**](docs/CloudIntegrationApi.md#delete_cloud_integration) | **DELETE** /api/v2/cloudintegration/{id} | Delete a specific cloud integration
 *CloudIntegrationApi* | [**disable_cloud_integration**](docs/CloudIntegrationApi.md#disable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/disable | Disable a specific cloud integration
 *CloudIntegrationApi* | [**enable_cloud_integration**](docs/CloudIntegrationApi.md#enable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/enable | Enable a specific cloud integration
 *CloudIntegrationApi* | [**get_all_cloud_integration**](docs/CloudIntegrationApi.md#get_all_cloud_integration) | **GET** /api/v2/cloudintegration | Get all cloud integrations for a customer
+*CloudIntegrationApi* | [**get_aws_external_id**](docs/CloudIntegrationApi.md#get_aws_external_id) | **GET** /api/v2/cloudintegration/awsExternalId/{id} | GETs (confirms) a valid external id that was created by Wavefront
 *CloudIntegrationApi* | [**get_cloud_integration**](docs/CloudIntegrationApi.md#get_cloud_integration) | **GET** /api/v2/cloudintegration/{id} | Get a specific cloud integration
 *CloudIntegrationApi* | [**undelete_cloud_integration**](docs/CloudIntegrationApi.md#undelete_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/undelete | Undelete a specific cloud integration
 *CloudIntegrationApi* | [**update_cloud_integration**](docs/CloudIntegrationApi.md#update_cloud_integration) | **PUT** /api/v2/cloudintegration/{id} | Update a specific cloud integration
@@ -324,7 +326,6 @@ Class | Method | HTTP request | Description
 *UserApi* | [**get_user_business_functions**](docs/UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user or service account.
 *UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
-*UserApi* | [**hard_delete_user**](docs/UserApi.md#hard_delete_user) | **DELETE** /admin/api/v2/user/{id}/{customerId} | 
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
 *UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
 *UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
@@ -400,7 +401,6 @@ Class | Method | HTTP request | Description
  - [IntegrationManifestGroup](docs/IntegrationManifestGroup.md)
  - [IntegrationMetrics](docs/IntegrationMetrics.md)
  - [IntegrationStatus](docs/IntegrationStatus.md)
- - [Iterable](docs/Iterable.md)
  - [IteratorEntryStringJsonNode](docs/IteratorEntryStringJsonNode.md)
  - [IteratorJsonNode](docs/IteratorJsonNode.md)
  - [IteratorString](docs/IteratorString.md)
@@ -506,7 +506,6 @@ Class | Method | HTTP request | Description
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
- - [ResponseContainerUserHardDelete](docs/ResponseContainerUserHardDelete.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [SavedSearch](docs/SavedSearch.md)
@@ -532,7 +531,6 @@ Class | Method | HTTP request | Description
  - [UserGroupModel](docs/UserGroupModel.md)
  - [UserGroupPropertiesDTO](docs/UserGroupPropertiesDTO.md)
  - [UserGroupWrite](docs/UserGroupWrite.md)
- - [UserHardDelete](docs/UserHardDelete.md)
  - [UserModel](docs/UserModel.md)
  - [UserRequestDTO](docs/UserRequestDTO.md)
  - [UserToCreate](docs/UserToCreate.md)
diff --git a/docs/CloudIntegrationApi.md b/docs/CloudIntegrationApi.md
index e9bda0e..3c05258 100644
--- a/docs/CloudIntegrationApi.md
+++ b/docs/CloudIntegrationApi.md
@@ -4,12 +4,14 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**create_aws_external_id**](CloudIntegrationApi.md#create_aws_external_id) | **POST** /api/v2/cloudintegration/awsExternalId/create | Create an external id
+[**create_aws_external_id**](CloudIntegrationApi.md#create_aws_external_id) | **POST** /api/v2/cloudintegration/awsExternalId | Create an external id
 [**create_cloud_integration**](CloudIntegrationApi.md#create_cloud_integration) | **POST** /api/v2/cloudintegration | Create a cloud integration
+[**delete_aws_external_id**](CloudIntegrationApi.md#delete_aws_external_id) | **DELETE** /api/v2/cloudintegration/awsExternalId/{id} | DELETEs an external id that was created by Wavefront
 [**delete_cloud_integration**](CloudIntegrationApi.md#delete_cloud_integration) | **DELETE** /api/v2/cloudintegration/{id} | Delete a specific cloud integration
 [**disable_cloud_integration**](CloudIntegrationApi.md#disable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/disable | Disable a specific cloud integration
 [**enable_cloud_integration**](CloudIntegrationApi.md#enable_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/enable | Enable a specific cloud integration
 [**get_all_cloud_integration**](CloudIntegrationApi.md#get_all_cloud_integration) | **GET** /api/v2/cloudintegration | Get all cloud integrations for a customer
+[**get_aws_external_id**](CloudIntegrationApi.md#get_aws_external_id) | **GET** /api/v2/cloudintegration/awsExternalId/{id} | GETs (confirms) a valid external id that was created by Wavefront
 [**get_cloud_integration**](CloudIntegrationApi.md#get_cloud_integration) | **GET** /api/v2/cloudintegration/{id} | Get a specific cloud integration
 [**undelete_cloud_integration**](CloudIntegrationApi.md#undelete_cloud_integration) | **POST** /api/v2/cloudintegration/{id}/undelete | Undelete a specific cloud integration
 [**update_cloud_integration**](CloudIntegrationApi.md#update_cloud_integration) | **PUT** /api/v2/cloudintegration/{id} | Update a specific cloud integration
@@ -119,6 +121,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **delete_aws_external_id**
+> ResponseContainerString delete_aws_external_id(id)
+
+DELETEs an external id that was created by Wavefront
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.CloudIntegrationApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # DELETEs an external id that was created by Wavefront
+    api_response = api_instance.delete_aws_external_id(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling CloudIntegrationApi->delete_aws_external_id: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **delete_cloud_integration**
 > ResponseContainerCloudIntegration delete_cloud_integration(id, skip_trash=skip_trash)
 
@@ -339,6 +395,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_aws_external_id**
+> ResponseContainerString get_aws_external_id(id)
+
+GETs (confirms) a valid external id that was created by Wavefront
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.CloudIntegrationApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # GETs (confirms) a valid external id that was created by Wavefront
+    api_response = api_instance.get_aws_external_id(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling CloudIntegrationApi->get_aws_external_id: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_cloud_integration**
 > ResponseContainerCloudIntegration get_cloud_integration(id)
 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 8dfeaf9..1948e74 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -13,7 +13,6 @@ Method | HTTP request | Description
 [**get_user_business_functions**](UserApi.md#get_user_business_functions) | **GET** /api/v2/user/{id}/businessFunctions | Returns business functions of a specific user or service account.
 [**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
-[**hard_delete_user**](UserApi.md#hard_delete_user) | **DELETE** /admin/api/v2/user/{id}/{customerId} | 
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
 [**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
 [**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
@@ -511,59 +510,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **hard_delete_user**
-> ResponseContainerUserHardDelete hard_delete_user(id, customer_id)
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-customer_id = 'customer_id_example' # str | 
-
-try:
-    api_response = api_instance.hard_delete_user(id, customer_id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UserApi->hard_delete_user: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **customer_id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerUserHardDelete**](ResponseContainerUserHardDelete.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **invite_users**
 > UserModel invite_users(body=body)
 
diff --git a/setup.py b/setup.py
index f8a8fb5..93cd7b7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.55.15"
+VERSION = "2.55.18"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index e4c7481..bba4406 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -96,7 +96,6 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
-from wavefront_api_client.models.iterable import Iterable
 from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
 from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
 from wavefront_api_client.models.iterator_string import IteratorString
@@ -202,7 +201,6 @@
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
-from wavefront_api_client.models.response_container_user_hard_delete import ResponseContainerUserHardDelete
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -228,7 +226,6 @@
 from wavefront_api_client.models.user_group_model import UserGroupModel
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
-from wavefront_api_client.models.user_hard_delete import UserHardDelete
 from wavefront_api_client.models.user_model import UserModel
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_to_create import UserToCreate
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 5a561df..339a5d7 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -109,7 +109,7 @@ def create_aws_external_id_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/cloudintegration/awsExternalId/create', 'POST',
+            '/api/v2/cloudintegration/awsExternalId', 'POST',
             path_params,
             query_params,
             header_params,
@@ -219,6 +219,105 @@ def create_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def delete_aws_external_id(self, id, **kwargs):  # noqa: E501
+        """DELETEs an external id that was created by Wavefront  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_aws_external_id(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_aws_external_id_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_aws_external_id_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_aws_external_id_with_http_info(self, id, **kwargs):  # noqa: E501
+        """DELETEs an external id that was created by Wavefront  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_aws_external_id_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_aws_external_id" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_aws_external_id`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/cloudintegration/awsExternalId/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_cloud_integration(self, id, **kwargs):  # noqa: E501
         """Delete a specific cloud integration  # noqa: E501
 
@@ -603,6 +702,105 @@ def get_all_cloud_integration_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_aws_external_id(self, id, **kwargs):  # noqa: E501
+        """GETs (confirms) a valid external id that was created by Wavefront  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_aws_external_id(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_aws_external_id_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_aws_external_id_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_aws_external_id_with_http_info(self, id, **kwargs):  # noqa: E501
+        """GETs (confirms) a valid external id that was created by Wavefront  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_aws_external_id_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_aws_external_id" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_aws_external_id`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/cloudintegration/awsExternalId/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_cloud_integration(self, id, **kwargs):  # noqa: E501
         """Get a specific cloud integration  # noqa: E501
 
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 7a89242..a7877d8 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -908,107 +908,6 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def hard_delete_user(self, id, customer_id, **kwargs):  # noqa: E501
-        """hard_delete_user  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.hard_delete_user(id, customer_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str customer_id: (required)
-        :return: ResponseContainerUserHardDelete
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.hard_delete_user_with_http_info(id, customer_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.hard_delete_user_with_http_info(id, customer_id, **kwargs)  # noqa: E501
-            return data
-
-    def hard_delete_user_with_http_info(self, id, customer_id, **kwargs):  # noqa: E501
-        """hard_delete_user  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.hard_delete_user_with_http_info(id, customer_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str customer_id: (required)
-        :return: ResponseContainerUserHardDelete
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'customer_id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method hard_delete_user" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `hard_delete_user`")  # noqa: E501
-        # verify the required parameter 'customer_id' is set
-        if ('customer_id' not in params or
-                params['customer_id'] is None):
-            raise ValueError("Missing the required parameter `customer_id` when calling `hard_delete_user`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'customer_id' in params:
-            path_params['customerId'] = params['customer_id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/admin/api/v2/user/{id}/{customerId}', 'DELETE',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerUserHardDelete',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def invite_users(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index d156cf2..7e5833c 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.55.15/python'
+        self.user_agent = 'Swagger-Codegen/2.55.18/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 3769872..35fae92 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.55.15".\
+               "SDK Package Version: 2.55.18".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 77fd2c5..eaad08c 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -66,7 +66,6 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
-from wavefront_api_client.models.iterable import Iterable
 from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
 from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
 from wavefront_api_client.models.iterator_string import IteratorString
@@ -172,7 +171,6 @@
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
-from wavefront_api_client.models.response_container_user_hard_delete import ResponseContainerUserHardDelete
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -198,7 +196,6 @@
 from wavefront_api_client.models.user_group_model import UserGroupModel
 from wavefront_api_client.models.user_group_properties_dto import UserGroupPropertiesDTO
 from wavefront_api_client.models.user_group_write import UserGroupWrite
-from wavefront_api_client.models.user_hard_delete import UserHardDelete
 from wavefront_api_client.models.user_model import UserModel
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_to_create import UserToCreate

From 8a32bf8e471da5f04e020dcde28e166251059d4f Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 6 Mar 2020 08:16:38 -0800
Subject: [PATCH 047/161] Autogenerated Update v2.56.8.

---
 .swagger-codegen/config.json                  |    2 +-
 .swagger-codegen/config.jsone                 |    2 +-
 README.md                                     |   37 +-
 docs/Account.md                               |    3 +
 docs/AccountUserAndServiceAccountApi.md       |  126 +-
 docs/CustomerFacingUserObject.md              |    2 +
 docs/Event.md                                 |    1 +
 docs/PagedRoleDTO.md                          |   16 +
 docs/RelatedEvent.md                          |    1 +
 docs/ResponseContainerPagedRoleDTO.md         |   11 +
 docs/ResponseContainerRoleDTO.md              |   11 +
 docs/RoleApi.md                               |  515 ++++++++
 docs/RoleDTO.md                               |   21 +
 docs/SearchApi.md                             |  334 +++++
 docs/ServiceAccount.md                        |    3 +
 docs/ServiceAccountWrite.md                   |    1 +
 docs/UserApi.md                               |   12 +-
 docs/UserDTO.md                               |    1 +
 docs/UserGroup.md                             |    1 +
 docs/UserGroupApi.md                          |  144 +--
 docs/UserGroupModel.md                        |    4 +-
 docs/UserGroupPropertiesDTO.md                |    1 +
 docs/UserGroupWrite.md                        |    3 +-
 docs/UserModel.md                             |    1 +
 docs/UserRequestDTO.md                        |    1 +
 docs/UserToCreate.md                          |    1 +
 setup.py                                      |    2 +-
 test/test_paged_role_dto.py                   |   40 +
 .../test_response_container_paged_role_dto.py |   40 +
 test/test_response_container_role_dto.py      |   40 +
 test/test_role_api.py                         |   97 ++
 test/test_role_dto.py                         |   40 +
 wavefront_api_client/__init__.py              |    6 +
 wavefront_api_client/api/__init__.py          |    2 +
 .../account__user_and_service_account_api.py  |  218 +++-
 wavefront_api_client/api/role_api.py          |  941 ++++++++++++++
 wavefront_api_client/api/search_api.py        | 1122 +++++++++++++----
 wavefront_api_client/api/user_api.py          |   12 +-
 wavefront_api_client/api/user_group_api.py    |  256 ++--
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |    2 +-
 wavefront_api_client/models/__init__.py       |    4 +
 wavefront_api_client/models/account.py        |   86 +-
 .../models/customer_facing_user_object.py     |   58 +-
 wavefront_api_client/models/event.py          |   30 +-
 wavefront_api_client/models/paged_role_dto.py |  279 ++++
 wavefront_api_client/models/related_event.py  |   30 +-
 .../response_container_paged_role_dto.py      |  142 +++
 .../models/response_container_role_dto.py     |  142 +++
 ...esponse_container_set_business_function.py |    2 +-
 wavefront_api_client/models/role_dto.py       |  423 +++++++
 wavefront_api_client/models/saved_search.py   |    2 +-
 .../models/service_account.py                 |   86 +-
 .../models/service_account_write.py           |   30 +-
 wavefront_api_client/models/user_dto.py       |   28 +-
 wavefront_api_client/models/user_group.py     |   30 +-
 .../models/user_group_model.py                |   62 +-
 .../models/user_group_properties_dto.py       |   28 +-
 .../models/user_group_write.py                |   39 +-
 wavefront_api_client/models/user_model.py     |   28 +-
 .../models/user_request_dto.py                |   28 +-
 wavefront_api_client/models/user_to_create.py |   30 +-
 62 files changed, 5138 insertions(+), 524 deletions(-)
 create mode 100644 docs/PagedRoleDTO.md
 create mode 100644 docs/ResponseContainerPagedRoleDTO.md
 create mode 100644 docs/ResponseContainerRoleDTO.md
 create mode 100644 docs/RoleApi.md
 create mode 100644 docs/RoleDTO.md
 create mode 100644 test/test_paged_role_dto.py
 create mode 100644 test/test_response_container_paged_role_dto.py
 create mode 100644 test/test_response_container_role_dto.py
 create mode 100644 test/test_role_api.py
 create mode 100644 test/test_role_dto.py
 create mode 100644 wavefront_api_client/api/role_api.py
 create mode 100644 wavefront_api_client/models/paged_role_dto.py
 create mode 100644 wavefront_api_client/models/response_container_paged_role_dto.py
 create mode 100644 wavefront_api_client/models/response_container_role_dto.py
 create mode 100644 wavefront_api_client/models/role_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 10dc218..f8affe5 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.55.18"
+    "packageVersion": "2.56.8"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6d02a5f..10dc218 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.55.15"
+    "packageVersion": "2.55.18"
 }
diff --git a/README.md b/README.md
index 44a2e2f..defa61e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.55.18
+- Package version: 2.56.8
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -77,6 +77,7 @@ All URIs are relative to *https://localhost*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
+*AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
@@ -94,6 +95,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**grant_account_permission**](docs/AccountUserAndServiceAccountApi.md#grant_account_permission) | **POST** /api/v2/account/{id}/grant/{permission} | Grants a specific permission to account (user or service account)
 *AccountUserAndServiceAccountApi* | [**grant_permission_to_accounts**](docs/AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
+*AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific user groups from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
@@ -217,6 +219,16 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
+*MonitoredClusterApi* | [**add_cluster_tag**](docs/MonitoredClusterApi.md#add_cluster_tag) | **PUT** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Add a tag to a specific cluster
+*MonitoredClusterApi* | [**create_cluster**](docs/MonitoredClusterApi.md#create_cluster) | **POST** /api/v2/monitoredcluster | Create a specific cluster
+*MonitoredClusterApi* | [**delete_cluster**](docs/MonitoredClusterApi.md#delete_cluster) | **DELETE** /api/v2/monitoredcluster/{id} | Delete a specific cluster
+*MonitoredClusterApi* | [**get_all_cluster**](docs/MonitoredClusterApi.md#get_all_cluster) | **GET** /api/v2/monitoredcluster | Get all monitored clusters
+*MonitoredClusterApi* | [**get_cluster**](docs/MonitoredClusterApi.md#get_cluster) | **GET** /api/v2/monitoredcluster/{id} | Get a specific cluster
+*MonitoredClusterApi* | [**get_cluster_tags**](docs/MonitoredClusterApi.md#get_cluster_tags) | **GET** /api/v2/monitoredcluster/{id}/tag | Get all tags associated with a specific cluster
+*MonitoredClusterApi* | [**merge_clusters**](docs/MonitoredClusterApi.md#merge_clusters) | **PUT** /api/v2/monitoredcluster/merge/{id1}/{id2} | Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
+*MonitoredClusterApi* | [**remove_cluster_tag**](docs/MonitoredClusterApi.md#remove_cluster_tag) | **DELETE** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Remove a tag from a specific cluster
+*MonitoredClusterApi* | [**set_cluster_tags**](docs/MonitoredClusterApi.md#set_cluster_tags) | **POST** /api/v2/monitoredcluster/{id}/tag | Set all tags associated with a specific cluster
+*MonitoredClusterApi* | [**update_cluster**](docs/MonitoredClusterApi.md#update_cluster) | **PUT** /api/v2/monitoredcluster/{id} | Update a specific cluster
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
 *NotificantApi* | [**get_all_notificants**](docs/NotificantApi.md#get_all_notificants) | **GET** /api/v2/notificant | Get all notification targets for a customer
@@ -230,6 +242,15 @@ Class | Method | HTTP request | Description
 *ProxyApi* | [**update_proxy**](docs/ProxyApi.md#update_proxy) | **PUT** /api/v2/proxy/{id} | Update the name of a specific proxy
 *QueryApi* | [**query_api**](docs/QueryApi.md#query_api) | **GET** /api/v2/chart/api | Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
 *QueryApi* | [**query_raw**](docs/QueryApi.md#query_raw) | **GET** /api/v2/chart/raw | Perform a raw data query against Wavefront servers that returns second granularity points grouped by tags
+*RoleApi* | [**add_assignees**](docs/RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add multiple users and user groups to a specific role
+*RoleApi* | [**create_role**](docs/RoleApi.md#create_role) | **POST** /api/v2/role | Create a specific role
+*RoleApi* | [**delete_role**](docs/RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a specific role
+*RoleApi* | [**get_all_roles**](docs/RoleApi.md#get_all_roles) | **GET** /api/v2/role | Get all roles for a customer
+*RoleApi* | [**get_role**](docs/RoleApi.md#get_role) | **GET** /api/v2/role/{id} | Get a specific role
+*RoleApi* | [**grant_permission_to_roles**](docs/RoleApi.md#grant_permission_to_roles) | **POST** /api/v2/role/grant/{permission} | Grants a single permission to role(s)
+*RoleApi* | [**remove_assignees**](docs/RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove multiple users and user groups from a specific role
+*RoleApi* | [**revoke_permission_from_roles**](docs/RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revokes a single permission from role(s)
+*RoleApi* | [**update_role**](docs/RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a specific role
 *SavedSearchApi* | [**create_saved_search**](docs/SavedSearchApi.md#create_saved_search) | **POST** /api/v2/savedsearch | Create a saved search
 *SavedSearchApi* | [**delete_saved_search**](docs/SavedSearchApi.md#delete_saved_search) | **DELETE** /api/v2/savedsearch/{id} | Delete a specific saved search
 *SavedSearchApi* | [**get_all_entity_type_saved_searches**](docs/SavedSearchApi.md#get_all_entity_type_saved_searches) | **GET** /api/v2/savedsearch/type/{entitytype} | Get all saved searches for a specific entity type for a user
@@ -266,6 +287,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_maintenance_window_entities**](docs/SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facet**](docs/SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facets**](docs/SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
+*SearchApi* | [**search_monitored_cluster_entities**](docs/SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
+*SearchApi* | [**search_monitored_cluster_for_facet**](docs/SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
+*SearchApi* | [**search_monitored_cluster_for_facets**](docs/SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 *SearchApi* | [**search_notficant_for_facets**](docs/SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 *SearchApi* | [**search_notificant_entities**](docs/SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 *SearchApi* | [**search_notificant_for_facet**](docs/SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -285,6 +309,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_report_event_entities**](docs/SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 *SearchApi* | [**search_report_event_for_facet**](docs/SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 *SearchApi* | [**search_report_event_for_facets**](docs/SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
+*SearchApi* | [**search_role_entities**](docs/SearchApi.md#search_role_entities) | **POST** /api/v2/search/role | Search over a customer&#39;s roles
+*SearchApi* | [**search_role_for_facet**](docs/SearchApi.md#search_role_for_facet) | **POST** /api/v2/search/role/{facet} | Lists the values of a specific facet over the customer&#39;s roles
+*SearchApi* | [**search_role_for_facets**](docs/SearchApi.md#search_role_for_facets) | **POST** /api/v2/search/role/facets | Lists the values of one or more facets over the customer&#39;s roles
 *SearchApi* | [**search_service_account_entities**](docs/SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
 *SearchApi* | [**search_service_account_for_facet**](docs/SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
 *SearchApi* | [**search_service_account_for_facets**](docs/SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
@@ -332,14 +359,14 @@ Class | Method | HTTP request | Description
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 *UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
 *UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
+*UserGroupApi* | [**add_roles_to_user_group**](docs/UserGroupApi.md#add_roles_to_user_group) | **POST** /api/v2/usergroup/{id}/addRoles | Add multiple roles to a specific user group
 *UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 *UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 *UserGroupApi* | [**delete_user_group**](docs/UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
 *UserGroupApi* | [**get_all_user_groups**](docs/UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
 *UserGroupApi* | [**get_user_group**](docs/UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
-*UserGroupApi* | [**grant_permission_to_user_groups**](docs/UserGroupApi.md#grant_permission_to_user_groups) | **POST** /api/v2/usergroup/grant/{permission} | Grants a single permission to user group(s)
+*UserGroupApi* | [**remove_roles_from_user_group**](docs/UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 *UserGroupApi* | [**remove_users_from_user_group**](docs/UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
-*UserGroupApi* | [**revoke_permission_from_user_groups**](docs/UserGroupApi.md#revoke_permission_from_user_groups) | **POST** /api/v2/usergroup/revoke/{permission} | Revokes a single permission from user group(s)
 *UserGroupApi* | [**update_user_group**](docs/UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
 *WebhookApi* | [**create_webhook**](docs/WebhookApi.md#create_webhook) | **POST** /api/v2/webhook | Create a specific webhook
 *WebhookApi* | [**delete_webhook**](docs/WebhookApi.md#delete_webhook) | **DELETE** /api/v2/webhook/{id} | Delete a specific webhook
@@ -436,6 +463,7 @@ Class | Method | HTTP request | Description
  - [PagedNotificant](docs/PagedNotificant.md)
  - [PagedProxy](docs/PagedProxy.md)
  - [PagedRelatedEvent](docs/PagedRelatedEvent.md)
+ - [PagedRoleDTO](docs/PagedRoleDTO.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
  - [PagedServiceAccount](docs/PagedServiceAccount.md)
  - [PagedSource](docs/PagedSource.md)
@@ -492,11 +520,13 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedNotificant](docs/ResponseContainerPagedNotificant.md)
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
  - [ResponseContainerPagedRelatedEvent](docs/ResponseContainerPagedRelatedEvent.md)
+ - [ResponseContainerPagedRoleDTO](docs/ResponseContainerPagedRoleDTO.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
  - [ResponseContainerPagedServiceAccount](docs/ResponseContainerPagedServiceAccount.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
  - [ResponseContainerPagedUserGroupModel](docs/ResponseContainerPagedUserGroupModel.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
+ - [ResponseContainerRoleDTO](docs/ResponseContainerRoleDTO.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
  - [ResponseContainerServiceAccount](docs/ResponseContainerServiceAccount.md)
  - [ResponseContainerSetBusinessFunction](docs/ResponseContainerSetBusinessFunction.md)
@@ -508,6 +538,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseStatus](docs/ResponseStatus.md)
+ - [RoleDTO](docs/RoleDTO.md)
  - [SavedSearch](docs/SavedSearch.md)
  - [SearchQuery](docs/SearchQuery.md)
  - [ServiceAccount](docs/ServiceAccount.md)
diff --git a/docs/Account.md b/docs/Account.md
index e563692..cbe1c65 100644
--- a/docs/Account.md
+++ b/docs/Account.md
@@ -6,6 +6,9 @@ Name | Type | Description | Notes
 **groups** | **list[str]** | The list of account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of an account. | 
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with account. | [optional] 
+**roles** | **list[str]** | The list of account&#39;s roles. | [optional] 
+**united_permissions** | **list[str]** | The list of account&#39;s permissions assigned directly or through united roles assigned to it | [optional] 
+**united_roles** | **list[str]** | The list of account&#39;s roles assigned directly or through user groups assigned to it | [optional] 
 **user_groups** | **list[str]** | The list of account&#39;s user groups. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index b377233..f7068f4 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -5,6 +5,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
+[**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
 [**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
@@ -22,6 +23,7 @@ Method | HTTP request | Description
 [**grant_account_permission**](AccountUserAndServiceAccountApi.md#grant_account_permission) | **POST** /api/v2/account/{id}/grant/{permission} | Grants a specific permission to account (user or service account)
 [**grant_permission_to_accounts**](AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
+[**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific user groups from the account (user or service account)
 [**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
@@ -85,6 +87,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **add_account_to_roles**
+> UserModel add_account_to_roles(id, body=body)
+
+Adds specific roles to the account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | The list of roles that should be added to the account (optional)
+
+try:
+    # Adds specific roles to the account (user or service account)
+    api_response = api_instance.add_account_to_roles(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->add_account_to_roles: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| The list of roles that should be added to the account | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **add_account_to_user_groups**
 > UserModel add_account_to_user_groups(id, body=body)
 
@@ -219,7 +277,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Creates or updates a user account
@@ -234,7 +292,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -974,7 +1032,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre> (optional)
 
 try:
     # Invite user accounts with given user groups and permissions.
@@ -988,7 +1046,63 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**UserModel**](UserModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_account_from_roles**
+> UserModel remove_account_from_roles(id, body=body)
+
+Removes specific roles from the account (user or service account)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | The list of roles that should be removed from the account (optional)
+
+try:
+    # Removes specific roles from the account (user or service account)
+    api_response = api_instance.remove_account_from_roles(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->remove_account_from_roles: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| The list of roles that should be removed from the account | [optional] 
 
 ### Return type
 
@@ -1307,7 +1421,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Update user with given user groups, permissions and ingestion policy.
@@ -1322,7 +1436,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index 385a4e7..f7badfe 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -12,6 +12,8 @@ Name | Type | Description | Notes
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
 **_self** | **bool** | Whether this user is the one calling the API | 
+**united_permissions** | **list[str]** | The list of account&#39;s permissions assigned directly or through united roles assigned to it | [optional] 
+**united_roles** | **list[str]** | The list of account&#39;s roles assigned directly or through user groups assigned to it | [optional] 
 **user_groups** | **list[str]** | List of user group identifiers this user belongs to | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Event.md b/docs/Event.md
index ce425e6..13145db 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**alert_tags** | **list[str]** | The list of tags on the alert which created this event. | [optional] 
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **can_close** | **bool** |  | [optional] 
 **can_delete** | **bool** |  | [optional] 
diff --git a/docs/PagedRoleDTO.md b/docs/PagedRoleDTO.md
new file mode 100644
index 0000000..1c47be5
--- /dev/null
+++ b/docs/PagedRoleDTO.md
@@ -0,0 +1,16 @@
+# PagedRoleDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[RoleDTO]**](RoleDTO.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RelatedEvent.md b/docs/RelatedEvent.md
index 4d3100f..e94ea8c 100644
--- a/docs/RelatedEvent.md
+++ b/docs/RelatedEvent.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**alert_tags** | **list[str]** | The list of tags on the alert which created this event. | [optional] 
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **can_close** | **bool** |  | [optional] 
 **can_delete** | **bool** |  | [optional] 
diff --git a/docs/ResponseContainerPagedRoleDTO.md b/docs/ResponseContainerPagedRoleDTO.md
new file mode 100644
index 0000000..9cfdf60
--- /dev/null
+++ b/docs/ResponseContainerPagedRoleDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedRoleDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedRoleDTO**](PagedRoleDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerRoleDTO.md b/docs/ResponseContainerRoleDTO.md
new file mode 100644
index 0000000..33becdb
--- /dev/null
+++ b/docs/ResponseContainerRoleDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerRoleDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**RoleDTO**](RoleDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RoleApi.md b/docs/RoleApi.md
new file mode 100644
index 0000000..8510782
--- /dev/null
+++ b/docs/RoleApi.md
@@ -0,0 +1,515 @@
+# wavefront_api_client.RoleApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_assignees**](RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add multiple users and user groups to a specific role
+[**create_role**](RoleApi.md#create_role) | **POST** /api/v2/role | Create a specific role
+[**delete_role**](RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a specific role
+[**get_all_roles**](RoleApi.md#get_all_roles) | **GET** /api/v2/role | Get all roles for a customer
+[**get_role**](RoleApi.md#get_role) | **GET** /api/v2/role/{id} | Get a specific role
+[**grant_permission_to_roles**](RoleApi.md#grant_permission_to_roles) | **POST** /api/v2/role/grant/{permission} | Grants a single permission to role(s)
+[**remove_assignees**](RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove multiple users and user groups from a specific role
+[**revoke_permission_from_roles**](RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revokes a single permission from role(s)
+[**update_role**](RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a specific role
+
+
+# **add_assignees**
+> ResponseContainerRoleDTO add_assignees(id, body=body)
+
+Add multiple users and user groups to a specific role
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of users and user groups thatshould be added to role (optional)
+
+try:
+    # Add multiple users and user groups to a specific role
+    api_response = api_instance.add_assignees(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->add_assignees: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of users and user groups thatshould be added to role | [optional] 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_role**
+> ResponseContainerRoleDTO create_role(body=body)
+
+Create a specific role
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.RoleDTO() # RoleDTO | Example Body:  <pre>{   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre> (optional)
+
+try:
+    # Create a specific role
+    api_response = api_instance.create_role(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->create_role: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**RoleDTO**](RoleDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Role name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;Role description\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_role**
+> ResponseContainerRoleDTO delete_role(id)
+
+Delete a specific role
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a specific role
+    api_response = api_instance.delete_role(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->delete_role: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_roles**
+> ResponseContainerPagedRoleDTO get_all_roles(offset=offset, limit=limit)
+
+Get all roles for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all roles for a customer
+    api_response = api_instance.get_all_roles(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->get_all_roles: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedRoleDTO**](ResponseContainerPagedRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_role**
+> ResponseContainerRoleDTO get_role(id)
+
+Get a specific role
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific role
+    api_response = api_instance.get_role(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->get_role: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **grant_permission_to_roles**
+> ResponseContainerRoleDTO grant_permission_to_roles(permission, body=body)
+
+Grants a single permission to role(s)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to grant to role(s).
+body = [wavefront_api_client.list[str]()] # list[str] | List of roles. (optional)
+
+try:
+    # Grants a single permission to role(s)
+    api_response = api_instance.grant_permission_to_roles(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->grant_permission_to_roles: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to grant to role(s). | 
+ **body** | **list[str]**| List of roles. | [optional] 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_assignees**
+> ResponseContainerRoleDTO remove_assignees(id, body=body)
+
+Remove multiple users and user groups from a specific role
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of users and user groups thatshould be removed from role (optional)
+
+try:
+    # Remove multiple users and user groups from a specific role
+    api_response = api_instance.remove_assignees(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->remove_assignees: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of users and user groups thatshould be removed from role | [optional] 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revoke_permission_from_roles**
+> ResponseContainerRoleDTO revoke_permission_from_roles(permission, body=body)
+
+Revokes a single permission from role(s)
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+permission = 'permission_example' # str | Permission to revoke from role(s).
+body = [wavefront_api_client.list[str]()] # list[str] | List of roles. (optional)
+
+try:
+    # Revokes a single permission from role(s)
+    api_response = api_instance.revoke_permission_from_roles(permission, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->revoke_permission_from_roles: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **permission** | **str**| Permission to revoke from role(s). | 
+ **body** | **list[str]**| List of roles. | [optional] 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_role**
+> ResponseContainerRoleDTO update_role(id, body=body)
+
+Update a specific role
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.RoleDTO() # RoleDTO | Example Body:  <pre>{   \"id\": \"Role identifier\",   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre> (optional)
+
+try:
+    # Update a specific role
+    api_response = api_instance.update_role(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RoleApi->update_role: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**RoleDTO**](RoleDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;Role identifier\&quot;,   \&quot;name\&quot;: \&quot;Role name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;Role description\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerRoleDTO**](ResponseContainerRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/RoleDTO.md b/docs/RoleDTO.md
new file mode 100644
index 0000000..3d52ac8
--- /dev/null
+++ b/docs/RoleDTO.md
@@ -0,0 +1,21 @@
+# RoleDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**customer** | **str** | The id of the customer to which the role belongs | [optional] 
+**description** | **str** | The description of the role | [optional] 
+**id** | **str** | The unique identifier of the role | [optional] 
+**last_updated_account_id** | **str** | The account that updated this role last time | [optional] 
+**last_updated_ms** | **int** | The last time when the role is updated, in epoch milliseconds | [optional] 
+**linked_accounts_count** | **int** | Total number of accounts that are linked to the role | [optional] 
+**linked_groups_count** | **int** | Total number of groups that are linked to the role | [optional] 
+**name** | **str** | The name of the role | [optional] 
+**permissions** | **list[str]** | List of permissions the role has been granted access to | [optional] 
+**sample_linked_accounts** | **list[str]** | A sample of the accounts assigned to this role. Please use the Role facet of the Account Search API to get the full list of accounts for this role | [optional] 
+**sample_linked_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this role. Please use the Role facet of the Group Search API to get the full list of groups for this role | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 94cb9e1..1ec7cbf 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -34,6 +34,9 @@ Method | HTTP request | Description
 [**search_maintenance_window_entities**](SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 [**search_maintenance_window_for_facet**](SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 [**search_maintenance_window_for_facets**](SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
+[**search_monitored_cluster_entities**](SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
+[**search_monitored_cluster_for_facet**](SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
+[**search_monitored_cluster_for_facets**](SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 [**search_notficant_for_facets**](SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 [**search_notificant_entities**](SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 [**search_notificant_for_facet**](SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -53,6 +56,9 @@ Method | HTTP request | Description
 [**search_report_event_entities**](SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 [**search_report_event_for_facet**](SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
 [**search_report_event_for_facets**](SearchApi.md#search_report_event_for_facets) | **POST** /api/v2/search/event/facets | Lists the values of one or more facets over the customer&#39;s events
+[**search_role_entities**](SearchApi.md#search_role_entities) | **POST** /api/v2/search/role | Search over a customer&#39;s roles
+[**search_role_for_facet**](SearchApi.md#search_role_for_facet) | **POST** /api/v2/search/role/{facet} | Lists the values of a specific facet over the customer&#39;s roles
+[**search_role_for_facets**](SearchApi.md#search_role_for_facets) | **POST** /api/v2/search/role/facets | Lists the values of one or more facets over the customer&#39;s roles
 [**search_service_account_entities**](SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
 [**search_service_account_for_facet**](SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
 [**search_service_account_for_facets**](SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
@@ -1710,6 +1716,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_monitored_cluster_entities**
+> ResponseContainerPagedMonitoredCluster search_monitored_cluster_entities(body=body)
+
+Search over all the customer's non-deleted monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over all the customer's non-deleted monitored clusters
+    api_response = api_instance.search_monitored_cluster_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_cluster_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedMonitoredCluster**](ResponseContainerPagedMonitoredCluster.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_cluster_for_facet**
+> ResponseContainerFacetResponse search_monitored_cluster_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted monitored cluster
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted monitored cluster
+    api_response = api_instance.search_monitored_cluster_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_cluster_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_cluster_for_facets**
+> ResponseContainerFacetsResponseContainer search_monitored_cluster_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted monitored clusters
+    api_response = api_instance.search_monitored_cluster_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_cluster_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_notficant_for_facets**
 > ResponseContainerFacetsResponseContainer search_notficant_for_facets(body=body)
 
@@ -2750,6 +2920,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_role_entities**
+> ResponseContainerPagedRoleDTO search_role_entities(body=body)
+
+Search over a customer's roles
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's roles
+    api_response = api_instance.search_role_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_role_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedRoleDTO**](ResponseContainerPagedRoleDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_role_for_facet**
+> ResponseContainerFacetResponse search_role_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's roles
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's roles
+    api_response = api_instance.search_role_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_role_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_role_for_facets**
+> ResponseContainerFacetsResponseContainer search_role_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's roles
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's roles
+    api_response = api_instance.search_role_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_role_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_service_account_entities**
 > ResponseContainerPagedServiceAccount search_service_account_entities(body=body)
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index 301f577..36fe554 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **identifier** | **str** | The unique identifier of a service account. | 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
+**roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
+**united_permissions** | **list[str]** | The list of account&#39;s permissions assigned directly or through united roles assigned to it | [optional] 
+**united_roles** | **list[str]** | The list of account&#39;s roles assigned directly or through user groups assigned to it | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of service account&#39;s user groups. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/ServiceAccountWrite.md b/docs/ServiceAccountWrite.md
index e58b80e..fe657a4 100644
--- a/docs/ServiceAccountWrite.md
+++ b/docs/ServiceAccountWrite.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **groups** | **list[str]** | The list of permissions, the service account will be granted. | [optional] 
 **identifier** | **str** | The unique identifier for a service account. | 
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with service account. | [optional] 
+**roles** | **list[str]** | The list of role ids, the service account will be added to.\&quot; | [optional] 
 **tokens** | **list[str]** | The service account&#39;s API tokens. | [optional] 
 **user_groups** | **list[str]** | The list of user group ids, the service account will be added to. | [optional] 
 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 1948e74..4869797 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -101,7 +101,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Creates or updates a user
@@ -116,7 +116,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -533,7 +533,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre> (optional)
 
 try:
     # Invite users with given user groups and permissions.
@@ -547,7 +547,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] } ]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -756,7 +756,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Update user with given user groups, permissions and ingestion policy.
@@ -771,7 +771,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index dc6d810..dddfbcd 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **identifier** | **str** |  | [optional] 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
+**roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) |  | [optional] 
 
diff --git a/docs/UserGroup.md b/docs/UserGroup.md
index 44eb5f7..6bb6ed4 100644
--- a/docs/UserGroup.md
+++ b/docs/UserGroup.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **name** | **str** | Name of the user group | [optional] 
 **permissions** | **list[str]** | Permission assigned to the user group | [optional] 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
+**roles** | [**list[RoleDTO]**](RoleDTO.md) | List of roles the user group has been linked to | [optional] 
 **user_count** | **int** | Total number of users that are members of the user group | [optional] 
 **users** | **list[str]** | List of Users that are members of the user group. Maybe incomplete. | [optional] 
 
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 9f2bd2c..2ed537a 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -4,17 +4,73 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_roles_to_user_group**](UserGroupApi.md#add_roles_to_user_group) | **POST** /api/v2/usergroup/{id}/addRoles | Add multiple roles to a specific user group
 [**add_users_to_user_group**](UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 [**create_user_group**](UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 [**delete_user_group**](UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
 [**get_all_user_groups**](UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
 [**get_user_group**](UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
-[**grant_permission_to_user_groups**](UserGroupApi.md#grant_permission_to_user_groups) | **POST** /api/v2/usergroup/grant/{permission} | Grants a single permission to user group(s)
+[**remove_roles_from_user_group**](UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 [**remove_users_from_user_group**](UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
-[**revoke_permission_from_user_groups**](UserGroupApi.md#revoke_permission_from_user_groups) | **POST** /api/v2/usergroup/revoke/{permission} | Revokes a single permission from user group(s)
 [**update_user_group**](UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
 
 
+# **add_roles_to_user_group**
+> ResponseContainerUserGroupModel add_roles_to_user_group(id, body=body)
+
+Add multiple roles to a specific user group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of roles that should be added to user group (optional)
+
+try:
+    # Add multiple roles to a specific user group
+    api_response = api_instance.add_roles_to_user_group(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->add_roles_to_user_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of roles that should be added to user group | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **add_users_to_user_group**
 > ResponseContainerUserGroupModel add_users_to_user_group(id, body=body)
 
@@ -94,7 +150,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
 
 try:
     # Create a specific user group
@@ -108,7 +164,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;roleIDs\&quot;: [   \&quot;role1\&quot;,   \&quot;role2\&quot;,   \&quot;role3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -289,10 +345,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **grant_permission_to_user_groups**
-> ResponseContainerUserGroupModel grant_permission_to_user_groups(permission, body=body)
+# **remove_roles_from_user_group**
+> ResponseContainerUserGroupModel remove_roles_from_user_group(id, body=body)
 
-Grants a single permission to user group(s)
+Remove multiple roles from a specific user group
 
 
 
@@ -312,23 +368,23 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to grant to user group(s).
-body = [wavefront_api_client.list[str]()] # list[str] | List of user groups. (optional)
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of roles that should be removed from user group (optional)
 
 try:
-    # Grants a single permission to user group(s)
-    api_response = api_instance.grant_permission_to_user_groups(permission, body=body)
+    # Remove multiple roles from a specific user group
+    api_response = api_instance.remove_roles_from_user_group(id, body=body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling UserGroupApi->grant_permission_to_user_groups: %s\n" % e)
+    print("Exception when calling UserGroupApi->remove_roles_from_user_group: %s\n" % e)
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to grant to user group(s). | 
- **body** | **list[str]**| List of user groups. | [optional] 
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of roles that should be removed from user group | [optional] 
 
 ### Return type
 
@@ -401,62 +457,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **revoke_permission_from_user_groups**
-> ResponseContainerUserGroupModel revoke_permission_from_user_groups(permission, body=body)
-
-Revokes a single permission from user group(s)
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to revoke from user group(s).
-body = [wavefront_api_client.list[str]()] # list[str] | List of user groups. (optional)
-
-try:
-    # Revokes a single permission from user group(s)
-    api_response = api_instance.revoke_permission_from_user_groups(permission, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UserGroupApi->revoke_permission_from_user_groups: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to revoke from user group(s). | 
- **body** | **list[str]**| List of user groups. | [optional] 
-
-### Return type
-
-[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **update_user_group**
 > ResponseContainerUserGroupModel update_user_group(id, body=body)
 
@@ -481,7 +481,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
 
 try:
     # Update a specific user group
@@ -496,7 +496,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;roleIDs\&quot;: [   \&quot;role1\&quot;,   \&quot;role2\&quot;,   \&quot;role3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 79f0291..617a98b 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -8,8 +8,10 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
 **name** | **str** | The name of the user group | 
-**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
+**permissions** | **list[str]** | List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission. | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
+**role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
+**roles** | [**list[RoleDTO]**](RoleDTO.md) | List of roles that are linked to the user group. | [optional] 
 **user_count** | **int** | Total number of users that are members of the user group | [optional] 
 **users** | **list[str]** | List(may be incomplete) of users that are members of the user group. | [optional] 
 
diff --git a/docs/UserGroupPropertiesDTO.md b/docs/UserGroupPropertiesDTO.md
index 626cf71..b9a6ed0 100644
--- a/docs/UserGroupPropertiesDTO.md
+++ b/docs/UserGroupPropertiesDTO.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name_editable** | **bool** |  | [optional] 
 **permissions_editable** | **bool** |  | [optional] 
+**roles_editable** | **bool** |  | [optional] 
 **users_editable** | **bool** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
index a037da9..de03e5e 100644
--- a/docs/UserGroupWrite.md
+++ b/docs/UserGroupWrite.md
@@ -8,7 +8,8 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
 **name** | **str** | The name of the user group | 
-**permissions** | **list[str]** | List of permissions the user group has been granted access to | 
+**permissions** | **list[str]** | List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission. | 
+**role_i_ds** | **list[str]** | List of role IDs the user group has been linked to. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 0e430e4..2357d00 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
+**roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | [**list[UserGroup]**](UserGroup.md) | The list of user groups the user belongs to | 
 
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
index 41f9d4a..5fafe13 100644
--- a/docs/UserRequestDTO.md
+++ b/docs/UserRequestDTO.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
 **ingestion_policy_id** | **str** |  | [optional] 
+**roles** | **list[str]** |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | **list[str]** |  | [optional] 
 
diff --git a/docs/UserToCreate.md b/docs/UserToCreate.md
index 5a04613..6befc0e 100644
--- a/docs/UserToCreate.md
+++ b/docs/UserToCreate.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **email_address** | **str** | The (unique) identifier of the user to create. Must be a valid email address | 
 **groups** | **list[str]** | List of permission groups to grant to this user. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management | 
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
+**roles** | **list[str]** | The list of role ids, the user will be added to.\&quot; | [optional] 
 **user_groups** | **list[str]** | List of user groups to this user.  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/setup.py b/setup.py
index 93cd7b7..09788e6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.55.18"
+VERSION = "2.56.8"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_paged_role_dto.py b/test/test_paged_role_dto.py
new file mode 100644
index 0000000..ea8263f
--- /dev/null
+++ b/test/test_paged_role_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_role_dto import PagedRoleDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedRoleDTO(unittest.TestCase):
+    """PagedRoleDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedRoleDTO(self):
+        """Test PagedRoleDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_role_dto.PagedRoleDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_role_dto.py b/test/test_response_container_paged_role_dto.py
new file mode 100644
index 0000000..3c1c353
--- /dev/null
+++ b/test/test_response_container_paged_role_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedRoleDTO(unittest.TestCase):
+    """ResponseContainerPagedRoleDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedRoleDTO(self):
+        """Test ResponseContainerPagedRoleDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_role_dto.ResponseContainerPagedRoleDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_role_dto.py b/test/test_response_container_role_dto.py
new file mode 100644
index 0000000..e5f2b8c
--- /dev/null
+++ b/test/test_response_container_role_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerRoleDTO(unittest.TestCase):
+    """ResponseContainerRoleDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerRoleDTO(self):
+        """Test ResponseContainerRoleDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_role_dto.ResponseContainerRoleDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_role_api.py b/test/test_role_api.py
new file mode 100644
index 0000000..6091f15
--- /dev/null
+++ b/test/test_role_api.py
@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.role_api import RoleApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRoleApi(unittest.TestCase):
+    """RoleApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.role_api.RoleApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_assignees(self):
+        """Test case for add_assignees
+
+        Add multiple users and user groups to a specific role  # noqa: E501
+        """
+        pass
+
+    def test_create_role(self):
+        """Test case for create_role
+
+        Create a specific role  # noqa: E501
+        """
+        pass
+
+    def test_delete_role(self):
+        """Test case for delete_role
+
+        Delete a specific role  # noqa: E501
+        """
+        pass
+
+    def test_get_all_roles(self):
+        """Test case for get_all_roles
+
+        Get all roles for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_role(self):
+        """Test case for get_role
+
+        Get a specific role  # noqa: E501
+        """
+        pass
+
+    def test_grant_permission_to_roles(self):
+        """Test case for grant_permission_to_roles
+
+        Grants a single permission to role(s)  # noqa: E501
+        """
+        pass
+
+    def test_remove_assignees(self):
+        """Test case for remove_assignees
+
+        Remove multiple users and user groups from a specific role  # noqa: E501
+        """
+        pass
+
+    def test_revoke_permission_from_roles(self):
+        """Test case for revoke_permission_from_roles
+
+        Revokes a single permission from role(s)  # noqa: E501
+        """
+        pass
+
+    def test_update_role(self):
+        """Test case for update_role
+
+        Update a specific role  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_role_dto.py b/test/test_role_dto.py
new file mode 100644
index 0000000..7f705ad
--- /dev/null
+++ b/test/test_role_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.role_dto import RoleDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRoleDTO(unittest.TestCase):
+    """RoleDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRoleDTO(self):
+        """Test RoleDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.role_dto.RoleDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index bba4406..aaed05e 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -30,9 +30,11 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
+from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
+from wavefront_api_client.api.role_api import RoleApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.source_api import SourceApi
@@ -131,6 +133,7 @@
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
+from wavefront_api_client.models.paged_role_dto import PagedRoleDTO
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
@@ -187,11 +190,13 @@
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
+from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
+from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
@@ -203,6 +208,7 @@
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
+from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 7c84b41..7d85d55 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -17,9 +17,11 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
+from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
+from wavefront_api_client.api.role_api import RoleApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.source_api import SourceApi
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 7408062..ce42e82 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -132,6 +132,109 @@ def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def add_account_to_roles(self, id, **kwargs):  # noqa: E501
+        """Adds specific roles to the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_account_to_roles(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of roles that should be added to the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_account_to_roles_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_account_to_roles_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Adds specific roles to the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_account_to_roles_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of roles that should be added to the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_account_to_roles" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_account_to_roles`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/addRoles', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific user groups to the account (user or service account)  # noqa: E501
 
@@ -341,7 +444,7 @@ def create_or_update_user_account(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -364,7 +467,7 @@ def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1682,7 +1785,7 @@ def invite_user_accounts(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1704,7 +1807,7 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1767,6 +1870,109 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
+        """Removes specific roles from the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_account_from_roles(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of roles that should be removed from the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_account_from_roles_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_account_from_roles_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Removes specific roles from the account (user or service account)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_account_from_roles_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: The list of roles that should be removed from the account
+        :return: UserModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_account_from_roles" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_account_from_roles`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/{id}/removeRoles', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UserModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific user groups from the account (user or service account)  # noqa: E501
 
@@ -2289,7 +2495,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2312,7 +2518,7 @@ def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
new file mode 100644
index 0000000..190386e
--- /dev/null
+++ b/wavefront_api_client/api/role_api.py
@@ -0,0 +1,941 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class RoleApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def add_assignees(self, id, **kwargs):  # noqa: E501
+        """Add multiple users and user groups to a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_assignees(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users and user groups thatshould be added to role
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_assignees_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_assignees_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add multiple users and user groups to a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_assignees_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users and user groups thatshould be added to role
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_assignees" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_assignees`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/{id}/addAssignees', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_role(self, **kwargs):  # noqa: E501
+        """Create a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_role(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RoleDTO body: Example Body:  <pre>{   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_role_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_role_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_role_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_role_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RoleDTO body: Example Body:  <pre>{   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_role" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_role(self, id, **kwargs):  # noqa: E501
+        """Delete a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_role(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_role_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_role_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_role_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_role" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `delete_role`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_roles(self, **kwargs):  # noqa: E501
+        """Get all roles for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_roles(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_roles_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_roles_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all roles for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_roles_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_roles" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_role(self, id, **kwargs):  # noqa: E501
+        """Get a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_role(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_role_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_role_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_role_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_role" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `get_role`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def grant_permission_to_roles(self, permission, **kwargs):  # noqa: E501
+        """Grants a single permission to role(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_permission_to_roles(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to role(s). (required)
+        :param list[str] body: List of roles.
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.grant_permission_to_roles_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.grant_permission_to_roles_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def grant_permission_to_roles_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Grants a single permission to role(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.grant_permission_to_roles_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to grant to role(s). (required)
+        :param list[str] body: List of roles.
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method grant_permission_to_roles" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_roles`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/grant/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_assignees(self, id, **kwargs):  # noqa: E501
+        """Remove multiple users and user groups from a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_assignees(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users and user groups thatshould be removed from role
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_assignees_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_assignees_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove multiple users and user groups from a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_assignees_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of users and user groups thatshould be removed from role
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_assignees" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_assignees`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/{id}/removeAssignees', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revoke_permission_from_roles(self, permission, **kwargs):  # noqa: E501
+        """Revokes a single permission from role(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_roles(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to revoke from role(s). (required)
+        :param list[str] body: List of roles.
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revoke_permission_from_roles_with_http_info(permission, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revoke_permission_from_roles_with_http_info(permission, **kwargs)  # noqa: E501
+            return data
+
+    def revoke_permission_from_roles_with_http_info(self, permission, **kwargs):  # noqa: E501
+        """Revokes a single permission from role(s)  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revoke_permission_from_roles_with_http_info(permission, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str permission: Permission to revoke from role(s). (required)
+        :param list[str] body: List of roles.
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['permission', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revoke_permission_from_roles" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'permission' is set
+        if ('permission' not in params or
+                params['permission'] is None):
+            raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_roles`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'permission' in params:
+            path_params['permission'] = params['permission']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/revoke/{permission}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_role(self, id, **kwargs):  # noqa: E501
+        """Update a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_role(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param RoleDTO body: Example Body:  <pre>{   \"id\": \"Role identifier\",   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_role_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_role_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_role_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific role  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_role_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param RoleDTO body: Example Body:  <pre>{   \"id\": \"Role identifier\",   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :return: ResponseContainerRoleDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_role" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `update_role`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/role/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRoleDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 7d1f123..c1f35c0 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2963,40 +2963,626 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_monitored_cluster_entities(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_cluster_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredCluster
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_cluster_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredcluster', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredCluster',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_cluster_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_cluster_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_cluster_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_monitored_cluster_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredcluster/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_cluster_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_cluster_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_cluster_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_cluster_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredcluster/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_notficant_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notficant_for_facets(async_req=True)
+        >>> thread = api.search_notficant_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notficant_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_notficant_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/notificant/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_notificant_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedNotificant
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedNotificant
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_notificant_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/notificant', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedNotificant',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_notificant_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_notificant_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_notificant_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/notificant/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted proxies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_proxy_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_notficant_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's notificants  # noqa: E501
+    def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notficant_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedProxy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3012,7 +3598,7 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_notficant_for_facets" % key
+                    " to method search_proxy_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3043,14 +3629,14 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/notificant/facets', 'POST',
+            '/api/v2/search/proxy/deleted', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            response_type='ResponseContainerPagedProxy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3058,45 +3644,47 @@ def search_notficant_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_notificant_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's notificants  # noqa: E501
+    def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_entities(async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedNotificant
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_notificant_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's notificants  # noqa: E501
+    def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_entities_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedNotificant
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['body']  # noqa: E501
+        all_params = ['facet', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -3107,14 +3695,20 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_notificant_entities" % key
+                    " to method search_proxy_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
 
         query_params = []
 
@@ -3138,14 +3732,14 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/notificant', 'POST',
+            '/api/v2/search/proxy/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedNotificant',  # noqa: E501
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3153,47 +3747,45 @@ def search_notificant_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_notificant_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+    def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_for_facet(facet, async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_notificant_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's notificants  # noqa: E501
+    def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_notificant_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_proxy_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['facet', 'body']  # noqa: E501
+        all_params = ['body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -3204,20 +3796,14 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_notificant_for_facet" % key
+                    " to method search_proxy_deleted_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_notificant_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'facet' in params:
-            path_params['facet'] = params['facet']  # noqa: E501
 
         query_params = []
 
@@ -3241,14 +3827,14 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/notificant/{facet}', 'POST',
+            '/api/v2/search/proxy/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3256,13 +3842,13 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted proxies  # noqa: E501
+    def search_proxy_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_entities(async_req=True)
+        >>> thread = api.search_proxy_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3273,18 +3859,18 @@ def search_proxy_deleted_entities(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted proxies  # noqa: E501
+    def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3305,7 +3891,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_deleted_entities" % key
+                    " to method search_proxy_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3336,7 +3922,7 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/deleted', 'POST',
+            '/api/v2/search/proxy', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3351,13 +3937,13 @@ def search_proxy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_proxy_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3369,18 +3955,18 @@ def search_proxy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_proxy_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3402,14 +3988,14 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_deleted_for_facet" % key
+                    " to method search_proxy_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -3439,7 +4025,7 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/deleted/{facet}', 'POST',
+            '/api/v2/search/proxy/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3454,13 +4040,13 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facets(async_req=True)
+        >>> thread = api.search_proxy_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3471,18 +4057,18 @@ def search_proxy_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted proxies  # noqa: E501
+    def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_proxy_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3503,7 +4089,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_deleted_for_facets" % key
+                    " to method search_proxy_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3534,7 +4120,7 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/deleted/facets', 'POST',
+            '/api/v2/search/proxy/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3549,40 +4135,40 @@ def search_proxy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_entities(async_req=True)
+        >>> thread = api.search_registered_query_deleted_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedProxy
+        :return: ResponseContainerPagedDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_entities_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_deleted_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedProxy
+        :return: ResponseContainerPagedDerivedMetricDefinition
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3598,7 +4184,7 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_entities" % key
+                    " to method search_registered_query_deleted_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3629,14 +4215,14 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy', 'POST',
+            '/api/v2/search/derivedmetric/deleted', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedProxy',  # noqa: E501
+            response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3644,13 +4230,13 @@ def search_proxy_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facet(facet, async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3662,18 +4248,18 @@ def search_proxy_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3695,14 +4281,14 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_for_facet" % key
+                    " to method search_registered_query_deleted_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_proxy_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -3732,7 +4318,7 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/{facet}', 'POST',
+            '/api/v2/search/derivedmetric/deleted/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3747,13 +4333,13 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_proxy_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facets(async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3764,18 +4350,18 @@ def search_proxy_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_proxy_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted proxies  # noqa: E501
+    def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_proxy_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_deleted_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3796,7 +4382,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_proxy_for_facets" % key
+                    " to method search_registered_query_deleted_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3827,7 +4413,7 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/proxy/facets', 'POST',
+            '/api/v2/search/derivedmetric/deleted/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -3842,40 +4428,40 @@ def search_proxy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_deleted_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_entities(async_req=True)
+        >>> thread = api.search_registered_query_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinition
+        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_entities_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinition
+        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -3891,7 +4477,7 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_deleted_entities" % key
+                    " to method search_registered_query_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -3922,14 +4508,14 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/deleted', 'POST',
+            '/api/v2/search/derivedmetric', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedDerivedMetricDefinition',  # noqa: E501
+            response_type='ResponseContainerPagedDerivedMetricDefinitionWithStats',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -3937,13 +4523,13 @@ def search_registered_query_deleted_entities_with_http_info(self, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facet(facet, async_req=True)
+        >>> thread = api.search_registered_query_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3955,18 +4541,18 @@ def search_registered_query_deleted_for_facet(self, facet, **kwargs):  # noqa: E
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_registered_query_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -3988,14 +4574,14 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_deleted_for_facet" % key
+                    " to method search_registered_query_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_deleted_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -4025,7 +4611,7 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/deleted/{facet}', 'POST',
+            '/api/v2/search/derivedmetric/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -4040,13 +4626,13 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facets(async_req=True)
+        >>> thread = api.search_registered_query_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4057,18 +4643,18 @@ def search_registered_query_deleted_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's deleted derived metric definitions  # noqa: E501
+    def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_deleted_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_registered_query_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4089,7 +4675,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_deleted_for_facets" % key
+                    " to method search_registered_query_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -4120,7 +4706,7 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/deleted/facets', 'POST',
+            '/api/v2/search/derivedmetric/facets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -4135,45 +4721,47 @@ def search_registered_query_deleted_for_facets_with_http_info(self, **kwargs):
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
+    def search_related_report_event_entities(self, event_id, **kwargs):  # noqa: E501
+        """List the related events over a firing event  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_entities(async_req=True)
+        >>> thread = api.search_related_report_event_entities(event_id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
+        :param str event_id: (required)
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedRelatedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_related_report_event_entities_with_http_info(event_id, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_related_report_event_entities_with_http_info(event_id, **kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's non-deleted derived metric definitions  # noqa: E501
+    def search_related_report_event_entities_with_http_info(self, event_id, **kwargs):  # noqa: E501
+        """List the related events over a firing event  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_entities_with_http_info(async_req=True)
+        >>> thread = api.search_related_report_event_entities_with_http_info(event_id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedDerivedMetricDefinitionWithStats
+        :param str event_id: (required)
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedRelatedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['body']  # noqa: E501
+        all_params = ['event_id', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -4184,14 +4772,20 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_entities" % key
+                    " to method search_related_report_event_entities" % key
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'event_id' is set
+        if ('event_id' not in params or
+                params['event_id'] is None):
+            raise ValueError("Missing the required parameter `event_id` when calling `search_related_report_event_entities`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
+        if 'event_id' in params:
+            path_params['eventId'] = params['event_id']  # noqa: E501
 
         query_params = []
 
@@ -4215,14 +4809,14 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric', 'POST',
+            '/api/v2/search/event/related/{eventId}', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedDerivedMetricDefinitionWithStats',  # noqa: E501
+            response_type='ResponseContainerPagedRelatedEvent',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -4230,47 +4824,45 @@ def search_registered_query_entities_with_http_info(self, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
+    def search_report_event_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facet(facet, async_req=True)
+        >>> thread = api.search_report_event_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted derived metric definitions  # noqa: E501
+    def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_report_event_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['facet', 'body']  # noqa: E501
+        all_params = ['body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -4281,20 +4873,14 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_for_facet" % key
+                    " to method search_report_event_entities" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'facet' in params:
-            path_params['facet'] = params['facet']  # noqa: E501
 
         query_params = []
 
@@ -4318,14 +4904,14 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/{facet}', 'POST',
+            '/api/v2/search/event', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            response_type='ResponseContainerPagedEvent',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -4333,45 +4919,47 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_registered_query_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
+    def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facets(async_req=True)
+        >>> thread = api.search_report_event_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_registered_query_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted derived metric definition  # noqa: E501
+    def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_registered_query_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_report_event_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['body']  # noqa: E501
+        all_params = ['facet', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -4382,14 +4970,20 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_registered_query_for_facets" % key
+                    " to method search_report_event_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_report_event_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
 
         query_params = []
 
@@ -4413,14 +5007,14 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/derivedmetric/facets', 'POST',
+            '/api/v2/search/event/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -4428,47 +5022,45 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_related_report_event_entities(self, event_id, **kwargs):  # noqa: E501
-        """List the related events over a firing event  # noqa: E501
+    def search_report_event_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_related_report_event_entities(event_id, async_req=True)
+        >>> thread = api.search_report_event_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str event_id: (required)
-        :param EventSearchRequest body:
-        :return: ResponseContainerPagedRelatedEvent
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_related_report_event_entities_with_http_info(event_id, **kwargs)  # noqa: E501
+            return self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_related_report_event_entities_with_http_info(event_id, **kwargs)  # noqa: E501
+            (data) = self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_related_report_event_entities_with_http_info(self, event_id, **kwargs):  # noqa: E501
-        """List the related events over a firing event  # noqa: E501
+    def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's events  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_related_report_event_entities_with_http_info(event_id, async_req=True)
+        >>> thread = api.search_report_event_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str event_id: (required)
-        :param EventSearchRequest body:
-        :return: ResponseContainerPagedRelatedEvent
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['event_id', 'body']  # noqa: E501
+        all_params = ['body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -4479,20 +5071,14 @@ def search_related_report_event_entities_with_http_info(self, event_id, **kwargs
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_related_report_event_entities" % key
+                    " to method search_report_event_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'event_id' is set
-        if ('event_id' not in params or
-                params['event_id'] is None):
-            raise ValueError("Missing the required parameter `event_id` when calling `search_related_report_event_entities`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'event_id' in params:
-            path_params['eventId'] = params['event_id']  # noqa: E501
 
         query_params = []
 
@@ -4516,14 +5102,14 @@ def search_related_report_event_entities_with_http_info(self, event_id, **kwargs
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event/related/{eventId}', 'POST',
+            '/api/v2/search/event/facets', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedRelatedEvent',  # noqa: E501
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -4531,40 +5117,40 @@ def search_related_report_event_entities_with_http_info(self, event_id, **kwargs
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_report_event_entities(self, **kwargs):  # noqa: E501
-        """Search over a customer's events  # noqa: E501
+    def search_role_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's roles  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_entities(async_req=True)
+        >>> thread = api.search_role_entities(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param EventSearchRequest body:
-        :return: ResponseContainerPagedEvent
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
+            return self.search_role_entities_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_report_event_entities_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_role_entities_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over a customer's events  # noqa: E501
+    def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's roles  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_entities_with_http_info(async_req=True)
+        >>> thread = api.search_role_entities_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param EventSearchRequest body:
-        :return: ResponseContainerPagedEvent
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -4580,7 +5166,7 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_report_event_entities" % key
+                    " to method search_role_entities" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -4611,14 +5197,14 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event', 'POST',
+            '/api/v2/search/role', 'POST',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedEvent',  # noqa: E501
+            response_type='ResponseContainerPagedRoleDTO',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -4626,13 +5212,13 @@ def search_report_event_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's events  # noqa: E501
+    def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facet(facet, async_req=True)
+        >>> thread = api.search_role_for_facet(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4644,18 +5230,18 @@ def search_report_event_for_facet(self, facet, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return self.search_role_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
         else:
-            (data) = self.search_report_event_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            (data) = self.search_role_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
             return data
 
-    def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's events  # noqa: E501
+    def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facet_with_http_info(facet, async_req=True)
+        >>> thread = api.search_role_for_facet_with_http_info(facet, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4677,14 +5263,14 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_report_event_for_facet" % key
+                    " to method search_role_for_facet" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
         if ('facet' not in params or
                 params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_report_event_for_facet`")  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_role_for_facet`")  # noqa: E501
 
         collection_formats = {}
 
@@ -4714,7 +5300,7 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event/{facet}', 'POST',
+            '/api/v2/search/role/{facet}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -4729,13 +5315,13 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_report_event_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's events  # noqa: E501
+    def search_role_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facets(async_req=True)
+        >>> thread = api.search_role_for_facets(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4746,18 +5332,18 @@ def search_report_event_for_facets(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return self.search_role_for_facets_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.search_report_event_for_facets_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.search_role_for_facets_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's events  # noqa: E501
+    def search_role_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_report_event_for_facets_with_http_info(async_req=True)
+        >>> thread = api.search_role_for_facets_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -4778,7 +5364,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method search_report_event_for_facets" % key
+                    " to method search_role_for_facets" % key
                 )
             params[key] = val
         del params['kwargs']
@@ -4809,7 +5395,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/search/event/facets', 'POST',
+            '/api/v2/search/role/facets', 'POST',
             path_params,
             query_params,
             header_params,
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index a7877d8..cefea62 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -147,7 +147,7 @@ def create_or_update_user(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -170,7 +170,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -918,7 +918,7 @@ def invite_users(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -940,7 +940,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1323,7 +1323,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1346,7 +1346,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\" }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index b8bd85d..482a12e 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -33,6 +33,109 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
+        """Add multiple roles to a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_roles_to_user_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of roles that should be added to user group
+        :return: ResponseContainerUserGroupModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_roles_to_user_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_roles_to_user_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add multiple roles to a specific user group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_roles_to_user_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of roles that should be added to user group
+        :return: ResponseContainerUserGroupModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_roles_to_user_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `add_roles_to_user_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/{id}/addRoles', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
@@ -146,7 +249,7 @@ def create_user_group(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -168,7 +271,7 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -516,47 +619,47 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def grant_permission_to_user_groups(self, permission, **kwargs):  # noqa: E501
-        """Grants a single permission to user group(s)  # noqa: E501
+    def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
+        """Remove multiple roles from a specific user group  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.grant_permission_to_user_groups(permission, async_req=True)
+        >>> thread = api.remove_roles_from_user_group(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to user group(s). (required)
-        :param list[str] body: List of user groups.
+        :param str id: (required)
+        :param list[str] body: List of roles that should be removed from user group
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.grant_permission_to_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
+            return self.remove_roles_from_user_group_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.grant_permission_to_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
+            (data) = self.remove_roles_from_user_group_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def grant_permission_to_user_groups_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Grants a single permission to user group(s)  # noqa: E501
+    def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove multiple roles from a specific user group  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.grant_permission_to_user_groups_with_http_info(permission, async_req=True)
+        >>> thread = api.remove_roles_from_user_group_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to user group(s). (required)
-        :param list[str] body: List of user groups.
+        :param str id: (required)
+        :param list[str] body: List of roles that should be removed from user group
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['permission', 'body']  # noqa: E501
+        all_params = ['id', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -567,20 +670,20 @@ def grant_permission_to_user_groups_with_http_info(self, permission, **kwargs):
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method grant_permission_to_user_groups" % key
+                    " to method remove_roles_from_user_group" % key
                 )
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
-            raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_user_groups`")  # noqa: E501
+        # verify the required parameter 'id' is set
+        if ('id' not in params or
+                params['id'] is None):
+            raise ValueError("Missing the required parameter `id` when calling `remove_roles_from_user_group`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
-        if 'permission' in params:
-            path_params['permission'] = params['permission']  # noqa: E501
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
 
@@ -604,7 +707,7 @@ def grant_permission_to_user_groups_with_http_info(self, permission, **kwargs):
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/usergroup/grant/{permission}', 'POST',
+            '/api/v2/usergroup/{id}/removeRoles', 'POST',
             path_params,
             query_params,
             header_params,
@@ -722,109 +825,6 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def revoke_permission_from_user_groups(self, permission, **kwargs):  # noqa: E501
-        """Revokes a single permission from user group(s)  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.revoke_permission_from_user_groups(permission, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str permission: Permission to revoke from user group(s). (required)
-        :param list[str] body: List of user groups.
-        :return: ResponseContainerUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.revoke_permission_from_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
-        else:
-            (data) = self.revoke_permission_from_user_groups_with_http_info(permission, **kwargs)  # noqa: E501
-            return data
-
-    def revoke_permission_from_user_groups_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Revokes a single permission from user group(s)  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.revoke_permission_from_user_groups_with_http_info(permission, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str permission: Permission to revoke from user group(s). (required)
-        :param list[str] body: List of user groups.
-        :return: ResponseContainerUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['permission', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method revoke_permission_from_user_groups" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
-            raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_user_groups`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'permission' in params:
-            path_params['permission'] = params['permission']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usergroup/revoke/{permission}', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerUserGroupModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def update_user_group(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
@@ -836,7 +836,7 @@ def update_user_group(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -859,7 +859,7 @@ def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 7e5833c..6d5aab9 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.55.18/python'
+        self.user_agent = 'Swagger-Codegen/2.56.8/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 35fae92..646b296 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.55.18".\
+               "SDK Package Version: 2.56.8".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index eaad08c..34c9d75 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -101,6 +101,7 @@
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
+from wavefront_api_client.models.paged_role_dto import PagedRoleDTO
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
@@ -157,11 +158,13 @@
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
+from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
+from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
@@ -173,6 +176,7 @@
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_status import ResponseStatus
+from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.saved_search import SavedSearch
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index 3184c9d..be04322 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -34,6 +34,9 @@ class Account(object):
         'groups': 'list[str]',
         'identifier': 'str',
         'ingestion_policy_id': 'str',
+        'roles': 'list[str]',
+        'united_permissions': 'list[str]',
+        'united_roles': 'list[str]',
         'user_groups': 'list[str]'
     }
 
@@ -41,15 +44,21 @@ class Account(object):
         'groups': 'groups',
         'identifier': 'identifier',
         'ingestion_policy_id': 'ingestionPolicyId',
+        'roles': 'roles',
+        'united_permissions': 'unitedPermissions',
+        'united_roles': 'unitedRoles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, roles=None, united_permissions=None, united_roles=None, user_groups=None):  # noqa: E501
         """Account - a model defined in Swagger"""  # noqa: E501
 
         self._groups = None
         self._identifier = None
         self._ingestion_policy_id = None
+        self._roles = None
+        self._united_permissions = None
+        self._united_roles = None
         self._user_groups = None
         self.discriminator = None
 
@@ -58,6 +67,12 @@ def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, user_
         self.identifier = identifier
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
+        if roles is not None:
+            self.roles = roles
+        if united_permissions is not None:
+            self.united_permissions = united_permissions
+        if united_roles is not None:
+            self.united_roles = united_roles
         if user_groups is not None:
             self.user_groups = user_groups
 
@@ -132,6 +147,75 @@ def ingestion_policy_id(self, ingestion_policy_id):
 
         self._ingestion_policy_id = ingestion_policy_id
 
+    @property
+    def roles(self):
+        """Gets the roles of this Account.  # noqa: E501
+
+        The list of account's roles.  # noqa: E501
+
+        :return: The roles of this Account.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this Account.
+
+        The list of account's roles.  # noqa: E501
+
+        :param roles: The roles of this Account.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._roles = roles
+
+    @property
+    def united_permissions(self):
+        """Gets the united_permissions of this Account.  # noqa: E501
+
+        The list of account's permissions assigned directly or through united roles assigned to it  # noqa: E501
+
+        :return: The united_permissions of this Account.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._united_permissions
+
+    @united_permissions.setter
+    def united_permissions(self, united_permissions):
+        """Sets the united_permissions of this Account.
+
+        The list of account's permissions assigned directly or through united roles assigned to it  # noqa: E501
+
+        :param united_permissions: The united_permissions of this Account.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._united_permissions = united_permissions
+
+    @property
+    def united_roles(self):
+        """Gets the united_roles of this Account.  # noqa: E501
+
+        The list of account's roles assigned directly or through user groups assigned to it  # noqa: E501
+
+        :return: The united_roles of this Account.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._united_roles
+
+    @united_roles.setter
+    def united_roles(self, united_roles):
+        """Sets the united_roles of this Account.
+
+        The list of account's roles assigned directly or through user groups assigned to it  # noqa: E501
+
+        :param united_roles: The united_roles of this Account.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._united_roles = united_roles
+
     @property
     def user_groups(self):
         """Gets the user_groups of this Account.  # noqa: E501
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index 43d700e..66d076b 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -40,6 +40,8 @@ class CustomerFacingUserObject(object):
         'ingestion_policy_id': 'str',
         'last_successful_login': 'int',
         '_self': 'bool',
+        'united_permissions': 'list[str]',
+        'united_roles': 'list[str]',
         'user_groups': 'list[str]'
     }
 
@@ -53,10 +55,12 @@ class CustomerFacingUserObject(object):
         'ingestion_policy_id': 'ingestionPolicyId',
         'last_successful_login': 'lastSuccessfulLogin',
         '_self': 'self',
+        'united_permissions': 'unitedPermissions',
+        'united_roles': 'unitedRoles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, ingestion_policy_id=None, last_successful_login=None, _self=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, ingestion_policy_id=None, last_successful_login=None, _self=None, united_permissions=None, united_roles=None, user_groups=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
@@ -68,6 +72,8 @@ def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, gr
         self._ingestion_policy_id = None
         self._last_successful_login = None
         self.__self = None
+        self._united_permissions = None
+        self._united_roles = None
         self._user_groups = None
         self.discriminator = None
 
@@ -85,6 +91,10 @@ def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, gr
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         self._self = _self
+        if united_permissions is not None:
+            self.united_permissions = united_permissions
+        if united_roles is not None:
+            self.united_roles = united_roles
         if user_groups is not None:
             self.user_groups = user_groups
 
@@ -303,6 +313,52 @@ def _self(self, _self):
 
         self.__self = _self
 
+    @property
+    def united_permissions(self):
+        """Gets the united_permissions of this CustomerFacingUserObject.  # noqa: E501
+
+        The list of account's permissions assigned directly or through united roles assigned to it  # noqa: E501
+
+        :return: The united_permissions of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._united_permissions
+
+    @united_permissions.setter
+    def united_permissions(self, united_permissions):
+        """Sets the united_permissions of this CustomerFacingUserObject.
+
+        The list of account's permissions assigned directly or through united roles assigned to it  # noqa: E501
+
+        :param united_permissions: The united_permissions of this CustomerFacingUserObject.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._united_permissions = united_permissions
+
+    @property
+    def united_roles(self):
+        """Gets the united_roles of this CustomerFacingUserObject.  # noqa: E501
+
+        The list of account's roles assigned directly or through user groups assigned to it  # noqa: E501
+
+        :return: The united_roles of this CustomerFacingUserObject.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._united_roles
+
+    @united_roles.setter
+    def united_roles(self, united_roles):
+        """Sets the united_roles of this CustomerFacingUserObject.
+
+        The list of account's roles assigned directly or through user groups assigned to it  # noqa: E501
+
+        :param united_roles: The united_roles of this CustomerFacingUserObject.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._united_roles = united_roles
+
     @property
     def user_groups(self):
         """Gets the user_groups of this CustomerFacingUserObject.  # noqa: E501
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 332caa6..0b4d4d6 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -31,6 +31,7 @@ class Event(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'alert_tags': 'list[str]',
         'annotations': 'dict(str, str)',
         'can_close': 'bool',
         'can_delete': 'bool',
@@ -57,6 +58,7 @@ class Event(object):
     }
 
     attribute_map = {
+        'alert_tags': 'alertTags',
         'annotations': 'annotations',
         'can_close': 'canClose',
         'can_delete': 'canDelete',
@@ -82,9 +84,10 @@ class Event(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
 
+        self._alert_tags = None
         self._annotations = None
         self._can_close = None
         self._can_delete = None
@@ -110,6 +113,8 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
         self._updater_id = None
         self.discriminator = None
 
+        if alert_tags is not None:
+            self.alert_tags = alert_tags
         self.annotations = annotations
         if can_close is not None:
             self.can_close = can_close
@@ -154,6 +159,29 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
         if updater_id is not None:
             self.updater_id = updater_id
 
+    @property
+    def alert_tags(self):
+        """Gets the alert_tags of this Event.  # noqa: E501
+
+        The list of tags on the alert which created this event.  # noqa: E501
+
+        :return: The alert_tags of this Event.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._alert_tags
+
+    @alert_tags.setter
+    def alert_tags(self, alert_tags):
+        """Sets the alert_tags of this Event.
+
+        The list of tags on the alert which created this event.  # noqa: E501
+
+        :param alert_tags: The alert_tags of this Event.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._alert_tags = alert_tags
+
     @property
     def annotations(self):
         """Gets the annotations of this Event.  # noqa: E501
diff --git a/wavefront_api_client/models/paged_role_dto.py b/wavefront_api_client/models/paged_role_dto.py
new file mode 100644
index 0000000..d2b6c47
--- /dev/null
+++ b/wavefront_api_client/models/paged_role_dto.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedRoleDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[RoleDTO]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedRoleDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedRoleDTO.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedRoleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedRoleDTO.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedRoleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedRoleDTO.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedRoleDTO.  # noqa: E501
+        :rtype: list[RoleDTO]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedRoleDTO.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedRoleDTO.  # noqa: E501
+        :type: list[RoleDTO]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedRoleDTO.  # noqa: E501
+
+
+        :return: The limit of this PagedRoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedRoleDTO.
+
+
+        :param limit: The limit of this PagedRoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedRoleDTO.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedRoleDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedRoleDTO.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedRoleDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedRoleDTO.  # noqa: E501
+
+
+        :return: The offset of this PagedRoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedRoleDTO.
+
+
+        :param offset: The offset of this PagedRoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedRoleDTO.  # noqa: E501
+
+
+        :return: The sort of this PagedRoleDTO.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedRoleDTO.
+
+
+        :param sort: The sort of this PagedRoleDTO.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedRoleDTO.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedRoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedRoleDTO.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedRoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedRoleDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedRoleDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index c68a861..7d475a8 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -31,6 +31,7 @@ class RelatedEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'alert_tags': 'list[str]',
         'annotations': 'dict(str, str)',
         'can_close': 'bool',
         'can_delete': 'bool',
@@ -58,6 +59,7 @@ class RelatedEvent(object):
     }
 
     attribute_map = {
+        'alert_tags': 'alertTags',
         'annotations': 'annotations',
         'can_close': 'canClose',
         'can_delete': 'canDelete',
@@ -84,9 +86,10 @@ class RelatedEvent(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """RelatedEvent - a model defined in Swagger"""  # noqa: E501
 
+        self._alert_tags = None
         self._annotations = None
         self._can_close = None
         self._can_delete = None
@@ -113,6 +116,8 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
         self._updater_id = None
         self.discriminator = None
 
+        if alert_tags is not None:
+            self.alert_tags = alert_tags
         self.annotations = annotations
         if can_close is not None:
             self.can_close = can_close
@@ -159,6 +164,29 @@ def __init__(self, annotations=None, can_close=None, can_delete=None, created_at
         if updater_id is not None:
             self.updater_id = updater_id
 
+    @property
+    def alert_tags(self):
+        """Gets the alert_tags of this RelatedEvent.  # noqa: E501
+
+        The list of tags on the alert which created this event.  # noqa: E501
+
+        :return: The alert_tags of this RelatedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._alert_tags
+
+    @alert_tags.setter
+    def alert_tags(self, alert_tags):
+        """Sets the alert_tags of this RelatedEvent.
+
+        The list of tags on the alert which created this event.  # noqa: E501
+
+        :param alert_tags: The alert_tags of this RelatedEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._alert_tags = alert_tags
+
     @property
     def annotations(self):
         """Gets the annotations of this RelatedEvent.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_role_dto.py b/wavefront_api_client/models/response_container_paged_role_dto.py
new file mode 100644
index 0000000..42209c9
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_role_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedRoleDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedRoleDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedRoleDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedRoleDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedRoleDTO.  # noqa: E501
+        :rtype: PagedRoleDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedRoleDTO.
+
+
+        :param response: The response of this ResponseContainerPagedRoleDTO.  # noqa: E501
+        :type: PagedRoleDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedRoleDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedRoleDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedRoleDTO.
+
+
+        :param status: The status of this ResponseContainerPagedRoleDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedRoleDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedRoleDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_role_dto.py b/wavefront_api_client/models/response_container_role_dto.py
new file mode 100644
index 0000000..2473820
--- /dev/null
+++ b/wavefront_api_client/models/response_container_role_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerRoleDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'RoleDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerRoleDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerRoleDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerRoleDTO.  # noqa: E501
+        :rtype: RoleDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerRoleDTO.
+
+
+        :param response: The response of this ResponseContainerRoleDTO.  # noqa: E501
+        :type: RoleDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerRoleDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerRoleDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerRoleDTO.
+
+
+        :param status: The status of this ResponseContainerRoleDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerRoleDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerRoleDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index bc02889..12d77e1 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -69,7 +69,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if not set(response).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
new file mode 100644
index 0000000..d1106f8
--- /dev/null
+++ b/wavefront_api_client/models/role_dto.py
@@ -0,0 +1,423 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class RoleDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'customer': 'str',
+        'description': 'str',
+        'id': 'str',
+        'last_updated_account_id': 'str',
+        'last_updated_ms': 'int',
+        'linked_accounts_count': 'int',
+        'linked_groups_count': 'int',
+        'name': 'str',
+        'permissions': 'list[str]',
+        'sample_linked_accounts': 'list[str]',
+        'sample_linked_groups': 'list[UserGroup]'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'customer': 'customer',
+        'description': 'description',
+        'id': 'id',
+        'last_updated_account_id': 'lastUpdatedAccountId',
+        'last_updated_ms': 'lastUpdatedMs',
+        'linked_accounts_count': 'linkedAccountsCount',
+        'linked_groups_count': 'linkedGroupsCount',
+        'name': 'name',
+        'permissions': 'permissions',
+        'sample_linked_accounts': 'sampleLinkedAccounts',
+        'sample_linked_groups': 'sampleLinkedGroups'
+    }
+
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, sample_linked_accounts=None, sample_linked_groups=None):  # noqa: E501
+        """RoleDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._created_epoch_millis = None
+        self._customer = None
+        self._description = None
+        self._id = None
+        self._last_updated_account_id = None
+        self._last_updated_ms = None
+        self._linked_accounts_count = None
+        self._linked_groups_count = None
+        self._name = None
+        self._permissions = None
+        self._sample_linked_accounts = None
+        self._sample_linked_groups = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if customer is not None:
+            self.customer = customer
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        if last_updated_account_id is not None:
+            self.last_updated_account_id = last_updated_account_id
+        if last_updated_ms is not None:
+            self.last_updated_ms = last_updated_ms
+        if linked_accounts_count is not None:
+            self.linked_accounts_count = linked_accounts_count
+        if linked_groups_count is not None:
+            self.linked_groups_count = linked_groups_count
+        if name is not None:
+            self.name = name
+        if permissions is not None:
+            self.permissions = permissions
+        if sample_linked_accounts is not None:
+            self.sample_linked_accounts = sample_linked_accounts
+        if sample_linked_groups is not None:
+            self.sample_linked_groups = sample_linked_groups
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this RoleDTO.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this RoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this RoleDTO.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this RoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def customer(self):
+        """Gets the customer of this RoleDTO.  # noqa: E501
+
+        The id of the customer to which the role belongs  # noqa: E501
+
+        :return: The customer of this RoleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this RoleDTO.
+
+        The id of the customer to which the role belongs  # noqa: E501
+
+        :param customer: The customer of this RoleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def description(self):
+        """Gets the description of this RoleDTO.  # noqa: E501
+
+        The description of the role  # noqa: E501
+
+        :return: The description of this RoleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this RoleDTO.
+
+        The description of the role  # noqa: E501
+
+        :param description: The description of this RoleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this RoleDTO.  # noqa: E501
+
+        The unique identifier of the role  # noqa: E501
+
+        :return: The id of this RoleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this RoleDTO.
+
+        The unique identifier of the role  # noqa: E501
+
+        :param id: The id of this RoleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def last_updated_account_id(self):
+        """Gets the last_updated_account_id of this RoleDTO.  # noqa: E501
+
+        The account that updated this role last time  # noqa: E501
+
+        :return: The last_updated_account_id of this RoleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_updated_account_id
+
+    @last_updated_account_id.setter
+    def last_updated_account_id(self, last_updated_account_id):
+        """Sets the last_updated_account_id of this RoleDTO.
+
+        The account that updated this role last time  # noqa: E501
+
+        :param last_updated_account_id: The last_updated_account_id of this RoleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._last_updated_account_id = last_updated_account_id
+
+    @property
+    def last_updated_ms(self):
+        """Gets the last_updated_ms of this RoleDTO.  # noqa: E501
+
+        The last time when the role is updated, in epoch milliseconds  # noqa: E501
+
+        :return: The last_updated_ms of this RoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated_ms
+
+    @last_updated_ms.setter
+    def last_updated_ms(self, last_updated_ms):
+        """Sets the last_updated_ms of this RoleDTO.
+
+        The last time when the role is updated, in epoch milliseconds  # noqa: E501
+
+        :param last_updated_ms: The last_updated_ms of this RoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated_ms = last_updated_ms
+
+    @property
+    def linked_accounts_count(self):
+        """Gets the linked_accounts_count of this RoleDTO.  # noqa: E501
+
+        Total number of accounts that are linked to the role  # noqa: E501
+
+        :return: The linked_accounts_count of this RoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._linked_accounts_count
+
+    @linked_accounts_count.setter
+    def linked_accounts_count(self, linked_accounts_count):
+        """Sets the linked_accounts_count of this RoleDTO.
+
+        Total number of accounts that are linked to the role  # noqa: E501
+
+        :param linked_accounts_count: The linked_accounts_count of this RoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._linked_accounts_count = linked_accounts_count
+
+    @property
+    def linked_groups_count(self):
+        """Gets the linked_groups_count of this RoleDTO.  # noqa: E501
+
+        Total number of groups that are linked to the role  # noqa: E501
+
+        :return: The linked_groups_count of this RoleDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._linked_groups_count
+
+    @linked_groups_count.setter
+    def linked_groups_count(self, linked_groups_count):
+        """Sets the linked_groups_count of this RoleDTO.
+
+        Total number of groups that are linked to the role  # noqa: E501
+
+        :param linked_groups_count: The linked_groups_count of this RoleDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._linked_groups_count = linked_groups_count
+
+    @property
+    def name(self):
+        """Gets the name of this RoleDTO.  # noqa: E501
+
+        The name of the role  # noqa: E501
+
+        :return: The name of this RoleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this RoleDTO.
+
+        The name of the role  # noqa: E501
+
+        :param name: The name of this RoleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def permissions(self):
+        """Gets the permissions of this RoleDTO.  # noqa: E501
+
+        List of permissions the role has been granted access to  # noqa: E501
+
+        :return: The permissions of this RoleDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this RoleDTO.
+
+        List of permissions the role has been granted access to  # noqa: E501
+
+        :param permissions: The permissions of this RoleDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._permissions = permissions
+
+    @property
+    def sample_linked_accounts(self):
+        """Gets the sample_linked_accounts of this RoleDTO.  # noqa: E501
+
+        A sample of the accounts assigned to this role. Please use the Role facet of the Account Search API to get the full list of accounts for this role  # noqa: E501
+
+        :return: The sample_linked_accounts of this RoleDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sample_linked_accounts
+
+    @sample_linked_accounts.setter
+    def sample_linked_accounts(self, sample_linked_accounts):
+        """Sets the sample_linked_accounts of this RoleDTO.
+
+        A sample of the accounts assigned to this role. Please use the Role facet of the Account Search API to get the full list of accounts for this role  # noqa: E501
+
+        :param sample_linked_accounts: The sample_linked_accounts of this RoleDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sample_linked_accounts = sample_linked_accounts
+
+    @property
+    def sample_linked_groups(self):
+        """Gets the sample_linked_groups of this RoleDTO.  # noqa: E501
+
+        A sample of the groups assigned to this role. Please use the Role facet of the Group Search API to get the full list of groups for this role  # noqa: E501
+
+        :return: The sample_linked_groups of this RoleDTO.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._sample_linked_groups
+
+    @sample_linked_groups.setter
+    def sample_linked_groups(self, sample_linked_groups):
+        """Sets the sample_linked_groups of this RoleDTO.
+
+        A sample of the groups assigned to this role. Please use the Role facet of the Group Search API to get the full list of groups for this role  # noqa: E501
+
+        :param sample_linked_groups: The sample_linked_groups of this RoleDTO.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._sample_linked_groups = sample_linked_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RoleDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RoleDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index df18b70..dd0680d 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -144,7 +144,7 @@ def entity_type(self, entity_type):
         """
         if entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE"]  # noqa: E501
         if entity_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index a6344ab..d6d2cca 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,7 +37,10 @@ class ServiceAccount(object):
         'identifier': 'str',
         'ingestion_policy': 'IngestionPolicy',
         'last_used': 'int',
+        'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
+        'united_permissions': 'list[str]',
+        'united_roles': 'list[str]',
         'user_groups': 'list[UserGroup]'
     }
 
@@ -48,11 +51,14 @@ class ServiceAccount(object):
         'identifier': 'identifier',
         'ingestion_policy': 'ingestionPolicy',
         'last_used': 'lastUsed',
+        'roles': 'roles',
         'tokens': 'tokens',
+        'united_permissions': 'unitedPermissions',
+        'united_roles': 'unitedRoles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy=None, last_used=None, tokens=None, user_groups=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None):  # noqa: E501
         """ServiceAccount - a model defined in Swagger"""  # noqa: E501
 
         self._active = None
@@ -61,7 +67,10 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self._identifier = None
         self._ingestion_policy = None
         self._last_used = None
+        self._roles = None
         self._tokens = None
+        self._united_permissions = None
+        self._united_roles = None
         self._user_groups = None
         self.discriminator = None
 
@@ -75,8 +84,14 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
             self.ingestion_policy = ingestion_policy
         if last_used is not None:
             self.last_used = last_used
+        if roles is not None:
+            self.roles = roles
         if tokens is not None:
             self.tokens = tokens
+        if united_permissions is not None:
+            self.united_permissions = united_permissions
+        if united_roles is not None:
+            self.united_roles = united_roles
         if user_groups is not None:
             self.user_groups = user_groups
 
@@ -222,6 +237,29 @@ def last_used(self, last_used):
 
         self._last_used = last_used
 
+    @property
+    def roles(self):
+        """Gets the roles of this ServiceAccount.  # noqa: E501
+
+        The list of service account's roles.  # noqa: E501
+
+        :return: The roles of this ServiceAccount.  # noqa: E501
+        :rtype: list[RoleDTO]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this ServiceAccount.
+
+        The list of service account's roles.  # noqa: E501
+
+        :param roles: The roles of this ServiceAccount.  # noqa: E501
+        :type: list[RoleDTO]
+        """
+
+        self._roles = roles
+
     @property
     def tokens(self):
         """Gets the tokens of this ServiceAccount.  # noqa: E501
@@ -245,6 +283,52 @@ def tokens(self, tokens):
 
         self._tokens = tokens
 
+    @property
+    def united_permissions(self):
+        """Gets the united_permissions of this ServiceAccount.  # noqa: E501
+
+        The list of account's permissions assigned directly or through united roles assigned to it  # noqa: E501
+
+        :return: The united_permissions of this ServiceAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._united_permissions
+
+    @united_permissions.setter
+    def united_permissions(self, united_permissions):
+        """Sets the united_permissions of this ServiceAccount.
+
+        The list of account's permissions assigned directly or through united roles assigned to it  # noqa: E501
+
+        :param united_permissions: The united_permissions of this ServiceAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._united_permissions = united_permissions
+
+    @property
+    def united_roles(self):
+        """Gets the united_roles of this ServiceAccount.  # noqa: E501
+
+        The list of account's roles assigned directly or through user groups assigned to it  # noqa: E501
+
+        :return: The united_roles of this ServiceAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._united_roles
+
+    @united_roles.setter
+    def united_roles(self, united_roles):
+        """Sets the united_roles of this ServiceAccount.
+
+        The list of account's roles assigned directly or through user groups assigned to it  # noqa: E501
+
+        :param united_roles: The united_roles of this ServiceAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._united_roles = united_roles
+
     @property
     def user_groups(self):
         """Gets the user_groups of this ServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index cbec34e..03f14df 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -36,6 +36,7 @@ class ServiceAccountWrite(object):
         'groups': 'list[str]',
         'identifier': 'str',
         'ingestion_policy_id': 'str',
+        'roles': 'list[str]',
         'tokens': 'list[str]',
         'user_groups': 'list[str]'
     }
@@ -46,11 +47,12 @@ class ServiceAccountWrite(object):
         'groups': 'groups',
         'identifier': 'identifier',
         'ingestion_policy_id': 'ingestionPolicyId',
+        'roles': 'roles',
         'tokens': 'tokens',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy_id=None, tokens=None, user_groups=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, tokens=None, user_groups=None):  # noqa: E501
         """ServiceAccountWrite - a model defined in Swagger"""  # noqa: E501
 
         self._active = None
@@ -58,6 +60,7 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self._groups = None
         self._identifier = None
         self._ingestion_policy_id = None
+        self._roles = None
         self._tokens = None
         self._user_groups = None
         self.discriminator = None
@@ -71,6 +74,8 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self.identifier = identifier
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
+        if roles is not None:
+            self.roles = roles
         if tokens is not None:
             self.tokens = tokens
         if user_groups is not None:
@@ -193,6 +198,29 @@ def ingestion_policy_id(self, ingestion_policy_id):
 
         self._ingestion_policy_id = ingestion_policy_id
 
+    @property
+    def roles(self):
+        """Gets the roles of this ServiceAccountWrite.  # noqa: E501
+
+        The list of role ids, the service account will be added to.\"  # noqa: E501
+
+        :return: The roles of this ServiceAccountWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this ServiceAccountWrite.
+
+        The list of role ids, the service account will be added to.\"  # noqa: E501
+
+        :param roles: The roles of this ServiceAccountWrite.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._roles = roles
+
     @property
     def tokens(self):
         """Gets the tokens of this ServiceAccountWrite.  # noqa: E501
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 25e5124..0f6dce2 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,6 +36,7 @@ class UserDTO(object):
         'identifier': 'str',
         'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
+        'roles': 'list[RoleDTO]',
         'sso_id': 'str',
         'user_groups': 'list[UserGroup]'
     }
@@ -46,11 +47,12 @@ class UserDTO(object):
         'identifier': 'identifier',
         'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
+        'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserDTO - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
@@ -58,6 +60,7 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
         self._identifier = None
         self._ingestion_policy = None
         self._last_successful_login = None
+        self._roles = None
         self._sso_id = None
         self._user_groups = None
         self.discriminator = None
@@ -72,6 +75,8 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
             self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
+        if roles is not None:
+            self.roles = roles
         if sso_id is not None:
             self.sso_id = sso_id
         if user_groups is not None:
@@ -182,6 +187,27 @@ def last_successful_login(self, last_successful_login):
 
         self._last_successful_login = last_successful_login
 
+    @property
+    def roles(self):
+        """Gets the roles of this UserDTO.  # noqa: E501
+
+
+        :return: The roles of this UserDTO.  # noqa: E501
+        :rtype: list[RoleDTO]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserDTO.
+
+
+        :param roles: The roles of this UserDTO.  # noqa: E501
+        :type: list[RoleDTO]
+        """
+
+        self._roles = roles
+
     @property
     def sso_id(self):
         """Gets the sso_id of this UserDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index 1c48d30..ce3195b 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -37,6 +37,7 @@ class UserGroup(object):
         'name': 'str',
         'permissions': 'list[str]',
         'properties': 'UserGroupPropertiesDTO',
+        'roles': 'list[RoleDTO]',
         'user_count': 'int',
         'users': 'list[str]'
     }
@@ -48,11 +49,12 @@ class UserGroup(object):
         'name': 'name',
         'permissions': 'permissions',
         'properties': 'properties',
+        'roles': 'roles',
         'user_count': 'userCount',
         'users': 'users'
     }
 
-    def __init__(self, customer=None, description=None, id=None, name=None, permissions=None, properties=None, user_count=None, users=None):  # noqa: E501
+    def __init__(self, customer=None, description=None, id=None, name=None, permissions=None, properties=None, roles=None, user_count=None, users=None):  # noqa: E501
         """UserGroup - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
@@ -61,6 +63,7 @@ def __init__(self, customer=None, description=None, id=None, name=None, permissi
         self._name = None
         self._permissions = None
         self._properties = None
+        self._roles = None
         self._user_count = None
         self._users = None
         self.discriminator = None
@@ -77,6 +80,8 @@ def __init__(self, customer=None, description=None, id=None, name=None, permissi
             self.permissions = permissions
         if properties is not None:
             self.properties = properties
+        if roles is not None:
+            self.roles = roles
         if user_count is not None:
             self.user_count = user_count
         if users is not None:
@@ -220,6 +225,29 @@ def properties(self, properties):
 
         self._properties = properties
 
+    @property
+    def roles(self):
+        """Gets the roles of this UserGroup.  # noqa: E501
+
+        List of roles the user group has been linked to  # noqa: E501
+
+        :return: The roles of this UserGroup.  # noqa: E501
+        :rtype: list[RoleDTO]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserGroup.
+
+        List of roles the user group has been linked to  # noqa: E501
+
+        :param roles: The roles of this UserGroup.  # noqa: E501
+        :type: list[RoleDTO]
+        """
+
+        self._roles = roles
+
     @property
     def user_count(self):
         """Gets the user_count of this UserGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 795b817..221323c 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -38,6 +38,8 @@ class UserGroupModel(object):
         'name': 'str',
         'permissions': 'list[str]',
         'properties': 'UserGroupPropertiesDTO',
+        'role_count': 'int',
+        'roles': 'list[RoleDTO]',
         'user_count': 'int',
         'users': 'list[str]'
     }
@@ -50,11 +52,13 @@ class UserGroupModel(object):
         'name': 'name',
         'permissions': 'permissions',
         'properties': 'properties',
+        'role_count': 'roleCount',
+        'roles': 'roles',
         'user_count': 'userCount',
         'users': 'users'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, properties=None, user_count=None, users=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, properties=None, role_count=None, roles=None, user_count=None, users=None):  # noqa: E501
         """UserGroupModel - a model defined in Swagger"""  # noqa: E501
 
         self._created_epoch_millis = None
@@ -64,6 +68,8 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._name = None
         self._permissions = None
         self._properties = None
+        self._role_count = None
+        self._roles = None
         self._user_count = None
         self._users = None
         self.discriminator = None
@@ -80,6 +86,10 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self.permissions = permissions
         if properties is not None:
             self.properties = properties
+        if role_count is not None:
+            self.role_count = role_count
+        if roles is not None:
+            self.roles = roles
         if user_count is not None:
             self.user_count = user_count
         if users is not None:
@@ -204,7 +214,7 @@ def name(self, name):
     def permissions(self):
         """Gets the permissions of this UserGroupModel.  # noqa: E501
 
-        List of permissions the user group has been granted access to  # noqa: E501
+        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
 
         :return: The permissions of this UserGroupModel.  # noqa: E501
         :rtype: list[str]
@@ -215,7 +225,7 @@ def permissions(self):
     def permissions(self, permissions):
         """Sets the permissions of this UserGroupModel.
 
-        List of permissions the user group has been granted access to  # noqa: E501
+        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
 
         :param permissions: The permissions of this UserGroupModel.  # noqa: E501
         :type: list[str]
@@ -248,6 +258,52 @@ def properties(self, properties):
 
         self._properties = properties
 
+    @property
+    def role_count(self):
+        """Gets the role_count of this UserGroupModel.  # noqa: E501
+
+        Total number of roles that are linked the the user group  # noqa: E501
+
+        :return: The role_count of this UserGroupModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._role_count
+
+    @role_count.setter
+    def role_count(self, role_count):
+        """Sets the role_count of this UserGroupModel.
+
+        Total number of roles that are linked the the user group  # noqa: E501
+
+        :param role_count: The role_count of this UserGroupModel.  # noqa: E501
+        :type: int
+        """
+
+        self._role_count = role_count
+
+    @property
+    def roles(self):
+        """Gets the roles of this UserGroupModel.  # noqa: E501
+
+        List of roles that are linked to the user group.  # noqa: E501
+
+        :return: The roles of this UserGroupModel.  # noqa: E501
+        :rtype: list[RoleDTO]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserGroupModel.
+
+        List of roles that are linked to the user group.  # noqa: E501
+
+        :param roles: The roles of this UserGroupModel.  # noqa: E501
+        :type: list[RoleDTO]
+        """
+
+        self._roles = roles
+
     @property
     def user_count(self):
         """Gets the user_count of this UserGroupModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index 5c18c93..8fef78a 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -33,20 +33,23 @@ class UserGroupPropertiesDTO(object):
     swagger_types = {
         'name_editable': 'bool',
         'permissions_editable': 'bool',
+        'roles_editable': 'bool',
         'users_editable': 'bool'
     }
 
     attribute_map = {
         'name_editable': 'nameEditable',
         'permissions_editable': 'permissionsEditable',
+        'roles_editable': 'rolesEditable',
         'users_editable': 'usersEditable'
     }
 
-    def __init__(self, name_editable=None, permissions_editable=None, users_editable=None):  # noqa: E501
+    def __init__(self, name_editable=None, permissions_editable=None, roles_editable=None, users_editable=None):  # noqa: E501
         """UserGroupPropertiesDTO - a model defined in Swagger"""  # noqa: E501
 
         self._name_editable = None
         self._permissions_editable = None
+        self._roles_editable = None
         self._users_editable = None
         self.discriminator = None
 
@@ -54,6 +57,8 @@ def __init__(self, name_editable=None, permissions_editable=None, users_editable
             self.name_editable = name_editable
         if permissions_editable is not None:
             self.permissions_editable = permissions_editable
+        if roles_editable is not None:
+            self.roles_editable = roles_editable
         if users_editable is not None:
             self.users_editable = users_editable
 
@@ -99,6 +104,27 @@ def permissions_editable(self, permissions_editable):
 
         self._permissions_editable = permissions_editable
 
+    @property
+    def roles_editable(self):
+        """Gets the roles_editable of this UserGroupPropertiesDTO.  # noqa: E501
+
+
+        :return: The roles_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._roles_editable
+
+    @roles_editable.setter
+    def roles_editable(self, roles_editable):
+        """Sets the roles_editable of this UserGroupPropertiesDTO.
+
+
+        :param roles_editable: The roles_editable of this UserGroupPropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._roles_editable = roles_editable
+
     @property
     def users_editable(self):
         """Gets the users_editable of this UserGroupPropertiesDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index cbdb344..7ae6ded 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -36,7 +36,8 @@ class UserGroupWrite(object):
         'description': 'str',
         'id': 'str',
         'name': 'str',
-        'permissions': 'list[str]'
+        'permissions': 'list[str]',
+        'role_i_ds': 'list[str]'
     }
 
     attribute_map = {
@@ -45,10 +46,11 @@ class UserGroupWrite(object):
         'description': 'description',
         'id': 'id',
         'name': 'name',
-        'permissions': 'permissions'
+        'permissions': 'permissions',
+        'role_i_ds': 'roleIDs'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, role_i_ds=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
 
         self._created_epoch_millis = None
@@ -57,6 +59,7 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._id = None
         self._name = None
         self._permissions = None
+        self._role_i_ds = None
         self.discriminator = None
 
         if created_epoch_millis is not None:
@@ -69,6 +72,7 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
             self.id = id
         self.name = name
         self.permissions = permissions
+        self.role_i_ds = role_i_ds
 
     @property
     def created_epoch_millis(self):
@@ -189,7 +193,7 @@ def name(self, name):
     def permissions(self):
         """Gets the permissions of this UserGroupWrite.  # noqa: E501
 
-        List of permissions the user group has been granted access to  # noqa: E501
+        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
 
         :return: The permissions of this UserGroupWrite.  # noqa: E501
         :rtype: list[str]
@@ -200,7 +204,7 @@ def permissions(self):
     def permissions(self, permissions):
         """Sets the permissions of this UserGroupWrite.
 
-        List of permissions the user group has been granted access to  # noqa: E501
+        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
 
         :param permissions: The permissions of this UserGroupWrite.  # noqa: E501
         :type: list[str]
@@ -210,6 +214,31 @@ def permissions(self, permissions):
 
         self._permissions = permissions
 
+    @property
+    def role_i_ds(self):
+        """Gets the role_i_ds of this UserGroupWrite.  # noqa: E501
+
+        List of role IDs the user group has been linked to.  # noqa: E501
+
+        :return: The role_i_ds of this UserGroupWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._role_i_ds
+
+    @role_i_ds.setter
+    def role_i_ds(self, role_i_ds):
+        """Sets the role_i_ds of this UserGroupWrite.
+
+        List of role IDs the user group has been linked to.  # noqa: E501
+
+        :param role_i_ds: The role_i_ds of this UserGroupWrite.  # noqa: E501
+        :type: list[str]
+        """
+        if role_i_ds is None:
+            raise ValueError("Invalid value for `role_i_ds`, must not be `None`")  # noqa: E501
+
+        self._role_i_ds = role_i_ds
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 8aaa457..91487f6 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,6 +36,7 @@ class UserModel(object):
         'identifier': 'str',
         'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
+        'roles': 'list[RoleDTO]',
         'sso_id': 'str',
         'user_groups': 'list[UserGroup]'
     }
@@ -46,11 +47,12 @@ class UserModel(object):
         'identifier': 'identifier',
         'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
+        'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
 
         self._customer = None
@@ -58,6 +60,7 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
         self._identifier = None
         self._ingestion_policy = None
         self._last_successful_login = None
+        self._roles = None
         self._sso_id = None
         self._user_groups = None
         self.discriminator = None
@@ -69,6 +72,8 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
             self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
+        if roles is not None:
+            self.roles = roles
         if sso_id is not None:
             self.sso_id = sso_id
         self.user_groups = user_groups
@@ -190,6 +195,27 @@ def last_successful_login(self, last_successful_login):
 
         self._last_successful_login = last_successful_login
 
+    @property
+    def roles(self):
+        """Gets the roles of this UserModel.  # noqa: E501
+
+
+        :return: The roles of this UserModel.  # noqa: E501
+        :rtype: list[RoleDTO]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserModel.
+
+
+        :param roles: The roles of this UserModel.  # noqa: E501
+        :type: list[RoleDTO]
+        """
+
+        self._roles = roles
+
     @property
     def sso_id(self):
         """Gets the sso_id of this UserModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 60cbe37..65c14b0 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -36,6 +36,7 @@ class UserRequestDTO(object):
         'groups': 'list[str]',
         'identifier': 'str',
         'ingestion_policy_id': 'str',
+        'roles': 'list[str]',
         'sso_id': 'str',
         'user_groups': 'list[str]'
     }
@@ -46,11 +47,12 @@ class UserRequestDTO(object):
         'groups': 'groups',
         'identifier': 'identifier',
         'ingestion_policy_id': 'ingestionPolicyId',
+        'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policy_id=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, sso_id=None, user_groups=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
 
         self._credential = None
@@ -58,6 +60,7 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
         self._groups = None
         self._identifier = None
         self._ingestion_policy_id = None
+        self._roles = None
         self._sso_id = None
         self._user_groups = None
         self.discriminator = None
@@ -72,6 +75,8 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
             self.identifier = identifier
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
+        if roles is not None:
+            self.roles = roles
         if sso_id is not None:
             self.sso_id = sso_id
         if user_groups is not None:
@@ -182,6 +187,27 @@ def ingestion_policy_id(self, ingestion_policy_id):
 
         self._ingestion_policy_id = ingestion_policy_id
 
+    @property
+    def roles(self):
+        """Gets the roles of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The roles of this UserRequestDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserRequestDTO.
+
+
+        :param roles: The roles of this UserRequestDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._roles = roles
+
     @property
     def sso_id(self):
         """Gets the sso_id of this UserRequestDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index 83417fd..33921c8 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -34,6 +34,7 @@ class UserToCreate(object):
         'email_address': 'str',
         'groups': 'list[str]',
         'ingestion_policy_id': 'str',
+        'roles': 'list[str]',
         'user_groups': 'list[str]'
     }
 
@@ -41,15 +42,17 @@ class UserToCreate(object):
         'email_address': 'emailAddress',
         'groups': 'groups',
         'ingestion_policy_id': 'ingestionPolicyId',
+        'roles': 'roles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, roles=None, user_groups=None):  # noqa: E501
         """UserToCreate - a model defined in Swagger"""  # noqa: E501
 
         self._email_address = None
         self._groups = None
         self._ingestion_policy_id = None
+        self._roles = None
         self._user_groups = None
         self.discriminator = None
 
@@ -57,6 +60,8 @@ def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, us
         self.groups = groups
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
+        if roles is not None:
+            self.roles = roles
         self.user_groups = user_groups
 
     @property
@@ -132,6 +137,29 @@ def ingestion_policy_id(self, ingestion_policy_id):
 
         self._ingestion_policy_id = ingestion_policy_id
 
+    @property
+    def roles(self):
+        """Gets the roles of this UserToCreate.  # noqa: E501
+
+        The list of role ids, the user will be added to.\"  # noqa: E501
+
+        :return: The roles of this UserToCreate.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this UserToCreate.
+
+        The list of role ids, the user will be added to.\"  # noqa: E501
+
+        :param roles: The roles of this UserToCreate.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._roles = roles
+
     @property
     def user_groups(self):
         """Gets the user_groups of this UserToCreate.  # noqa: E501

From 5b36aeb603e586166b12d2456e3b52607083fd3f Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 26 Mar 2020 08:16:31 -0700
Subject: [PATCH 048/161] Autogenerated Update v2.56.16.

---
 .swagger-codegen/config.json            |  2 +-
 .swagger-codegen/config.jsone           |  2 +-
 README.md                               |  6 +--
 docs/AnomalyApi.md                      | 32 ++++++-------
 setup.py                                |  2 +-
 wavefront_api_client/api/anomaly_api.py | 64 ++++++++++++-------------
 wavefront_api_client/api_client.py      |  2 +-
 wavefront_api_client/configuration.py   |  2 +-
 8 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f8affe5..b8b55f2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.8"
+    "packageVersion": "2.56.16"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 10dc218..f8affe5 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.55.18"
+    "packageVersion": "2.56.8"
 }
diff --git a/README.md b/README.md
index defa61e..7600695 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.56.8
+- Package version: 2.56.16
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -127,8 +127,8 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 *AnomalyApi* | [**get_all_anomalies**](docs/AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
 *AnomalyApi* | [**get_anomalies_for_chart_and_param_hash**](docs/AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
-*AnomalyApi* | [**get_chart_anomalies**](docs/AnomalyApi.md#get_chart_anomalies) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-*AnomalyApi* | [**get_chart_anomalies_0**](docs/AnomalyApi.md#get_chart_anomalies_0) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+*AnomalyApi* | [**get_chart_anomalies_for_chart**](docs/AnomalyApi.md#get_chart_anomalies_for_chart) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+*AnomalyApi* | [**get_chart_anomalies_of_one_dashboard**](docs/AnomalyApi.md#get_chart_anomalies_of_one_dashboard) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
 *AnomalyApi* | [**get_dashboard_anomalies**](docs/AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
 *AnomalyApi* | [**get_related_anomalies**](docs/AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
diff --git a/docs/AnomalyApi.md b/docs/AnomalyApi.md
index e896bd9..9c5652e 100644
--- a/docs/AnomalyApi.md
+++ b/docs/AnomalyApi.md
@@ -6,8 +6,8 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**get_all_anomalies**](AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
 [**get_anomalies_for_chart_and_param_hash**](AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
-[**get_chart_anomalies**](AnomalyApi.md#get_chart_anomalies) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-[**get_chart_anomalies_0**](AnomalyApi.md#get_chart_anomalies_0) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+[**get_chart_anomalies_for_chart**](AnomalyApi.md#get_chart_anomalies_for_chart) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+[**get_chart_anomalies_of_one_dashboard**](AnomalyApi.md#get_chart_anomalies_of_one_dashboard) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
 [**get_dashboard_anomalies**](AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
 [**get_related_anomalies**](AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
 
@@ -138,10 +138,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_chart_anomalies**
-> ResponseContainerPagedAnomaly get_chart_anomalies(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+# **get_chart_anomalies_for_chart**
+> ResponseContainerPagedAnomaly get_chart_anomalies_for_chart(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
 
-Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+Get all anomalies for a chart during a time interval
 
 
 
@@ -162,17 +162,18 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
 dashboard_id = 'dashboard_id_example' # str | 
+chart_hash = 'chart_hash_example' # str | 
 start_ms = 789 # int |  (optional)
 end_ms = 789 # int |  (optional)
 offset = 0 # int |  (optional) (default to 0)
 limit = 1000 # int |  (optional) (default to 1000)
 
 try:
-    # Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-    api_response = api_instance.get_chart_anomalies(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    # Get all anomalies for a chart during a time interval
+    api_response = api_instance.get_chart_anomalies_for_chart(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AnomalyApi->get_chart_anomalies: %s\n" % e)
+    print("Exception when calling AnomalyApi->get_chart_anomalies_for_chart: %s\n" % e)
 ```
 
 ### Parameters
@@ -180,6 +181,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **dashboard_id** | **str**|  | 
+ **chart_hash** | **str**|  | 
  **start_ms** | **int**|  | [optional] 
  **end_ms** | **int**|  | [optional] 
  **offset** | **int**|  | [optional] [default to 0]
@@ -200,10 +202,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_chart_anomalies_0**
-> ResponseContainerPagedAnomaly get_chart_anomalies_0(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+# **get_chart_anomalies_of_one_dashboard**
+> ResponseContainerPagedAnomaly get_chart_anomalies_of_one_dashboard(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
 
-Get all anomalies for a chart during a time interval
+Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
 
 
 
@@ -224,18 +226,17 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
 dashboard_id = 'dashboard_id_example' # str | 
-chart_hash = 'chart_hash_example' # str | 
 start_ms = 789 # int |  (optional)
 end_ms = 789 # int |  (optional)
 offset = 0 # int |  (optional) (default to 0)
 limit = 1000 # int |  (optional) (default to 1000)
 
 try:
-    # Get all anomalies for a chart during a time interval
-    api_response = api_instance.get_chart_anomalies_0(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
+    # Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+    api_response = api_instance.get_chart_anomalies_of_one_dashboard(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AnomalyApi->get_chart_anomalies_0: %s\n" % e)
+    print("Exception when calling AnomalyApi->get_chart_anomalies_of_one_dashboard: %s\n" % e)
 ```
 
 ### Parameters
@@ -243,7 +244,6 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **dashboard_id** | **str**|  | 
- **chart_hash** | **str**|  | 
  **start_ms** | **int**|  | [optional] 
  **end_ms** | **int**|  | [optional] 
  **offset** | **int**|  | [optional] [default to 0]
diff --git a/setup.py b/setup.py
index 09788e6..d7b5d82 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.56.8"
+VERSION = "2.56.16"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/anomaly_api.py b/wavefront_api_client/api/anomaly_api.py
index a70c74f..6427ce5 100644
--- a/wavefront_api_client/api/anomaly_api.py
+++ b/wavefront_api_client/api/anomaly_api.py
@@ -263,17 +263,18 @@ def get_anomalies_for_chart_and_param_hash_with_http_info(self, dashboard_id, ch
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_chart_anomalies(self, dashboard_id, **kwargs):  # noqa: E501
-        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
+    def get_chart_anomalies_for_chart(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a chart during a time interval  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies(dashboard_id, async_req=True)
+        >>> thread = api.get_chart_anomalies_for_chart(dashboard_id, chart_hash, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str dashboard_id: (required)
+        :param str chart_hash: (required)
         :param int start_ms:
         :param int end_ms:
         :param int offset:
@@ -284,22 +285,23 @@ def get_chart_anomalies(self, dashboard_id, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_chart_anomalies_with_http_info(dashboard_id, **kwargs)  # noqa: E501
+            return self.get_chart_anomalies_for_chart_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_chart_anomalies_with_http_info(dashboard_id, **kwargs)  # noqa: E501
+            (data) = self.get_chart_anomalies_for_chart_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
             return data
 
-    def get_chart_anomalies_with_http_info(self, dashboard_id, **kwargs):  # noqa: E501
-        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
+    def get_chart_anomalies_for_chart_with_http_info(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
+        """Get all anomalies for a chart during a time interval  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_with_http_info(dashboard_id, async_req=True)
+        >>> thread = api.get_chart_anomalies_for_chart_with_http_info(dashboard_id, chart_hash, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str dashboard_id: (required)
+        :param str chart_hash: (required)
         :param int start_ms:
         :param int end_ms:
         :param int offset:
@@ -309,7 +311,7 @@ def get_chart_anomalies_with_http_info(self, dashboard_id, **kwargs):  # noqa: E
                  returns the request thread.
         """
 
-        all_params = ['dashboard_id', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params = ['dashboard_id', 'chart_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -320,20 +322,26 @@ def get_chart_anomalies_with_http_info(self, dashboard_id, **kwargs):  # noqa: E
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_chart_anomalies" % key
+                    " to method get_chart_anomalies_for_chart" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'dashboard_id' is set
         if ('dashboard_id' not in params or
                 params['dashboard_id'] is None):
-            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies`")  # noqa: E501
+            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies_for_chart`")  # noqa: E501
+        # verify the required parameter 'chart_hash' is set
+        if ('chart_hash' not in params or
+                params['chart_hash'] is None):
+            raise ValueError("Missing the required parameter `chart_hash` when calling `get_chart_anomalies_for_chart`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
         if 'dashboard_id' in params:
             path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
+        if 'chart_hash' in params:
+            path_params['chartHash'] = params['chart_hash']  # noqa: E501
 
         query_params = []
         if 'start_ms' in params:
@@ -359,7 +367,7 @@ def get_chart_anomalies_with_http_info(self, dashboard_id, **kwargs):  # noqa: E
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/anomaly/{dashboardId}', 'GET',
+            '/api/v2/anomaly/{dashboardId}/chart/{chartHash}', 'GET',
             path_params,
             query_params,
             header_params,
@@ -374,18 +382,17 @@ def get_chart_anomalies_with_http_info(self, dashboard_id, **kwargs):  # noqa: E
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_chart_anomalies_0(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a chart during a time interval  # noqa: E501
+    def get_chart_anomalies_of_one_dashboard(self, dashboard_id, **kwargs):  # noqa: E501
+        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_0(dashboard_id, chart_hash, async_req=True)
+        >>> thread = api.get_chart_anomalies_of_one_dashboard(dashboard_id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str dashboard_id: (required)
-        :param str chart_hash: (required)
         :param int start_ms:
         :param int end_ms:
         :param int offset:
@@ -396,23 +403,22 @@ def get_chart_anomalies_0(self, dashboard_id, chart_hash, **kwargs):  # noqa: E5
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_chart_anomalies_0_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
+            return self.get_chart_anomalies_of_one_dashboard_with_http_info(dashboard_id, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_chart_anomalies_0_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
+            (data) = self.get_chart_anomalies_of_one_dashboard_with_http_info(dashboard_id, **kwargs)  # noqa: E501
             return data
 
-    def get_chart_anomalies_0_with_http_info(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a chart during a time interval  # noqa: E501
+    def get_chart_anomalies_of_one_dashboard_with_http_info(self, dashboard_id, **kwargs):  # noqa: E501
+        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_0_with_http_info(dashboard_id, chart_hash, async_req=True)
+        >>> thread = api.get_chart_anomalies_of_one_dashboard_with_http_info(dashboard_id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str dashboard_id: (required)
-        :param str chart_hash: (required)
         :param int start_ms:
         :param int end_ms:
         :param int offset:
@@ -422,7 +428,7 @@ def get_chart_anomalies_0_with_http_info(self, dashboard_id, chart_hash, **kwarg
                  returns the request thread.
         """
 
-        all_params = ['dashboard_id', 'chart_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
+        all_params = ['dashboard_id', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -433,26 +439,20 @@ def get_chart_anomalies_0_with_http_info(self, dashboard_id, chart_hash, **kwarg
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_chart_anomalies_0" % key
+                    " to method get_chart_anomalies_of_one_dashboard" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'dashboard_id' is set
         if ('dashboard_id' not in params or
                 params['dashboard_id'] is None):
-            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies_0`")  # noqa: E501
-        # verify the required parameter 'chart_hash' is set
-        if ('chart_hash' not in params or
-                params['chart_hash'] is None):
-            raise ValueError("Missing the required parameter `chart_hash` when calling `get_chart_anomalies_0`")  # noqa: E501
+            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies_of_one_dashboard`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
         if 'dashboard_id' in params:
             path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
-        if 'chart_hash' in params:
-            path_params['chartHash'] = params['chart_hash']  # noqa: E501
 
         query_params = []
         if 'start_ms' in params:
@@ -478,7 +478,7 @@ def get_chart_anomalies_0_with_http_info(self, dashboard_id, chart_hash, **kwarg
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/anomaly/{dashboardId}/chart/{chartHash}', 'GET',
+            '/api/v2/anomaly/{dashboardId}', 'GET',
             path_params,
             query_params,
             header_params,
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6d5aab9..0c5e8e7 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.56.8/python'
+        self.user_agent = 'Swagger-Codegen/2.56.16/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 646b296..da74838 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.56.8".\
+               "SDK Package Version: 2.56.16".\
                format(env=sys.platform, pyversion=sys.version)

From c686ad8e88273e8e7b075335cdb51b598265f25d Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 1 Apr 2020 08:16:38 -0700
Subject: [PATCH 049/161] Autogenerated Update v2.56.17.

---
 .swagger-codegen/config.json           |   2 +-
 .swagger-codegen/config.jsone          |   2 +-
 README.md                              |  15 +-
 docs/SearchApi.md                      | 167 --------------
 setup.py                               |   2 +-
 wavefront_api_client/__init__.py       |   1 -
 wavefront_api_client/api/__init__.py   |   1 -
 wavefront_api_client/api/search_api.py | 293 -------------------------
 wavefront_api_client/api_client.py     |   2 +-
 wavefront_api_client/configuration.py  |   2 +-
 10 files changed, 6 insertions(+), 481 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index b8b55f2..5e19643 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.16"
+    "packageVersion": "2.56.17"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f8affe5..b8b55f2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.8"
+    "packageVersion": "2.56.16"
 }
diff --git a/README.md b/README.md
index 7600695..09be51c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.56.16
+- Package version: 2.56.17
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -219,16 +219,6 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
-*MonitoredClusterApi* | [**add_cluster_tag**](docs/MonitoredClusterApi.md#add_cluster_tag) | **PUT** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Add a tag to a specific cluster
-*MonitoredClusterApi* | [**create_cluster**](docs/MonitoredClusterApi.md#create_cluster) | **POST** /api/v2/monitoredcluster | Create a specific cluster
-*MonitoredClusterApi* | [**delete_cluster**](docs/MonitoredClusterApi.md#delete_cluster) | **DELETE** /api/v2/monitoredcluster/{id} | Delete a specific cluster
-*MonitoredClusterApi* | [**get_all_cluster**](docs/MonitoredClusterApi.md#get_all_cluster) | **GET** /api/v2/monitoredcluster | Get all monitored clusters
-*MonitoredClusterApi* | [**get_cluster**](docs/MonitoredClusterApi.md#get_cluster) | **GET** /api/v2/monitoredcluster/{id} | Get a specific cluster
-*MonitoredClusterApi* | [**get_cluster_tags**](docs/MonitoredClusterApi.md#get_cluster_tags) | **GET** /api/v2/monitoredcluster/{id}/tag | Get all tags associated with a specific cluster
-*MonitoredClusterApi* | [**merge_clusters**](docs/MonitoredClusterApi.md#merge_clusters) | **PUT** /api/v2/monitoredcluster/merge/{id1}/{id2} | Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
-*MonitoredClusterApi* | [**remove_cluster_tag**](docs/MonitoredClusterApi.md#remove_cluster_tag) | **DELETE** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Remove a tag from a specific cluster
-*MonitoredClusterApi* | [**set_cluster_tags**](docs/MonitoredClusterApi.md#set_cluster_tags) | **POST** /api/v2/monitoredcluster/{id}/tag | Set all tags associated with a specific cluster
-*MonitoredClusterApi* | [**update_cluster**](docs/MonitoredClusterApi.md#update_cluster) | **PUT** /api/v2/monitoredcluster/{id} | Update a specific cluster
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
 *NotificantApi* | [**get_all_notificants**](docs/NotificantApi.md#get_all_notificants) | **GET** /api/v2/notificant | Get all notification targets for a customer
@@ -287,9 +277,6 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_maintenance_window_entities**](docs/SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facet**](docs/SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facets**](docs/SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
-*SearchApi* | [**search_monitored_cluster_entities**](docs/SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
-*SearchApi* | [**search_monitored_cluster_for_facet**](docs/SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
-*SearchApi* | [**search_monitored_cluster_for_facets**](docs/SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 *SearchApi* | [**search_notficant_for_facets**](docs/SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 *SearchApi* | [**search_notificant_entities**](docs/SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 *SearchApi* | [**search_notificant_for_facet**](docs/SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 1ec7cbf..35fe4c5 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -34,9 +34,6 @@ Method | HTTP request | Description
 [**search_maintenance_window_entities**](SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 [**search_maintenance_window_for_facet**](SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 [**search_maintenance_window_for_facets**](SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
-[**search_monitored_cluster_entities**](SearchApi.md#search_monitored_cluster_entities) | **POST** /api/v2/search/monitoredcluster | Search over all the customer&#39;s non-deleted monitored clusters
-[**search_monitored_cluster_for_facet**](SearchApi.md#search_monitored_cluster_for_facet) | **POST** /api/v2/search/monitoredcluster/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored cluster
-[**search_monitored_cluster_for_facets**](SearchApi.md#search_monitored_cluster_for_facets) | **POST** /api/v2/search/monitoredcluster/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 [**search_notficant_for_facets**](SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 [**search_notificant_entities**](SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 [**search_notificant_for_facet**](SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -1716,170 +1713,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **search_monitored_cluster_entities**
-> ResponseContainerPagedMonitoredCluster search_monitored_cluster_entities(body=body)
-
-Search over all the customer's non-deleted monitored clusters
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
-
-try:
-    # Search over all the customer's non-deleted monitored clusters
-    api_response = api_instance.search_monitored_cluster_entities(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SearchApi->search_monitored_cluster_entities: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerPagedMonitoredCluster**](ResponseContainerPagedMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **search_monitored_cluster_for_facet**
-> ResponseContainerFacetResponse search_monitored_cluster_for_facet(facet, body=body)
-
-Lists the values of a specific facet over the customer's non-deleted monitored cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
-facet = 'facet_example' # str | 
-body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
-
-try:
-    # Lists the values of a specific facet over the customer's non-deleted monitored cluster
-    api_response = api_instance.search_monitored_cluster_for_facet(facet, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SearchApi->search_monitored_cluster_for_facet: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **facet** | **str**|  | 
- **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **search_monitored_cluster_for_facets**
-> ResponseContainerFacetsResponseContainer search_monitored_cluster_for_facets(body=body)
-
-Lists the values of one or more facets over the customer's non-deleted monitored clusters
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
-
-try:
-    # Lists the values of one or more facets over the customer's non-deleted monitored clusters
-    api_response = api_instance.search_monitored_cluster_for_facets(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SearchApi->search_monitored_cluster_for_facets: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **search_notficant_for_facets**
 > ResponseContainerFacetsResponseContainer search_notficant_for_facets(body=body)
 
diff --git a/setup.py b/setup.py
index d7b5d82..63e3f71 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.56.16"
+VERSION = "2.56.17"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index aaed05e..3b2bf79 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -30,7 +30,6 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
-from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 7d85d55..94888b9 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -17,7 +17,6 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
-from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index c1f35c0..8d5f7e7 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2963,299 +2963,6 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def search_monitored_cluster_entities(self, **kwargs):  # noqa: E501
-        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_entities(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.search_monitored_cluster_entities_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def search_monitored_cluster_entities_with_http_info(self, **kwargs):  # noqa: E501
-        """Search over all the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_entities_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param SortableSearchRequest body:
-        :return: ResponseContainerPagedMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method search_monitored_cluster_entities" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/search/monitoredcluster', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def search_monitored_cluster_for_facet(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facet(facet, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
-        else:
-            (data) = self.search_monitored_cluster_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
-            return data
-
-    def search_monitored_cluster_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
-        """Lists the values of a specific facet over the customer's non-deleted monitored cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facet_with_http_info(facet, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str facet: (required)
-        :param FacetSearchRequestContainer body:
-        :return: ResponseContainerFacetResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['facet', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method search_monitored_cluster_for_facet" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
-            raise ValueError("Missing the required parameter `facet` when calling `search_monitored_cluster_for_facet`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'facet' in params:
-            path_params['facet'] = params['facet']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/search/monitoredcluster/{facet}', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerFacetResponse',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def search_monitored_cluster_for_facets(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facets(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.search_monitored_cluster_for_facets_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def search_monitored_cluster_for_facets_with_http_info(self, **kwargs):  # noqa: E501
-        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.search_monitored_cluster_for_facets_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param FacetsSearchRequestContainer body:
-        :return: ResponseContainerFacetsResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method search_monitored_cluster_for_facets" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/search/monitoredcluster/facets', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def search_notficant_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 0c5e8e7..9916c9e 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.56.16/python'
+        self.user_agent = 'Swagger-Codegen/2.56.17/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index da74838..e6953ba 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.56.16".\
+               "SDK Package Version: 2.56.17".\
                format(env=sys.platform, pyversion=sys.version)

From 84cb6066c72856c82de7488381e0d3426127eaec Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 9 Apr 2020 08:16:21 -0700
Subject: [PATCH 050/161] Autogenerated Update v2.57.8.

---
 .swagger-codegen/config.json                              | 2 +-
 .swagger-codegen/config.jsone                             | 2 +-
 README.md                                                 | 2 +-
 docs/FacetSearchRequestContainer.md                       | 2 +-
 docs/FacetsSearchRequestContainer.md                      | 2 +-
 docs/SortableSearchRequest.md                             | 2 +-
 setup.py                                                  | 2 +-
 wavefront_api_client/api_client.py                        | 2 +-
 wavefront_api_client/configuration.py                     | 2 +-
 .../models/facet_search_request_container.py              | 8 ++++++--
 .../models/facets_search_request_container.py             | 8 ++++++--
 wavefront_api_client/models/sortable_search_request.py    | 8 ++++++--
 12 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5e19643..de97537 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.17"
+    "packageVersion": "2.57.8"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index b8b55f2..5e19643 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.16"
+    "packageVersion": "2.56.17"
 }
diff --git a/README.md b/README.md
index 09be51c..0c65385 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.56.17
+- Package version: 2.57.8
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/FacetSearchRequestContainer.md b/docs/FacetSearchRequestContainer.md
index ec3a22a..d75c3ee 100644
--- a/docs/FacetSearchRequestContainer.md
+++ b/docs/FacetSearchRequestContainer.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned. | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
-**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100, Maximum allowed: 1000 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
 
diff --git a/docs/FacetsSearchRequestContainer.md b/docs/FacetsSearchRequestContainer.md
index 035c127..81dbf4c 100644
--- a/docs/FacetsSearchRequestContainer.md
+++ b/docs/FacetsSearchRequestContainer.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
 **facets** | **list[str]** | A list of facets (property keys) to return values from found in entities matching &#39;query&#39;.  Examples are &#39;tags&#39;, &#39;creatorId&#39;, etc | 
-**limit** | **int** | The number of results to return.  Default 100 | [optional] 
+**limit** | **int** | The number of results to return.  Default 100, Maximum allowed: 1000 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of &#39;entity search results&#39;.  All facets listed in the &#39;facets&#39; search parameter of all entities within &#39;entity search results&#39; are scanned to produce the search results (of facet values). | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/SortableSearchRequest.md b/docs/SortableSearchRequest.md
index 8d7a49a..28ea1b4 100644
--- a/docs/SortableSearchRequest.md
+++ b/docs/SortableSearchRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100, Maximum allowed: 1000 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
diff --git a/setup.py b/setup.py
index 63e3f71..271c141 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.56.17"
+VERSION = "2.57.8"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 9916c9e..0063488 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.56.17/python'
+        self.user_agent = 'Swagger-Codegen/2.57.8/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e6953ba..f0e0273 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.56.17".\
+               "SDK Package Version: 2.57.8".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 5e4c417..f4deeb3 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -123,7 +123,7 @@ def facet_query_matching_method(self, facet_query_matching_method):
     def limit(self):
         """Gets the limit of this FacetSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :return: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -134,11 +134,15 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this FacetSearchRequestContainer.
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :param limit: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :type: int
         """
+        if limit is not None and limit > 1000:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
+        if limit is not None and limit < 1:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index 0afc644..dadf95d 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -147,7 +147,7 @@ def facets(self, facets):
     def limit(self):
         """Gets the limit of this FacetsSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default 100  # noqa: E501
+        The number of results to return.  Default 100, Maximum allowed: 1000  # noqa: E501
 
         :return: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -158,11 +158,15 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this FacetsSearchRequestContainer.
 
-        The number of results to return.  Default 100  # noqa: E501
+        The number of results to return.  Default 100, Maximum allowed: 1000  # noqa: E501
 
         :param limit: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :type: int
         """
+        if limit is not None and limit > 1000:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
+        if limit is not None and limit < 1:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 63a3a5a..9d9a9c7 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -66,7 +66,7 @@ def __init__(self, limit=None, offset=None, query=None, sort=None):  # noqa: E50
     def limit(self):
         """Gets the limit of this SortableSearchRequest.  # noqa: E501
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :return: The limit of this SortableSearchRequest.  # noqa: E501
         :rtype: int
@@ -77,11 +77,15 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this SortableSearchRequest.
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :param limit: The limit of this SortableSearchRequest.  # noqa: E501
         :type: int
         """
+        if limit is not None and limit > 1000:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
+        if limit is not None and limit < 1:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 

From 1fb7efdf112ff7658a38f717d6e6eab02a2d451e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 10 Apr 2020 08:16:37 -0700
Subject: [PATCH 051/161] Autogenerated Update v2.56.21.

---
 .swagger-codegen/config.json                              | 2 +-
 .swagger-codegen/config.jsone                             | 2 +-
 README.md                                                 | 2 +-
 docs/FacetSearchRequestContainer.md                       | 2 +-
 docs/FacetsSearchRequestContainer.md                      | 2 +-
 docs/SortableSearchRequest.md                             | 2 +-
 setup.py                                                  | 2 +-
 wavefront_api_client/api_client.py                        | 2 +-
 wavefront_api_client/configuration.py                     | 2 +-
 .../models/facet_search_request_container.py              | 8 ++------
 .../models/facets_search_request_container.py             | 8 ++------
 wavefront_api_client/models/sortable_search_request.py    | 8 ++------
 12 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index de97537..a51db1a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.57.8"
+    "packageVersion": "2.56.21"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5e19643..de97537 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.17"
+    "packageVersion": "2.57.8"
 }
diff --git a/README.md b/README.md
index 0c65385..c1303c2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.57.8
+- Package version: 2.56.21
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/FacetSearchRequestContainer.md b/docs/FacetSearchRequestContainer.md
index d75c3ee..ec3a22a 100644
--- a/docs/FacetSearchRequestContainer.md
+++ b/docs/FacetSearchRequestContainer.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned. | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
-**limit** | **int** | The number of results to return.  Default: 100, Maximum allowed: 1000 | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
 
diff --git a/docs/FacetsSearchRequestContainer.md b/docs/FacetsSearchRequestContainer.md
index 81dbf4c..035c127 100644
--- a/docs/FacetsSearchRequestContainer.md
+++ b/docs/FacetsSearchRequestContainer.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
 **facets** | **list[str]** | A list of facets (property keys) to return values from found in entities matching &#39;query&#39;.  Examples are &#39;tags&#39;, &#39;creatorId&#39;, etc | 
-**limit** | **int** | The number of results to return.  Default 100, Maximum allowed: 1000 | [optional] 
+**limit** | **int** | The number of results to return.  Default 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of &#39;entity search results&#39;.  All facets listed in the &#39;facets&#39; search parameter of all entities within &#39;entity search results&#39; are scanned to produce the search results (of facet values). | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/SortableSearchRequest.md b/docs/SortableSearchRequest.md
index 28ea1b4..8d7a49a 100644
--- a/docs/SortableSearchRequest.md
+++ b/docs/SortableSearchRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**limit** | **int** | The number of results to return.  Default: 100, Maximum allowed: 1000 | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
diff --git a/setup.py b/setup.py
index 271c141..de50359 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.57.8"
+VERSION = "2.56.21"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 0063488..dad7d65 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.57.8/python'
+        self.user_agent = 'Swagger-Codegen/2.56.21/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index f0e0273..ee90b47 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.57.8".\
+               "SDK Package Version: 2.56.21".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index f4deeb3..5e4c417 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -123,7 +123,7 @@ def facet_query_matching_method(self, facet_query_matching_method):
     def limit(self):
         """Gets the limit of this FacetSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
+        The number of results to return.  Default: 100  # noqa: E501
 
         :return: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -134,15 +134,11 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this FacetSearchRequestContainer.
 
-        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
+        The number of results to return.  Default: 100  # noqa: E501
 
         :param limit: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :type: int
         """
-        if limit is not None and limit > 1000:  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if limit is not None and limit < 1:  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index dadf95d..0afc644 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -147,7 +147,7 @@ def facets(self, facets):
     def limit(self):
         """Gets the limit of this FacetsSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default 100, Maximum allowed: 1000  # noqa: E501
+        The number of results to return.  Default 100  # noqa: E501
 
         :return: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -158,15 +158,11 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this FacetsSearchRequestContainer.
 
-        The number of results to return.  Default 100, Maximum allowed: 1000  # noqa: E501
+        The number of results to return.  Default 100  # noqa: E501
 
         :param limit: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :type: int
         """
-        if limit is not None and limit > 1000:  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if limit is not None and limit < 1:  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 9d9a9c7..63a3a5a 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -66,7 +66,7 @@ def __init__(self, limit=None, offset=None, query=None, sort=None):  # noqa: E50
     def limit(self):
         """Gets the limit of this SortableSearchRequest.  # noqa: E501
 
-        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
+        The number of results to return.  Default: 100  # noqa: E501
 
         :return: The limit of this SortableSearchRequest.  # noqa: E501
         :rtype: int
@@ -77,15 +77,11 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this SortableSearchRequest.
 
-        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
+        The number of results to return.  Default: 100  # noqa: E501
 
         :param limit: The limit of this SortableSearchRequest.  # noqa: E501
         :type: int
         """
-        if limit is not None and limit > 1000:  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if limit is not None and limit < 1:  # noqa: E501
-            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 

From a2b32398cb9a1a3956a764db4755ba9a1d40eb06 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 11 Apr 2020 08:16:37 -0700
Subject: [PATCH 052/161] Autogenerated Update v2.57.10.

---
 .swagger-codegen/config.json                              | 2 +-
 .swagger-codegen/config.jsone                             | 2 +-
 README.md                                                 | 2 +-
 docs/FacetSearchRequestContainer.md                       | 2 +-
 docs/FacetsSearchRequestContainer.md                      | 2 +-
 docs/SortableSearchRequest.md                             | 2 +-
 setup.py                                                  | 2 +-
 wavefront_api_client/api_client.py                        | 2 +-
 wavefront_api_client/configuration.py                     | 2 +-
 .../models/facet_search_request_container.py              | 8 ++++++--
 .../models/facets_search_request_container.py             | 8 ++++++--
 wavefront_api_client/models/sortable_search_request.py    | 8 ++++++--
 12 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index a51db1a..3e46d14 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.21"
+    "packageVersion": "2.57.10"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index de97537..a51db1a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.57.8"
+    "packageVersion": "2.56.21"
 }
diff --git a/README.md b/README.md
index c1303c2..ee71276 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.56.21
+- Package version: 2.57.10
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/FacetSearchRequestContainer.md b/docs/FacetSearchRequestContainer.md
index ec3a22a..d75c3ee 100644
--- a/docs/FacetSearchRequestContainer.md
+++ b/docs/FacetSearchRequestContainer.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned. | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
-**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100, Maximum allowed: 1000 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
 
diff --git a/docs/FacetsSearchRequestContainer.md b/docs/FacetsSearchRequestContainer.md
index 035c127..81dbf4c 100644
--- a/docs/FacetsSearchRequestContainer.md
+++ b/docs/FacetsSearchRequestContainer.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **facet_query** | **str** | A string against which facet results are compared.  If the facet result either CONTAINs, STARTSWITH, or is an EXACT match for this value, as specified by facetQueryMatchingMethod, then it is returned | [optional] 
 **facet_query_matching_method** | **str** | The matching method used to filter when &#39;facetQuery&#39; is used. Defaults to CONTAINS. | [optional] 
 **facets** | **list[str]** | A list of facets (property keys) to return values from found in entities matching &#39;query&#39;.  Examples are &#39;tags&#39;, &#39;creatorId&#39;, etc | 
-**limit** | **int** | The number of results to return.  Default 100 | [optional] 
+**limit** | **int** | The number of results to return.  Default 100, Maximum allowed: 1000 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in this list constitute a set of &#39;entity search results&#39;.  All facets listed in the &#39;facets&#39; search parameter of all entities within &#39;entity search results&#39; are scanned to produce the search results (of facet values). | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/SortableSearchRequest.md b/docs/SortableSearchRequest.md
index 8d7a49a..28ea1b4 100644
--- a/docs/SortableSearchRequest.md
+++ b/docs/SortableSearchRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**limit** | **int** | The number of results to return.  Default: 100 | [optional] 
+**limit** | **int** | The number of results to return.  Default: 100, Maximum allowed: 1000 | [optional] 
 **offset** | **int** | The number of results to skip before returning values.  Default: 0 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results.  Entities that match ALL queries in the list are returned | [optional] 
 **sort** | [**Sorting**](Sorting.md) |  | [optional] 
diff --git a/setup.py b/setup.py
index de50359..294b11a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.56.21"
+VERSION = "2.57.10"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index dad7d65..42fddb0 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.56.21/python'
+        self.user_agent = 'Swagger-Codegen/2.57.10/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index ee90b47..cf770f4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.56.21".\
+               "SDK Package Version: 2.57.10".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 5e4c417..f4deeb3 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -123,7 +123,7 @@ def facet_query_matching_method(self, facet_query_matching_method):
     def limit(self):
         """Gets the limit of this FacetSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :return: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -134,11 +134,15 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this FacetSearchRequestContainer.
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :param limit: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :type: int
         """
+        if limit is not None and limit > 1000:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
+        if limit is not None and limit < 1:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index 0afc644..dadf95d 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -147,7 +147,7 @@ def facets(self, facets):
     def limit(self):
         """Gets the limit of this FacetsSearchRequestContainer.  # noqa: E501
 
-        The number of results to return.  Default 100  # noqa: E501
+        The number of results to return.  Default 100, Maximum allowed: 1000  # noqa: E501
 
         :return: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :rtype: int
@@ -158,11 +158,15 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this FacetsSearchRequestContainer.
 
-        The number of results to return.  Default 100  # noqa: E501
+        The number of results to return.  Default 100, Maximum allowed: 1000  # noqa: E501
 
         :param limit: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :type: int
         """
+        if limit is not None and limit > 1000:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
+        if limit is not None and limit < 1:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 63a3a5a..9d9a9c7 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -66,7 +66,7 @@ def __init__(self, limit=None, offset=None, query=None, sort=None):  # noqa: E50
     def limit(self):
         """Gets the limit of this SortableSearchRequest.  # noqa: E501
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :return: The limit of this SortableSearchRequest.  # noqa: E501
         :rtype: int
@@ -77,11 +77,15 @@ def limit(self):
     def limit(self, limit):
         """Sets the limit of this SortableSearchRequest.
 
-        The number of results to return.  Default: 100  # noqa: E501
+        The number of results to return.  Default: 100, Maximum allowed: 1000  # noqa: E501
 
         :param limit: The limit of this SortableSearchRequest.  # noqa: E501
         :type: int
         """
+        if limit is not None and limit > 1000:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
+        if limit is not None and limit < 1:  # noqa: E501
+            raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
 

From bf7cbf3180a92fa323069cc814239cae2154a328 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 18 Apr 2020 08:16:35 -0700
Subject: [PATCH 053/161] Autogenerated Update v2.57.18.

---
 .swagger-codegen/config.json                  | 2 +-
 .swagger-codegen/config.jsone                 | 2 +-
 README.md                                     | 2 +-
 setup.py                                      | 2 +-
 wavefront_api_client/api_client.py            | 2 +-
 wavefront_api_client/configuration.py         | 2 +-
 wavefront_api_client/models/chart_settings.py | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 3e46d14..598118f 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.57.10"
+    "packageVersion": "2.57.18"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index a51db1a..3e46d14 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.56.21"
+    "packageVersion": "2.57.10"
 }
diff --git a/README.md b/README.md
index ee71276..56f8333 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.57.10
+- Package version: 2.57.18
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 294b11a..3658ca9 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.57.10"
+VERSION = "2.57.18"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 42fddb0..4b54da1 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.57.10/python'
+        self.user_agent = 'Swagger-Codegen/2.57.18/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index cf770f4..0459ea7 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.57.10".\
+               "SDK Package Version: 2.57.18".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 613c8c1..223d4ff 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1397,7 +1397,7 @@ def type(self, type):
         """
         if type is None:
             raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
-        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list"]  # noqa: E501
+        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list", "histogram"]  # noqa: E501
         if type not in allowed_values:
             raise ValueError(
                 "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501

From a9ff87af44aba7a148f6a46824bea9fccc379b7d Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 13 May 2020 08:16:30 -0700
Subject: [PATCH 054/161] Autogenerated Update v2.58.13.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  11 +-
 docs/ChartSettings.md                         |   9 +-
 docs/DashboardParameterValue.md               |   1 +
 docs/IngestionSpyApi.md                       | 222 +++++
 docs/PagedReportEventAnomalyDTO.md            |  16 +
 docs/RelatedAnomaly.md                        |  34 +
 docs/RelatedData.md                           |   8 +-
 docs/RelatedEvent.md                          |   1 +
 docs/ReportEventAnomalyDTO.md                 |  12 +
 ...onseContainerPagedReportEventAnomalyDTO.md |  11 +
 docs/SearchApi.md                             |  57 ++
 setup.py                                      |   2 +-
 test/test_ingestion_spy_api.py                |  62 ++
 test/test_paged_report_event_anomaly_dto.py   |  40 +
 test/test_related_anomaly.py                  |  40 +
 test/test_report_event_anomaly_dto.py         |  40 +
 ...ontainer_paged_report_event_anomaly_dto.py |  40 +
 wavefront_api_client/__init__.py              |   5 +
 wavefront_api_client/api/__init__.py          |   1 +
 wavefront_api_client/api/ingestion_spy_api.py | 445 ++++++++++
 wavefront_api_client/api/search_api.py        | 103 +++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   4 +
 wavefront_api_client/models/chart_settings.py |  48 +-
 .../models/dashboard_parameter_value.py       |  30 +-
 .../models/paged_report_event_anomaly_dto.py  | 279 +++++++
 .../models/related_anomaly.py                 | 790 ++++++++++++++++++
 wavefront_api_client/models/related_data.py   |  70 +-
 wavefront_api_client/models/related_event.py  |  30 +-
 .../models/report_event_anomaly_dto.py        | 167 ++++
 ...ontainer_paged_report_event_anomaly_dto.py | 142 ++++
 34 files changed, 2696 insertions(+), 32 deletions(-)
 create mode 100644 docs/IngestionSpyApi.md
 create mode 100644 docs/PagedReportEventAnomalyDTO.md
 create mode 100644 docs/RelatedAnomaly.md
 create mode 100644 docs/ReportEventAnomalyDTO.md
 create mode 100644 docs/ResponseContainerPagedReportEventAnomalyDTO.md
 create mode 100644 test/test_ingestion_spy_api.py
 create mode 100644 test/test_paged_report_event_anomaly_dto.py
 create mode 100644 test/test_related_anomaly.py
 create mode 100644 test/test_report_event_anomaly_dto.py
 create mode 100644 test/test_response_container_paged_report_event_anomaly_dto.py
 create mode 100644 wavefront_api_client/api/ingestion_spy_api.py
 create mode 100644 wavefront_api_client/models/paged_report_event_anomaly_dto.py
 create mode 100644 wavefront_api_client/models/related_anomaly.py
 create mode 100644 wavefront_api_client/models/report_event_anomaly_dto.py
 create mode 100644 wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 598118f..fc5ccf9 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.57.18"
+    "packageVersion": "2.58.13"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 3e46d14..598118f 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.57.10"
+    "packageVersion": "2.57.18"
 }
diff --git a/README.md b/README.md
index 56f8333..62c2e87 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.57.18
+- Package version: 2.58.13
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -200,6 +200,10 @@ Class | Method | HTTP request | Description
 *ExternalLinkApi* | [**get_all_external_link**](docs/ExternalLinkApi.md#get_all_external_link) | **GET** /api/v2/extlink | Get all external links for a customer
 *ExternalLinkApi* | [**get_external_link**](docs/ExternalLinkApi.md#get_external_link) | **GET** /api/v2/extlink/{id} | Get a specific external link
 *ExternalLinkApi* | [**update_external_link**](docs/ExternalLinkApi.md#update_external_link) | **PUT** /api/v2/extlink/{id} | Update a specific external link
+*IngestionSpyApi* | [**spy_on_histograms**](docs/IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
+*IngestionSpyApi* | [**spy_on_id_creations**](docs/IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
+*IngestionSpyApi* | [**spy_on_points**](docs/IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
+*IngestionSpyApi* | [**spy_on_spans**](docs/IngestionSpyApi.md#spy_on_spans) | **GET** /api/spy/spans | Gets new spans with existing source names and span tags.
 *IntegrationApi* | [**get_all_integration**](docs/IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Wavefront integrations available, along with their status
 *IntegrationApi* | [**get_all_integration_in_manifests**](docs/IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
 *IntegrationApi* | [**get_all_integration_in_manifests_min**](docs/IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Wavefront integrations as structured in their integration manifests.
@@ -292,6 +296,7 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_registered_query_entities**](docs/SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetric | Search over a customer&#39;s non-deleted derived metric definitions
 *SearchApi* | [**search_registered_query_for_facet**](docs/SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetric/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
 *SearchApi* | [**search_registered_query_for_facets**](docs/SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetric/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
+*SearchApi* | [**search_related_report_event_anomaly_entities**](docs/SearchApi.md#search_related_report_event_anomaly_entities) | **POST** /api/v2/search/event/related/{eventId}/withAnomalies | List the related events and anomalies over a firing event
 *SearchApi* | [**search_related_report_event_entities**](docs/SearchApi.md#search_related_report_event_entities) | **POST** /api/v2/search/event/related/{eventId} | List the related events over a firing event
 *SearchApi* | [**search_report_event_entities**](docs/SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 *SearchApi* | [**search_report_event_for_facet**](docs/SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
@@ -450,6 +455,7 @@ Class | Method | HTTP request | Description
  - [PagedNotificant](docs/PagedNotificant.md)
  - [PagedProxy](docs/PagedProxy.md)
  - [PagedRelatedEvent](docs/PagedRelatedEvent.md)
+ - [PagedReportEventAnomalyDTO](docs/PagedReportEventAnomalyDTO.md)
  - [PagedRoleDTO](docs/PagedRoleDTO.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
  - [PagedServiceAccount](docs/PagedServiceAccount.md)
@@ -460,8 +466,10 @@ Class | Method | HTTP request | Description
  - [QueryEvent](docs/QueryEvent.md)
  - [QueryResult](docs/QueryResult.md)
  - [RawTimeseries](docs/RawTimeseries.md)
+ - [RelatedAnomaly](docs/RelatedAnomaly.md)
  - [RelatedData](docs/RelatedData.md)
  - [RelatedEvent](docs/RelatedEvent.md)
+ - [ReportEventAnomalyDTO](docs/ReportEventAnomalyDTO.md)
  - [ResponseContainer](docs/ResponseContainer.md)
  - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
@@ -507,6 +515,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedNotificant](docs/ResponseContainerPagedNotificant.md)
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
  - [ResponseContainerPagedRelatedEvent](docs/ResponseContainerPagedRelatedEvent.md)
+ - [ResponseContainerPagedReportEventAnomalyDTO](docs/ResponseContainerPagedReportEventAnomalyDTO.md)
  - [ResponseContainerPagedRoleDTO](docs/ResponseContainerPagedRoleDTO.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
  - [ResponseContainerPagedServiceAccount](docs/ResponseContainerPagedServiceAccount.md)
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index bf1d9fb..aba08d0 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **auto_column_tags** | **bool** | deprecated | [optional] 
+**chart_default_color** | **str** | Default color that will be used in any chart rendering. Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
 **column_tags** | **str** | deprecated | [optional] 
 **custom_tags** | **list[str]** | For the tabular view, a list of point tags to display when using the \&quot;custom\&quot; tag display mode | [optional] 
 **expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
@@ -27,18 +28,18 @@ Name | Type | Description | Notes
 **show_raw_values** | **bool** | For the tabular view, whether to display raw values.  Default: false | [optional] 
 **sort_values_descending** | **bool** | For the tabular view, whether to display display values in descending order.  Default: false | [optional] 
 **sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
-**sparkline_display_color** | **str** | For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_display_color** | **str** | For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
 **sparkline_display_font_size** | **str** | For the single stat view, the font size of the displayed text, in percent | [optional] 
 **sparkline_display_horizontal_position** | **str** | For the single stat view, the horizontal position of the displayed text | [optional] 
 **sparkline_display_postfix** | **str** | For the single stat view, a string to append to the displayed text | [optional] 
 **sparkline_display_prefix** | **str** | For the single stat view, a string to add before the displayed text | [optional] 
 **sparkline_display_value_type** | **str** | For the single stat view, whether to display the name of the query or the value of query | [optional] 
 **sparkline_display_vertical_position** | **str** | deprecated | [optional] 
-**sparkline_fill_color** | **str** | For the single stat view, the color of the background fill. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
-**sparkline_line_color** | **str** | For the single stat view, the color of the line. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_fill_color** | **str** | For the single stat view, the color of the background fill. Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
+**sparkline_line_color** | **str** | For the single stat view, the color of the line. Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
 **sparkline_size** | **str** | For the single stat view, a misleadingly named property.  This determines whether the sparkline of the statistic is displayed in the chart BACKGROUND, BOTTOM, or NONE | [optional] 
 **sparkline_value_color_map_apply_to** | **str** | For the single stat view, whether to apply dynamic color settings to the displayed TEXT or BACKGROUND | [optional] 
-**sparkline_value_color_map_colors** | **list[str]** | For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\&quot;rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;\&quot; format | [optional] 
+**sparkline_value_color_map_colors** | **list[str]** | For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
 **sparkline_value_color_map_values** | **list[int]** | deprecated | [optional] 
 **sparkline_value_color_map_values_v2** | **list[float]** | For the single stat view, a list of boundaries for mapping different query values to colors.  Must contain one less element than sparklineValueColorMapColors | [optional] 
 **sparkline_value_text_map_text** | **list[str]** | For the single stat view, a list of display text values that different query values map to.  Must contain one more element than sparklineValueTextMapThresholds | [optional] 
diff --git a/docs/DashboardParameterValue.md b/docs/DashboardParameterValue.md
index e7b3b2d..d746e11 100644
--- a/docs/DashboardParameterValue.md
+++ b/docs/DashboardParameterValue.md
@@ -15,6 +15,7 @@ Name | Type | Description | Notes
 **query_value** | **str** |  | [optional] 
 **reverse_dyn_sort** | **bool** | Whether to reverse alphabetically sort the returned result. | [optional] 
 **tag_key** | **str** |  | [optional] 
+**tags_black_list_regex** | **str** | The regular expression to filter out source tags from the Current Values list. | [optional] 
 **value_ordering** | **list[str]** |  | [optional] 
 **values_to_readable_strings** | **dict(str, str)** |  | [optional] 
 
diff --git a/docs/IngestionSpyApi.md b/docs/IngestionSpyApi.md
new file mode 100644
index 0000000..0fa8084
--- /dev/null
+++ b/docs/IngestionSpyApi.md
@@ -0,0 +1,222 @@
+# wavefront_api_client.IngestionSpyApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**spy_on_histograms**](IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
+[**spy_on_id_creations**](IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
+[**spy_on_points**](IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
+[**spy_on_spans**](IngestionSpyApi.md#spy_on_spans) | **GET** /api/spy/spans | Gets new spans with existing source names and span tags.
+
+
+# **spy_on_histograms**
+> spy_on_histograms(histogram=histogram, host=host, histogram_tag_key=histogram_tag_key, sampling=sampling)
+
+Gets new histograms that are added to existing time series.
+
+Try it Out button won't work in this case, as it's a streaming API. Endpoint: https://.wavefront.com/api/spy/histograms  .   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-histograms-with-spy
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+histogram = 'histogram_example' # str | List a histogram only if its name starts with the specified case-sensitive prefix. E.g., histogram=orderShirt matches histograms named orderShirt and orderShirts, but not OrderShirts. (optional)
+host = 'host_example' # str | List a histogram only if the name of its source starts with the specified case-sensitive prefix. (optional)
+histogram_tag_key = ['histogram_tag_key_example'] # list[str] | List a histogram only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. histogramTagKey=cluster&histogramTagKey=shard  put cluster in the first line, put shard in the second line as values (optional)
+sampling = 0.01 # float |  (optional) (default to 0.01)
+
+try:
+    # Gets new histograms that are added to existing time series.
+    api_instance.spy_on_histograms(histogram=histogram, host=host, histogram_tag_key=histogram_tag_key, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_histograms: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **histogram** | **str**| List a histogram only if its name starts with the specified case-sensitive prefix. E.g., histogram&#x3D;orderShirt matches histograms named orderShirt and orderShirts, but not OrderShirts. | [optional] 
+ **host** | **str**| List a histogram only if the name of its source starts with the specified case-sensitive prefix. | [optional] 
+ **histogram_tag_key** | [**list[str]**](str.md)| List a histogram only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. histogramTagKey&#x3D;cluster&amp;histogramTagKey&#x3D;shard  put cluster in the first line, put shard in the second line as values | [optional] 
+ **sampling** | **float**|  | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **spy_on_id_creations**
+> spy_on_id_creations(type=type, body=body, sampling=sampling)
+
+Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
+
+Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ids.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-new-id-assignments-with-spy
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+type = 'type_example' # str | Type of new items you want to see ID assignments for: METRIC - Metric names SPAN - Span names HOST - Source names STRING - Point tags or span tags, represented as a single string containing a unique key-value pair, e.g. env=prod, env=dev, etc. (optional)
+body = 'body_example' # str | Case-sensitive prefix for the items that you are interested in. (optional)
+sampling = 0.01 # float | goes from 0 to 1 with 0.01 being 1% (optional) (default to 0.01)
+
+try:
+    # Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
+    api_instance.spy_on_id_creations(type=type, body=body, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_id_creations: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **type** | **str**| Type of new items you want to see ID assignments for: METRIC - Metric names SPAN - Span names HOST - Source names STRING - Point tags or span tags, represented as a single string containing a unique key-value pair, e.g. env&#x3D;prod, env&#x3D;dev, etc. | [optional] 
+ **body** | **str**| Case-sensitive prefix for the items that you are interested in. | [optional] 
+ **sampling** | **float**| goes from 0 to 1 with 0.01 being 1% | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **spy_on_points**
+> spy_on_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
+
+Gets a sampling of new metric data points that are added to existing time series.
+
+Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/points.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+metric = 'metric_example' # str | List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. (optional)
+host = 'host_example' # str | List a point only if its source name starts with the specified case-sensitive prefix. (optional)
+point_tag_key = ['point_tag_key_example'] # list[str] | List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values (optional)
+sampling = 0.01 # float | goes from 0 to 1 with 0.01 being 1% (optional) (default to 0.01)
+
+try:
+    # Gets a sampling of new metric data points that are added to existing time series.
+    api_instance.spy_on_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_points: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **metric** | **str**| List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric&#x3D;Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. | [optional] 
+ **host** | **str**| List a point only if its source name starts with the specified case-sensitive prefix. | [optional] 
+ **point_tag_key** | [**list[str]**](str.md)| List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey&#x3D;env&amp;pointTagKey&#x3D;datacenter  put env in the first line and datacenter in the second line as values | [optional] 
+ **sampling** | **float**| goes from 0 to 1 with 0.01 being 1% | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **spy_on_spans**
+> spy_on_spans(name=name, host=host, span_tag_key=span_tag_key, sampling=sampling)
+
+Gets new spans with existing source names and span tags.
+
+Try it Out button won't work in this case, as it's a streaming API.   Endpoint: https://<cluster>.wavefront.com/api/spy/spans   Details usage can be find at: https://docs.wavefron.com/wavefront_monitoring_spy.html#get-ingested-spans-with-spy
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+name = 'name_example' # str | List a span only if its operation name starts with the specified case-sensitive prefix. E.g., name=orderShirt matches spans named orderShirt and orderShirts, but not OrderShirts. (optional)
+host = 'host_example' # str | List a span only if the name of its source starts with the specified case-sensitive prefix. (optional)
+span_tag_key = ['span_tag_key_example'] # list[str] | List a span only if it has the specified span tag key. Add this parameter multiple times to specify multiple span tags, e.g. spanTagKey=cluster&spanTagKey=shard (optional)
+sampling = 0.01 # float | goes from 0 to 1 with 0.01 being 1% (optional) (default to 0.01)
+
+try:
+    # Gets new spans with existing source names and span tags.
+    api_instance.spy_on_spans(name=name, host=host, span_tag_key=span_tag_key, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_spans: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **name** | **str**| List a span only if its operation name starts with the specified case-sensitive prefix. E.g., name&#x3D;orderShirt matches spans named orderShirt and orderShirts, but not OrderShirts. | [optional] 
+ **host** | **str**| List a span only if the name of its source starts with the specified case-sensitive prefix. | [optional] 
+ **span_tag_key** | [**list[str]**](str.md)| List a span only if it has the specified span tag key. Add this parameter multiple times to specify multiple span tags, e.g. spanTagKey&#x3D;cluster&amp;spanTagKey&#x3D;shard | [optional] 
+ **sampling** | **float**| goes from 0 to 1 with 0.01 being 1% | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/PagedReportEventAnomalyDTO.md b/docs/PagedReportEventAnomalyDTO.md
new file mode 100644
index 0000000..499751b
--- /dev/null
+++ b/docs/PagedReportEventAnomalyDTO.md
@@ -0,0 +1,16 @@
+# PagedReportEventAnomalyDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[ReportEventAnomalyDTO]**](ReportEventAnomalyDTO.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RelatedAnomaly.md b/docs/RelatedAnomaly.md
new file mode 100644
index 0000000..d8456a5
--- /dev/null
+++ b/docs/RelatedAnomaly.md
@@ -0,0 +1,34 @@
+# RelatedAnomaly
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**chart_hash** | **str** | chart hash(as unique identifier) for this anomaly | 
+**chart_link** | **str** | chart link for this anomaly | [optional] 
+**col** | **int** | column number for this anomaly | 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**customer** | **str** | id of the customer to which this anomaly belongs | [optional] 
+**dashboard_id** | **str** | dashboard id for this anomaly | 
+**deleted** | **bool** |  | [optional] 
+**end_ms** | **int** | endMs for this anomaly | 
+**hosts_used** | **list[str]** | list of hosts affected of this anomaly | [optional] 
+**id** | **str** | unique id that defines this anomaly | [optional] 
+**image_link** | **str** | image link for this anomaly | [optional] 
+**metrics_used** | **list[str]** | list of metrics used of this anomaly | [optional] 
+**model** | **str** | model for this anomaly | [optional] 
+**original_stripes** | [**list[Stripe]**](Stripe.md) | list of originalStripe belongs to this anomaly | [optional] 
+**param_hash** | **str** | param hash for this anomaly | 
+**query_hash** | **str** | query hash for this anomaly | 
+**_query_params** | **dict(str, str)** | map of query params belongs to this anomaly | 
+**related_data** | [**RelatedData**](RelatedData.md) | Data concerning how this anomaly is related to the event in the request | [optional] 
+**row** | **int** | row number for this anomaly | 
+**section** | **int** | section number for this anomaly | 
+**start_ms** | **int** | startMs for this anomaly | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updated_ms** | **int** | updateMs for this anomaly | 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RelatedData.md b/docs/RelatedData.md
index 9f10863..4569e4b 100644
--- a/docs/RelatedData.md
+++ b/docs/RelatedData.md
@@ -4,11 +4,13 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **alert_description** | **str** | If this event is generated by an alert, the description of that alert. | [optional] 
+**anomaly_chart_link** | **str** | Chart Link of the anomaly to which this event is related | [optional] 
 **common_dimensions** | **list[str]** | Set of common dimensions between the 2 events, presented in key&#x3D;value format | [optional] 
-**common_metrics** | **list[str]** | Set of common metrics/labels between the 2 events | [optional] 
-**common_sources** | **list[str]** | Set of common sources between the 2 events | [optional] 
+**common_metrics** | **list[str]** | Set of common metrics/labels between the 2 events or anomalies | [optional] 
+**common_sources** | **list[str]** | Set of common sources between the 2 events or anomalies | [optional] 
+**enhanced_score** | **float** | Enhanced score to sort related events and anomalies | [optional] 
 **related_id** | **str** | ID of the event to which this event is related | [optional] 
-**summary** | **str** | Text summary of why the two events are relateds | [optional] 
+**summary** | **str** | Text summary of why the two events are related | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RelatedEvent.md b/docs/RelatedEvent.md
index e94ea8c..6c02099 100644
--- a/docs/RelatedEvent.md
+++ b/docs/RelatedEvent.md
@@ -21,6 +21,7 @@ Name | Type | Description | Notes
 **name** | **str** | The name of the event.  If &#39;annotations.prettyName&#39; is present, &#39;name&#39; will be equivalent to that value | 
 **related_data** | [**RelatedData**](RelatedData.md) | Data concerning how this event is related to the event in the request | [optional] 
 **running_state** | **str** |  | [optional] 
+**similarity_score** | **float** | similarity score | [optional] 
 **start_time** | **int** | Start time of the event, in epoch millis.  If the JSON value is missing or set to 0, startTime will be set to the current time | 
 **summarized_events** | **int** | In some event queries, multiple events that occur nearly simultaneously are summarized under a single event.  This value specifies the number of events summarized under this one | [optional] 
 **table** | **str** | The customer to which the event belongs | [optional] 
diff --git a/docs/ReportEventAnomalyDTO.md b/docs/ReportEventAnomalyDTO.md
new file mode 100644
index 0000000..e06caf0
--- /dev/null
+++ b/docs/ReportEventAnomalyDTO.md
@@ -0,0 +1,12 @@
+# ReportEventAnomalyDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**related_anomaly_dto** | [**RelatedAnomaly**](RelatedAnomaly.md) |  | [optional] 
+**related_event_dto** | [**RelatedEvent**](RelatedEvent.md) |  | [optional] 
+**similarity_score** | **float** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedReportEventAnomalyDTO.md b/docs/ResponseContainerPagedReportEventAnomalyDTO.md
new file mode 100644
index 0000000..ac12fab
--- /dev/null
+++ b/docs/ResponseContainerPagedReportEventAnomalyDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedReportEventAnomalyDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedReportEventAnomalyDTO**](PagedReportEventAnomalyDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 35fe4c5..e621a43 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -49,6 +49,7 @@ Method | HTTP request | Description
 [**search_registered_query_entities**](SearchApi.md#search_registered_query_entities) | **POST** /api/v2/search/derivedmetric | Search over a customer&#39;s non-deleted derived metric definitions
 [**search_registered_query_for_facet**](SearchApi.md#search_registered_query_for_facet) | **POST** /api/v2/search/derivedmetric/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted derived metric definitions
 [**search_registered_query_for_facets**](SearchApi.md#search_registered_query_for_facets) | **POST** /api/v2/search/derivedmetric/facets | Lists the values of one or more facets over the customer&#39;s non-deleted derived metric definition
+[**search_related_report_event_anomaly_entities**](SearchApi.md#search_related_report_event_anomaly_entities) | **POST** /api/v2/search/event/related/{eventId}/withAnomalies | List the related events and anomalies over a firing event
 [**search_related_report_event_entities**](SearchApi.md#search_related_report_event_entities) | **POST** /api/v2/search/event/related/{eventId} | List the related events over a firing event
 [**search_report_event_entities**](SearchApi.md#search_report_event_entities) | **POST** /api/v2/search/event | Search over a customer&#39;s events
 [**search_report_event_for_facet**](SearchApi.md#search_report_event_for_facet) | **POST** /api/v2/search/event/{facet} | Lists the values of a specific facet over the customer&#39;s events
@@ -2533,6 +2534,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_related_report_event_anomaly_entities**
+> ResponseContainerPagedReportEventAnomalyDTO search_related_report_event_anomaly_entities(event_id, body=body)
+
+List the related events and anomalies over a firing event
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+event_id = 'event_id_example' # str | 
+body = wavefront_api_client.EventSearchRequest() # EventSearchRequest |  (optional)
+
+try:
+    # List the related events and anomalies over a firing event
+    api_response = api_instance.search_related_report_event_anomaly_entities(event_id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_related_report_event_anomaly_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **event_id** | **str**|  | 
+ **body** | [**EventSearchRequest**](EventSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedReportEventAnomalyDTO**](ResponseContainerPagedReportEventAnomalyDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_related_report_event_entities**
 > ResponseContainerPagedRelatedEvent search_related_report_event_entities(event_id, body=body)
 
diff --git a/setup.py b/setup.py
index 3658ca9..1e4dc58 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.57.18"
+VERSION = "2.58.13"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_ingestion_spy_api.py b/test/test_ingestion_spy_api.py
new file mode 100644
index 0000000..1c7bcd6
--- /dev/null
+++ b/test/test_ingestion_spy_api.py
@@ -0,0 +1,62 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.ingestion_spy_api import IngestionSpyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionSpyApi(unittest.TestCase):
+    """IngestionSpyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.ingestion_spy_api.IngestionSpyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_spy_on_histograms(self):
+        """Test case for spy_on_histograms
+
+        Gets new histograms that are added to existing time series.  # noqa: E501
+        """
+        pass
+
+    def test_spy_on_id_creations(self):
+        """Test case for spy_on_id_creations
+
+        Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.  # noqa: E501
+        """
+        pass
+
+    def test_spy_on_points(self):
+        """Test case for spy_on_points
+
+        Gets a sampling of new metric data points that are added to existing time series.  # noqa: E501
+        """
+        pass
+
+    def test_spy_on_spans(self):
+        """Test case for spy_on_spans
+
+        Gets new spans with existing source names and span tags.  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_report_event_anomaly_dto.py b/test/test_paged_report_event_anomaly_dto.py
new file mode 100644
index 0000000..a0b36b1
--- /dev/null
+++ b/test/test_paged_report_event_anomaly_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_report_event_anomaly_dto import PagedReportEventAnomalyDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedReportEventAnomalyDTO(unittest.TestCase):
+    """PagedReportEventAnomalyDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedReportEventAnomalyDTO(self):
+        """Test PagedReportEventAnomalyDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_report_event_anomaly_dto.PagedReportEventAnomalyDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_related_anomaly.py b/test/test_related_anomaly.py
new file mode 100644
index 0000000..c63f9cb
--- /dev/null
+++ b/test/test_related_anomaly.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.related_anomaly import RelatedAnomaly  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRelatedAnomaly(unittest.TestCase):
+    """RelatedAnomaly unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRelatedAnomaly(self):
+        """Test RelatedAnomaly"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.related_anomaly.RelatedAnomaly()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_report_event_anomaly_dto.py b/test/test_report_event_anomaly_dto.py
new file mode 100644
index 0000000..289cfdb
--- /dev/null
+++ b/test/test_report_event_anomaly_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestReportEventAnomalyDTO(unittest.TestCase):
+    """ReportEventAnomalyDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testReportEventAnomalyDTO(self):
+        """Test ReportEventAnomalyDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.report_event_anomaly_dto.ReportEventAnomalyDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_report_event_anomaly_dto.py b/test/test_response_container_paged_report_event_anomaly_dto.py
new file mode 100644
index 0000000..2ca1132
--- /dev/null
+++ b/test/test_response_container_paged_report_event_anomaly_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_report_event_anomaly_dto import ResponseContainerPagedReportEventAnomalyDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedReportEventAnomalyDTO(unittest.TestCase):
+    """ResponseContainerPagedReportEventAnomalyDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedReportEventAnomalyDTO(self):
+        """Test ResponseContainerPagedReportEventAnomalyDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_report_event_anomaly_dto.ResponseContainerPagedReportEventAnomalyDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 3b2bf79..429e08d 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -26,6 +26,7 @@
 from wavefront_api_client.api.direct_ingestion_api import DirectIngestionApi
 from wavefront_api_client.api.event_api import EventApi
 from wavefront_api_client.api.external_link_api import ExternalLinkApi
+from wavefront_api_client.api.ingestion_spy_api import IngestionSpyApi
 from wavefront_api_client.api.integration_api import IntegrationApi
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
@@ -132,6 +133,7 @@
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
+from wavefront_api_client.models.paged_report_event_anomaly_dto import PagedReportEventAnomalyDTO
 from wavefront_api_client.models.paged_role_dto import PagedRoleDTO
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
@@ -142,8 +144,10 @@
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
+from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
 from wavefront_api_client.models.related_event import RelatedEvent
+from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO
 from wavefront_api_client.models.response_container import ResponseContainer
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
@@ -189,6 +193,7 @@
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
+from wavefront_api_client.models.response_container_paged_report_event_anomaly_dto import ResponseContainerPagedReportEventAnomalyDTO
 from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 94888b9..1fe4c3a 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -13,6 +13,7 @@
 from wavefront_api_client.api.direct_ingestion_api import DirectIngestionApi
 from wavefront_api_client.api.event_api import EventApi
 from wavefront_api_client.api.external_link_api import ExternalLinkApi
+from wavefront_api_client.api.ingestion_spy_api import IngestionSpyApi
 from wavefront_api_client.api.integration_api import IntegrationApi
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
new file mode 100644
index 0000000..1f653e1
--- /dev/null
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -0,0 +1,445 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class IngestionSpyApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def spy_on_histograms(self, **kwargs):  # noqa: E501
+        """Gets new histograms that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API. Endpoint: https://.wavefront.com/api/spy/histograms  .   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-histograms-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_histograms(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str histogram: List a histogram only if its name starts with the specified case-sensitive prefix. E.g., histogram=orderShirt matches histograms named orderShirt and orderShirts, but not OrderShirts.
+        :param str host: List a histogram only if the name of its source starts with the specified case-sensitive prefix.
+        :param list[str] histogram_tag_key: List a histogram only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. histogramTagKey=cluster&histogramTagKey=shard  put cluster in the first line, put shard in the second line as values
+        :param float sampling:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_histograms_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_histograms_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_histograms_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets new histograms that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API. Endpoint: https://.wavefront.com/api/spy/histograms  .   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-histograms-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_histograms_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str histogram: List a histogram only if its name starts with the specified case-sensitive prefix. E.g., histogram=orderShirt matches histograms named orderShirt and orderShirts, but not OrderShirts.
+        :param str host: List a histogram only if the name of its source starts with the specified case-sensitive prefix.
+        :param list[str] histogram_tag_key: List a histogram only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. histogramTagKey=cluster&histogramTagKey=shard  put cluster in the first line, put shard in the second line as values
+        :param float sampling:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['histogram', 'host', 'histogram_tag_key', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_histograms" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'histogram' in params:
+            query_params.append(('histogram', params['histogram']))  # noqa: E501
+        if 'host' in params:
+            query_params.append(('host', params['host']))  # noqa: E501
+        if 'histogram_tag_key' in params:
+            query_params.append(('histogramTagKey', params['histogram_tag_key']))  # noqa: E501
+            collection_formats['histogramTagKey'] = 'multi'  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/histograms', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def spy_on_id_creations(self, **kwargs):  # noqa: E501
+        """Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ids.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-new-id-assignments-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_id_creations(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: Type of new items you want to see ID assignments for: METRIC - Metric names SPAN - Span names HOST - Source names STRING - Point tags or span tags, represented as a single string containing a unique key-value pair, e.g. env=prod, env=dev, etc.
+        :param str body: Case-sensitive prefix for the items that you are interested in.
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_id_creations_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_id_creations_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_id_creations_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ids.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-new-id-assignments-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_id_creations_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: Type of new items you want to see ID assignments for: METRIC - Metric names SPAN - Span names HOST - Source names STRING - Point tags or span tags, represented as a single string containing a unique key-value pair, e.g. env=prod, env=dev, etc.
+        :param str body: Case-sensitive prefix for the items that you are interested in.
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['type', 'body', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_id_creations" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'type' in params:
+            query_params.append(('type', params['type']))  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/ids', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def spy_on_points(self, **kwargs):  # noqa: E501
+        """Gets a sampling of new metric data points that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/points.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_points(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
+        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
+        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_points_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_points_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_points_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets a sampling of new metric data points that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/points.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_points_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
+        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
+        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['metric', 'host', 'point_tag_key', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_points" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'metric' in params:
+            query_params.append(('metric', params['metric']))  # noqa: E501
+        if 'host' in params:
+            query_params.append(('host', params['host']))  # noqa: E501
+        if 'point_tag_key' in params:
+            query_params.append(('pointTagKey', params['point_tag_key']))  # noqa: E501
+            collection_formats['pointTagKey'] = 'multi'  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/points', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def spy_on_spans(self, **kwargs):  # noqa: E501
+        """Gets new spans with existing source names and span tags.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.   Endpoint: https://<cluster>.wavefront.com/api/spy/spans   Details usage can be find at: https://docs.wavefron.com/wavefront_monitoring_spy.html#get-ingested-spans-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_spans(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str name: List a span only if its operation name starts with the specified case-sensitive prefix. E.g., name=orderShirt matches spans named orderShirt and orderShirts, but not OrderShirts.
+        :param str host: List a span only if the name of its source starts with the specified case-sensitive prefix.
+        :param list[str] span_tag_key: List a span only if it has the specified span tag key. Add this parameter multiple times to specify multiple span tags, e.g. spanTagKey=cluster&spanTagKey=shard
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_spans_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_spans_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_spans_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets new spans with existing source names and span tags.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.   Endpoint: https://<cluster>.wavefront.com/api/spy/spans   Details usage can be find at: https://docs.wavefron.com/wavefront_monitoring_spy.html#get-ingested-spans-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_spans_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str name: List a span only if its operation name starts with the specified case-sensitive prefix. E.g., name=orderShirt matches spans named orderShirt and orderShirts, but not OrderShirts.
+        :param str host: List a span only if the name of its source starts with the specified case-sensitive prefix.
+        :param list[str] span_tag_key: List a span only if it has the specified span tag key. Add this parameter multiple times to specify multiple span tags, e.g. spanTagKey=cluster&spanTagKey=shard
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['name', 'host', 'span_tag_key', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_spans" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'name' in params:
+            query_params.append(('name', params['name']))  # noqa: E501
+        if 'host' in params:
+            query_params.append(('host', params['host']))  # noqa: E501
+        if 'span_tag_key' in params:
+            query_params.append(('spanTagKey', params['span_tag_key']))  # noqa: E501
+            collection_formats['spanTagKey'] = 'multi'  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/spans', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 8d5f7e7..6a8d26e 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -4428,6 +4428,109 @@ def search_registered_query_for_facets_with_http_info(self, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_related_report_event_anomaly_entities(self, event_id, **kwargs):  # noqa: E501
+        """List the related events and anomalies over a firing event  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_related_report_event_anomaly_entities(event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str event_id: (required)
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedReportEventAnomalyDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_related_report_event_anomaly_entities_with_http_info(event_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_related_report_event_anomaly_entities_with_http_info(event_id, **kwargs)  # noqa: E501
+            return data
+
+    def search_related_report_event_anomaly_entities_with_http_info(self, event_id, **kwargs):  # noqa: E501
+        """List the related events and anomalies over a firing event  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_related_report_event_anomaly_entities_with_http_info(event_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str event_id: (required)
+        :param EventSearchRequest body:
+        :return: ResponseContainerPagedReportEventAnomalyDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['event_id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_related_report_event_anomaly_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'event_id' is set
+        if ('event_id' not in params or
+                params['event_id'] is None):
+            raise ValueError("Missing the required parameter `event_id` when calling `search_related_report_event_anomaly_entities`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'event_id' in params:
+            path_params['eventId'] = params['event_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/event/related/{eventId}/withAnomalies', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedReportEventAnomalyDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_related_report_event_entities(self, event_id, **kwargs):  # noqa: E501
         """List the related events over a firing event  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4b54da1..b11e49c 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.57.18/python'
+        self.user_agent = 'Swagger-Codegen/2.58.13/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 0459ea7..8540a73 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.57.18".\
+               "SDK Package Version: 2.58.13".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 34c9d75..fe42dfb 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -101,6 +101,7 @@
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
+from wavefront_api_client.models.paged_report_event_anomaly_dto import PagedReportEventAnomalyDTO
 from wavefront_api_client.models.paged_role_dto import PagedRoleDTO
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
@@ -111,8 +112,10 @@
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
+from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
 from wavefront_api_client.models.related_event import RelatedEvent
+from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO
 from wavefront_api_client.models.response_container import ResponseContainer
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
@@ -158,6 +161,7 @@
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
+from wavefront_api_client.models.response_container_paged_report_event_anomaly_dto import ResponseContainerPagedReportEventAnomalyDTO
 from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 223d4ff..3f90992 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -32,6 +32,7 @@ class ChartSettings(object):
     """
     swagger_types = {
         'auto_column_tags': 'bool',
+        'chart_default_color': 'str',
         'column_tags': 'str',
         'custom_tags': 'list[str]',
         'expected_data_spacing': 'int',
@@ -92,6 +93,7 @@ class ChartSettings(object):
 
     attribute_map = {
         'auto_column_tags': 'autoColumnTags',
+        'chart_default_color': 'chartDefaultColor',
         'column_tags': 'columnTags',
         'custom_tags': 'customTags',
         'expected_data_spacing': 'expectedDataSpacing',
@@ -150,10 +152,11 @@ class ChartSettings(object):
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, column_tags=None, custom_tags=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
         self._auto_column_tags = None
+        self._chart_default_color = None
         self._column_tags = None
         self._custom_tags = None
         self._expected_data_spacing = None
@@ -214,6 +217,8 @@ def __init__(self, auto_column_tags=None, column_tags=None, custom_tags=None, ex
 
         if auto_column_tags is not None:
             self.auto_column_tags = auto_column_tags
+        if chart_default_color is not None:
+            self.chart_default_color = chart_default_color
         if column_tags is not None:
             self.column_tags = column_tags
         if custom_tags is not None:
@@ -349,6 +354,29 @@ def auto_column_tags(self, auto_column_tags):
 
         self._auto_column_tags = auto_column_tags
 
+    @property
+    def chart_default_color(self):
+        """Gets the chart_default_color of this ChartSettings.  # noqa: E501
+
+        Default color that will be used in any chart rendering. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
+
+        :return: The chart_default_color of this ChartSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._chart_default_color
+
+    @chart_default_color.setter
+    def chart_default_color(self, chart_default_color):
+        """Sets the chart_default_color of this ChartSettings.
+
+        Default color that will be used in any chart rendering. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
+
+        :param chart_default_color: The chart_default_color of this ChartSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._chart_default_color = chart_default_color
+
     @property
     def column_tags(self):
         """Gets the column_tags of this ChartSettings.  # noqa: E501
@@ -906,7 +934,7 @@ def sparkline_decimal_precision(self, sparkline_decimal_precision):
     def sparkline_display_color(self):
         """Gets the sparkline_display_color of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :return: The sparkline_display_color of this ChartSettings.  # noqa: E501
         :rtype: str
@@ -917,7 +945,7 @@ def sparkline_display_color(self):
     def sparkline_display_color(self, sparkline_display_color):
         """Sets the sparkline_display_color of this ChartSettings.
 
-        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :param sparkline_display_color: The sparkline_display_color of this ChartSettings.  # noqa: E501
         :type: str
@@ -1079,7 +1107,7 @@ def sparkline_display_vertical_position(self, sparkline_display_vertical_positio
     def sparkline_fill_color(self):
         """Gets the sparkline_fill_color of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, the color of the background fill. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :return: The sparkline_fill_color of this ChartSettings.  # noqa: E501
         :rtype: str
@@ -1090,7 +1118,7 @@ def sparkline_fill_color(self):
     def sparkline_fill_color(self, sparkline_fill_color):
         """Sets the sparkline_fill_color of this ChartSettings.
 
-        For the single stat view, the color of the background fill. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, the color of the background fill. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :param sparkline_fill_color: The sparkline_fill_color of this ChartSettings.  # noqa: E501
         :type: str
@@ -1102,7 +1130,7 @@ def sparkline_fill_color(self, sparkline_fill_color):
     def sparkline_line_color(self):
         """Gets the sparkline_line_color of this ChartSettings.  # noqa: E501
 
-        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, the color of the line. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :return: The sparkline_line_color of this ChartSettings.  # noqa: E501
         :rtype: str
@@ -1113,7 +1141,7 @@ def sparkline_line_color(self):
     def sparkline_line_color(self, sparkline_line_color):
         """Sets the sparkline_line_color of this ChartSettings.
 
-        For the single stat view, the color of the line. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, the color of the line. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :param sparkline_line_color: The sparkline_line_color of this ChartSettings.  # noqa: E501
         :type: str
@@ -1183,7 +1211,7 @@ def sparkline_value_color_map_apply_to(self, sparkline_value_color_map_apply_to)
     def sparkline_value_color_map_colors(self):
         """Gets the sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
 
-        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :return: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
         :rtype: list[str]
@@ -1194,7 +1222,7 @@ def sparkline_value_color_map_colors(self):
     def sparkline_value_color_map_colors(self, sparkline_value_color_map_colors):
         """Sets the sparkline_value_color_map_colors of this ChartSettings.
 
-        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in\"rgba(<rval>, <gval>, <bval>, <aval>\" format  # noqa: E501
+        For the single stat view, a list of colors that differing query values map to.  Must contain one more element than sparklineValueColorMapValuesV2. Values should be in \"rgba(&lt;rval&gt;, &lt;gval&gt;, &lt;bval&gt;, &lt;aval&gt;)\" format  # noqa: E501
 
         :param sparkline_value_color_map_colors: The sparkline_value_color_map_colors of this ChartSettings.  # noqa: E501
         :type: list[str]
@@ -1397,7 +1425,7 @@ def type(self, type):
         """
         if type is None:
             raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
-        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list", "histogram"]  # noqa: E501
+        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list", "histogram", "heatmap", "gauge"]  # noqa: E501
         if type not in allowed_values:
             raise ValueError(
                 "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index ec1e8e5..61de122 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -43,6 +43,7 @@ class DashboardParameterValue(object):
         'query_value': 'str',
         'reverse_dyn_sort': 'bool',
         'tag_key': 'str',
+        'tags_black_list_regex': 'str',
         'value_ordering': 'list[str]',
         'values_to_readable_strings': 'dict(str, str)'
     }
@@ -60,11 +61,12 @@ class DashboardParameterValue(object):
         'query_value': 'queryValue',
         'reverse_dyn_sort': 'reverseDynSort',
         'tag_key': 'tagKey',
+        'tags_black_list_regex': 'tagsBlackListRegex',
         'value_ordering': 'valueOrdering',
         'values_to_readable_strings': 'valuesToReadableStrings'
     }
 
-    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, order=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, value_ordering=None, values_to_readable_strings=None):  # noqa: E501
+    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, order=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, tags_black_list_regex=None, value_ordering=None, values_to_readable_strings=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
 
         self._allow_all = None
@@ -79,6 +81,7 @@ def __init__(self, allow_all=None, default_value=None, description=None, dynamic
         self._query_value = None
         self._reverse_dyn_sort = None
         self._tag_key = None
+        self._tags_black_list_regex = None
         self._value_ordering = None
         self._values_to_readable_strings = None
         self.discriminator = None
@@ -107,6 +110,8 @@ def __init__(self, allow_all=None, default_value=None, description=None, dynamic
             self.reverse_dyn_sort = reverse_dyn_sort
         if tag_key is not None:
             self.tag_key = tag_key
+        if tags_black_list_regex is not None:
+            self.tags_black_list_regex = tags_black_list_regex
         if value_ordering is not None:
             self.value_ordering = value_ordering
         if values_to_readable_strings is not None:
@@ -378,6 +383,29 @@ def tag_key(self, tag_key):
 
         self._tag_key = tag_key
 
+    @property
+    def tags_black_list_regex(self):
+        """Gets the tags_black_list_regex of this DashboardParameterValue.  # noqa: E501
+
+        The regular expression to filter out source tags from the Current Values list.  # noqa: E501
+
+        :return: The tags_black_list_regex of this DashboardParameterValue.  # noqa: E501
+        :rtype: str
+        """
+        return self._tags_black_list_regex
+
+    @tags_black_list_regex.setter
+    def tags_black_list_regex(self, tags_black_list_regex):
+        """Sets the tags_black_list_regex of this DashboardParameterValue.
+
+        The regular expression to filter out source tags from the Current Values list.  # noqa: E501
+
+        :param tags_black_list_regex: The tags_black_list_regex of this DashboardParameterValue.  # noqa: E501
+        :type: str
+        """
+
+        self._tags_black_list_regex = tags_black_list_regex
+
     @property
     def value_ordering(self):
         """Gets the value_ordering of this DashboardParameterValue.  # noqa: E501
diff --git a/wavefront_api_client/models/paged_report_event_anomaly_dto.py b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
new file mode 100644
index 0000000..045da42
--- /dev/null
+++ b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedReportEventAnomalyDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[ReportEventAnomalyDTO]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedReportEventAnomalyDTO.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: list[ReportEventAnomalyDTO]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedReportEventAnomalyDTO.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: list[ReportEventAnomalyDTO]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The limit of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedReportEventAnomalyDTO.
+
+
+        :param limit: The limit of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedReportEventAnomalyDTO.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The offset of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedReportEventAnomalyDTO.
+
+
+        :param offset: The offset of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The sort of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedReportEventAnomalyDTO.
+
+
+        :param sort: The sort of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedReportEventAnomalyDTO.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedReportEventAnomalyDTO.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedReportEventAnomalyDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedReportEventAnomalyDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedReportEventAnomalyDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/related_anomaly.py b/wavefront_api_client/models/related_anomaly.py
new file mode 100644
index 0000000..4958453
--- /dev/null
+++ b/wavefront_api_client/models/related_anomaly.py
@@ -0,0 +1,790 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class RelatedAnomaly(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'chart_hash': 'str',
+        'chart_link': 'str',
+        'col': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'customer': 'str',
+        'dashboard_id': 'str',
+        'deleted': 'bool',
+        'end_ms': 'int',
+        'hosts_used': 'list[str]',
+        'id': 'str',
+        'image_link': 'str',
+        'metrics_used': 'list[str]',
+        'model': 'str',
+        'original_stripes': 'list[Stripe]',
+        'param_hash': 'str',
+        'query_hash': 'str',
+        '_query_params': 'dict(str, str)',
+        'related_data': 'RelatedData',
+        'row': 'int',
+        'section': 'int',
+        'start_ms': 'int',
+        'updated_epoch_millis': 'int',
+        'updated_ms': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'chart_hash': 'chartHash',
+        'chart_link': 'chartLink',
+        'col': 'col',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'customer': 'customer',
+        'dashboard_id': 'dashboardId',
+        'deleted': 'deleted',
+        'end_ms': 'endMs',
+        'hosts_used': 'hostsUsed',
+        'id': 'id',
+        'image_link': 'imageLink',
+        'metrics_used': 'metricsUsed',
+        'model': 'model',
+        'original_stripes': 'originalStripes',
+        'param_hash': 'paramHash',
+        'query_hash': 'queryHash',
+        '_query_params': 'queryParams',
+        'related_data': 'relatedData',
+        'row': 'row',
+        'section': 'section',
+        'start_ms': 'startMs',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updated_ms': 'updatedMs',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, chart_hash=None, chart_link=None, col=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_id=None, deleted=None, end_ms=None, hosts_used=None, id=None, image_link=None, metrics_used=None, model=None, original_stripes=None, param_hash=None, query_hash=None, _query_params=None, related_data=None, row=None, section=None, start_ms=None, updated_epoch_millis=None, updated_ms=None, updater_id=None):  # noqa: E501
+        """RelatedAnomaly - a model defined in Swagger"""  # noqa: E501
+
+        self._chart_hash = None
+        self._chart_link = None
+        self._col = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._customer = None
+        self._dashboard_id = None
+        self._deleted = None
+        self._end_ms = None
+        self._hosts_used = None
+        self._id = None
+        self._image_link = None
+        self._metrics_used = None
+        self._model = None
+        self._original_stripes = None
+        self._param_hash = None
+        self._query_hash = None
+        self.__query_params = None
+        self._related_data = None
+        self._row = None
+        self._section = None
+        self._start_ms = None
+        self._updated_epoch_millis = None
+        self._updated_ms = None
+        self._updater_id = None
+        self.discriminator = None
+
+        self.chart_hash = chart_hash
+        if chart_link is not None:
+            self.chart_link = chart_link
+        self.col = col
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if customer is not None:
+            self.customer = customer
+        self.dashboard_id = dashboard_id
+        if deleted is not None:
+            self.deleted = deleted
+        self.end_ms = end_ms
+        if hosts_used is not None:
+            self.hosts_used = hosts_used
+        if id is not None:
+            self.id = id
+        if image_link is not None:
+            self.image_link = image_link
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        if model is not None:
+            self.model = model
+        if original_stripes is not None:
+            self.original_stripes = original_stripes
+        self.param_hash = param_hash
+        self.query_hash = query_hash
+        self._query_params = _query_params
+        if related_data is not None:
+            self.related_data = related_data
+        self.row = row
+        self.section = section
+        self.start_ms = start_ms
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        self.updated_ms = updated_ms
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def chart_hash(self):
+        """Gets the chart_hash of this RelatedAnomaly.  # noqa: E501
+
+        chart hash(as unique identifier) for this anomaly  # noqa: E501
+
+        :return: The chart_hash of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._chart_hash
+
+    @chart_hash.setter
+    def chart_hash(self, chart_hash):
+        """Sets the chart_hash of this RelatedAnomaly.
+
+        chart hash(as unique identifier) for this anomaly  # noqa: E501
+
+        :param chart_hash: The chart_hash of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+        if chart_hash is None:
+            raise ValueError("Invalid value for `chart_hash`, must not be `None`")  # noqa: E501
+
+        self._chart_hash = chart_hash
+
+    @property
+    def chart_link(self):
+        """Gets the chart_link of this RelatedAnomaly.  # noqa: E501
+
+        chart link for this anomaly  # noqa: E501
+
+        :return: The chart_link of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._chart_link
+
+    @chart_link.setter
+    def chart_link(self, chart_link):
+        """Sets the chart_link of this RelatedAnomaly.
+
+        chart link for this anomaly  # noqa: E501
+
+        :param chart_link: The chart_link of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._chart_link = chart_link
+
+    @property
+    def col(self):
+        """Gets the col of this RelatedAnomaly.  # noqa: E501
+
+        column number for this anomaly  # noqa: E501
+
+        :return: The col of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._col
+
+    @col.setter
+    def col(self, col):
+        """Sets the col of this RelatedAnomaly.
+
+        column number for this anomaly  # noqa: E501
+
+        :param col: The col of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+        if col is None:
+            raise ValueError("Invalid value for `col`, must not be `None`")  # noqa: E501
+
+        self._col = col
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this RelatedAnomaly.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this RelatedAnomaly.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this RelatedAnomaly.  # noqa: E501
+
+
+        :return: The creator_id of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this RelatedAnomaly.
+
+
+        :param creator_id: The creator_id of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this RelatedAnomaly.  # noqa: E501
+
+        id of the customer to which this anomaly belongs  # noqa: E501
+
+        :return: The customer of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this RelatedAnomaly.
+
+        id of the customer to which this anomaly belongs  # noqa: E501
+
+        :param customer: The customer of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def dashboard_id(self):
+        """Gets the dashboard_id of this RelatedAnomaly.  # noqa: E501
+
+        dashboard id for this anomaly  # noqa: E501
+
+        :return: The dashboard_id of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._dashboard_id
+
+    @dashboard_id.setter
+    def dashboard_id(self, dashboard_id):
+        """Sets the dashboard_id of this RelatedAnomaly.
+
+        dashboard id for this anomaly  # noqa: E501
+
+        :param dashboard_id: The dashboard_id of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+        if dashboard_id is None:
+            raise ValueError("Invalid value for `dashboard_id`, must not be `None`")  # noqa: E501
+
+        self._dashboard_id = dashboard_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this RelatedAnomaly.  # noqa: E501
+
+
+        :return: The deleted of this RelatedAnomaly.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this RelatedAnomaly.
+
+
+        :param deleted: The deleted of this RelatedAnomaly.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def end_ms(self):
+        """Gets the end_ms of this RelatedAnomaly.  # noqa: E501
+
+        endMs for this anomaly  # noqa: E501
+
+        :return: The end_ms of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._end_ms
+
+    @end_ms.setter
+    def end_ms(self, end_ms):
+        """Sets the end_ms of this RelatedAnomaly.
+
+        endMs for this anomaly  # noqa: E501
+
+        :param end_ms: The end_ms of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+        if end_ms is None:
+            raise ValueError("Invalid value for `end_ms`, must not be `None`")  # noqa: E501
+
+        self._end_ms = end_ms
+
+    @property
+    def hosts_used(self):
+        """Gets the hosts_used of this RelatedAnomaly.  # noqa: E501
+
+        list of hosts affected of this anomaly  # noqa: E501
+
+        :return: The hosts_used of this RelatedAnomaly.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._hosts_used
+
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this RelatedAnomaly.
+
+        list of hosts affected of this anomaly  # noqa: E501
+
+        :param hosts_used: The hosts_used of this RelatedAnomaly.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._hosts_used = hosts_used
+
+    @property
+    def id(self):
+        """Gets the id of this RelatedAnomaly.  # noqa: E501
+
+        unique id that defines this anomaly  # noqa: E501
+
+        :return: The id of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this RelatedAnomaly.
+
+        unique id that defines this anomaly  # noqa: E501
+
+        :param id: The id of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def image_link(self):
+        """Gets the image_link of this RelatedAnomaly.  # noqa: E501
+
+        image link for this anomaly  # noqa: E501
+
+        :return: The image_link of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._image_link
+
+    @image_link.setter
+    def image_link(self, image_link):
+        """Sets the image_link of this RelatedAnomaly.
+
+        image link for this anomaly  # noqa: E501
+
+        :param image_link: The image_link of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._image_link = image_link
+
+    @property
+    def metrics_used(self):
+        """Gets the metrics_used of this RelatedAnomaly.  # noqa: E501
+
+        list of metrics used of this anomaly  # noqa: E501
+
+        :return: The metrics_used of this RelatedAnomaly.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._metrics_used
+
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this RelatedAnomaly.
+
+        list of metrics used of this anomaly  # noqa: E501
+
+        :param metrics_used: The metrics_used of this RelatedAnomaly.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._metrics_used = metrics_used
+
+    @property
+    def model(self):
+        """Gets the model of this RelatedAnomaly.  # noqa: E501
+
+        model for this anomaly  # noqa: E501
+
+        :return: The model of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._model
+
+    @model.setter
+    def model(self, model):
+        """Sets the model of this RelatedAnomaly.
+
+        model for this anomaly  # noqa: E501
+
+        :param model: The model of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._model = model
+
+    @property
+    def original_stripes(self):
+        """Gets the original_stripes of this RelatedAnomaly.  # noqa: E501
+
+        list of originalStripe belongs to this anomaly  # noqa: E501
+
+        :return: The original_stripes of this RelatedAnomaly.  # noqa: E501
+        :rtype: list[Stripe]
+        """
+        return self._original_stripes
+
+    @original_stripes.setter
+    def original_stripes(self, original_stripes):
+        """Sets the original_stripes of this RelatedAnomaly.
+
+        list of originalStripe belongs to this anomaly  # noqa: E501
+
+        :param original_stripes: The original_stripes of this RelatedAnomaly.  # noqa: E501
+        :type: list[Stripe]
+        """
+
+        self._original_stripes = original_stripes
+
+    @property
+    def param_hash(self):
+        """Gets the param_hash of this RelatedAnomaly.  # noqa: E501
+
+        param hash for this anomaly  # noqa: E501
+
+        :return: The param_hash of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._param_hash
+
+    @param_hash.setter
+    def param_hash(self, param_hash):
+        """Sets the param_hash of this RelatedAnomaly.
+
+        param hash for this anomaly  # noqa: E501
+
+        :param param_hash: The param_hash of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+        if param_hash is None:
+            raise ValueError("Invalid value for `param_hash`, must not be `None`")  # noqa: E501
+
+        self._param_hash = param_hash
+
+    @property
+    def query_hash(self):
+        """Gets the query_hash of this RelatedAnomaly.  # noqa: E501
+
+        query hash for this anomaly  # noqa: E501
+
+        :return: The query_hash of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._query_hash
+
+    @query_hash.setter
+    def query_hash(self, query_hash):
+        """Sets the query_hash of this RelatedAnomaly.
+
+        query hash for this anomaly  # noqa: E501
+
+        :param query_hash: The query_hash of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+        if query_hash is None:
+            raise ValueError("Invalid value for `query_hash`, must not be `None`")  # noqa: E501
+
+        self._query_hash = query_hash
+
+    @property
+    def _query_params(self):
+        """Gets the _query_params of this RelatedAnomaly.  # noqa: E501
+
+        map of query params belongs to this anomaly  # noqa: E501
+
+        :return: The _query_params of this RelatedAnomaly.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self.__query_params
+
+    @_query_params.setter
+    def _query_params(self, _query_params):
+        """Sets the _query_params of this RelatedAnomaly.
+
+        map of query params belongs to this anomaly  # noqa: E501
+
+        :param _query_params: The _query_params of this RelatedAnomaly.  # noqa: E501
+        :type: dict(str, str)
+        """
+        if _query_params is None:
+            raise ValueError("Invalid value for `_query_params`, must not be `None`")  # noqa: E501
+
+        self.__query_params = _query_params
+
+    @property
+    def related_data(self):
+        """Gets the related_data of this RelatedAnomaly.  # noqa: E501
+
+        Data concerning how this anomaly is related to the event in the request  # noqa: E501
+
+        :return: The related_data of this RelatedAnomaly.  # noqa: E501
+        :rtype: RelatedData
+        """
+        return self._related_data
+
+    @related_data.setter
+    def related_data(self, related_data):
+        """Sets the related_data of this RelatedAnomaly.
+
+        Data concerning how this anomaly is related to the event in the request  # noqa: E501
+
+        :param related_data: The related_data of this RelatedAnomaly.  # noqa: E501
+        :type: RelatedData
+        """
+
+        self._related_data = related_data
+
+    @property
+    def row(self):
+        """Gets the row of this RelatedAnomaly.  # noqa: E501
+
+        row number for this anomaly  # noqa: E501
+
+        :return: The row of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._row
+
+    @row.setter
+    def row(self, row):
+        """Sets the row of this RelatedAnomaly.
+
+        row number for this anomaly  # noqa: E501
+
+        :param row: The row of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+        if row is None:
+            raise ValueError("Invalid value for `row`, must not be `None`")  # noqa: E501
+
+        self._row = row
+
+    @property
+    def section(self):
+        """Gets the section of this RelatedAnomaly.  # noqa: E501
+
+        section number for this anomaly  # noqa: E501
+
+        :return: The section of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._section
+
+    @section.setter
+    def section(self, section):
+        """Sets the section of this RelatedAnomaly.
+
+        section number for this anomaly  # noqa: E501
+
+        :param section: The section of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+        if section is None:
+            raise ValueError("Invalid value for `section`, must not be `None`")  # noqa: E501
+
+        self._section = section
+
+    @property
+    def start_ms(self):
+        """Gets the start_ms of this RelatedAnomaly.  # noqa: E501
+
+        startMs for this anomaly  # noqa: E501
+
+        :return: The start_ms of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_ms
+
+    @start_ms.setter
+    def start_ms(self, start_ms):
+        """Sets the start_ms of this RelatedAnomaly.
+
+        startMs for this anomaly  # noqa: E501
+
+        :param start_ms: The start_ms of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+        if start_ms is None:
+            raise ValueError("Invalid value for `start_ms`, must not be `None`")  # noqa: E501
+
+        self._start_ms = start_ms
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this RelatedAnomaly.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this RelatedAnomaly.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updated_ms(self):
+        """Gets the updated_ms of this RelatedAnomaly.  # noqa: E501
+
+        updateMs for this anomaly  # noqa: E501
+
+        :return: The updated_ms of this RelatedAnomaly.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_ms
+
+    @updated_ms.setter
+    def updated_ms(self, updated_ms):
+        """Sets the updated_ms of this RelatedAnomaly.
+
+        updateMs for this anomaly  # noqa: E501
+
+        :param updated_ms: The updated_ms of this RelatedAnomaly.  # noqa: E501
+        :type: int
+        """
+        if updated_ms is None:
+            raise ValueError("Invalid value for `updated_ms`, must not be `None`")  # noqa: E501
+
+        self._updated_ms = updated_ms
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this RelatedAnomaly.  # noqa: E501
+
+
+        :return: The updater_id of this RelatedAnomaly.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this RelatedAnomaly.
+
+
+        :param updater_id: The updater_id of this RelatedAnomaly.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RelatedAnomaly, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RelatedAnomaly):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/related_data.py b/wavefront_api_client/models/related_data.py
index 358a6bb..e581ce2 100644
--- a/wavefront_api_client/models/related_data.py
+++ b/wavefront_api_client/models/related_data.py
@@ -32,41 +32,51 @@ class RelatedData(object):
     """
     swagger_types = {
         'alert_description': 'str',
+        'anomaly_chart_link': 'str',
         'common_dimensions': 'list[str]',
         'common_metrics': 'list[str]',
         'common_sources': 'list[str]',
+        'enhanced_score': 'float',
         'related_id': 'str',
         'summary': 'str'
     }
 
     attribute_map = {
         'alert_description': 'alertDescription',
+        'anomaly_chart_link': 'anomalyChartLink',
         'common_dimensions': 'commonDimensions',
         'common_metrics': 'commonMetrics',
         'common_sources': 'commonSources',
+        'enhanced_score': 'enhancedScore',
         'related_id': 'relatedId',
         'summary': 'summary'
     }
 
-    def __init__(self, alert_description=None, common_dimensions=None, common_metrics=None, common_sources=None, related_id=None, summary=None):  # noqa: E501
+    def __init__(self, alert_description=None, anomaly_chart_link=None, common_dimensions=None, common_metrics=None, common_sources=None, enhanced_score=None, related_id=None, summary=None):  # noqa: E501
         """RelatedData - a model defined in Swagger"""  # noqa: E501
 
         self._alert_description = None
+        self._anomaly_chart_link = None
         self._common_dimensions = None
         self._common_metrics = None
         self._common_sources = None
+        self._enhanced_score = None
         self._related_id = None
         self._summary = None
         self.discriminator = None
 
         if alert_description is not None:
             self.alert_description = alert_description
+        if anomaly_chart_link is not None:
+            self.anomaly_chart_link = anomaly_chart_link
         if common_dimensions is not None:
             self.common_dimensions = common_dimensions
         if common_metrics is not None:
             self.common_metrics = common_metrics
         if common_sources is not None:
             self.common_sources = common_sources
+        if enhanced_score is not None:
+            self.enhanced_score = enhanced_score
         if related_id is not None:
             self.related_id = related_id
         if summary is not None:
@@ -95,6 +105,29 @@ def alert_description(self, alert_description):
 
         self._alert_description = alert_description
 
+    @property
+    def anomaly_chart_link(self):
+        """Gets the anomaly_chart_link of this RelatedData.  # noqa: E501
+
+        Chart Link of the anomaly to which this event is related  # noqa: E501
+
+        :return: The anomaly_chart_link of this RelatedData.  # noqa: E501
+        :rtype: str
+        """
+        return self._anomaly_chart_link
+
+    @anomaly_chart_link.setter
+    def anomaly_chart_link(self, anomaly_chart_link):
+        """Sets the anomaly_chart_link of this RelatedData.
+
+        Chart Link of the anomaly to which this event is related  # noqa: E501
+
+        :param anomaly_chart_link: The anomaly_chart_link of this RelatedData.  # noqa: E501
+        :type: str
+        """
+
+        self._anomaly_chart_link = anomaly_chart_link
+
     @property
     def common_dimensions(self):
         """Gets the common_dimensions of this RelatedData.  # noqa: E501
@@ -122,7 +155,7 @@ def common_dimensions(self, common_dimensions):
     def common_metrics(self):
         """Gets the common_metrics of this RelatedData.  # noqa: E501
 
-        Set of common metrics/labels between the 2 events  # noqa: E501
+        Set of common metrics/labels between the 2 events or anomalies  # noqa: E501
 
         :return: The common_metrics of this RelatedData.  # noqa: E501
         :rtype: list[str]
@@ -133,7 +166,7 @@ def common_metrics(self):
     def common_metrics(self, common_metrics):
         """Sets the common_metrics of this RelatedData.
 
-        Set of common metrics/labels between the 2 events  # noqa: E501
+        Set of common metrics/labels between the 2 events or anomalies  # noqa: E501
 
         :param common_metrics: The common_metrics of this RelatedData.  # noqa: E501
         :type: list[str]
@@ -145,7 +178,7 @@ def common_metrics(self, common_metrics):
     def common_sources(self):
         """Gets the common_sources of this RelatedData.  # noqa: E501
 
-        Set of common sources between the 2 events  # noqa: E501
+        Set of common sources between the 2 events or anomalies  # noqa: E501
 
         :return: The common_sources of this RelatedData.  # noqa: E501
         :rtype: list[str]
@@ -156,7 +189,7 @@ def common_sources(self):
     def common_sources(self, common_sources):
         """Sets the common_sources of this RelatedData.
 
-        Set of common sources between the 2 events  # noqa: E501
+        Set of common sources between the 2 events or anomalies  # noqa: E501
 
         :param common_sources: The common_sources of this RelatedData.  # noqa: E501
         :type: list[str]
@@ -164,6 +197,29 @@ def common_sources(self, common_sources):
 
         self._common_sources = common_sources
 
+    @property
+    def enhanced_score(self):
+        """Gets the enhanced_score of this RelatedData.  # noqa: E501
+
+        Enhanced score to sort related events and anomalies  # noqa: E501
+
+        :return: The enhanced_score of this RelatedData.  # noqa: E501
+        :rtype: float
+        """
+        return self._enhanced_score
+
+    @enhanced_score.setter
+    def enhanced_score(self, enhanced_score):
+        """Sets the enhanced_score of this RelatedData.
+
+        Enhanced score to sort related events and anomalies  # noqa: E501
+
+        :param enhanced_score: The enhanced_score of this RelatedData.  # noqa: E501
+        :type: float
+        """
+
+        self._enhanced_score = enhanced_score
+
     @property
     def related_id(self):
         """Gets the related_id of this RelatedData.  # noqa: E501
@@ -191,7 +247,7 @@ def related_id(self, related_id):
     def summary(self):
         """Gets the summary of this RelatedData.  # noqa: E501
 
-        Text summary of why the two events are relateds  # noqa: E501
+        Text summary of why the two events are related  # noqa: E501
 
         :return: The summary of this RelatedData.  # noqa: E501
         :rtype: str
@@ -202,7 +258,7 @@ def summary(self):
     def summary(self, summary):
         """Sets the summary of this RelatedData.
 
-        Text summary of why the two events are relateds  # noqa: E501
+        Text summary of why the two events are related  # noqa: E501
 
         :param summary: The summary of this RelatedData.  # noqa: E501
         :type: str
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index 7d475a8..409845d 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -49,6 +49,7 @@ class RelatedEvent(object):
         'name': 'str',
         'related_data': 'RelatedData',
         'running_state': 'str',
+        'similarity_score': 'float',
         'start_time': 'int',
         'summarized_events': 'int',
         'table': 'str',
@@ -77,6 +78,7 @@ class RelatedEvent(object):
         'name': 'name',
         'related_data': 'relatedData',
         'running_state': 'runningState',
+        'similarity_score': 'similarityScore',
         'start_time': 'startTime',
         'summarized_events': 'summarizedEvents',
         'table': 'table',
@@ -86,7 +88,7 @@ class RelatedEvent(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, similarity_score=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """RelatedEvent - a model defined in Swagger"""  # noqa: E501
 
         self._alert_tags = None
@@ -107,6 +109,7 @@ def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete
         self._name = None
         self._related_data = None
         self._running_state = None
+        self._similarity_score = None
         self._start_time = None
         self._summarized_events = None
         self._table = None
@@ -150,6 +153,8 @@ def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete
             self.related_data = related_data
         if running_state is not None:
             self.running_state = running_state
+        if similarity_score is not None:
+            self.similarity_score = similarity_score
         self.start_time = start_time
         if summarized_events is not None:
             self.summarized_events = summarized_events
@@ -579,6 +584,29 @@ def running_state(self, running_state):
 
         self._running_state = running_state
 
+    @property
+    def similarity_score(self):
+        """Gets the similarity_score of this RelatedEvent.  # noqa: E501
+
+        similarity score  # noqa: E501
+
+        :return: The similarity_score of this RelatedEvent.  # noqa: E501
+        :rtype: float
+        """
+        return self._similarity_score
+
+    @similarity_score.setter
+    def similarity_score(self, similarity_score):
+        """Sets the similarity_score of this RelatedEvent.
+
+        similarity score  # noqa: E501
+
+        :param similarity_score: The similarity_score of this RelatedEvent.  # noqa: E501
+        :type: float
+        """
+
+        self._similarity_score = similarity_score
+
     @property
     def start_time(self):
         """Gets the start_time of this RelatedEvent.  # noqa: E501
diff --git a/wavefront_api_client/models/report_event_anomaly_dto.py b/wavefront_api_client/models/report_event_anomaly_dto.py
new file mode 100644
index 0000000..42633e8
--- /dev/null
+++ b/wavefront_api_client/models/report_event_anomaly_dto.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ReportEventAnomalyDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'related_anomaly_dto': 'RelatedAnomaly',
+        'related_event_dto': 'RelatedEvent',
+        'similarity_score': 'float'
+    }
+
+    attribute_map = {
+        'related_anomaly_dto': 'relatedAnomalyDTO',
+        'related_event_dto': 'relatedEventDTO',
+        'similarity_score': 'similarityScore'
+    }
+
+    def __init__(self, related_anomaly_dto=None, related_event_dto=None, similarity_score=None):  # noqa: E501
+        """ReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._related_anomaly_dto = None
+        self._related_event_dto = None
+        self._similarity_score = None
+        self.discriminator = None
+
+        if related_anomaly_dto is not None:
+            self.related_anomaly_dto = related_anomaly_dto
+        if related_event_dto is not None:
+            self.related_event_dto = related_event_dto
+        if similarity_score is not None:
+            self.similarity_score = similarity_score
+
+    @property
+    def related_anomaly_dto(self):
+        """Gets the related_anomaly_dto of this ReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The related_anomaly_dto of this ReportEventAnomalyDTO.  # noqa: E501
+        :rtype: RelatedAnomaly
+        """
+        return self._related_anomaly_dto
+
+    @related_anomaly_dto.setter
+    def related_anomaly_dto(self, related_anomaly_dto):
+        """Sets the related_anomaly_dto of this ReportEventAnomalyDTO.
+
+
+        :param related_anomaly_dto: The related_anomaly_dto of this ReportEventAnomalyDTO.  # noqa: E501
+        :type: RelatedAnomaly
+        """
+
+        self._related_anomaly_dto = related_anomaly_dto
+
+    @property
+    def related_event_dto(self):
+        """Gets the related_event_dto of this ReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The related_event_dto of this ReportEventAnomalyDTO.  # noqa: E501
+        :rtype: RelatedEvent
+        """
+        return self._related_event_dto
+
+    @related_event_dto.setter
+    def related_event_dto(self, related_event_dto):
+        """Sets the related_event_dto of this ReportEventAnomalyDTO.
+
+
+        :param related_event_dto: The related_event_dto of this ReportEventAnomalyDTO.  # noqa: E501
+        :type: RelatedEvent
+        """
+
+        self._related_event_dto = related_event_dto
+
+    @property
+    def similarity_score(self):
+        """Gets the similarity_score of this ReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The similarity_score of this ReportEventAnomalyDTO.  # noqa: E501
+        :rtype: float
+        """
+        return self._similarity_score
+
+    @similarity_score.setter
+    def similarity_score(self, similarity_score):
+        """Sets the similarity_score of this ReportEventAnomalyDTO.
+
+
+        :param similarity_score: The similarity_score of this ReportEventAnomalyDTO.  # noqa: E501
+        :type: float
+        """
+
+        self._similarity_score = similarity_score
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ReportEventAnomalyDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ReportEventAnomalyDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
new file mode 100644
index 0000000..57712d7
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedReportEventAnomalyDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedReportEventAnomalyDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: PagedReportEventAnomalyDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedReportEventAnomalyDTO.
+
+
+        :param response: The response of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+        :type: PagedReportEventAnomalyDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedReportEventAnomalyDTO.
+
+
+        :param status: The status of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedReportEventAnomalyDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedReportEventAnomalyDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From f315df39a5a8b32e5143aac9e9481d7feb896fc0 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Mon, 18 May 2020 10:54:14 -0700
Subject: [PATCH 055/161] Autogenerated Update v2.58.20.

---
 .swagger-codegen/VERSION              | 2 +-
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 generate_client                       | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 wavefront_api_client/rest.py          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index b385137..3eb2ae3 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.12
\ No newline at end of file
+2.4.14
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index fc5ccf9..25462ab 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.58.13"
+    "packageVersion": "2.58.20"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 598118f..fc5ccf9 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.57.18"
+    "packageVersion": "2.58.13"
 }
diff --git a/README.md b/README.md
index 62c2e87..0b81d9a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.58.13
+- Package version: 2.58.20
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 0ce1e9e..2555a5e 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.12"  # For 3.x use CGEN_VER="3.0.16"
+CGEN_VER="2.4.14"  # For 3.x use CGEN_VER="3.0.16"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 1e4dc58..01c050a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.58.13"
+VERSION = "2.58.20"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b11e49c..08f6dda 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.58.13/python'
+        self.user_agent = 'Swagger-Codegen/2.58.20/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 8540a73..7bf21be 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.58.13".\
+               "SDK Package Version: 2.58.20".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/rest.py b/wavefront_api_client/rest.py
index 6091697..919963d 100644
--- a/wavefront_api_client/rest.py
+++ b/wavefront_api_client/rest.py
@@ -156,7 +156,7 @@ def request(self, method, url, query_params=None, headers=None,
                 if query_params:
                     url += '?' + urlencode(query_params)
                 if re.search('json', headers['Content-Type'], re.IGNORECASE):
-                    request_body = None
+                    request_body = '{}'
                     if body is not None:
                         request_body = json.dumps(body)
                     r = self.pool_manager.request(

From d9cbd1ad8843c33cdd9b863fe9fbc1772ecdc9a9 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 18 Jun 2020 08:16:22 -0700
Subject: [PATCH 056/161] Autogenerated Update v2.60.15.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   5 +-
 docs/Chart.md                                 |   5 +
 docs/ChartSettings.md                         |   2 +-
 docs/CloudWatchConfiguration.md               |   4 +-
 docs/ExternalLink.md                          |   1 +
 docs/GCPConfiguration.md                      |   2 +
 docs/Proxy.md                                 |   6 +
 docs/QueryResult.md                           |   2 +
 docs/SourceLabelPair.md                       |   1 +
 docs/Tuple.md                                 |  10 ++
 docs/TupleResult.md                           |  11 ++
 docs/TupleValueResult.md                      |  11 ++
 setup.py                                      |   2 +-
 test/test_tuple.py                            |  40 +++++
 test/test_tuple_result.py                     |  40 +++++
 test/test_tuple_value_result.py               |  40 +++++
 wavefront_api_client/__init__.py              |   3 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   3 +
 wavefront_api_client/models/chart.py          | 160 ++++++++++++++++-
 wavefront_api_client/models/chart_settings.py |   4 +-
 .../models/cloud_watch_configuration.py       |   8 +-
 wavefront_api_client/models/external_link.py  |  30 +++-
 .../models/gcp_configuration.py               |  58 +++++-
 wavefront_api_client/models/proxy.py          | 170 +++++++++++++++++-
 wavefront_api_client/models/query_result.py   |  58 +++++-
 .../models/source_label_pair.py               |  30 +++-
 wavefront_api_client/models/tuple.py          | 115 ++++++++++++
 wavefront_api_client/models/tuple_result.py   | 145 +++++++++++++++
 .../models/tuple_value_result.py              | 145 +++++++++++++++
 33 files changed, 1098 insertions(+), 21 deletions(-)
 create mode 100644 docs/Tuple.md
 create mode 100644 docs/TupleResult.md
 create mode 100644 docs/TupleValueResult.md
 create mode 100644 test/test_tuple.py
 create mode 100644 test/test_tuple_result.py
 create mode 100644 test/test_tuple_value_result.py
 create mode 100644 wavefront_api_client/models/tuple.py
 create mode 100644 wavefront_api_client/models/tuple_result.py
 create mode 100644 wavefront_api_client/models/tuple_value_result.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 25462ab..45960ed 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.58.20"
+    "packageVersion": "2.60.15"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index fc5ccf9..25462ab 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.58.13"
+    "packageVersion": "2.58.20"
 }
diff --git a/README.md b/README.md
index 0b81d9a..1096221 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.58.20
+- Package version: 2.60.15
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -552,6 +552,9 @@ Class | Method | HTTP request | Description
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
+ - [Tuple](docs/Tuple.md)
+ - [TupleResult](docs/TupleResult.md)
+ - [TupleValueResult](docs/TupleValueResult.md)
  - [UserApiToken](docs/UserApiToken.md)
  - [UserDTO](docs/UserDTO.md)
  - [UserGroup](docs/UserGroup.md)
diff --git a/docs/Chart.md b/docs/Chart.md
index 4503846..5acdf21 100644
--- a/docs/Chart.md
+++ b/docs/Chart.md
@@ -3,10 +3,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**anomaly_sample_size** | **str** | The amount of historical data to use for anomaly detection baselining | [optional] 
+**anomaly_severity** | **str** | Anomaly Severity. Default medium | [optional] 
+**anomaly_type** | **str** | Anomaly Type. Default both | [optional] 
 **base** | **int** | If the chart has a log-scale Y-axis, the base for the logarithms | [optional] 
 **chart_attributes** | [**JsonNode**](JsonNode.md) | Experimental field for chart attributes | [optional] 
 **chart_settings** | [**ChartSettings**](ChartSettings.md) |  | [optional] 
 **description** | **str** | Description of the chart | [optional] 
+**display_confidence_bounds** | **bool** | Whether to show confidence bounds. Default false | [optional] 
+**filter_out_non_anomalies** | **bool** | Whether to filter out non anomalies. Default false | [optional] 
 **include_obsolete_metrics** | **bool** | Whether to show obsolete metrics.  Default: false | [optional] 
 **interpolate_points** | **bool** | Whether to interpolate points in the charts produced. Default: true | [optional] 
 **name** | **str** | Name of the source | 
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index aba08d0..3ebedbd 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -46,7 +46,7 @@ Name | Type | Description | Notes
 **sparkline_value_text_map_thresholds** | **list[float]** | For the single stat view, a list of threshold boundaries for mapping different query values to display text. Must contain one less element than sparklineValueTextMapText | [optional] 
 **stack_type** | **str** | Type of stacked chart (applicable only if chart type is stacked).  zero (default) means stacked from y&#x3D;0.  expand means Normalized from 0 to 1.  wiggle means Minimize weighted changes. silhouette means to Center the Stream | [optional] 
 **tag_mode** | **str** | For the tabular view, which mode to use to determine which point tags to display | [optional] 
-**time_based_coloring** | **bool** | Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false | [optional] 
+**time_based_coloring** | **bool** | For x-y scatterplots, whether to color more recent points as darker than older points. Default: false | [optional] 
 **type** | **str** | Chart Type.  &#39;line&#39; refers to the Line Plot, &#39;scatter&#39; to the Point Plot, &#39;stacked-area&#39; to the Stacked Area plot, &#39;table&#39; to the Tabular View, &#39;scatterploy-xy&#39; to Scatter Plot, &#39;markdown-widget&#39; to the Markdown display, and &#39;sparkline&#39; to the Single Stat view | 
 **window_size** | **int** | Width, in minutes, of the time window to use for \&quot;last\&quot; windowing | [optional] 
 **windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index 21dbbd0..d824f31 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -4,11 +4,11 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
-**instance_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**instance_selection_tags** | **dict(str, str)** | A string-&gt;string map of white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
 **namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
-**volume_selection_tags** | **dict(str, str)** | A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**volume_selection_tags** | **dict(str, str)** | A string-&gt;string map of white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ExternalLink.md b/docs/ExternalLink.md
index 8b3da46..4bab49d 100644
--- a/docs/ExternalLink.md
+++ b/docs/ExternalLink.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **creator_id** | **str** |  | [optional] 
 **description** | **str** | Human-readable description for this external link | 
 **id** | **str** |  | [optional] 
+**is_log_integration** | **bool** | Whether this is a \&quot;Log Integration\&quot; subType of external link | [optional] 
 **metric_filter_regex** | **str** | Controls whether a link displayed in the context menu of a highlighted series.  If present, the metric name of the highlighted series must match this regular expression in order for the link to be displayed | [optional] 
 **name** | **str** | Name of the external link.  Will be displayed in context (right-click) menus on charts | 
 **point_tag_filter_regexes** | **dict(str, str)** | Controls whether a link displayed in the context menu of a highlighted series.  This is a map from string to regular expression. The highlighted series must contain point tags whose keys are present in the keys of this map and whose values match the regular expressions associated with those keys in order for the link to be displayed | [optional] 
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index 47adce0..3b87bb7 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN | [optional] 
 **custom_metric_prefix** | **list[str]** | List of custom metric prefix to fetch the data from | [optional] 
+**disable_delta_counts** | **bool** | Whether to disable the ingestion of counts for GCP delta metrics. Ingestion is enabled by default. | [optional] 
+**disable_histogram_to_metric_conversion** | **bool** | Whether to disable the ingestion of bucket data for GCP distributions. Ingestion is enabled by default. | [optional] 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index ba5484f..8f90726 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -10,6 +10,8 @@ Name | Type | Description | Notes
 **customer_id** | **str** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 **ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
+**events_rate_limit** | **float** | Proxy&#39;s rate limit for events | [optional] 
+**histogram_rate_limit** | **int** | Proxy&#39;s rate limit for histograms | [optional] 
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
@@ -20,7 +22,11 @@ Name | Type | Description | Notes
 **last_known_error** | **str** | deprecated | [optional] 
 **local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
 **name** | **str** | Proxy name (modifiable) | 
+**preprocessor_rules** | **str** | Proxy&#39;s preprocessor rules | [optional] 
 **shutdown** | **bool** | When true, attempt to shut down this proxy remotely | [optional] 
+**source_tags_rate_limit** | **float** | Proxy&#39;s rate limit for source tag operations | [optional] 
+**span_logs_rate_limit** | **int** | Proxy&#39;s rate limit for span logs | [optional] 
+**span_rate_limit** | **int** | Proxy&#39;s rate limit for spans | [optional] 
 **ssh_agent** | **bool** | deprecated | [optional] 
 **status** | **str** | the proxy&#39;s status | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
diff --git a/docs/QueryResult.md b/docs/QueryResult.md
index d823387..f1393d0 100644
--- a/docs/QueryResult.md
+++ b/docs/QueryResult.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**dimensions** | [**list[TupleResult]**](TupleResult.md) | List of all dimension tuple results | [optional] 
 **error_message** | **str** | Error message, if query execution did not finish successfully | [optional] 
 **error_type** | **str** | Error type, if query execution did not finish successfully | [optional] 
 **events** | [**list[QueryEvent]**](QueryEvent.md) |  | [optional] 
@@ -12,6 +13,7 @@ Name | Type | Description | Notes
 **spans** | [**list[Span]**](Span.md) |  | [optional] 
 **stats** | [**StatsModelInternalUse**](StatsModelInternalUse.md) |  | [optional] 
 **timeseries** | [**list[Timeseries]**](Timeseries.md) |  | [optional] 
+**trace_dimensions** | [**list[TupleResult]**](TupleResult.md) | List of all tracing tuple results | [optional] 
 **traces** | [**list[Trace]**](Trace.md) |  | [optional] 
 **warnings** | **str** | The warnings incurred by this query | [optional] 
 
diff --git a/docs/SourceLabelPair.md b/docs/SourceLabelPair.md
index 61a1bfa..14c7e8e 100644
--- a/docs/SourceLabelPair.md
+++ b/docs/SourceLabelPair.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **label** | **str** |  | [optional] 
 **observed** | **int** |  | [optional] 
 **severity** | **str** |  | [optional] 
+**start_time** | **int** | Start time of this failing HLP, in epoch millis. | [optional] 
 **tags** | **dict(str, str)** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Tuple.md b/docs/Tuple.md
new file mode 100644
index 0000000..ea986c7
--- /dev/null
+++ b/docs/Tuple.md
@@ -0,0 +1,10 @@
+# Tuple
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**elements** | **list[str]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/TupleResult.md b/docs/TupleResult.md
new file mode 100644
index 0000000..e47165b
--- /dev/null
+++ b/docs/TupleResult.md
@@ -0,0 +1,11 @@
+# TupleResult
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**key** | [**Tuple**](Tuple.md) | The keys used to surface the dimensions. | [optional] 
+**value_list** | [**list[TupleValueResult]**](TupleValueResult.md) | All the possible value combination satisfying the provided keys and their respective counts from the query keys. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/TupleValueResult.md b/docs/TupleValueResult.md
new file mode 100644
index 0000000..f7db227
--- /dev/null
+++ b/docs/TupleValueResult.md
@@ -0,0 +1,11 @@
+# TupleValueResult
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**count** | **int** | The count of the values appearing in the query keys. | [optional] 
+**value** | [**Tuple**](Tuple.md) | The possible values for a given key tuple. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 01c050a..c7aad5e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.58.20"
+VERSION = "2.60.15"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_tuple.py b/test/test_tuple.py
new file mode 100644
index 0000000..8d8708c
--- /dev/null
+++ b/test/test_tuple.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.tuple import Tuple  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTuple(unittest.TestCase):
+    """Tuple unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTuple(self):
+        """Test Tuple"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.tuple.Tuple()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_tuple_result.py b/test/test_tuple_result.py
new file mode 100644
index 0000000..4411a6d
--- /dev/null
+++ b/test/test_tuple_result.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.tuple_result import TupleResult  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTupleResult(unittest.TestCase):
+    """TupleResult unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTupleResult(self):
+        """Test TupleResult"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.tuple_result.TupleResult()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_tuple_value_result.py b/test/test_tuple_value_result.py
new file mode 100644
index 0000000..c81617a
--- /dev/null
+++ b/test/test_tuple_value_result.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.tuple_value_result import TupleValueResult  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTupleValueResult(unittest.TestCase):
+    """TupleValueResult unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTupleValueResult(self):
+        """Test TupleValueResult"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.tuple_value_result.TupleValueResult()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 429e08d..acd0482 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -230,6 +230,9 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
+from wavefront_api_client.models.tuple import Tuple
+from wavefront_api_client.models.tuple_result import TupleResult
+from wavefront_api_client.models.tuple_value_result import TupleValueResult
 from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 08f6dda..04bf014 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.58.20/python'
+        self.user_agent = 'Swagger-Codegen/2.60.15/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 7bf21be..50b13b4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.58.20".\
+               "SDK Package Version: 2.60.15".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index fe42dfb..8d8d794 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -198,6 +198,9 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
+from wavefront_api_client.models.tuple import Tuple
+from wavefront_api_client.models.tuple_result import TupleResult
+from wavefront_api_client.models.tuple_value_result import TupleValueResult
 from wavefront_api_client.models.user_api_token import UserApiToken
 from wavefront_api_client.models.user_dto import UserDTO
 from wavefront_api_client.models.user_group import UserGroup
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 97536cb..4b64777 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -31,10 +31,15 @@ class Chart(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'anomaly_sample_size': 'str',
+        'anomaly_severity': 'str',
+        'anomaly_type': 'str',
         'base': 'int',
         'chart_attributes': 'JsonNode',
         'chart_settings': 'ChartSettings',
         'description': 'str',
+        'display_confidence_bounds': 'bool',
+        'filter_out_non_anomalies': 'bool',
         'include_obsolete_metrics': 'bool',
         'interpolate_points': 'bool',
         'name': 'str',
@@ -45,10 +50,15 @@ class Chart(object):
     }
 
     attribute_map = {
+        'anomaly_sample_size': 'anomalySampleSize',
+        'anomaly_severity': 'anomalySeverity',
+        'anomaly_type': 'anomalyType',
         'base': 'base',
         'chart_attributes': 'chartAttributes',
         'chart_settings': 'chartSettings',
         'description': 'description',
+        'display_confidence_bounds': 'displayConfidenceBounds',
+        'filter_out_non_anomalies': 'filterOutNonAnomalies',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
         'interpolate_points': 'interpolatePoints',
         'name': 'name',
@@ -58,13 +68,18 @@ class Chart(object):
         'units': 'units'
     }
 
-    def __init__(self, base=None, chart_attributes=None, chart_settings=None, description=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None):  # noqa: E501
+    def __init__(self, anomaly_sample_size=None, anomaly_severity=None, anomaly_type=None, base=None, chart_attributes=None, chart_settings=None, description=None, display_confidence_bounds=None, filter_out_non_anomalies=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
 
+        self._anomaly_sample_size = None
+        self._anomaly_severity = None
+        self._anomaly_type = None
         self._base = None
         self._chart_attributes = None
         self._chart_settings = None
         self._description = None
+        self._display_confidence_bounds = None
+        self._filter_out_non_anomalies = None
         self._include_obsolete_metrics = None
         self._interpolate_points = None
         self._name = None
@@ -74,6 +89,12 @@ def __init__(self, base=None, chart_attributes=None, chart_settings=None, descri
         self._units = None
         self.discriminator = None
 
+        if anomaly_sample_size is not None:
+            self.anomaly_sample_size = anomaly_sample_size
+        if anomaly_severity is not None:
+            self.anomaly_severity = anomaly_severity
+        if anomaly_type is not None:
+            self.anomaly_type = anomaly_type
         if base is not None:
             self.base = base
         if chart_attributes is not None:
@@ -82,6 +103,10 @@ def __init__(self, base=None, chart_attributes=None, chart_settings=None, descri
             self.chart_settings = chart_settings
         if description is not None:
             self.description = description
+        if display_confidence_bounds is not None:
+            self.display_confidence_bounds = display_confidence_bounds
+        if filter_out_non_anomalies is not None:
+            self.filter_out_non_anomalies = filter_out_non_anomalies
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
         if interpolate_points is not None:
@@ -95,6 +120,93 @@ def __init__(self, base=None, chart_attributes=None, chart_settings=None, descri
         if units is not None:
             self.units = units
 
+    @property
+    def anomaly_sample_size(self):
+        """Gets the anomaly_sample_size of this Chart.  # noqa: E501
+
+        The amount of historical data to use for anomaly detection baselining  # noqa: E501
+
+        :return: The anomaly_sample_size of this Chart.  # noqa: E501
+        :rtype: str
+        """
+        return self._anomaly_sample_size
+
+    @anomaly_sample_size.setter
+    def anomaly_sample_size(self, anomaly_sample_size):
+        """Sets the anomaly_sample_size of this Chart.
+
+        The amount of historical data to use for anomaly detection baselining  # noqa: E501
+
+        :param anomaly_sample_size: The anomaly_sample_size of this Chart.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["2 8 35"]  # noqa: E501
+        if anomaly_sample_size not in allowed_values:
+            raise ValueError(
+                "Invalid value for `anomaly_sample_size` ({0}), must be one of {1}"  # noqa: E501
+                .format(anomaly_sample_size, allowed_values)
+            )
+
+        self._anomaly_sample_size = anomaly_sample_size
+
+    @property
+    def anomaly_severity(self):
+        """Gets the anomaly_severity of this Chart.  # noqa: E501
+
+        Anomaly Severity. Default medium  # noqa: E501
+
+        :return: The anomaly_severity of this Chart.  # noqa: E501
+        :rtype: str
+        """
+        return self._anomaly_severity
+
+    @anomaly_severity.setter
+    def anomaly_severity(self, anomaly_severity):
+        """Sets the anomaly_severity of this Chart.
+
+        Anomaly Severity. Default medium  # noqa: E501
+
+        :param anomaly_severity: The anomaly_severity of this Chart.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["low medium high"]  # noqa: E501
+        if anomaly_severity not in allowed_values:
+            raise ValueError(
+                "Invalid value for `anomaly_severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(anomaly_severity, allowed_values)
+            )
+
+        self._anomaly_severity = anomaly_severity
+
+    @property
+    def anomaly_type(self):
+        """Gets the anomaly_type of this Chart.  # noqa: E501
+
+        Anomaly Type. Default both  # noqa: E501
+
+        :return: The anomaly_type of this Chart.  # noqa: E501
+        :rtype: str
+        """
+        return self._anomaly_type
+
+    @anomaly_type.setter
+    def anomaly_type(self, anomaly_type):
+        """Sets the anomaly_type of this Chart.
+
+        Anomaly Type. Default both  # noqa: E501
+
+        :param anomaly_type: The anomaly_type of this Chart.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["both low high"]  # noqa: E501
+        if anomaly_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `anomaly_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(anomaly_type, allowed_values)
+            )
+
+        self._anomaly_type = anomaly_type
+
     @property
     def base(self):
         """Gets the base of this Chart.  # noqa: E501
@@ -185,6 +297,52 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def display_confidence_bounds(self):
+        """Gets the display_confidence_bounds of this Chart.  # noqa: E501
+
+        Whether to show confidence bounds. Default false  # noqa: E501
+
+        :return: The display_confidence_bounds of this Chart.  # noqa: E501
+        :rtype: bool
+        """
+        return self._display_confidence_bounds
+
+    @display_confidence_bounds.setter
+    def display_confidence_bounds(self, display_confidence_bounds):
+        """Sets the display_confidence_bounds of this Chart.
+
+        Whether to show confidence bounds. Default false  # noqa: E501
+
+        :param display_confidence_bounds: The display_confidence_bounds of this Chart.  # noqa: E501
+        :type: bool
+        """
+
+        self._display_confidence_bounds = display_confidence_bounds
+
+    @property
+    def filter_out_non_anomalies(self):
+        """Gets the filter_out_non_anomalies of this Chart.  # noqa: E501
+
+        Whether to filter out non anomalies. Default false  # noqa: E501
+
+        :return: The filter_out_non_anomalies of this Chart.  # noqa: E501
+        :rtype: bool
+        """
+        return self._filter_out_non_anomalies
+
+    @filter_out_non_anomalies.setter
+    def filter_out_non_anomalies(self, filter_out_non_anomalies):
+        """Sets the filter_out_non_anomalies of this Chart.
+
+        Whether to filter out non anomalies. Default false  # noqa: E501
+
+        :param filter_out_non_anomalies: The filter_out_non_anomalies of this Chart.  # noqa: E501
+        :type: bool
+        """
+
+        self._filter_out_non_anomalies = filter_out_non_anomalies
+
     @property
     def include_obsolete_metrics(self):
         """Gets the include_obsolete_metrics of this Chart.  # noqa: E501
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 3f90992..a6d6423 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1384,7 +1384,7 @@ def tag_mode(self, tag_mode):
     def time_based_coloring(self):
         """Gets the time_based_coloring of this ChartSettings.  # noqa: E501
 
-        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
+        For x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
 
         :return: The time_based_coloring of this ChartSettings.  # noqa: E501
         :rtype: bool
@@ -1395,7 +1395,7 @@ def time_based_coloring(self):
     def time_based_coloring(self, time_based_coloring):
         """Sets the time_based_coloring of this ChartSettings.
 
-        Fox x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
+        For x-y scatterplots, whether to color more recent points as darker than older points. Default: false  # noqa: E501
 
         :param time_based_coloring: The time_based_coloring of this ChartSettings.  # noqa: E501
         :type: bool
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index f236c51..bf80769 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -97,7 +97,7 @@ def base_credentials(self, base_credentials):
     def instance_selection_tags(self):
         """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
 
-        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :return: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :rtype: dict(str, str)
@@ -108,7 +108,7 @@ def instance_selection_tags(self):
     def instance_selection_tags(self, instance_selection_tags):
         """Sets the instance_selection_tags of this CloudWatchConfiguration.
 
-        A comma-separated white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :param instance_selection_tags: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :type: dict(str, str)
@@ -189,7 +189,7 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
     def volume_selection_tags(self):
         """Gets the volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
 
-        A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :return: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :rtype: dict(str, str)
@@ -200,7 +200,7 @@ def volume_selection_tags(self):
     def volume_selection_tags(self, volume_selection_tags):
         """Sets the volume_selection_tags of this CloudWatchConfiguration.
 
-        A comma-separated white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :param volume_selection_tags: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :type: dict(str, str)
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index b40ae76..fa79b5c 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -35,6 +35,7 @@ class ExternalLink(object):
         'creator_id': 'str',
         'description': 'str',
         'id': 'str',
+        'is_log_integration': 'bool',
         'metric_filter_regex': 'str',
         'name': 'str',
         'point_tag_filter_regexes': 'dict(str, str)',
@@ -49,6 +50,7 @@ class ExternalLink(object):
         'creator_id': 'creatorId',
         'description': 'description',
         'id': 'id',
+        'is_log_integration': 'isLogIntegration',
         'metric_filter_regex': 'metricFilterRegex',
         'name': 'name',
         'point_tag_filter_regexes': 'pointTagFilterRegexes',
@@ -58,13 +60,14 @@ class ExternalLink(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, id=None, metric_filter_regex=None, name=None, point_tag_filter_regexes=None, source_filter_regex=None, template=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, id=None, is_log_integration=None, metric_filter_regex=None, name=None, point_tag_filter_regexes=None, source_filter_regex=None, template=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """ExternalLink - a model defined in Swagger"""  # noqa: E501
 
         self._created_epoch_millis = None
         self._creator_id = None
         self._description = None
         self._id = None
+        self._is_log_integration = None
         self._metric_filter_regex = None
         self._name = None
         self._point_tag_filter_regexes = None
@@ -81,6 +84,8 @@ def __init__(self, created_epoch_millis=None, creator_id=None, description=None,
         self.description = description
         if id is not None:
             self.id = id
+        if is_log_integration is not None:
+            self.is_log_integration = is_log_integration
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
         self.name = name
@@ -182,6 +187,29 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def is_log_integration(self):
+        """Gets the is_log_integration of this ExternalLink.  # noqa: E501
+
+        Whether this is a \"Log Integration\" subType of external link  # noqa: E501
+
+        :return: The is_log_integration of this ExternalLink.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_log_integration
+
+    @is_log_integration.setter
+    def is_log_integration(self, is_log_integration):
+        """Sets the is_log_integration of this ExternalLink.
+
+        Whether this is a \"Log Integration\" subType of external link  # noqa: E501
+
+        :param is_log_integration: The is_log_integration of this ExternalLink.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_log_integration = is_log_integration
+
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this ExternalLink.  # noqa: E501
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 2e10c76..836413f 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -33,6 +33,8 @@ class GCPConfiguration(object):
     swagger_types = {
         'categories_to_fetch': 'list[str]',
         'custom_metric_prefix': 'list[str]',
+        'disable_delta_counts': 'bool',
+        'disable_histogram_to_metric_conversion': 'bool',
         'gcp_json_key': 'str',
         'metric_filter_regex': 'str',
         'project_id': 'str'
@@ -41,16 +43,20 @@ class GCPConfiguration(object):
     attribute_map = {
         'categories_to_fetch': 'categoriesToFetch',
         'custom_metric_prefix': 'customMetricPrefix',
+        'disable_delta_counts': 'disableDeltaCounts',
+        'disable_histogram_to_metric_conversion': 'disableHistogramToMetricConversion',
         'gcp_json_key': 'gcpJsonKey',
         'metric_filter_regex': 'metricFilterRegex',
         'project_id': 'projectId'
     }
 
-    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, gcp_json_key=None, metric_filter_regex=None, project_id=None):  # noqa: E501
+    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_delta_counts=None, disable_histogram_to_metric_conversion=None, gcp_json_key=None, metric_filter_regex=None, project_id=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._categories_to_fetch = None
         self._custom_metric_prefix = None
+        self._disable_delta_counts = None
+        self._disable_histogram_to_metric_conversion = None
         self._gcp_json_key = None
         self._metric_filter_regex = None
         self._project_id = None
@@ -60,6 +66,10 @@ def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, gcp_json
             self.categories_to_fetch = categories_to_fetch
         if custom_metric_prefix is not None:
             self.custom_metric_prefix = custom_metric_prefix
+        if disable_delta_counts is not None:
+            self.disable_delta_counts = disable_delta_counts
+        if disable_histogram_to_metric_conversion is not None:
+            self.disable_histogram_to_metric_conversion = disable_histogram_to_metric_conversion
         self.gcp_json_key = gcp_json_key
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
@@ -118,6 +128,52 @@ def custom_metric_prefix(self, custom_metric_prefix):
 
         self._custom_metric_prefix = custom_metric_prefix
 
+    @property
+    def disable_delta_counts(self):
+        """Gets the disable_delta_counts of this GCPConfiguration.  # noqa: E501
+
+        Whether to disable the ingestion of counts for GCP delta metrics. Ingestion is enabled by default.  # noqa: E501
+
+        :return: The disable_delta_counts of this GCPConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._disable_delta_counts
+
+    @disable_delta_counts.setter
+    def disable_delta_counts(self, disable_delta_counts):
+        """Sets the disable_delta_counts of this GCPConfiguration.
+
+        Whether to disable the ingestion of counts for GCP delta metrics. Ingestion is enabled by default.  # noqa: E501
+
+        :param disable_delta_counts: The disable_delta_counts of this GCPConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._disable_delta_counts = disable_delta_counts
+
+    @property
+    def disable_histogram_to_metric_conversion(self):
+        """Gets the disable_histogram_to_metric_conversion of this GCPConfiguration.  # noqa: E501
+
+        Whether to disable the ingestion of bucket data for GCP distributions. Ingestion is enabled by default.  # noqa: E501
+
+        :return: The disable_histogram_to_metric_conversion of this GCPConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._disable_histogram_to_metric_conversion
+
+    @disable_histogram_to_metric_conversion.setter
+    def disable_histogram_to_metric_conversion(self, disable_histogram_to_metric_conversion):
+        """Sets the disable_histogram_to_metric_conversion of this GCPConfiguration.
+
+        Whether to disable the ingestion of bucket data for GCP distributions. Ingestion is enabled by default.  # noqa: E501
+
+        :param disable_histogram_to_metric_conversion: The disable_histogram_to_metric_conversion of this GCPConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._disable_histogram_to_metric_conversion = disable_histogram_to_metric_conversion
+
     @property
     def gcp_json_key(self):
         """Gets the gcp_json_key of this GCPConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 9a994da..826f7eb 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -38,6 +38,8 @@ class Proxy(object):
         'customer_id': 'str',
         'deleted': 'bool',
         'ephemeral': 'bool',
+        'events_rate_limit': 'float',
+        'histogram_rate_limit': 'int',
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
@@ -48,7 +50,11 @@ class Proxy(object):
         'last_known_error': 'str',
         'local_queue_size': 'int',
         'name': 'str',
+        'preprocessor_rules': 'str',
         'shutdown': 'bool',
+        'source_tags_rate_limit': 'float',
+        'span_logs_rate_limit': 'int',
+        'span_rate_limit': 'int',
         'ssh_agent': 'bool',
         'status': 'str',
         'status_cause': 'str',
@@ -65,6 +71,8 @@ class Proxy(object):
         'customer_id': 'customerId',
         'deleted': 'deleted',
         'ephemeral': 'ephemeral',
+        'events_rate_limit': 'eventsRateLimit',
+        'histogram_rate_limit': 'histogramRateLimit',
         'hostname': 'hostname',
         'id': 'id',
         'in_trash': 'inTrash',
@@ -75,7 +83,11 @@ class Proxy(object):
         'last_known_error': 'lastKnownError',
         'local_queue_size': 'localQueueSize',
         'name': 'name',
+        'preprocessor_rules': 'preprocessorRules',
         'shutdown': 'shutdown',
+        'source_tags_rate_limit': 'sourceTagsRateLimit',
+        'span_logs_rate_limit': 'spanLogsRateLimit',
+        'span_rate_limit': 'spanRateLimit',
         'ssh_agent': 'sshAgent',
         'status': 'status',
         'status_cause': 'statusCause',
@@ -84,7 +96,7 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, shutdown=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
 
         self._bytes_left_for_buffer = None
@@ -94,6 +106,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._customer_id = None
         self._deleted = None
         self._ephemeral = None
+        self._events_rate_limit = None
+        self._histogram_rate_limit = None
         self._hostname = None
         self._id = None
         self._in_trash = None
@@ -104,7 +118,11 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._last_known_error = None
         self._local_queue_size = None
         self._name = None
+        self._preprocessor_rules = None
         self._shutdown = None
+        self._source_tags_rate_limit = None
+        self._span_logs_rate_limit = None
+        self._span_rate_limit = None
         self._ssh_agent = None
         self._status = None
         self._status_cause = None
@@ -127,6 +145,10 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.deleted = deleted
         if ephemeral is not None:
             self.ephemeral = ephemeral
+        if events_rate_limit is not None:
+            self.events_rate_limit = events_rate_limit
+        if histogram_rate_limit is not None:
+            self.histogram_rate_limit = histogram_rate_limit
         if hostname is not None:
             self.hostname = hostname
         if id is not None:
@@ -146,8 +168,16 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         if local_queue_size is not None:
             self.local_queue_size = local_queue_size
         self.name = name
+        if preprocessor_rules is not None:
+            self.preprocessor_rules = preprocessor_rules
         if shutdown is not None:
             self.shutdown = shutdown
+        if source_tags_rate_limit is not None:
+            self.source_tags_rate_limit = source_tags_rate_limit
+        if span_logs_rate_limit is not None:
+            self.span_logs_rate_limit = span_logs_rate_limit
+        if span_rate_limit is not None:
+            self.span_rate_limit = span_rate_limit
         if ssh_agent is not None:
             self.ssh_agent = ssh_agent
         if status is not None:
@@ -318,6 +348,52 @@ def ephemeral(self, ephemeral):
 
         self._ephemeral = ephemeral
 
+    @property
+    def events_rate_limit(self):
+        """Gets the events_rate_limit of this Proxy.  # noqa: E501
+
+        Proxy's rate limit for events  # noqa: E501
+
+        :return: The events_rate_limit of this Proxy.  # noqa: E501
+        :rtype: float
+        """
+        return self._events_rate_limit
+
+    @events_rate_limit.setter
+    def events_rate_limit(self, events_rate_limit):
+        """Sets the events_rate_limit of this Proxy.
+
+        Proxy's rate limit for events  # noqa: E501
+
+        :param events_rate_limit: The events_rate_limit of this Proxy.  # noqa: E501
+        :type: float
+        """
+
+        self._events_rate_limit = events_rate_limit
+
+    @property
+    def histogram_rate_limit(self):
+        """Gets the histogram_rate_limit of this Proxy.  # noqa: E501
+
+        Proxy's rate limit for histograms  # noqa: E501
+
+        :return: The histogram_rate_limit of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._histogram_rate_limit
+
+    @histogram_rate_limit.setter
+    def histogram_rate_limit(self, histogram_rate_limit):
+        """Sets the histogram_rate_limit of this Proxy.
+
+        Proxy's rate limit for histograms  # noqa: E501
+
+        :param histogram_rate_limit: The histogram_rate_limit of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._histogram_rate_limit = histogram_rate_limit
+
     @property
     def hostname(self):
         """Gets the hostname of this Proxy.  # noqa: E501
@@ -544,6 +620,29 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def preprocessor_rules(self):
+        """Gets the preprocessor_rules of this Proxy.  # noqa: E501
+
+        Proxy's preprocessor rules  # noqa: E501
+
+        :return: The preprocessor_rules of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._preprocessor_rules
+
+    @preprocessor_rules.setter
+    def preprocessor_rules(self, preprocessor_rules):
+        """Sets the preprocessor_rules of this Proxy.
+
+        Proxy's preprocessor rules  # noqa: E501
+
+        :param preprocessor_rules: The preprocessor_rules of this Proxy.  # noqa: E501
+        :type: str
+        """
+
+        self._preprocessor_rules = preprocessor_rules
+
     @property
     def shutdown(self):
         """Gets the shutdown of this Proxy.  # noqa: E501
@@ -567,6 +666,75 @@ def shutdown(self, shutdown):
 
         self._shutdown = shutdown
 
+    @property
+    def source_tags_rate_limit(self):
+        """Gets the source_tags_rate_limit of this Proxy.  # noqa: E501
+
+        Proxy's rate limit for source tag operations  # noqa: E501
+
+        :return: The source_tags_rate_limit of this Proxy.  # noqa: E501
+        :rtype: float
+        """
+        return self._source_tags_rate_limit
+
+    @source_tags_rate_limit.setter
+    def source_tags_rate_limit(self, source_tags_rate_limit):
+        """Sets the source_tags_rate_limit of this Proxy.
+
+        Proxy's rate limit for source tag operations  # noqa: E501
+
+        :param source_tags_rate_limit: The source_tags_rate_limit of this Proxy.  # noqa: E501
+        :type: float
+        """
+
+        self._source_tags_rate_limit = source_tags_rate_limit
+
+    @property
+    def span_logs_rate_limit(self):
+        """Gets the span_logs_rate_limit of this Proxy.  # noqa: E501
+
+        Proxy's rate limit for span logs  # noqa: E501
+
+        :return: The span_logs_rate_limit of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._span_logs_rate_limit
+
+    @span_logs_rate_limit.setter
+    def span_logs_rate_limit(self, span_logs_rate_limit):
+        """Sets the span_logs_rate_limit of this Proxy.
+
+        Proxy's rate limit for span logs  # noqa: E501
+
+        :param span_logs_rate_limit: The span_logs_rate_limit of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._span_logs_rate_limit = span_logs_rate_limit
+
+    @property
+    def span_rate_limit(self):
+        """Gets the span_rate_limit of this Proxy.  # noqa: E501
+
+        Proxy's rate limit for spans  # noqa: E501
+
+        :return: The span_rate_limit of this Proxy.  # noqa: E501
+        :rtype: int
+        """
+        return self._span_rate_limit
+
+    @span_rate_limit.setter
+    def span_rate_limit(self, span_rate_limit):
+        """Sets the span_rate_limit of this Proxy.
+
+        Proxy's rate limit for spans  # noqa: E501
+
+        :param span_rate_limit: The span_rate_limit of this Proxy.  # noqa: E501
+        :type: int
+        """
+
+        self._span_rate_limit = span_rate_limit
+
     @property
     def ssh_agent(self):
         """Gets the ssh_agent of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index d94a0ee..d771787 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -31,6 +31,7 @@ class QueryResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'dimensions': 'list[TupleResult]',
         'error_message': 'str',
         'error_type': 'str',
         'events': 'list[QueryEvent]',
@@ -40,11 +41,13 @@ class QueryResult(object):
         'spans': 'list[Span]',
         'stats': 'StatsModelInternalUse',
         'timeseries': 'list[Timeseries]',
+        'trace_dimensions': 'list[TupleResult]',
         'traces': 'list[Trace]',
         'warnings': 'str'
     }
 
     attribute_map = {
+        'dimensions': 'dimensions',
         'error_message': 'errorMessage',
         'error_type': 'errorType',
         'events': 'events',
@@ -54,13 +57,15 @@ class QueryResult(object):
         'spans': 'spans',
         'stats': 'stats',
         'timeseries': 'timeseries',
+        'trace_dimensions': 'traceDimensions',
         'traces': 'traces',
         'warnings': 'warnings'
     }
 
-    def __init__(self, error_message=None, error_type=None, events=None, granularity=None, name=None, query=None, spans=None, stats=None, timeseries=None, traces=None, warnings=None):  # noqa: E501
+    def __init__(self, dimensions=None, error_message=None, error_type=None, events=None, granularity=None, name=None, query=None, spans=None, stats=None, timeseries=None, trace_dimensions=None, traces=None, warnings=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
 
+        self._dimensions = None
         self._error_message = None
         self._error_type = None
         self._events = None
@@ -70,10 +75,13 @@ def __init__(self, error_message=None, error_type=None, events=None, granularity
         self._spans = None
         self._stats = None
         self._timeseries = None
+        self._trace_dimensions = None
         self._traces = None
         self._warnings = None
         self.discriminator = None
 
+        if dimensions is not None:
+            self.dimensions = dimensions
         if error_message is not None:
             self.error_message = error_message
         if error_type is not None:
@@ -92,11 +100,36 @@ def __init__(self, error_message=None, error_type=None, events=None, granularity
             self.stats = stats
         if timeseries is not None:
             self.timeseries = timeseries
+        if trace_dimensions is not None:
+            self.trace_dimensions = trace_dimensions
         if traces is not None:
             self.traces = traces
         if warnings is not None:
             self.warnings = warnings
 
+    @property
+    def dimensions(self):
+        """Gets the dimensions of this QueryResult.  # noqa: E501
+
+        List of all dimension tuple results  # noqa: E501
+
+        :return: The dimensions of this QueryResult.  # noqa: E501
+        :rtype: list[TupleResult]
+        """
+        return self._dimensions
+
+    @dimensions.setter
+    def dimensions(self, dimensions):
+        """Sets the dimensions of this QueryResult.
+
+        List of all dimension tuple results  # noqa: E501
+
+        :param dimensions: The dimensions of this QueryResult.  # noqa: E501
+        :type: list[TupleResult]
+        """
+
+        self._dimensions = dimensions
+
     @property
     def error_message(self):
         """Gets the error_message of this QueryResult.  # noqa: E501
@@ -302,6 +335,29 @@ def timeseries(self, timeseries):
 
         self._timeseries = timeseries
 
+    @property
+    def trace_dimensions(self):
+        """Gets the trace_dimensions of this QueryResult.  # noqa: E501
+
+        List of all tracing tuple results  # noqa: E501
+
+        :return: The trace_dimensions of this QueryResult.  # noqa: E501
+        :rtype: list[TupleResult]
+        """
+        return self._trace_dimensions
+
+    @trace_dimensions.setter
+    def trace_dimensions(self, trace_dimensions):
+        """Sets the trace_dimensions of this QueryResult.
+
+        List of all tracing tuple results  # noqa: E501
+
+        :param trace_dimensions: The trace_dimensions of this QueryResult.  # noqa: E501
+        :type: list[TupleResult]
+        """
+
+        self._trace_dimensions = trace_dimensions
+
     @property
     def traces(self):
         """Gets the traces of this QueryResult.  # noqa: E501
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 627262f..145be39 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -36,6 +36,7 @@ class SourceLabelPair(object):
         'label': 'str',
         'observed': 'int',
         'severity': 'str',
+        'start_time': 'int',
         'tags': 'dict(str, str)'
     }
 
@@ -45,10 +46,11 @@ class SourceLabelPair(object):
         'label': 'label',
         'observed': 'observed',
         'severity': 'severity',
+        'start_time': 'startTime',
         'tags': 'tags'
     }
 
-    def __init__(self, firing=None, host=None, label=None, observed=None, severity=None, tags=None):  # noqa: E501
+    def __init__(self, firing=None, host=None, label=None, observed=None, severity=None, start_time=None, tags=None):  # noqa: E501
         """SourceLabelPair - a model defined in Swagger"""  # noqa: E501
 
         self._firing = None
@@ -56,6 +58,7 @@ def __init__(self, firing=None, host=None, label=None, observed=None, severity=N
         self._label = None
         self._observed = None
         self._severity = None
+        self._start_time = None
         self._tags = None
         self.discriminator = None
 
@@ -69,6 +72,8 @@ def __init__(self, firing=None, host=None, label=None, observed=None, severity=N
             self.observed = observed
         if severity is not None:
             self.severity = severity
+        if start_time is not None:
+            self.start_time = start_time
         if tags is not None:
             self.tags = tags
 
@@ -185,6 +190,29 @@ def severity(self, severity):
 
         self._severity = severity
 
+    @property
+    def start_time(self):
+        """Gets the start_time of this SourceLabelPair.  # noqa: E501
+
+        Start time of this failing HLP, in epoch millis.  # noqa: E501
+
+        :return: The start_time of this SourceLabelPair.  # noqa: E501
+        :rtype: int
+        """
+        return self._start_time
+
+    @start_time.setter
+    def start_time(self, start_time):
+        """Sets the start_time of this SourceLabelPair.
+
+        Start time of this failing HLP, in epoch millis.  # noqa: E501
+
+        :param start_time: The start_time of this SourceLabelPair.  # noqa: E501
+        :type: int
+        """
+
+        self._start_time = start_time
+
     @property
     def tags(self):
         """Gets the tags of this SourceLabelPair.  # noqa: E501
diff --git a/wavefront_api_client/models/tuple.py b/wavefront_api_client/models/tuple.py
new file mode 100644
index 0000000..2a95ccc
--- /dev/null
+++ b/wavefront_api_client/models/tuple.py
@@ -0,0 +1,115 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Tuple(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'elements': 'list[str]'
+    }
+
+    attribute_map = {
+        'elements': 'elements'
+    }
+
+    def __init__(self, elements=None):  # noqa: E501
+        """Tuple - a model defined in Swagger"""  # noqa: E501
+
+        self._elements = None
+        self.discriminator = None
+
+        if elements is not None:
+            self.elements = elements
+
+    @property
+    def elements(self):
+        """Gets the elements of this Tuple.  # noqa: E501
+
+
+        :return: The elements of this Tuple.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._elements
+
+    @elements.setter
+    def elements(self, elements):
+        """Sets the elements of this Tuple.
+
+
+        :param elements: The elements of this Tuple.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._elements = elements
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Tuple, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Tuple):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/tuple_result.py b/wavefront_api_client/models/tuple_result.py
new file mode 100644
index 0000000..5c328dc
--- /dev/null
+++ b/wavefront_api_client/models/tuple_result.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class TupleResult(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'key': 'Tuple',
+        'value_list': 'list[TupleValueResult]'
+    }
+
+    attribute_map = {
+        'key': 'key',
+        'value_list': 'valueList'
+    }
+
+    def __init__(self, key=None, value_list=None):  # noqa: E501
+        """TupleResult - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value_list = None
+        self.discriminator = None
+
+        if key is not None:
+            self.key = key
+        if value_list is not None:
+            self.value_list = value_list
+
+    @property
+    def key(self):
+        """Gets the key of this TupleResult.  # noqa: E501
+
+        The keys used to surface the dimensions.  # noqa: E501
+
+        :return: The key of this TupleResult.  # noqa: E501
+        :rtype: Tuple
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this TupleResult.
+
+        The keys used to surface the dimensions.  # noqa: E501
+
+        :param key: The key of this TupleResult.  # noqa: E501
+        :type: Tuple
+        """
+
+        self._key = key
+
+    @property
+    def value_list(self):
+        """Gets the value_list of this TupleResult.  # noqa: E501
+
+        All the possible value combination satisfying the provided keys and their respective counts from the query keys.  # noqa: E501
+
+        :return: The value_list of this TupleResult.  # noqa: E501
+        :rtype: list[TupleValueResult]
+        """
+        return self._value_list
+
+    @value_list.setter
+    def value_list(self, value_list):
+        """Sets the value_list of this TupleResult.
+
+        All the possible value combination satisfying the provided keys and their respective counts from the query keys.  # noqa: E501
+
+        :param value_list: The value_list of this TupleResult.  # noqa: E501
+        :type: list[TupleValueResult]
+        """
+
+        self._value_list = value_list
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(TupleResult, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, TupleResult):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/tuple_value_result.py b/wavefront_api_client/models/tuple_value_result.py
new file mode 100644
index 0000000..8a56fd5
--- /dev/null
+++ b/wavefront_api_client/models/tuple_value_result.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class TupleValueResult(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'count': 'int',
+        'value': 'Tuple'
+    }
+
+    attribute_map = {
+        'count': 'count',
+        'value': 'value'
+    }
+
+    def __init__(self, count=None, value=None):  # noqa: E501
+        """TupleValueResult - a model defined in Swagger"""  # noqa: E501
+
+        self._count = None
+        self._value = None
+        self.discriminator = None
+
+        if count is not None:
+            self.count = count
+        if value is not None:
+            self.value = value
+
+    @property
+    def count(self):
+        """Gets the count of this TupleValueResult.  # noqa: E501
+
+        The count of the values appearing in the query keys.  # noqa: E501
+
+        :return: The count of this TupleValueResult.  # noqa: E501
+        :rtype: int
+        """
+        return self._count
+
+    @count.setter
+    def count(self, count):
+        """Sets the count of this TupleValueResult.
+
+        The count of the values appearing in the query keys.  # noqa: E501
+
+        :param count: The count of this TupleValueResult.  # noqa: E501
+        :type: int
+        """
+
+        self._count = count
+
+    @property
+    def value(self):
+        """Gets the value of this TupleValueResult.  # noqa: E501
+
+        The possible values for a given key tuple.  # noqa: E501
+
+        :return: The value of this TupleValueResult.  # noqa: E501
+        :rtype: Tuple
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this TupleValueResult.
+
+        The possible values for a given key tuple.  # noqa: E501
+
+        :param value: The value of this TupleValueResult.  # noqa: E501
+        :type: Tuple
+        """
+
+        self._value = value
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(TupleValueResult, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, TupleValueResult):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 3313befa12fe6902308a2622c6f2a9db57383ded Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 28 Jul 2020 08:19:51 -0700
Subject: [PATCH 057/161] Autogenerated Update v2.61.7.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  13 +-
 docs/Annotation.md                            |   9 +
 docs/ClassLoader.md                           |  14 +
 docs/FastReaderBuilder.md                     |  11 +
 docs/Module.md                                |  17 +
 docs/ModuleDescriptor.md                      |  11 +
 docs/ModuleLayer.md                           |   9 +
 docs/Package.md                               |  19 +
 docs/StatsModelInternalUse.md                 |   4 +
 setup.py                                      |   2 +-
 test/test_annotation.py                       |  40 ++
 test/test_class_loader.py                     |  40 ++
 test/test_fast_reader_builder.py              |  40 ++
 test/test_module.py                           |  40 ++
 test/test_module_descriptor.py                |  40 ++
 test/test_module_layer.py                     |  40 ++
 test/test_package.py                          |  40 ++
 wavefront_api_client/__init__.py              |  11 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  11 +-
 wavefront_api_client/models/annotation.py     |  87 +++++
 wavefront_api_client/models/class_loader.py   | 219 +++++++++++
 .../models/fast_reader_builder.py             | 141 +++++++
 wavefront_api_client/models/module.py         | 297 +++++++++++++++
 .../models/module_descriptor.py               | 141 +++++++
 wavefront_api_client/models/module_layer.py   |  87 +++++
 wavefront_api_client/models/package.py        | 349 ++++++++++++++++++
 .../models/stats_model_internal_use.py        | 106 +++++-
 31 files changed, 1827 insertions(+), 19 deletions(-)
 create mode 100644 docs/Annotation.md
 create mode 100644 docs/ClassLoader.md
 create mode 100644 docs/FastReaderBuilder.md
 create mode 100644 docs/Module.md
 create mode 100644 docs/ModuleDescriptor.md
 create mode 100644 docs/ModuleLayer.md
 create mode 100644 docs/Package.md
 create mode 100644 test/test_annotation.py
 create mode 100644 test/test_class_loader.py
 create mode 100644 test/test_fast_reader_builder.py
 create mode 100644 test/test_module.py
 create mode 100644 test/test_module_descriptor.py
 create mode 100644 test/test_module_layer.py
 create mode 100644 test/test_package.py
 create mode 100644 wavefront_api_client/models/annotation.py
 create mode 100644 wavefront_api_client/models/class_loader.py
 create mode 100644 wavefront_api_client/models/fast_reader_builder.py
 create mode 100644 wavefront_api_client/models/module.py
 create mode 100644 wavefront_api_client/models/module_descriptor.py
 create mode 100644 wavefront_api_client/models/module_layer.py
 create mode 100644 wavefront_api_client/models/package.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 45960ed..348c93d 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.60.15"
+    "packageVersion": "2.61.7"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 25462ab..45960ed 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.58.20"
+    "packageVersion": "2.60.15"
 }
diff --git a/README.md b/README.md
index 1096221..a2dfaa1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.60.15
+- Package version: 2.61.7
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -378,6 +378,7 @@ Class | Method | HTTP request | Description
  - [Alert](docs/Alert.md)
  - [AlertMin](docs/AlertMin.md)
  - [AlertRoute](docs/AlertRoute.md)
+ - [Annotation](docs/Annotation.md)
  - [Anomaly](docs/Anomaly.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
  - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
@@ -387,6 +388,7 @@ Class | Method | HTTP request | Description
  - [Chart](docs/Chart.md)
  - [ChartSettings](docs/ChartSettings.md)
  - [ChartSourceQuery](docs/ChartSourceQuery.md)
+ - [ClassLoader](docs/ClassLoader.md)
  - [CloudIntegration](docs/CloudIntegration.md)
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
@@ -406,6 +408,7 @@ Class | Method | HTTP request | Description
  - [FacetSearchRequestContainer](docs/FacetSearchRequestContainer.md)
  - [FacetsResponseContainer](docs/FacetsResponseContainer.md)
  - [FacetsSearchRequestContainer](docs/FacetsSearchRequestContainer.md)
+ - [FastReaderBuilder](docs/FastReaderBuilder.md)
  - [GCPBillingConfiguration](docs/GCPBillingConfiguration.md)
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
@@ -420,9 +423,6 @@ Class | Method | HTTP request | Description
  - [IntegrationManifestGroup](docs/IntegrationManifestGroup.md)
  - [IntegrationMetrics](docs/IntegrationMetrics.md)
  - [IntegrationStatus](docs/IntegrationStatus.md)
- - [IteratorEntryStringJsonNode](docs/IteratorEntryStringJsonNode.md)
- - [IteratorJsonNode](docs/IteratorJsonNode.md)
- - [IteratorString](docs/IteratorString.md)
  - [JsonNode](docs/JsonNode.md)
  - [KubernetesComponent](docs/KubernetesComponent.md)
  - [LogicalType](docs/LogicalType.md)
@@ -431,11 +431,14 @@ Class | Method | HTTP request | Description
  - [MetricDetails](docs/MetricDetails.md)
  - [MetricDetailsResponse](docs/MetricDetailsResponse.md)
  - [MetricStatus](docs/MetricStatus.md)
+ - [Module](docs/Module.md)
+ - [ModuleDescriptor](docs/ModuleDescriptor.md)
+ - [ModuleLayer](docs/ModuleLayer.md)
  - [MonitoredCluster](docs/MonitoredCluster.md)
  - [NewRelicConfiguration](docs/NewRelicConfiguration.md)
  - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
- - [Number](docs/Number.md)
+ - [Package](docs/Package.md)
  - [PagedAccount](docs/PagedAccount.md)
  - [PagedAlert](docs/PagedAlert.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
diff --git a/docs/Annotation.md b/docs/Annotation.md
new file mode 100644
index 0000000..7c74ed2
--- /dev/null
+++ b/docs/Annotation.md
@@ -0,0 +1,9 @@
+# Annotation
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ClassLoader.md b/docs/ClassLoader.md
new file mode 100644
index 0000000..c70f770
--- /dev/null
+++ b/docs/ClassLoader.md
@@ -0,0 +1,14 @@
+# ClassLoader
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**defined_packages** | [**list[Package]**](Package.md) |  | [optional] 
+**name** | **str** |  | [optional] 
+**parent** | [**ClassLoader**](ClassLoader.md) |  | [optional] 
+**registered_as_parallel_capable** | **bool** |  | [optional] 
+**unnamed_module** | [**Module**](Module.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/FastReaderBuilder.md b/docs/FastReaderBuilder.md
new file mode 100644
index 0000000..02ac2e6
--- /dev/null
+++ b/docs/FastReaderBuilder.md
@@ -0,0 +1,11 @@
+# FastReaderBuilder
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_prop_enabled** | **bool** |  | [optional] 
+**key_class_enabled** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Module.md b/docs/Module.md
new file mode 100644
index 0000000..c4f5529
--- /dev/null
+++ b/docs/Module.md
@@ -0,0 +1,17 @@
+# Module
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**annotations** | [**list[Annotation]**](Annotation.md) |  | [optional] 
+**class_loader** | [**ClassLoader**](ClassLoader.md) |  | [optional] 
+**declared_annotations** | [**list[Annotation]**](Annotation.md) |  | [optional] 
+**descriptor** | [**ModuleDescriptor**](ModuleDescriptor.md) |  | [optional] 
+**layer** | [**ModuleLayer**](ModuleLayer.md) |  | [optional] 
+**name** | **str** |  | [optional] 
+**named** | **bool** |  | [optional] 
+**packages** | **list[str]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ModuleDescriptor.md b/docs/ModuleDescriptor.md
new file mode 100644
index 0000000..35eac49
--- /dev/null
+++ b/docs/ModuleDescriptor.md
@@ -0,0 +1,11 @@
+# ModuleDescriptor
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**automatic** | **bool** |  | [optional] 
+**open** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ModuleLayer.md b/docs/ModuleLayer.md
new file mode 100644
index 0000000..14d8cee
--- /dev/null
+++ b/docs/ModuleLayer.md
@@ -0,0 +1,9 @@
+# ModuleLayer
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Package.md b/docs/Package.md
new file mode 100644
index 0000000..e425035
--- /dev/null
+++ b/docs/Package.md
@@ -0,0 +1,19 @@
+# Package
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**annotations** | [**list[Annotation]**](Annotation.md) |  | [optional] 
+**declared_annotations** | [**list[Annotation]**](Annotation.md) |  | [optional] 
+**implementation_title** | **str** |  | [optional] 
+**implementation_vendor** | **str** |  | [optional] 
+**implementation_version** | **str** |  | [optional] 
+**name** | **str** |  | [optional] 
+**sealed** | **bool** |  | [optional] 
+**specification_title** | **str** |  | [optional] 
+**specification_vendor** | **str** |  | [optional] 
+**specification_version** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/StatsModelInternalUse.md b/docs/StatsModelInternalUse.md
index c709e9d..124879b 100644
--- a/docs/StatsModelInternalUse.md
+++ b/docs/StatsModelInternalUse.md
@@ -8,15 +8,19 @@ Name | Type | Description | Notes
 **compacted_keys** | **int** |  | [optional] 
 **compacted_points** | **int** |  | [optional] 
 **cpu_ns** | **int** |  | [optional] 
+**distributions** | **int** |  | [optional] 
+**edges** | **int** |  | [optional] 
 **hosts_used** | **int** |  | [optional] 
 **keys** | **int** |  | [optional] 
 **latency** | **int** |  | [optional] 
+**metrics** | **int** |  | [optional] 
 **metrics_used** | **int** |  | [optional] 
 **points** | **int** |  | [optional] 
 **queries** | **int** |  | [optional] 
 **query_tasks** | **int** |  | [optional] 
 **s3_keys** | **int** |  | [optional] 
 **skipped_compacted_keys** | **int** |  | [optional] 
+**spans** | **int** |  | [optional] 
 **summaries** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/setup.py b/setup.py
index c7aad5e..8a193fe 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.60.15"
+VERSION = "2.61.7"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_annotation.py b/test/test_annotation.py
new file mode 100644
index 0000000..0f2d58b
--- /dev/null
+++ b/test/test_annotation.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.annotation import Annotation  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAnnotation(unittest.TestCase):
+    """Annotation unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAnnotation(self):
+        """Test Annotation"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.annotation.Annotation()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_class_loader.py b/test/test_class_loader.py
new file mode 100644
index 0000000..7e94468
--- /dev/null
+++ b/test/test_class_loader.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.class_loader import ClassLoader  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestClassLoader(unittest.TestCase):
+    """ClassLoader unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testClassLoader(self):
+        """Test ClassLoader"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.class_loader.ClassLoader()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_fast_reader_builder.py b/test/test_fast_reader_builder.py
new file mode 100644
index 0000000..b3b56e7
--- /dev/null
+++ b/test/test_fast_reader_builder.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.fast_reader_builder import FastReaderBuilder  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestFastReaderBuilder(unittest.TestCase):
+    """FastReaderBuilder unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testFastReaderBuilder(self):
+        """Test FastReaderBuilder"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.fast_reader_builder.FastReaderBuilder()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_module.py b/test/test_module.py
new file mode 100644
index 0000000..41ceace
--- /dev/null
+++ b/test/test_module.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.module import Module  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestModule(unittest.TestCase):
+    """Module unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testModule(self):
+        """Test Module"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.module.Module()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_module_descriptor.py b/test/test_module_descriptor.py
new file mode 100644
index 0000000..34b9e6c
--- /dev/null
+++ b/test/test_module_descriptor.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.module_descriptor import ModuleDescriptor  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestModuleDescriptor(unittest.TestCase):
+    """ModuleDescriptor unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testModuleDescriptor(self):
+        """Test ModuleDescriptor"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.module_descriptor.ModuleDescriptor()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_module_layer.py b/test/test_module_layer.py
new file mode 100644
index 0000000..45b5d1f
--- /dev/null
+++ b/test/test_module_layer.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.module_layer import ModuleLayer  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestModuleLayer(unittest.TestCase):
+    """ModuleLayer unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testModuleLayer(self):
+        """Test ModuleLayer"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.module_layer.ModuleLayer()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_package.py b/test/test_package.py
new file mode 100644
index 0000000..d01c9e0
--- /dev/null
+++ b/test/test_package.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.package import Package  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPackage(unittest.TestCase):
+    """Package unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPackage(self):
+        """Test Package"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.package.Package()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index acd0482..2986b44 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -56,6 +56,7 @@
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
+from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
@@ -65,6 +66,7 @@
 from wavefront_api_client.models.chart import Chart
 from wavefront_api_client.models.chart_settings import ChartSettings
 from wavefront_api_client.models.chart_source_query import ChartSourceQuery
+from wavefront_api_client.models.class_loader import ClassLoader
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
@@ -84,6 +86,7 @@
 from wavefront_api_client.models.facet_search_request_container import FacetSearchRequestContainer
 from wavefront_api_client.models.facets_response_container import FacetsResponseContainer
 from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer
+from wavefront_api_client.models.fast_reader_builder import FastReaderBuilder
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
@@ -98,9 +101,6 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
-from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
-from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
-from wavefront_api_client.models.iterator_string import IteratorString
 from wavefront_api_client.models.json_node import JsonNode
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.logical_type import LogicalType
@@ -109,11 +109,14 @@
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.module import Module
+from wavefront_api_client.models.module_descriptor import ModuleDescriptor
+from wavefront_api_client.models.module_layer import ModuleLayer
 from wavefront_api_client.models.monitored_cluster import MonitoredCluster
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
-from wavefront_api_client.models.number import Number
+from wavefront_api_client.models.package import Package
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 04bf014..6b77384 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.60.15/python'
+        self.user_agent = 'Swagger-Codegen/2.61.7/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 50b13b4..ff6c239 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.60.15".\
+               "SDK Package Version: 2.61.7".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 8d8d794..0049792 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -24,6 +24,7 @@
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
+from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
@@ -33,6 +34,7 @@
 from wavefront_api_client.models.chart import Chart
 from wavefront_api_client.models.chart_settings import ChartSettings
 from wavefront_api_client.models.chart_source_query import ChartSourceQuery
+from wavefront_api_client.models.class_loader import ClassLoader
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
@@ -52,6 +54,7 @@
 from wavefront_api_client.models.facet_search_request_container import FacetSearchRequestContainer
 from wavefront_api_client.models.facets_response_container import FacetsResponseContainer
 from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer
+from wavefront_api_client.models.fast_reader_builder import FastReaderBuilder
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
@@ -66,9 +69,6 @@
 from wavefront_api_client.models.integration_manifest_group import IntegrationManifestGroup
 from wavefront_api_client.models.integration_metrics import IntegrationMetrics
 from wavefront_api_client.models.integration_status import IntegrationStatus
-from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode
-from wavefront_api_client.models.iterator_json_node import IteratorJsonNode
-from wavefront_api_client.models.iterator_string import IteratorString
 from wavefront_api_client.models.json_node import JsonNode
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.logical_type import LogicalType
@@ -77,11 +77,14 @@
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.module import Module
+from wavefront_api_client.models.module_descriptor import ModuleDescriptor
+from wavefront_api_client.models.module_layer import ModuleLayer
 from wavefront_api_client.models.monitored_cluster import MonitoredCluster
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
-from wavefront_api_client.models.number import Number
+from wavefront_api_client.models.package import Package
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
new file mode 100644
index 0000000..cf05f3e
--- /dev/null
+++ b/wavefront_api_client/models/annotation.py
@@ -0,0 +1,87 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Annotation(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """Annotation - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Annotation, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Annotation):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/class_loader.py b/wavefront_api_client/models/class_loader.py
new file mode 100644
index 0000000..b4d9278
--- /dev/null
+++ b/wavefront_api_client/models/class_loader.py
@@ -0,0 +1,219 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ClassLoader(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'defined_packages': 'list[Package]',
+        'name': 'str',
+        'parent': 'ClassLoader',
+        'registered_as_parallel_capable': 'bool',
+        'unnamed_module': 'Module'
+    }
+
+    attribute_map = {
+        'defined_packages': 'definedPackages',
+        'name': 'name',
+        'parent': 'parent',
+        'registered_as_parallel_capable': 'registeredAsParallelCapable',
+        'unnamed_module': 'unnamedModule'
+    }
+
+    def __init__(self, defined_packages=None, name=None, parent=None, registered_as_parallel_capable=None, unnamed_module=None):  # noqa: E501
+        """ClassLoader - a model defined in Swagger"""  # noqa: E501
+
+        self._defined_packages = None
+        self._name = None
+        self._parent = None
+        self._registered_as_parallel_capable = None
+        self._unnamed_module = None
+        self.discriminator = None
+
+        if defined_packages is not None:
+            self.defined_packages = defined_packages
+        if name is not None:
+            self.name = name
+        if parent is not None:
+            self.parent = parent
+        if registered_as_parallel_capable is not None:
+            self.registered_as_parallel_capable = registered_as_parallel_capable
+        if unnamed_module is not None:
+            self.unnamed_module = unnamed_module
+
+    @property
+    def defined_packages(self):
+        """Gets the defined_packages of this ClassLoader.  # noqa: E501
+
+
+        :return: The defined_packages of this ClassLoader.  # noqa: E501
+        :rtype: list[Package]
+        """
+        return self._defined_packages
+
+    @defined_packages.setter
+    def defined_packages(self, defined_packages):
+        """Sets the defined_packages of this ClassLoader.
+
+
+        :param defined_packages: The defined_packages of this ClassLoader.  # noqa: E501
+        :type: list[Package]
+        """
+
+        self._defined_packages = defined_packages
+
+    @property
+    def name(self):
+        """Gets the name of this ClassLoader.  # noqa: E501
+
+
+        :return: The name of this ClassLoader.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ClassLoader.
+
+
+        :param name: The name of this ClassLoader.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def parent(self):
+        """Gets the parent of this ClassLoader.  # noqa: E501
+
+
+        :return: The parent of this ClassLoader.  # noqa: E501
+        :rtype: ClassLoader
+        """
+        return self._parent
+
+    @parent.setter
+    def parent(self, parent):
+        """Sets the parent of this ClassLoader.
+
+
+        :param parent: The parent of this ClassLoader.  # noqa: E501
+        :type: ClassLoader
+        """
+
+        self._parent = parent
+
+    @property
+    def registered_as_parallel_capable(self):
+        """Gets the registered_as_parallel_capable of this ClassLoader.  # noqa: E501
+
+
+        :return: The registered_as_parallel_capable of this ClassLoader.  # noqa: E501
+        :rtype: bool
+        """
+        return self._registered_as_parallel_capable
+
+    @registered_as_parallel_capable.setter
+    def registered_as_parallel_capable(self, registered_as_parallel_capable):
+        """Sets the registered_as_parallel_capable of this ClassLoader.
+
+
+        :param registered_as_parallel_capable: The registered_as_parallel_capable of this ClassLoader.  # noqa: E501
+        :type: bool
+        """
+
+        self._registered_as_parallel_capable = registered_as_parallel_capable
+
+    @property
+    def unnamed_module(self):
+        """Gets the unnamed_module of this ClassLoader.  # noqa: E501
+
+
+        :return: The unnamed_module of this ClassLoader.  # noqa: E501
+        :rtype: Module
+        """
+        return self._unnamed_module
+
+    @unnamed_module.setter
+    def unnamed_module(self, unnamed_module):
+        """Sets the unnamed_module of this ClassLoader.
+
+
+        :param unnamed_module: The unnamed_module of this ClassLoader.  # noqa: E501
+        :type: Module
+        """
+
+        self._unnamed_module = unnamed_module
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ClassLoader, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ClassLoader):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/fast_reader_builder.py b/wavefront_api_client/models/fast_reader_builder.py
new file mode 100644
index 0000000..718f1a3
--- /dev/null
+++ b/wavefront_api_client/models/fast_reader_builder.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class FastReaderBuilder(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'class_prop_enabled': 'bool',
+        'key_class_enabled': 'bool'
+    }
+
+    attribute_map = {
+        'class_prop_enabled': 'classPropEnabled',
+        'key_class_enabled': 'keyClassEnabled'
+    }
+
+    def __init__(self, class_prop_enabled=None, key_class_enabled=None):  # noqa: E501
+        """FastReaderBuilder - a model defined in Swagger"""  # noqa: E501
+
+        self._class_prop_enabled = None
+        self._key_class_enabled = None
+        self.discriminator = None
+
+        if class_prop_enabled is not None:
+            self.class_prop_enabled = class_prop_enabled
+        if key_class_enabled is not None:
+            self.key_class_enabled = key_class_enabled
+
+    @property
+    def class_prop_enabled(self):
+        """Gets the class_prop_enabled of this FastReaderBuilder.  # noqa: E501
+
+
+        :return: The class_prop_enabled of this FastReaderBuilder.  # noqa: E501
+        :rtype: bool
+        """
+        return self._class_prop_enabled
+
+    @class_prop_enabled.setter
+    def class_prop_enabled(self, class_prop_enabled):
+        """Sets the class_prop_enabled of this FastReaderBuilder.
+
+
+        :param class_prop_enabled: The class_prop_enabled of this FastReaderBuilder.  # noqa: E501
+        :type: bool
+        """
+
+        self._class_prop_enabled = class_prop_enabled
+
+    @property
+    def key_class_enabled(self):
+        """Gets the key_class_enabled of this FastReaderBuilder.  # noqa: E501
+
+
+        :return: The key_class_enabled of this FastReaderBuilder.  # noqa: E501
+        :rtype: bool
+        """
+        return self._key_class_enabled
+
+    @key_class_enabled.setter
+    def key_class_enabled(self, key_class_enabled):
+        """Sets the key_class_enabled of this FastReaderBuilder.
+
+
+        :param key_class_enabled: The key_class_enabled of this FastReaderBuilder.  # noqa: E501
+        :type: bool
+        """
+
+        self._key_class_enabled = key_class_enabled
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(FastReaderBuilder, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, FastReaderBuilder):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/module.py b/wavefront_api_client/models/module.py
new file mode 100644
index 0000000..439a7ba
--- /dev/null
+++ b/wavefront_api_client/models/module.py
@@ -0,0 +1,297 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Module(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'annotations': 'list[Annotation]',
+        'class_loader': 'ClassLoader',
+        'declared_annotations': 'list[Annotation]',
+        'descriptor': 'ModuleDescriptor',
+        'layer': 'ModuleLayer',
+        'name': 'str',
+        'named': 'bool',
+        'packages': 'list[str]'
+    }
+
+    attribute_map = {
+        'annotations': 'annotations',
+        'class_loader': 'classLoader',
+        'declared_annotations': 'declaredAnnotations',
+        'descriptor': 'descriptor',
+        'layer': 'layer',
+        'name': 'name',
+        'named': 'named',
+        'packages': 'packages'
+    }
+
+    def __init__(self, annotations=None, class_loader=None, declared_annotations=None, descriptor=None, layer=None, name=None, named=None, packages=None):  # noqa: E501
+        """Module - a model defined in Swagger"""  # noqa: E501
+
+        self._annotations = None
+        self._class_loader = None
+        self._declared_annotations = None
+        self._descriptor = None
+        self._layer = None
+        self._name = None
+        self._named = None
+        self._packages = None
+        self.discriminator = None
+
+        if annotations is not None:
+            self.annotations = annotations
+        if class_loader is not None:
+            self.class_loader = class_loader
+        if declared_annotations is not None:
+            self.declared_annotations = declared_annotations
+        if descriptor is not None:
+            self.descriptor = descriptor
+        if layer is not None:
+            self.layer = layer
+        if name is not None:
+            self.name = name
+        if named is not None:
+            self.named = named
+        if packages is not None:
+            self.packages = packages
+
+    @property
+    def annotations(self):
+        """Gets the annotations of this Module.  # noqa: E501
+
+
+        :return: The annotations of this Module.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._annotations
+
+    @annotations.setter
+    def annotations(self, annotations):
+        """Sets the annotations of this Module.
+
+
+        :param annotations: The annotations of this Module.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._annotations = annotations
+
+    @property
+    def class_loader(self):
+        """Gets the class_loader of this Module.  # noqa: E501
+
+
+        :return: The class_loader of this Module.  # noqa: E501
+        :rtype: ClassLoader
+        """
+        return self._class_loader
+
+    @class_loader.setter
+    def class_loader(self, class_loader):
+        """Sets the class_loader of this Module.
+
+
+        :param class_loader: The class_loader of this Module.  # noqa: E501
+        :type: ClassLoader
+        """
+
+        self._class_loader = class_loader
+
+    @property
+    def declared_annotations(self):
+        """Gets the declared_annotations of this Module.  # noqa: E501
+
+
+        :return: The declared_annotations of this Module.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._declared_annotations
+
+    @declared_annotations.setter
+    def declared_annotations(self, declared_annotations):
+        """Sets the declared_annotations of this Module.
+
+
+        :param declared_annotations: The declared_annotations of this Module.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._declared_annotations = declared_annotations
+
+    @property
+    def descriptor(self):
+        """Gets the descriptor of this Module.  # noqa: E501
+
+
+        :return: The descriptor of this Module.  # noqa: E501
+        :rtype: ModuleDescriptor
+        """
+        return self._descriptor
+
+    @descriptor.setter
+    def descriptor(self, descriptor):
+        """Sets the descriptor of this Module.
+
+
+        :param descriptor: The descriptor of this Module.  # noqa: E501
+        :type: ModuleDescriptor
+        """
+
+        self._descriptor = descriptor
+
+    @property
+    def layer(self):
+        """Gets the layer of this Module.  # noqa: E501
+
+
+        :return: The layer of this Module.  # noqa: E501
+        :rtype: ModuleLayer
+        """
+        return self._layer
+
+    @layer.setter
+    def layer(self, layer):
+        """Sets the layer of this Module.
+
+
+        :param layer: The layer of this Module.  # noqa: E501
+        :type: ModuleLayer
+        """
+
+        self._layer = layer
+
+    @property
+    def name(self):
+        """Gets the name of this Module.  # noqa: E501
+
+
+        :return: The name of this Module.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Module.
+
+
+        :param name: The name of this Module.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def named(self):
+        """Gets the named of this Module.  # noqa: E501
+
+
+        :return: The named of this Module.  # noqa: E501
+        :rtype: bool
+        """
+        return self._named
+
+    @named.setter
+    def named(self, named):
+        """Sets the named of this Module.
+
+
+        :param named: The named of this Module.  # noqa: E501
+        :type: bool
+        """
+
+        self._named = named
+
+    @property
+    def packages(self):
+        """Gets the packages of this Module.  # noqa: E501
+
+
+        :return: The packages of this Module.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._packages
+
+    @packages.setter
+    def packages(self, packages):
+        """Sets the packages of this Module.
+
+
+        :param packages: The packages of this Module.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._packages = packages
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Module, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Module):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/module_descriptor.py b/wavefront_api_client/models/module_descriptor.py
new file mode 100644
index 0000000..64e4caa
--- /dev/null
+++ b/wavefront_api_client/models/module_descriptor.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ModuleDescriptor(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'automatic': 'bool',
+        'open': 'bool'
+    }
+
+    attribute_map = {
+        'automatic': 'automatic',
+        'open': 'open'
+    }
+
+    def __init__(self, automatic=None, open=None):  # noqa: E501
+        """ModuleDescriptor - a model defined in Swagger"""  # noqa: E501
+
+        self._automatic = None
+        self._open = None
+        self.discriminator = None
+
+        if automatic is not None:
+            self.automatic = automatic
+        if open is not None:
+            self.open = open
+
+    @property
+    def automatic(self):
+        """Gets the automatic of this ModuleDescriptor.  # noqa: E501
+
+
+        :return: The automatic of this ModuleDescriptor.  # noqa: E501
+        :rtype: bool
+        """
+        return self._automatic
+
+    @automatic.setter
+    def automatic(self, automatic):
+        """Sets the automatic of this ModuleDescriptor.
+
+
+        :param automatic: The automatic of this ModuleDescriptor.  # noqa: E501
+        :type: bool
+        """
+
+        self._automatic = automatic
+
+    @property
+    def open(self):
+        """Gets the open of this ModuleDescriptor.  # noqa: E501
+
+
+        :return: The open of this ModuleDescriptor.  # noqa: E501
+        :rtype: bool
+        """
+        return self._open
+
+    @open.setter
+    def open(self, open):
+        """Sets the open of this ModuleDescriptor.
+
+
+        :param open: The open of this ModuleDescriptor.  # noqa: E501
+        :type: bool
+        """
+
+        self._open = open
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ModuleDescriptor, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ModuleDescriptor):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/module_layer.py b/wavefront_api_client/models/module_layer.py
new file mode 100644
index 0000000..1c1be72
--- /dev/null
+++ b/wavefront_api_client/models/module_layer.py
@@ -0,0 +1,87 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ModuleLayer(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self):  # noqa: E501
+        """ModuleLayer - a model defined in Swagger"""  # noqa: E501
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ModuleLayer, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ModuleLayer):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/package.py b/wavefront_api_client/models/package.py
new file mode 100644
index 0000000..51a43ea
--- /dev/null
+++ b/wavefront_api_client/models/package.py
@@ -0,0 +1,349 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Package(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'annotations': 'list[Annotation]',
+        'declared_annotations': 'list[Annotation]',
+        'implementation_title': 'str',
+        'implementation_vendor': 'str',
+        'implementation_version': 'str',
+        'name': 'str',
+        'sealed': 'bool',
+        'specification_title': 'str',
+        'specification_vendor': 'str',
+        'specification_version': 'str'
+    }
+
+    attribute_map = {
+        'annotations': 'annotations',
+        'declared_annotations': 'declaredAnnotations',
+        'implementation_title': 'implementationTitle',
+        'implementation_vendor': 'implementationVendor',
+        'implementation_version': 'implementationVersion',
+        'name': 'name',
+        'sealed': 'sealed',
+        'specification_title': 'specificationTitle',
+        'specification_vendor': 'specificationVendor',
+        'specification_version': 'specificationVersion'
+    }
+
+    def __init__(self, annotations=None, declared_annotations=None, implementation_title=None, implementation_vendor=None, implementation_version=None, name=None, sealed=None, specification_title=None, specification_vendor=None, specification_version=None):  # noqa: E501
+        """Package - a model defined in Swagger"""  # noqa: E501
+
+        self._annotations = None
+        self._declared_annotations = None
+        self._implementation_title = None
+        self._implementation_vendor = None
+        self._implementation_version = None
+        self._name = None
+        self._sealed = None
+        self._specification_title = None
+        self._specification_vendor = None
+        self._specification_version = None
+        self.discriminator = None
+
+        if annotations is not None:
+            self.annotations = annotations
+        if declared_annotations is not None:
+            self.declared_annotations = declared_annotations
+        if implementation_title is not None:
+            self.implementation_title = implementation_title
+        if implementation_vendor is not None:
+            self.implementation_vendor = implementation_vendor
+        if implementation_version is not None:
+            self.implementation_version = implementation_version
+        if name is not None:
+            self.name = name
+        if sealed is not None:
+            self.sealed = sealed
+        if specification_title is not None:
+            self.specification_title = specification_title
+        if specification_vendor is not None:
+            self.specification_vendor = specification_vendor
+        if specification_version is not None:
+            self.specification_version = specification_version
+
+    @property
+    def annotations(self):
+        """Gets the annotations of this Package.  # noqa: E501
+
+
+        :return: The annotations of this Package.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._annotations
+
+    @annotations.setter
+    def annotations(self, annotations):
+        """Sets the annotations of this Package.
+
+
+        :param annotations: The annotations of this Package.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._annotations = annotations
+
+    @property
+    def declared_annotations(self):
+        """Gets the declared_annotations of this Package.  # noqa: E501
+
+
+        :return: The declared_annotations of this Package.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._declared_annotations
+
+    @declared_annotations.setter
+    def declared_annotations(self, declared_annotations):
+        """Sets the declared_annotations of this Package.
+
+
+        :param declared_annotations: The declared_annotations of this Package.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._declared_annotations = declared_annotations
+
+    @property
+    def implementation_title(self):
+        """Gets the implementation_title of this Package.  # noqa: E501
+
+
+        :return: The implementation_title of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._implementation_title
+
+    @implementation_title.setter
+    def implementation_title(self, implementation_title):
+        """Sets the implementation_title of this Package.
+
+
+        :param implementation_title: The implementation_title of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._implementation_title = implementation_title
+
+    @property
+    def implementation_vendor(self):
+        """Gets the implementation_vendor of this Package.  # noqa: E501
+
+
+        :return: The implementation_vendor of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._implementation_vendor
+
+    @implementation_vendor.setter
+    def implementation_vendor(self, implementation_vendor):
+        """Sets the implementation_vendor of this Package.
+
+
+        :param implementation_vendor: The implementation_vendor of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._implementation_vendor = implementation_vendor
+
+    @property
+    def implementation_version(self):
+        """Gets the implementation_version of this Package.  # noqa: E501
+
+
+        :return: The implementation_version of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._implementation_version
+
+    @implementation_version.setter
+    def implementation_version(self, implementation_version):
+        """Sets the implementation_version of this Package.
+
+
+        :param implementation_version: The implementation_version of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._implementation_version = implementation_version
+
+    @property
+    def name(self):
+        """Gets the name of this Package.  # noqa: E501
+
+
+        :return: The name of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Package.
+
+
+        :param name: The name of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def sealed(self):
+        """Gets the sealed of this Package.  # noqa: E501
+
+
+        :return: The sealed of this Package.  # noqa: E501
+        :rtype: bool
+        """
+        return self._sealed
+
+    @sealed.setter
+    def sealed(self, sealed):
+        """Sets the sealed of this Package.
+
+
+        :param sealed: The sealed of this Package.  # noqa: E501
+        :type: bool
+        """
+
+        self._sealed = sealed
+
+    @property
+    def specification_title(self):
+        """Gets the specification_title of this Package.  # noqa: E501
+
+
+        :return: The specification_title of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._specification_title
+
+    @specification_title.setter
+    def specification_title(self, specification_title):
+        """Sets the specification_title of this Package.
+
+
+        :param specification_title: The specification_title of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._specification_title = specification_title
+
+    @property
+    def specification_vendor(self):
+        """Gets the specification_vendor of this Package.  # noqa: E501
+
+
+        :return: The specification_vendor of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._specification_vendor
+
+    @specification_vendor.setter
+    def specification_vendor(self, specification_vendor):
+        """Sets the specification_vendor of this Package.
+
+
+        :param specification_vendor: The specification_vendor of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._specification_vendor = specification_vendor
+
+    @property
+    def specification_version(self):
+        """Gets the specification_version of this Package.  # noqa: E501
+
+
+        :return: The specification_version of this Package.  # noqa: E501
+        :rtype: str
+        """
+        return self._specification_version
+
+    @specification_version.setter
+    def specification_version(self, specification_version):
+        """Sets the specification_version of this Package.
+
+
+        :param specification_version: The specification_version of this Package.  # noqa: E501
+        :type: str
+        """
+
+        self._specification_version = specification_version
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Package, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Package):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
index 8163ae7..9bca289 100644
--- a/wavefront_api_client/models/stats_model_internal_use.py
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -36,15 +36,19 @@ class StatsModelInternalUse(object):
         'compacted_keys': 'int',
         'compacted_points': 'int',
         'cpu_ns': 'int',
+        'distributions': 'int',
+        'edges': 'int',
         'hosts_used': 'int',
         'keys': 'int',
         'latency': 'int',
+        'metrics': 'int',
         'metrics_used': 'int',
         'points': 'int',
         'queries': 'int',
         'query_tasks': 'int',
         's3_keys': 'int',
         'skipped_compacted_keys': 'int',
+        'spans': 'int',
         'summaries': 'int'
     }
 
@@ -54,19 +58,23 @@ class StatsModelInternalUse(object):
         'compacted_keys': 'compacted_keys',
         'compacted_points': 'compacted_points',
         'cpu_ns': 'cpu_ns',
+        'distributions': 'distributions',
+        'edges': 'edges',
         'hosts_used': 'hosts_used',
         'keys': 'keys',
         'latency': 'latency',
+        'metrics': 'metrics',
         'metrics_used': 'metrics_used',
         'points': 'points',
         'queries': 'queries',
         'query_tasks': 'query_tasks',
         's3_keys': 's3_keys',
         'skipped_compacted_keys': 'skipped_compacted_keys',
+        'spans': 'spans',
         'summaries': 'summaries'
     }
 
-    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, hosts_used=None, keys=None, latency=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, summaries=None):  # noqa: E501
+    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, distributions=None, edges=None, hosts_used=None, keys=None, latency=None, metrics=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, spans=None, summaries=None):  # noqa: E501
         """StatsModelInternalUse - a model defined in Swagger"""  # noqa: E501
 
         self._buffer_keys = None
@@ -74,15 +82,19 @@ def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=
         self._compacted_keys = None
         self._compacted_points = None
         self._cpu_ns = None
+        self._distributions = None
+        self._edges = None
         self._hosts_used = None
         self._keys = None
         self._latency = None
+        self._metrics = None
         self._metrics_used = None
         self._points = None
         self._queries = None
         self._query_tasks = None
         self._s3_keys = None
         self._skipped_compacted_keys = None
+        self._spans = None
         self._summaries = None
         self.discriminator = None
 
@@ -96,12 +108,18 @@ def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=
             self.compacted_points = compacted_points
         if cpu_ns is not None:
             self.cpu_ns = cpu_ns
+        if distributions is not None:
+            self.distributions = distributions
+        if edges is not None:
+            self.edges = edges
         if hosts_used is not None:
             self.hosts_used = hosts_used
         if keys is not None:
             self.keys = keys
         if latency is not None:
             self.latency = latency
+        if metrics is not None:
+            self.metrics = metrics
         if metrics_used is not None:
             self.metrics_used = metrics_used
         if points is not None:
@@ -114,6 +132,8 @@ def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=
             self.s3_keys = s3_keys
         if skipped_compacted_keys is not None:
             self.skipped_compacted_keys = skipped_compacted_keys
+        if spans is not None:
+            self.spans = spans
         if summaries is not None:
             self.summaries = summaries
 
@@ -222,6 +242,48 @@ def cpu_ns(self, cpu_ns):
 
         self._cpu_ns = cpu_ns
 
+    @property
+    def distributions(self):
+        """Gets the distributions of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The distributions of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._distributions
+
+    @distributions.setter
+    def distributions(self, distributions):
+        """Sets the distributions of this StatsModelInternalUse.
+
+
+        :param distributions: The distributions of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._distributions = distributions
+
+    @property
+    def edges(self):
+        """Gets the edges of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The edges of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._edges
+
+    @edges.setter
+    def edges(self, edges):
+        """Sets the edges of this StatsModelInternalUse.
+
+
+        :param edges: The edges of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._edges = edges
+
     @property
     def hosts_used(self):
         """Gets the hosts_used of this StatsModelInternalUse.  # noqa: E501
@@ -285,6 +347,27 @@ def latency(self, latency):
 
         self._latency = latency
 
+    @property
+    def metrics(self):
+        """Gets the metrics of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The metrics of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._metrics
+
+    @metrics.setter
+    def metrics(self, metrics):
+        """Sets the metrics of this StatsModelInternalUse.
+
+
+        :param metrics: The metrics of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._metrics = metrics
+
     @property
     def metrics_used(self):
         """Gets the metrics_used of this StatsModelInternalUse.  # noqa: E501
@@ -411,6 +494,27 @@ def skipped_compacted_keys(self, skipped_compacted_keys):
 
         self._skipped_compacted_keys = skipped_compacted_keys
 
+    @property
+    def spans(self):
+        """Gets the spans of this StatsModelInternalUse.  # noqa: E501
+
+
+        :return: The spans of this StatsModelInternalUse.  # noqa: E501
+        :rtype: int
+        """
+        return self._spans
+
+    @spans.setter
+    def spans(self, spans):
+        """Sets the spans of this StatsModelInternalUse.
+
+
+        :param spans: The spans of this StatsModelInternalUse.  # noqa: E501
+        :type: int
+        """
+
+        self._spans = spans
+
     @property
     def summaries(self):
         """Gets the summaries of this StatsModelInternalUse.  # noqa: E501

From b667116fe4c029593e7013b29135a86319b2d041 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 21 Aug 2020 08:25:18 -0700
Subject: [PATCH 058/161] Autogenerated Update v2.62.8.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  14 +-
 docs/ChartSettings.md                         |   1 +
 docs/ComponentStatus.md                       |  12 +
 docs/DerivedMetricDefinition.md               |   2 +-
 docs/EventApi.md                              |   6 +-
 docs/EventSearchRequest.md                    |   1 +
 docs/KubernetesComponent.md                   |   1 +
 docs/MetricsPolicyApi.md                      | 281 ++++++++++
 docs/MetricsPolicyReadModel.md                |  13 +
 docs/MetricsPolicyWriteModel.md               |  13 +
 docs/PolicyRuleReadModel.md                   |  19 +
 docs/PolicyRuleWriteModel.md                  |  19 +
 docs/RelatedEventTimeRange.md                 |  11 +
 ...ResponseContainerMetricsPolicyReadModel.md |  11 +
 setup.py                                      |   2 +-
 test/test_component_status.py                 |  40 ++
 test/test_metrics_policy_api.py               |  69 +++
 test/test_metrics_policy_read_model.py        |  40 ++
 test/test_metrics_policy_write_model.py       |  40 ++
 test/test_policy_rule_read_model.py           |  40 ++
 test/test_policy_rule_write_model.py          |  40 ++
 test/test_related_event_time_range.py         |  40 ++
 ...nse_container_metrics_policy_read_model.py |  40 ++
 wavefront_api_client/__init__.py              |   8 +
 wavefront_api_client/api/__init__.py          |   1 +
 wavefront_api_client/api/event_api.py         |   6 +-
 .../api/metrics_policy_api.py                 | 517 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   7 +
 wavefront_api_client/models/chart_settings.py |  30 +-
 .../models/component_status.py                | 167 ++++++
 .../models/derived_metric_definition.py       |   4 +-
 .../models/event_search_request.py            |  28 +-
 .../models/kubernetes_component.py            |  32 +-
 .../models/metrics_policy_read_model.py       | 201 +++++++
 .../models/metrics_policy_write_model.py      | 201 +++++++
 .../models/policy_rule_read_model.py          | 374 +++++++++++++
 .../models/policy_rule_write_model.py         | 374 +++++++++++++
 .../models/related_event_time_range.py        | 145 +++++
 ...nse_container_metrics_policy_read_model.py | 142 +++++
 ...esponse_container_set_business_function.py |   2 +-
 44 files changed, 2984 insertions(+), 18 deletions(-)
 create mode 100644 docs/ComponentStatus.md
 create mode 100644 docs/MetricsPolicyApi.md
 create mode 100644 docs/MetricsPolicyReadModel.md
 create mode 100644 docs/MetricsPolicyWriteModel.md
 create mode 100644 docs/PolicyRuleReadModel.md
 create mode 100644 docs/PolicyRuleWriteModel.md
 create mode 100644 docs/RelatedEventTimeRange.md
 create mode 100644 docs/ResponseContainerMetricsPolicyReadModel.md
 create mode 100644 test/test_component_status.py
 create mode 100644 test/test_metrics_policy_api.py
 create mode 100644 test/test_metrics_policy_read_model.py
 create mode 100644 test/test_metrics_policy_write_model.py
 create mode 100644 test/test_policy_rule_read_model.py
 create mode 100644 test/test_policy_rule_write_model.py
 create mode 100644 test/test_related_event_time_range.py
 create mode 100644 test/test_response_container_metrics_policy_read_model.py
 create mode 100644 wavefront_api_client/api/metrics_policy_api.py
 create mode 100644 wavefront_api_client/models/component_status.py
 create mode 100644 wavefront_api_client/models/metrics_policy_read_model.py
 create mode 100644 wavefront_api_client/models/metrics_policy_write_model.py
 create mode 100644 wavefront_api_client/models/policy_rule_read_model.py
 create mode 100644 wavefront_api_client/models/policy_rule_write_model.py
 create mode 100644 wavefront_api_client/models/related_event_time_range.py
 create mode 100644 wavefront_api_client/models/response_container_metrics_policy_read_model.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 348c93d..ead948b 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.61.7"
+    "packageVersion": "2.62.8"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 45960ed..348c93d 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.60.15"
+    "packageVersion": "2.61.7"
 }
diff --git a/README.md b/README.md
index a2dfaa1..4d83870 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.61.7
+- Package version: 2.62.8
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -223,6 +223,11 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
+*MetricsPolicyApi* | [**get_metrics_policy**](docs/MetricsPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
+*MetricsPolicyApi* | [**get_metrics_policy_by_version**](docs/MetricsPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
+*MetricsPolicyApi* | [**get_metrics_policy_history**](docs/MetricsPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
+*MetricsPolicyApi* | [**revert_metrics_policy_by_version**](docs/MetricsPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
+*MetricsPolicyApi* | [**update_metrics_policy**](docs/MetricsPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
 *NotificantApi* | [**get_all_notificants**](docs/NotificantApi.md#get_all_notificants) | **GET** /api/v2/notificant | Get all notification targets for a customer
@@ -392,6 +397,7 @@ Class | Method | HTTP request | Description
  - [CloudIntegration](docs/CloudIntegration.md)
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
+ - [ComponentStatus](docs/ComponentStatus.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
  - [Dashboard](docs/Dashboard.md)
  - [DashboardMin](docs/DashboardMin.md)
@@ -431,6 +437,8 @@ Class | Method | HTTP request | Description
  - [MetricDetails](docs/MetricDetails.md)
  - [MetricDetailsResponse](docs/MetricDetailsResponse.md)
  - [MetricStatus](docs/MetricStatus.md)
+ - [MetricsPolicyReadModel](docs/MetricsPolicyReadModel.md)
+ - [MetricsPolicyWriteModel](docs/MetricsPolicyWriteModel.md)
  - [Module](docs/Module.md)
  - [ModuleDescriptor](docs/ModuleDescriptor.md)
  - [ModuleLayer](docs/ModuleLayer.md)
@@ -465,6 +473,8 @@ Class | Method | HTTP request | Description
  - [PagedSource](docs/PagedSource.md)
  - [PagedUserGroupModel](docs/PagedUserGroupModel.md)
  - [Point](docs/Point.md)
+ - [PolicyRuleReadModel](docs/PolicyRuleReadModel.md)
+ - [PolicyRuleWriteModel](docs/PolicyRuleWriteModel.md)
  - [Proxy](docs/Proxy.md)
  - [QueryEvent](docs/QueryEvent.md)
  - [QueryResult](docs/QueryResult.md)
@@ -472,6 +482,7 @@ Class | Method | HTTP request | Description
  - [RelatedAnomaly](docs/RelatedAnomaly.md)
  - [RelatedData](docs/RelatedData.md)
  - [RelatedEvent](docs/RelatedEvent.md)
+ - [RelatedEventTimeRange](docs/RelatedEventTimeRange.md)
  - [ReportEventAnomalyDTO](docs/ReportEventAnomalyDTO.md)
  - [ResponseContainer](docs/ResponseContainer.md)
  - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
@@ -497,6 +508,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
  - [ResponseContainerMessage](docs/ResponseContainerMessage.md)
+ - [ResponseContainerMetricsPolicyReadModel](docs/ResponseContainerMetricsPolicyReadModel.md)
  - [ResponseContainerMonitoredCluster](docs/ResponseContainerMonitoredCluster.md)
  - [ResponseContainerNotificant](docs/ResponseContainerNotificant.md)
  - [ResponseContainerPagedAccount](docs/ResponseContainerPagedAccount.md)
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index 3ebedbd..ca3b438 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **chart_default_color** | **str** | Default color that will be used in any chart rendering. Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
 **column_tags** | **str** | deprecated | [optional] 
 **custom_tags** | **list[str]** | For the tabular view, a list of point tags to display when using the \&quot;custom\&quot; tag display mode | [optional] 
+**default_sort_column** | **str** | For the tabular view, to select column for default sort | [optional] 
 **expected_data_spacing** | **int** | Threshold (in seconds) for time delta between consecutive points in a series above which a dotted line will replace a solid line in line plots.  Default: 60s | [optional] 
 **fixed_legend_display_stats** | **list[str]** | For a chart with a fixed legend, a list of statistics to display in the legend | [optional] 
 **fixed_legend_enabled** | **bool** | Whether to enable a fixed tabular legend adjacent to the chart | [optional] 
diff --git a/docs/ComponentStatus.md b/docs/ComponentStatus.md
new file mode 100644
index 0000000..c2bdd28
--- /dev/null
+++ b/docs/ComponentStatus.md
@@ -0,0 +1,12 @@
+# ComponentStatus
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** |  | [optional] 
+**name** | **str** |  | [optional] 
+**status** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index d73f2ad..3dcd218 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -18,7 +18,7 @@ Name | Type | Description | Notes
 **last_processed_millis** | **int** | The last time when the derived metric query was run, in epoch millis | [optional] 
 **last_query_time** | **int** | Time for the query execute, averaged on hourly basis | [optional] 
 **metrics_used** | **list[str]** | Number of metrics checked by the query | [optional] 
-**minutes** | **int** | How frequently the query generating the derived metric is run | 
+**minutes** | **int** | Number of minutes to query for the derived metric | 
 **name** | **str** |  | 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
 **process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
diff --git a/docs/EventApi.md b/docs/EventApi.md
index 30c870e..ec14291 100644
--- a/docs/EventApi.md
+++ b/docs/EventApi.md
@@ -347,7 +347,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_alert_firing_events**
-> ResponseContainerPagedEvent get_alert_firing_events(alert_id, earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, limit=limit)
+> ResponseContainerPagedEvent get_alert_firing_events(alert_id, earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, limit=limit, asc=asc)
 
 Get firings events of an alert within a time range
 
@@ -373,10 +373,11 @@ alert_id = 'alert_id_example' # str |
 earliest_start_time_epoch_millis = 789 # int |  (optional)
 latest_start_time_epoch_millis = 789 # int |  (optional)
 limit = 100 # int |  (optional) (default to 100)
+asc = true # bool |  (optional)
 
 try:
     # Get firings events of an alert within a time range
-    api_response = api_instance.get_alert_firing_events(alert_id, earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, limit=limit)
+    api_response = api_instance.get_alert_firing_events(alert_id, earliest_start_time_epoch_millis=earliest_start_time_epoch_millis, latest_start_time_epoch_millis=latest_start_time_epoch_millis, limit=limit, asc=asc)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling EventApi->get_alert_firing_events: %s\n" % e)
@@ -390,6 +391,7 @@ Name | Type | Description  | Notes
  **earliest_start_time_epoch_millis** | **int**|  | [optional] 
  **latest_start_time_epoch_millis** | **int**|  | [optional] 
  **limit** | **int**|  | [optional] [default to 100]
+ **asc** | **bool**|  | [optional] 
 
 ### Return type
 
diff --git a/docs/EventSearchRequest.md b/docs/EventSearchRequest.md
index b502767..fd83e5a 100644
--- a/docs/EventSearchRequest.md
+++ b/docs/EventSearchRequest.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **cursor** | **str** | The id (exclusive) from which search results resume returning.  Users should supply an entity &#39;id&#39; to this property.  Its main purpose is to resume where a previous search left off because of the &#39;limit&#39; parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results | [optional] 
 **limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results | [optional] 
+**related_event_time_range** | [**RelatedEventTimeRange**](RelatedEventTimeRange.md) |  | [optional] 
 **sort_score_method** | **str** | Whether to sort events on similarity score : {NONE, SCORE_ASC, SCORE_DES}. Default: NONE. If sortScoreMethod is set to SCORE_ASC or SCORE_DES, it will override time sort | [optional] 
 **sort_time_ascending** | **bool** | Whether to sort event results ascending in start time.  Default: false | [optional] 
 **time_range** | [**EventTimeRange**](EventTimeRange.md) |  | [optional] 
diff --git a/docs/KubernetesComponent.md b/docs/KubernetesComponent.md
index f1f5dea..29fc8fa 100644
--- a/docs/KubernetesComponent.md
+++ b/docs/KubernetesComponent.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **last_updated** | **int** |  | [optional] 
 **name** | **str** |  | [optional] 
+**status** | [**dict(str, ComponentStatus)**](ComponentStatus.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MetricsPolicyApi.md b/docs/MetricsPolicyApi.md
new file mode 100644
index 0000000..194d871
--- /dev/null
+++ b/docs/MetricsPolicyApi.md
@@ -0,0 +1,281 @@
+# wavefront_api_client.MetricsPolicyApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_metrics_policy**](MetricsPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
+[**get_metrics_policy_by_version**](MetricsPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
+[**get_metrics_policy_history**](MetricsPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
+[**revert_metrics_policy_by_version**](MetricsPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
+[**update_metrics_policy**](MetricsPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
+
+
+# **get_metrics_policy**
+> ResponseContainerMetricsPolicyReadModel get_metrics_policy()
+
+Get the metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MetricsPolicyApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get the metrics policy
+    api_response = api_instance.get_metrics_policy()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MetricsPolicyApi->get_metrics_policy: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_metrics_policy_by_version**
+> ResponseContainerMetricsPolicyReadModel get_metrics_policy_by_version(version)
+
+Get a specific historical version of a metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MetricsPolicyApi(wavefront_api_client.ApiClient(configuration))
+version = 789 # int | 
+
+try:
+    # Get a specific historical version of a metrics policy
+    api_response = api_instance.get_metrics_policy_by_version(version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MetricsPolicyApi->get_metrics_policy_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_metrics_policy_history**
+> ResponseContainerHistoryResponse get_metrics_policy_history(offset=offset, limit=limit)
+
+Get the version history of metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MetricsPolicyApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of metrics policy
+    api_response = api_instance.get_metrics_policy_history(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MetricsPolicyApi->get_metrics_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revert_metrics_policy_by_version**
+> ResponseContainerMetricsPolicyReadModel revert_metrics_policy_by_version(version)
+
+Revert to a specific historical version of a metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MetricsPolicyApi(wavefront_api_client.ApiClient(configuration))
+version = 789 # int | 
+
+try:
+    # Revert to a specific historical version of a metrics policy
+    api_response = api_instance.revert_metrics_policy_by_version(version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MetricsPolicyApi->revert_metrics_policy_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_metrics_policy**
+> ResponseContainerMetricsPolicyReadModel update_metrics_policy(body=body)
+
+Update the metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MetricsPolicyApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.MetricsPolicyWriteModel() # MetricsPolicyWriteModel | Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre> (optional)
+
+try:
+    # Update the metrics policy
+    api_response = api_instance.update_metrics_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MetricsPolicyApi->update_metrics_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**MetricsPolicyWriteModel**](MetricsPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{ \&quot;policyRules\&quot;: [{   \&quot;name\&quot;: \&quot;Policy rule1 name\&quot;,   \&quot;description\&quot;: \&quot;Policy rule1 description\&quot;,   \&quot;prefixes\&quot;: [\&quot;revenue.*\&quot;],   \&quot;tags\&quot;: [{\&quot;key\&quot;:\&quot;sensitive\&quot;,  \&quot;value\&quot;:\&quot;false\&quot;},              {\&quot;key\&quot;:\&quot;source\&quot;,  \&quot;value\&quot;:\&quot;app1\&quot;}],   \&quot;tagsAnded\&quot;: \&quot;true\&quot;,   \&quot;accessType\&quot;: \&quot;ALLOW\&quot;,   \&quot;accounts\&quot;: [\&quot;accountId1\&quot;, \&quot;accountId2\&quot;],   \&quot;userGroups\&quot;: [\&quot;userGroupId1\&quot;],   \&quot;roles\&quot;: [\&quot;roleId\&quot;] }, {   \&quot;name\&quot;: \&quot;Policy rule2 name\&quot;,   \&quot;description\&quot;: \&quot;Policy rule2 description\&quot;,   \&quot;prefixes\&quot;: [\&quot;revenue.*\&quot;],   \&quot;accessType\&quot;: \&quot;BLOCK\&quot;,   \&quot;accounts\&quot;: [\&quot;accountId3\&quot;],   \&quot;userGroups\&quot;: [\&quot;userGroupId1\&quot;] }] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/MetricsPolicyReadModel.md b/docs/MetricsPolicyReadModel.md
new file mode 100644
index 0000000..4502936
--- /dev/null
+++ b/docs/MetricsPolicyReadModel.md
@@ -0,0 +1,13 @@
+# MetricsPolicyReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer** | **str** | The customer identifier of the metrics policy | [optional] 
+**policy_rules** | [**list[PolicyRuleReadModel]**](PolicyRuleReadModel.md) | The list of policy rules of the metrics policy | [optional] 
+**updated_epoch_millis** | **int** | The date time of the metrics policy update | [optional] 
+**updater_id** | **str** | The id of the metrics policy updater | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/MetricsPolicyWriteModel.md b/docs/MetricsPolicyWriteModel.md
new file mode 100644
index 0000000..7217fab
--- /dev/null
+++ b/docs/MetricsPolicyWriteModel.md
@@ -0,0 +1,13 @@
+# MetricsPolicyWriteModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer** | **str** | The customer identifier of the metrics policy | [optional] 
+**policy_rules** | [**list[PolicyRuleWriteModel]**](PolicyRuleWriteModel.md) | The policy rules of the metrics policy | [optional] 
+**updated_epoch_millis** | **int** | The date time of the metrics policy update | [optional] 
+**updater_id** | **str** | The id of the metrics policy updater | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PolicyRuleReadModel.md b/docs/PolicyRuleReadModel.md
new file mode 100644
index 0000000..d26e99e
--- /dev/null
+++ b/docs/PolicyRuleReadModel.md
@@ -0,0 +1,19 @@
+# PolicyRuleReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**access_type** | **str** | The access type of the policy rule | [optional] 
+**accounts** | [**list[AccessControlElement]**](AccessControlElement.md) | The list of accounts of the policy rule | [optional] 
+**description** | **str** | The description of the policy rule | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** | The name of the policy rule | 
+**prefixes** | **list[str]** | The prefixes of the policy rule | [optional] 
+**roles** | [**list[AccessControlElement]**](AccessControlElement.md) | The list of roles of the policy rule | [optional] 
+**tags** | [**list[Annotation]**](Annotation.md) | The tag/value pairs of the policy rule | [optional] 
+**tags_anded** | **bool** | Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the policy rule to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false | [optional] 
+**user_groups** | [**list[AccessControlElement]**](AccessControlElement.md) | The list of user groups of the policy rule | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PolicyRuleWriteModel.md b/docs/PolicyRuleWriteModel.md
new file mode 100644
index 0000000..7945495
--- /dev/null
+++ b/docs/PolicyRuleWriteModel.md
@@ -0,0 +1,19 @@
+# PolicyRuleWriteModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**access_type** | **str** | The access type of the policy rule | [optional] 
+**accounts** | **list[str]** | The list of account identifiers of the policy rule | [optional] 
+**description** | **str** | The description of the policy rule | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** | The name of the policy rule | 
+**prefixes** | **list[str]** | The prefixes of the policy rule | [optional] 
+**roles** | **list[str]** | The list of role identifiers of the policy rule | [optional] 
+**tags** | [**list[Annotation]**](Annotation.md) | The tag/value pairs of the policy rule | [optional] 
+**tags_anded** | **bool** | Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the policy rule to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false | [optional] 
+**user_groups** | **list[str]** | The list of user group identifiers of the policy rule | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RelatedEventTimeRange.md b/docs/RelatedEventTimeRange.md
new file mode 100644
index 0000000..b482ebc
--- /dev/null
+++ b/docs/RelatedEventTimeRange.md
@@ -0,0 +1,11 @@
+# RelatedEventTimeRange
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**earliest_start_time_epoch_millis** | **int** | Start of search time window, in milliseconds since the Unix Epoch. Events whose start time occurs after this value will be returned.  If no value is supplied, will return null | [optional] 
+**latest_start_time_epoch_millis** | **int** | End of the search time window, in milliseconds since the Unix Epoch. Events whose start time occurs before this value will be returned.  If no value is supplied, will return null | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerMetricsPolicyReadModel.md b/docs/ResponseContainerMetricsPolicyReadModel.md
new file mode 100644
index 0000000..03a9569
--- /dev/null
+++ b/docs/ResponseContainerMetricsPolicyReadModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerMetricsPolicyReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**MetricsPolicyReadModel**](MetricsPolicyReadModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 8a193fe..1d0a44e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.61.7"
+VERSION = "2.62.8"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_component_status.py b/test/test_component_status.py
new file mode 100644
index 0000000..65b0b6a
--- /dev/null
+++ b/test/test_component_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.component_status import ComponentStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestComponentStatus(unittest.TestCase):
+    """ComponentStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testComponentStatus(self):
+        """Test ComponentStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.component_status.ComponentStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metrics_policy_api.py b/test/test_metrics_policy_api.py
new file mode 100644
index 0000000..fa1f0a3
--- /dev/null
+++ b/test/test_metrics_policy_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricsPolicyApi(unittest.TestCase):
+    """MetricsPolicyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.metrics_policy_api.MetricsPolicyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_metrics_policy(self):
+        """Test case for get_metrics_policy
+
+        Get the metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_get_metrics_policy_by_version(self):
+        """Test case for get_metrics_policy_by_version
+
+        Get a specific historical version of a metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_get_metrics_policy_history(self):
+        """Test case for get_metrics_policy_history
+
+        Get the version history of metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_revert_metrics_policy_by_version(self):
+        """Test case for revert_metrics_policy_by_version
+
+        Revert to a specific historical version of a metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_update_metrics_policy(self):
+        """Test case for update_metrics_policy
+
+        Update the metrics policy  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metrics_policy_read_model.py b/test/test_metrics_policy_read_model.py
new file mode 100644
index 0000000..705d854
--- /dev/null
+++ b/test/test_metrics_policy_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.metrics_policy_read_model import MetricsPolicyReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricsPolicyReadModel(unittest.TestCase):
+    """MetricsPolicyReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMetricsPolicyReadModel(self):
+        """Test MetricsPolicyReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.metrics_policy_read_model.MetricsPolicyReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_metrics_policy_write_model.py b/test/test_metrics_policy_write_model.py
new file mode 100644
index 0000000..69b19b5
--- /dev/null
+++ b/test/test_metrics_policy_write_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.metrics_policy_write_model import MetricsPolicyWriteModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMetricsPolicyWriteModel(unittest.TestCase):
+    """MetricsPolicyWriteModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMetricsPolicyWriteModel(self):
+        """Test MetricsPolicyWriteModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.metrics_policy_write_model.MetricsPolicyWriteModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_policy_rule_read_model.py b/test/test_policy_rule_read_model.py
new file mode 100644
index 0000000..ce079f1
--- /dev/null
+++ b/test/test_policy_rule_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.policy_rule_read_model import PolicyRuleReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPolicyRuleReadModel(unittest.TestCase):
+    """PolicyRuleReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPolicyRuleReadModel(self):
+        """Test PolicyRuleReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.policy_rule_read_model.PolicyRuleReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_policy_rule_write_model.py b/test/test_policy_rule_write_model.py
new file mode 100644
index 0000000..67ec424
--- /dev/null
+++ b/test/test_policy_rule_write_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.policy_rule_write_model import PolicyRuleWriteModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPolicyRuleWriteModel(unittest.TestCase):
+    """PolicyRuleWriteModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPolicyRuleWriteModel(self):
+        """Test PolicyRuleWriteModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.policy_rule_write_model.PolicyRuleWriteModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_related_event_time_range.py b/test/test_related_event_time_range.py
new file mode 100644
index 0000000..88b17f9
--- /dev/null
+++ b/test/test_related_event_time_range.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.related_event_time_range import RelatedEventTimeRange  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRelatedEventTimeRange(unittest.TestCase):
+    """RelatedEventTimeRange unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRelatedEventTimeRange(self):
+        """Test RelatedEventTimeRange"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.related_event_time_range.RelatedEventTimeRange()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_metrics_policy_read_model.py b/test/test_response_container_metrics_policy_read_model.py
new file mode 100644
index 0000000..0160391
--- /dev/null
+++ b/test/test_response_container_metrics_policy_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_metrics_policy_read_model import ResponseContainerMetricsPolicyReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMetricsPolicyReadModel(unittest.TestCase):
+    """ResponseContainerMetricsPolicyReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMetricsPolicyReadModel(self):
+        """Test ResponseContainerMetricsPolicyReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_metrics_policy_read_model.ResponseContainerMetricsPolicyReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 2986b44..b4937ac 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -31,6 +31,7 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
+from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
@@ -70,6 +71,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.component_status import ComponentStatus
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
@@ -109,6 +111,8 @@
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.metrics_policy_read_model import MetricsPolicyReadModel
+from wavefront_api_client.models.metrics_policy_write_model import MetricsPolicyWriteModel
 from wavefront_api_client.models.module import Module
 from wavefront_api_client.models.module_descriptor import ModuleDescriptor
 from wavefront_api_client.models.module_layer import ModuleLayer
@@ -143,6 +147,8 @@
 from wavefront_api_client.models.paged_source import PagedSource
 from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
+from wavefront_api_client.models.policy_rule_read_model import PolicyRuleReadModel
+from wavefront_api_client.models.policy_rule_write_model import PolicyRuleWriteModel
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
@@ -150,6 +156,7 @@
 from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
 from wavefront_api_client.models.related_event import RelatedEvent
+from wavefront_api_client.models.related_event_time_range import RelatedEventTimeRange
 from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO
 from wavefront_api_client.models.response_container import ResponseContainer
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
@@ -175,6 +182,7 @@
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
+from wavefront_api_client.models.response_container_metrics_policy_read_model import ResponseContainerMetricsPolicyReadModel
 from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 1fe4c3a..2f9c997 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -18,6 +18,7 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
+from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index e74c2e2..7bb58cd 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -629,6 +629,7 @@ def get_alert_firing_events(self, alert_id, **kwargs):  # noqa: E501
         :param int earliest_start_time_epoch_millis:
         :param int latest_start_time_epoch_millis:
         :param int limit:
+        :param bool asc:
         :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
@@ -654,12 +655,13 @@ def get_alert_firing_events_with_http_info(self, alert_id, **kwargs):  # noqa: E
         :param int earliest_start_time_epoch_millis:
         :param int latest_start_time_epoch_millis:
         :param int limit:
+        :param bool asc:
         :return: ResponseContainerPagedEvent
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['alert_id', 'earliest_start_time_epoch_millis', 'latest_start_time_epoch_millis', 'limit']  # noqa: E501
+        all_params = ['alert_id', 'earliest_start_time_epoch_millis', 'latest_start_time_epoch_millis', 'limit', 'asc']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -692,6 +694,8 @@ def get_alert_firing_events_with_http_info(self, alert_id, **kwargs):  # noqa: E
             query_params.append(('latestStartTimeEpochMillis', params['latest_start_time_epoch_millis']))  # noqa: E501
         if 'limit' in params:
             query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'asc' in params:
+            query_params.append(('asc', params['asc']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/metrics_policy_api.py b/wavefront_api_client/api/metrics_policy_api.py
new file mode 100644
index 0000000..9c3a51c
--- /dev/null
+++ b/wavefront_api_client/api/metrics_policy_api.py
@@ -0,0 +1,517 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class MetricsPolicyApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_metrics_policy(self, **kwargs):  # noqa: E501
+        """Get the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_metrics_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Get the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_metrics_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_metrics_policy_by_version(self, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_by_version(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+            return data
+
+    def get_metrics_policy_by_version_with_http_info(self, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_by_version_with_http_info(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_metrics_policy_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'version' is set
+        if ('version' not in params or
+                params['version'] is None):
+            raise ValueError("Missing the required parameter `version` when calling `get_metrics_policy_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy/history/{version}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_metrics_policy_history(self, **kwargs):  # noqa: E501
+        """Get the version history of metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_history(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_metrics_policy_history_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_metrics_policy_history_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_metrics_policy_history_with_http_info(self, **kwargs):  # noqa: E501
+        """Get the version history of metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_history_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_metrics_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revert_metrics_policy_by_version(self, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revert_metrics_policy_by_version(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revert_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revert_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+            return data
+
+    def revert_metrics_policy_by_version_with_http_info(self, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revert_metrics_policy_by_version_with_http_info(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revert_metrics_policy_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'version' is set
+        if ('version' not in params or
+                params['version'] is None):
+            raise ValueError("Missing the required parameter `version` when calling `revert_metrics_policy_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy/revert/{version}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_metrics_policy(self, **kwargs):  # noqa: E501
+        """Update the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_metrics_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param MetricsPolicyWriteModel body: Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre>
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.update_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def update_metrics_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Update the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_metrics_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param MetricsPolicyWriteModel body: Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre>
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_metrics_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6b77384..78f6943 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.61.7/python'
+        self.user_agent = 'Swagger-Codegen/2.62.8/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index ff6c239..435cf3f 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.61.7".\
+               "SDK Package Version: 2.62.8".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 0049792..3c77afb 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -38,6 +38,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.component_status import ComponentStatus
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
@@ -77,6 +78,8 @@
 from wavefront_api_client.models.metric_details import MetricDetails
 from wavefront_api_client.models.metric_details_response import MetricDetailsResponse
 from wavefront_api_client.models.metric_status import MetricStatus
+from wavefront_api_client.models.metrics_policy_read_model import MetricsPolicyReadModel
+from wavefront_api_client.models.metrics_policy_write_model import MetricsPolicyWriteModel
 from wavefront_api_client.models.module import Module
 from wavefront_api_client.models.module_descriptor import ModuleDescriptor
 from wavefront_api_client.models.module_layer import ModuleLayer
@@ -111,6 +114,8 @@
 from wavefront_api_client.models.paged_source import PagedSource
 from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
+from wavefront_api_client.models.policy_rule_read_model import PolicyRuleReadModel
+from wavefront_api_client.models.policy_rule_write_model import PolicyRuleWriteModel
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
@@ -118,6 +123,7 @@
 from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
 from wavefront_api_client.models.related_event import RelatedEvent
+from wavefront_api_client.models.related_event_time_range import RelatedEventTimeRange
 from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO
 from wavefront_api_client.models.response_container import ResponseContainer
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
@@ -143,6 +149,7 @@
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
+from wavefront_api_client.models.response_container_metrics_policy_read_model import ResponseContainerMetricsPolicyReadModel
 from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index a6d6423..c75d8e0 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -35,6 +35,7 @@ class ChartSettings(object):
         'chart_default_color': 'str',
         'column_tags': 'str',
         'custom_tags': 'list[str]',
+        'default_sort_column': 'str',
         'expected_data_spacing': 'int',
         'fixed_legend_display_stats': 'list[str]',
         'fixed_legend_enabled': 'bool',
@@ -96,6 +97,7 @@ class ChartSettings(object):
         'chart_default_color': 'chartDefaultColor',
         'column_tags': 'columnTags',
         'custom_tags': 'customTags',
+        'default_sort_column': 'defaultSortColumn',
         'expected_data_spacing': 'expectedDataSpacing',
         'fixed_legend_display_stats': 'fixedLegendDisplayStats',
         'fixed_legend_enabled': 'fixedLegendEnabled',
@@ -152,13 +154,14 @@ class ChartSettings(object):
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
         self._auto_column_tags = None
         self._chart_default_color = None
         self._column_tags = None
         self._custom_tags = None
+        self._default_sort_column = None
         self._expected_data_spacing = None
         self._fixed_legend_display_stats = None
         self._fixed_legend_enabled = None
@@ -223,6 +226,8 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
             self.column_tags = column_tags
         if custom_tags is not None:
             self.custom_tags = custom_tags
+        if default_sort_column is not None:
+            self.default_sort_column = default_sort_column
         if expected_data_spacing is not None:
             self.expected_data_spacing = expected_data_spacing
         if fixed_legend_display_stats is not None:
@@ -423,6 +428,29 @@ def custom_tags(self, custom_tags):
 
         self._custom_tags = custom_tags
 
+    @property
+    def default_sort_column(self):
+        """Gets the default_sort_column of this ChartSettings.  # noqa: E501
+
+        For the tabular view, to select column for default sort  # noqa: E501
+
+        :return: The default_sort_column of this ChartSettings.  # noqa: E501
+        :rtype: str
+        """
+        return self._default_sort_column
+
+    @default_sort_column.setter
+    def default_sort_column(self, default_sort_column):
+        """Sets the default_sort_column of this ChartSettings.
+
+        For the tabular view, to select column for default sort  # noqa: E501
+
+        :param default_sort_column: The default_sort_column of this ChartSettings.  # noqa: E501
+        :type: str
+        """
+
+        self._default_sort_column = default_sort_column
+
     @property
     def expected_data_spacing(self):
         """Gets the expected_data_spacing of this ChartSettings.  # noqa: E501
diff --git a/wavefront_api_client/models/component_status.py b/wavefront_api_client/models/component_status.py
new file mode 100644
index 0000000..5f7c72d
--- /dev/null
+++ b/wavefront_api_client/models/component_status.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ComponentStatus(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'name': 'str',
+        'status': 'bool'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'name': 'name',
+        'status': 'status'
+    }
+
+    def __init__(self, description=None, name=None, status=None):  # noqa: E501
+        """ComponentStatus - a model defined in Swagger"""  # noqa: E501
+
+        self._description = None
+        self._name = None
+        self._status = None
+        self.discriminator = None
+
+        if description is not None:
+            self.description = description
+        if name is not None:
+            self.name = name
+        if status is not None:
+            self.status = status
+
+    @property
+    def description(self):
+        """Gets the description of this ComponentStatus.  # noqa: E501
+
+
+        :return: The description of this ComponentStatus.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ComponentStatus.
+
+
+        :param description: The description of this ComponentStatus.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def name(self):
+        """Gets the name of this ComponentStatus.  # noqa: E501
+
+
+        :return: The name of this ComponentStatus.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ComponentStatus.
+
+
+        :param name: The name of this ComponentStatus.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def status(self):
+        """Gets the status of this ComponentStatus.  # noqa: E501
+
+
+        :return: The status of this ComponentStatus.  # noqa: E501
+        :rtype: bool
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ComponentStatus.
+
+
+        :param status: The status of this ComponentStatus.  # noqa: E501
+        :type: bool
+        """
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ComponentStatus, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ComponentStatus):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index f65fe88..bbfab34 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -521,7 +521,7 @@ def metrics_used(self, metrics_used):
     def minutes(self):
         """Gets the minutes of this DerivedMetricDefinition.  # noqa: E501
 
-        How frequently the query generating the derived metric is run  # noqa: E501
+        Number of minutes to query for the derived metric  # noqa: E501
 
         :return: The minutes of this DerivedMetricDefinition.  # noqa: E501
         :rtype: int
@@ -532,7 +532,7 @@ def minutes(self):
     def minutes(self, minutes):
         """Sets the minutes of this DerivedMetricDefinition.
 
-        How frequently the query generating the derived metric is run  # noqa: E501
+        Number of minutes to query for the derived metric  # noqa: E501
 
         :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
         :type: int
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 313ef9a..c5693dd 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -34,6 +34,7 @@ class EventSearchRequest(object):
         'cursor': 'str',
         'limit': 'int',
         'query': 'list[SearchQuery]',
+        'related_event_time_range': 'RelatedEventTimeRange',
         'sort_score_method': 'str',
         'sort_time_ascending': 'bool',
         'time_range': 'EventTimeRange'
@@ -43,17 +44,19 @@ class EventSearchRequest(object):
         'cursor': 'cursor',
         'limit': 'limit',
         'query': 'query',
+        'related_event_time_range': 'relatedEventTimeRange',
         'sort_score_method': 'sortScoreMethod',
         'sort_time_ascending': 'sortTimeAscending',
         'time_range': 'timeRange'
     }
 
-    def __init__(self, cursor=None, limit=None, query=None, sort_score_method=None, sort_time_ascending=None, time_range=None):  # noqa: E501
+    def __init__(self, cursor=None, limit=None, query=None, related_event_time_range=None, sort_score_method=None, sort_time_ascending=None, time_range=None):  # noqa: E501
         """EventSearchRequest - a model defined in Swagger"""  # noqa: E501
 
         self._cursor = None
         self._limit = None
         self._query = None
+        self._related_event_time_range = None
         self._sort_score_method = None
         self._sort_time_ascending = None
         self._time_range = None
@@ -65,6 +68,8 @@ def __init__(self, cursor=None, limit=None, query=None, sort_score_method=None,
             self.limit = limit
         if query is not None:
             self.query = query
+        if related_event_time_range is not None:
+            self.related_event_time_range = related_event_time_range
         if sort_score_method is not None:
             self.sort_score_method = sort_score_method
         if sort_time_ascending is not None:
@@ -141,6 +146,27 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def related_event_time_range(self):
+        """Gets the related_event_time_range of this EventSearchRequest.  # noqa: E501
+
+
+        :return: The related_event_time_range of this EventSearchRequest.  # noqa: E501
+        :rtype: RelatedEventTimeRange
+        """
+        return self._related_event_time_range
+
+    @related_event_time_range.setter
+    def related_event_time_range(self, related_event_time_range):
+        """Sets the related_event_time_range of this EventSearchRequest.
+
+
+        :param related_event_time_range: The related_event_time_range of this EventSearchRequest.  # noqa: E501
+        :type: RelatedEventTimeRange
+        """
+
+        self._related_event_time_range = related_event_time_range
+
     @property
     def sort_score_method(self):
         """Gets the sort_score_method of this EventSearchRequest.  # noqa: E501
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
index f6d038a..2d776f4 100644
--- a/wavefront_api_client/models/kubernetes_component.py
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -32,25 +32,30 @@ class KubernetesComponent(object):
     """
     swagger_types = {
         'last_updated': 'int',
-        'name': 'str'
+        'name': 'str',
+        'status': 'dict(str, ComponentStatus)'
     }
 
     attribute_map = {
         'last_updated': 'lastUpdated',
-        'name': 'name'
+        'name': 'name',
+        'status': 'status'
     }
 
-    def __init__(self, last_updated=None, name=None):  # noqa: E501
+    def __init__(self, last_updated=None, name=None, status=None):  # noqa: E501
         """KubernetesComponent - a model defined in Swagger"""  # noqa: E501
 
         self._last_updated = None
         self._name = None
+        self._status = None
         self.discriminator = None
 
         if last_updated is not None:
             self.last_updated = last_updated
         if name is not None:
             self.name = name
+        if status is not None:
+            self.status = status
 
     @property
     def last_updated(self):
@@ -94,6 +99,27 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def status(self):
+        """Gets the status of this KubernetesComponent.  # noqa: E501
+
+
+        :return: The status of this KubernetesComponent.  # noqa: E501
+        :rtype: dict(str, ComponentStatus)
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this KubernetesComponent.
+
+
+        :param status: The status of this KubernetesComponent.  # noqa: E501
+        :type: dict(str, ComponentStatus)
+        """
+
+        self._status = status
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/metrics_policy_read_model.py b/wavefront_api_client/models/metrics_policy_read_model.py
new file mode 100644
index 0000000..49f7f1a
--- /dev/null
+++ b/wavefront_api_client/models/metrics_policy_read_model.py
@@ -0,0 +1,201 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class MetricsPolicyReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer': 'str',
+        'policy_rules': 'list[PolicyRuleReadModel]',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'customer': 'customer',
+        'policy_rules': 'policyRules',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+        """MetricsPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+
+        self._customer = None
+        self._policy_rules = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if customer is not None:
+            self.customer = customer
+        if policy_rules is not None:
+            self.policy_rules = policy_rules
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this MetricsPolicyReadModel.  # noqa: E501
+
+        The customer identifier of the metrics policy  # noqa: E501
+
+        :return: The customer of this MetricsPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this MetricsPolicyReadModel.
+
+        The customer identifier of the metrics policy  # noqa: E501
+
+        :param customer: The customer of this MetricsPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def policy_rules(self):
+        """Gets the policy_rules of this MetricsPolicyReadModel.  # noqa: E501
+
+        The list of policy rules of the metrics policy  # noqa: E501
+
+        :return: The policy_rules of this MetricsPolicyReadModel.  # noqa: E501
+        :rtype: list[PolicyRuleReadModel]
+        """
+        return self._policy_rules
+
+    @policy_rules.setter
+    def policy_rules(self, policy_rules):
+        """Sets the policy_rules of this MetricsPolicyReadModel.
+
+        The list of policy rules of the metrics policy  # noqa: E501
+
+        :param policy_rules: The policy_rules of this MetricsPolicyReadModel.  # noqa: E501
+        :type: list[PolicyRuleReadModel]
+        """
+
+        self._policy_rules = policy_rules
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this MetricsPolicyReadModel.  # noqa: E501
+
+        The date time of the metrics policy update  # noqa: E501
+
+        :return: The updated_epoch_millis of this MetricsPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this MetricsPolicyReadModel.
+
+        The date time of the metrics policy update  # noqa: E501
+
+        :param updated_epoch_millis: The updated_epoch_millis of this MetricsPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this MetricsPolicyReadModel.  # noqa: E501
+
+        The id of the metrics policy updater  # noqa: E501
+
+        :return: The updater_id of this MetricsPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this MetricsPolicyReadModel.
+
+        The id of the metrics policy updater  # noqa: E501
+
+        :param updater_id: The updater_id of this MetricsPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(MetricsPolicyReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, MetricsPolicyReadModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/metrics_policy_write_model.py b/wavefront_api_client/models/metrics_policy_write_model.py
new file mode 100644
index 0000000..9d617c2
--- /dev/null
+++ b/wavefront_api_client/models/metrics_policy_write_model.py
@@ -0,0 +1,201 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class MetricsPolicyWriteModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer': 'str',
+        'policy_rules': 'list[PolicyRuleWriteModel]',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'customer': 'customer',
+        'policy_rules': 'policyRules',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+        """MetricsPolicyWriteModel - a model defined in Swagger"""  # noqa: E501
+
+        self._customer = None
+        self._policy_rules = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if customer is not None:
+            self.customer = customer
+        if policy_rules is not None:
+            self.policy_rules = policy_rules
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this MetricsPolicyWriteModel.  # noqa: E501
+
+        The customer identifier of the metrics policy  # noqa: E501
+
+        :return: The customer of this MetricsPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this MetricsPolicyWriteModel.
+
+        The customer identifier of the metrics policy  # noqa: E501
+
+        :param customer: The customer of this MetricsPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def policy_rules(self):
+        """Gets the policy_rules of this MetricsPolicyWriteModel.  # noqa: E501
+
+        The policy rules of the metrics policy  # noqa: E501
+
+        :return: The policy_rules of this MetricsPolicyWriteModel.  # noqa: E501
+        :rtype: list[PolicyRuleWriteModel]
+        """
+        return self._policy_rules
+
+    @policy_rules.setter
+    def policy_rules(self, policy_rules):
+        """Sets the policy_rules of this MetricsPolicyWriteModel.
+
+        The policy rules of the metrics policy  # noqa: E501
+
+        :param policy_rules: The policy_rules of this MetricsPolicyWriteModel.  # noqa: E501
+        :type: list[PolicyRuleWriteModel]
+        """
+
+        self._policy_rules = policy_rules
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this MetricsPolicyWriteModel.  # noqa: E501
+
+        The date time of the metrics policy update  # noqa: E501
+
+        :return: The updated_epoch_millis of this MetricsPolicyWriteModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this MetricsPolicyWriteModel.
+
+        The date time of the metrics policy update  # noqa: E501
+
+        :param updated_epoch_millis: The updated_epoch_millis of this MetricsPolicyWriteModel.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this MetricsPolicyWriteModel.  # noqa: E501
+
+        The id of the metrics policy updater  # noqa: E501
+
+        :return: The updater_id of this MetricsPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this MetricsPolicyWriteModel.
+
+        The id of the metrics policy updater  # noqa: E501
+
+        :param updater_id: The updater_id of this MetricsPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(MetricsPolicyWriteModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, MetricsPolicyWriteModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/policy_rule_read_model.py b/wavefront_api_client/models/policy_rule_read_model.py
new file mode 100644
index 0000000..7e668ff
--- /dev/null
+++ b/wavefront_api_client/models/policy_rule_read_model.py
@@ -0,0 +1,374 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PolicyRuleReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'access_type': 'str',
+        'accounts': 'list[AccessControlElement]',
+        'description': 'str',
+        'id': 'str',
+        'name': 'str',
+        'prefixes': 'list[str]',
+        'roles': 'list[AccessControlElement]',
+        'tags': 'list[Annotation]',
+        'tags_anded': 'bool',
+        'user_groups': 'list[AccessControlElement]'
+    }
+
+    attribute_map = {
+        'access_type': 'accessType',
+        'accounts': 'accounts',
+        'description': 'description',
+        'id': 'id',
+        'name': 'name',
+        'prefixes': 'prefixes',
+        'roles': 'roles',
+        'tags': 'tags',
+        'tags_anded': 'tagsAnded',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, access_type=None, accounts=None, description=None, id=None, name=None, prefixes=None, roles=None, tags=None, tags_anded=None, user_groups=None):  # noqa: E501
+        """PolicyRuleReadModel - a model defined in Swagger"""  # noqa: E501
+
+        self._access_type = None
+        self._accounts = None
+        self._description = None
+        self._id = None
+        self._name = None
+        self._prefixes = None
+        self._roles = None
+        self._tags = None
+        self._tags_anded = None
+        self._user_groups = None
+        self.discriminator = None
+
+        if access_type is not None:
+            self.access_type = access_type
+        if accounts is not None:
+            self.accounts = accounts
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        self.name = name
+        if prefixes is not None:
+            self.prefixes = prefixes
+        if roles is not None:
+            self.roles = roles
+        if tags is not None:
+            self.tags = tags
+        if tags_anded is not None:
+            self.tags_anded = tags_anded
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def access_type(self):
+        """Gets the access_type of this PolicyRuleReadModel.  # noqa: E501
+
+        The access type of the policy rule  # noqa: E501
+
+        :return: The access_type of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._access_type
+
+    @access_type.setter
+    def access_type(self, access_type):
+        """Sets the access_type of this PolicyRuleReadModel.
+
+        The access type of the policy rule  # noqa: E501
+
+        :param access_type: The access_type of this PolicyRuleReadModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ALLOW", "BLOCK"]  # noqa: E501
+        if access_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `access_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(access_type, allowed_values)
+            )
+
+        self._access_type = access_type
+
+    @property
+    def accounts(self):
+        """Gets the accounts of this PolicyRuleReadModel.  # noqa: E501
+
+        The list of accounts of the policy rule  # noqa: E501
+
+        :return: The accounts of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._accounts
+
+    @accounts.setter
+    def accounts(self, accounts):
+        """Sets the accounts of this PolicyRuleReadModel.
+
+        The list of accounts of the policy rule  # noqa: E501
+
+        :param accounts: The accounts of this PolicyRuleReadModel.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._accounts = accounts
+
+    @property
+    def description(self):
+        """Gets the description of this PolicyRuleReadModel.  # noqa: E501
+
+        The description of the policy rule  # noqa: E501
+
+        :return: The description of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this PolicyRuleReadModel.
+
+        The description of the policy rule  # noqa: E501
+
+        :param description: The description of this PolicyRuleReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this PolicyRuleReadModel.  # noqa: E501
+
+
+        :return: The id of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this PolicyRuleReadModel.
+
+
+        :param id: The id of this PolicyRuleReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this PolicyRuleReadModel.  # noqa: E501
+
+        The name of the policy rule  # noqa: E501
+
+        :return: The name of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this PolicyRuleReadModel.
+
+        The name of the policy rule  # noqa: E501
+
+        :param name: The name of this PolicyRuleReadModel.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def prefixes(self):
+        """Gets the prefixes of this PolicyRuleReadModel.  # noqa: E501
+
+        The prefixes of the policy rule  # noqa: E501
+
+        :return: The prefixes of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._prefixes
+
+    @prefixes.setter
+    def prefixes(self, prefixes):
+        """Sets the prefixes of this PolicyRuleReadModel.
+
+        The prefixes of the policy rule  # noqa: E501
+
+        :param prefixes: The prefixes of this PolicyRuleReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._prefixes = prefixes
+
+    @property
+    def roles(self):
+        """Gets the roles of this PolicyRuleReadModel.  # noqa: E501
+
+        The list of roles of the policy rule  # noqa: E501
+
+        :return: The roles of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this PolicyRuleReadModel.
+
+        The list of roles of the policy rule  # noqa: E501
+
+        :param roles: The roles of this PolicyRuleReadModel.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._roles = roles
+
+    @property
+    def tags(self):
+        """Gets the tags of this PolicyRuleReadModel.  # noqa: E501
+
+        The tag/value pairs of the policy rule  # noqa: E501
+
+        :return: The tags of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this PolicyRuleReadModel.
+
+        The tag/value pairs of the policy rule  # noqa: E501
+
+        :param tags: The tags of this PolicyRuleReadModel.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._tags = tags
+
+    @property
+    def tags_anded(self):
+        """Gets the tags_anded of this PolicyRuleReadModel.  # noqa: E501
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the policy rule to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :return: The tags_anded of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._tags_anded
+
+    @tags_anded.setter
+    def tags_anded(self, tags_anded):
+        """Sets the tags_anded of this PolicyRuleReadModel.
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the policy rule to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :param tags_anded: The tags_anded of this PolicyRuleReadModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._tags_anded = tags_anded
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this PolicyRuleReadModel.  # noqa: E501
+
+        The list of user groups of the policy rule  # noqa: E501
+
+        :return: The user_groups of this PolicyRuleReadModel.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this PolicyRuleReadModel.
+
+        The list of user groups of the policy rule  # noqa: E501
+
+        :param user_groups: The user_groups of this PolicyRuleReadModel.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PolicyRuleReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PolicyRuleReadModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/policy_rule_write_model.py b/wavefront_api_client/models/policy_rule_write_model.py
new file mode 100644
index 0000000..6c8e27b
--- /dev/null
+++ b/wavefront_api_client/models/policy_rule_write_model.py
@@ -0,0 +1,374 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PolicyRuleWriteModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'access_type': 'str',
+        'accounts': 'list[str]',
+        'description': 'str',
+        'id': 'str',
+        'name': 'str',
+        'prefixes': 'list[str]',
+        'roles': 'list[str]',
+        'tags': 'list[Annotation]',
+        'tags_anded': 'bool',
+        'user_groups': 'list[str]'
+    }
+
+    attribute_map = {
+        'access_type': 'accessType',
+        'accounts': 'accounts',
+        'description': 'description',
+        'id': 'id',
+        'name': 'name',
+        'prefixes': 'prefixes',
+        'roles': 'roles',
+        'tags': 'tags',
+        'tags_anded': 'tagsAnded',
+        'user_groups': 'userGroups'
+    }
+
+    def __init__(self, access_type=None, accounts=None, description=None, id=None, name=None, prefixes=None, roles=None, tags=None, tags_anded=None, user_groups=None):  # noqa: E501
+        """PolicyRuleWriteModel - a model defined in Swagger"""  # noqa: E501
+
+        self._access_type = None
+        self._accounts = None
+        self._description = None
+        self._id = None
+        self._name = None
+        self._prefixes = None
+        self._roles = None
+        self._tags = None
+        self._tags_anded = None
+        self._user_groups = None
+        self.discriminator = None
+
+        if access_type is not None:
+            self.access_type = access_type
+        if accounts is not None:
+            self.accounts = accounts
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        self.name = name
+        if prefixes is not None:
+            self.prefixes = prefixes
+        if roles is not None:
+            self.roles = roles
+        if tags is not None:
+            self.tags = tags
+        if tags_anded is not None:
+            self.tags_anded = tags_anded
+        if user_groups is not None:
+            self.user_groups = user_groups
+
+    @property
+    def access_type(self):
+        """Gets the access_type of this PolicyRuleWriteModel.  # noqa: E501
+
+        The access type of the policy rule  # noqa: E501
+
+        :return: The access_type of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._access_type
+
+    @access_type.setter
+    def access_type(self, access_type):
+        """Sets the access_type of this PolicyRuleWriteModel.
+
+        The access type of the policy rule  # noqa: E501
+
+        :param access_type: The access_type of this PolicyRuleWriteModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ALLOW", "BLOCK"]  # noqa: E501
+        if access_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `access_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(access_type, allowed_values)
+            )
+
+        self._access_type = access_type
+
+    @property
+    def accounts(self):
+        """Gets the accounts of this PolicyRuleWriteModel.  # noqa: E501
+
+        The list of account identifiers of the policy rule  # noqa: E501
+
+        :return: The accounts of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._accounts
+
+    @accounts.setter
+    def accounts(self, accounts):
+        """Sets the accounts of this PolicyRuleWriteModel.
+
+        The list of account identifiers of the policy rule  # noqa: E501
+
+        :param accounts: The accounts of this PolicyRuleWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._accounts = accounts
+
+    @property
+    def description(self):
+        """Gets the description of this PolicyRuleWriteModel.  # noqa: E501
+
+        The description of the policy rule  # noqa: E501
+
+        :return: The description of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this PolicyRuleWriteModel.
+
+        The description of the policy rule  # noqa: E501
+
+        :param description: The description of this PolicyRuleWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this PolicyRuleWriteModel.  # noqa: E501
+
+
+        :return: The id of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this PolicyRuleWriteModel.
+
+
+        :param id: The id of this PolicyRuleWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this PolicyRuleWriteModel.  # noqa: E501
+
+        The name of the policy rule  # noqa: E501
+
+        :return: The name of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this PolicyRuleWriteModel.
+
+        The name of the policy rule  # noqa: E501
+
+        :param name: The name of this PolicyRuleWriteModel.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def prefixes(self):
+        """Gets the prefixes of this PolicyRuleWriteModel.  # noqa: E501
+
+        The prefixes of the policy rule  # noqa: E501
+
+        :return: The prefixes of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._prefixes
+
+    @prefixes.setter
+    def prefixes(self, prefixes):
+        """Sets the prefixes of this PolicyRuleWriteModel.
+
+        The prefixes of the policy rule  # noqa: E501
+
+        :param prefixes: The prefixes of this PolicyRuleWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._prefixes = prefixes
+
+    @property
+    def roles(self):
+        """Gets the roles of this PolicyRuleWriteModel.  # noqa: E501
+
+        The list of role identifiers of the policy rule  # noqa: E501
+
+        :return: The roles of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._roles
+
+    @roles.setter
+    def roles(self, roles):
+        """Sets the roles of this PolicyRuleWriteModel.
+
+        The list of role identifiers of the policy rule  # noqa: E501
+
+        :param roles: The roles of this PolicyRuleWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._roles = roles
+
+    @property
+    def tags(self):
+        """Gets the tags of this PolicyRuleWriteModel.  # noqa: E501
+
+        The tag/value pairs of the policy rule  # noqa: E501
+
+        :return: The tags of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this PolicyRuleWriteModel.
+
+        The tag/value pairs of the policy rule  # noqa: E501
+
+        :param tags: The tags of this PolicyRuleWriteModel.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._tags = tags
+
+    @property
+    def tags_anded(self):
+        """Gets the tags_anded of this PolicyRuleWriteModel.  # noqa: E501
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the policy rule to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :return: The tags_anded of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._tags_anded
+
+    @tags_anded.setter
+    def tags_anded(self, tags_anded):
+        """Sets the tags_anded of this PolicyRuleWriteModel.
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the policy rule to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :param tags_anded: The tags_anded of this PolicyRuleWriteModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._tags_anded = tags_anded
+
+    @property
+    def user_groups(self):
+        """Gets the user_groups of this PolicyRuleWriteModel.  # noqa: E501
+
+        The list of user group identifiers of the policy rule  # noqa: E501
+
+        :return: The user_groups of this PolicyRuleWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._user_groups
+
+    @user_groups.setter
+    def user_groups(self, user_groups):
+        """Sets the user_groups of this PolicyRuleWriteModel.
+
+        The list of user group identifiers of the policy rule  # noqa: E501
+
+        :param user_groups: The user_groups of this PolicyRuleWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._user_groups = user_groups
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PolicyRuleWriteModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PolicyRuleWriteModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/related_event_time_range.py b/wavefront_api_client/models/related_event_time_range.py
new file mode 100644
index 0000000..9388dad
--- /dev/null
+++ b/wavefront_api_client/models/related_event_time_range.py
@@ -0,0 +1,145 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class RelatedEventTimeRange(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'earliest_start_time_epoch_millis': 'int',
+        'latest_start_time_epoch_millis': 'int'
+    }
+
+    attribute_map = {
+        'earliest_start_time_epoch_millis': 'earliestStartTimeEpochMillis',
+        'latest_start_time_epoch_millis': 'latestStartTimeEpochMillis'
+    }
+
+    def __init__(self, earliest_start_time_epoch_millis=None, latest_start_time_epoch_millis=None):  # noqa: E501
+        """RelatedEventTimeRange - a model defined in Swagger"""  # noqa: E501
+
+        self._earliest_start_time_epoch_millis = None
+        self._latest_start_time_epoch_millis = None
+        self.discriminator = None
+
+        if earliest_start_time_epoch_millis is not None:
+            self.earliest_start_time_epoch_millis = earliest_start_time_epoch_millis
+        if latest_start_time_epoch_millis is not None:
+            self.latest_start_time_epoch_millis = latest_start_time_epoch_millis
+
+    @property
+    def earliest_start_time_epoch_millis(self):
+        """Gets the earliest_start_time_epoch_millis of this RelatedEventTimeRange.  # noqa: E501
+
+        Start of search time window, in milliseconds since the Unix Epoch. Events whose start time occurs after this value will be returned.  If no value is supplied, will return null  # noqa: E501
+
+        :return: The earliest_start_time_epoch_millis of this RelatedEventTimeRange.  # noqa: E501
+        :rtype: int
+        """
+        return self._earliest_start_time_epoch_millis
+
+    @earliest_start_time_epoch_millis.setter
+    def earliest_start_time_epoch_millis(self, earliest_start_time_epoch_millis):
+        """Sets the earliest_start_time_epoch_millis of this RelatedEventTimeRange.
+
+        Start of search time window, in milliseconds since the Unix Epoch. Events whose start time occurs after this value will be returned.  If no value is supplied, will return null  # noqa: E501
+
+        :param earliest_start_time_epoch_millis: The earliest_start_time_epoch_millis of this RelatedEventTimeRange.  # noqa: E501
+        :type: int
+        """
+
+        self._earliest_start_time_epoch_millis = earliest_start_time_epoch_millis
+
+    @property
+    def latest_start_time_epoch_millis(self):
+        """Gets the latest_start_time_epoch_millis of this RelatedEventTimeRange.  # noqa: E501
+
+        End of the search time window, in milliseconds since the Unix Epoch. Events whose start time occurs before this value will be returned.  If no value is supplied, will return null  # noqa: E501
+
+        :return: The latest_start_time_epoch_millis of this RelatedEventTimeRange.  # noqa: E501
+        :rtype: int
+        """
+        return self._latest_start_time_epoch_millis
+
+    @latest_start_time_epoch_millis.setter
+    def latest_start_time_epoch_millis(self, latest_start_time_epoch_millis):
+        """Sets the latest_start_time_epoch_millis of this RelatedEventTimeRange.
+
+        End of the search time window, in milliseconds since the Unix Epoch. Events whose start time occurs before this value will be returned.  If no value is supplied, will return null  # noqa: E501
+
+        :param latest_start_time_epoch_millis: The latest_start_time_epoch_millis of this RelatedEventTimeRange.  # noqa: E501
+        :type: int
+        """
+
+        self._latest_start_time_epoch_millis = latest_start_time_epoch_millis
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RelatedEventTimeRange, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RelatedEventTimeRange):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_metrics_policy_read_model.py b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
new file mode 100644
index 0000000..259fed6
--- /dev/null
+++ b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerMetricsPolicyReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'MetricsPolicyReadModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerMetricsPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+        :rtype: MetricsPolicyReadModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMetricsPolicyReadModel.
+
+
+        :param response: The response of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+        :type: MetricsPolicyReadModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerMetricsPolicyReadModel.
+
+
+        :param status: The status of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerMetricsPolicyReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerMetricsPolicyReadModel):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 12d77e1..3b2a55e 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -69,7 +69,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if not set(response).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501

From 26cd0691fa267d36b5e971d384d2244d6d4b74df Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Thu, 27 Aug 2020 11:14:58 -0700
Subject: [PATCH 059/161] Update Swagger Codegen to v2.4.15.

---
 .swagger-codegen/VERSION              | 2 +-
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 generate_client                       | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 3eb2ae3..9b83c55 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.14
\ No newline at end of file
+2.4.15
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ead948b..cee39f6 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.8"
+    "packageVersion": "2.62.11"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 348c93d..ead948b 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.61.7"
+    "packageVersion": "2.62.8"
 }
diff --git a/README.md b/README.md
index 4d83870..c1beeaa 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.62.8
+- Package version: 2.62.11
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 2555a5e..1acb804 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.14"  # For 3.x use CGEN_VER="3.0.16"
+CGEN_VER="2.4.15"  # For 3.x use CGEN_VER="3.0.21"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 1d0a44e..e9d285e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.62.8"
+VERSION = "2.62.11"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 78f6943..48c59c8 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.62.8/python'
+        self.user_agent = 'Swagger-Codegen/2.62.11/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 435cf3f..8b41c68 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.62.8".\
+               "SDK Package Version: 2.62.11".\
                format(env=sys.platform, pyversion=sys.version)

From c211f607f2182ed687e339a403d82408f08291b5 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 17 Sep 2020 08:16:20 -0700
Subject: [PATCH 060/161] Autogenerated Update v2.62.25.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Annotation.md                        |  2 +
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 ++++++++++++++++++++++-
 8 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index cee39f6..ec7f85e 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.11"
+    "packageVersion": "2.62.25"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ead948b..cee39f6 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.8"
+    "packageVersion": "2.62.11"
 }
diff --git a/README.md b/README.md
index c1beeaa..9052d21 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.62.11
+- Package version: 2.62.25
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index e9d285e..d2c6f6e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.62.11"
+VERSION = "2.62.25"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 48c59c8..9d070fb 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.62.11/python'
+        self.user_agent = 'Swagger-Codegen/2.62.25/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 8b41c68..f098670 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.62.11".\
+               "SDK Package Version: 2.62.25".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..927f98e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,15 +31,69 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, key=None, value=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 5ab32e2df16bd0fce84cb05fbc7a33db384aa7f6 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 18 Sep 2020 08:18:22 -0700
Subject: [PATCH 061/161] Autogenerated Update v2.62.28.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Annotation.md                        |  2 -
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 +----------------------
 8 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ec7f85e..a6ba9cb 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.25"
+    "packageVersion": "2.62.28"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index cee39f6..ec7f85e 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.11"
+    "packageVersion": "2.62.25"
 }
diff --git a/README.md b/README.md
index 9052d21..a9d1245 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.62.25
+- Package version: 2.62.28
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index d2c6f6e..23543a0 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.62.25"
+VERSION = "2.62.28"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 9d070fb..115a421 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.62.25/python'
+        self.user_agent = 'Swagger-Codegen/2.62.28/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index f098670..c235036 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.62.25".\
+               "SDK Package Version: 2.62.28".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 927f98e..cf05f3e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,69 +31,15 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None):  # noqa: E501
+    def __init__(self):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 3a99a47250a438e928a5315d337945ebc76a37b2 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 29 Sep 2020 08:19:09 -0700
Subject: [PATCH 062/161] Autogenerated Update v2.63.12.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/Alert.md                                 |  1 +
 docs/GCPConfiguration.md                      |  2 +-
 docs/SourceSearchRequestContainer.md          |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/alert.py          | 30 ++++++++++++++++++-
 .../models/gcp_configuration.py               |  6 ++--
 ...esponse_container_set_business_function.py |  2 +-
 .../models/source_search_request_container.py | 30 ++++++++++++++++++-
 13 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index a6ba9cb..49f7bf7 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.28"
+    "packageVersion": "2.63.12"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ec7f85e..a6ba9cb 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.25"
+    "packageVersion": "2.62.28"
 }
diff --git a/README.md b/README.md
index a9d1245..6046a98 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.62.28
+- Package version: 2.63.12
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index 1ade5e1..235cb2d 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -52,6 +52,7 @@ Name | Type | Description | Notes
 **process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
+**secure_metric_details** | **bool** | Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security. | [optional] 
 **severity** | **str** | Severity of the alert | [optional] 
 **severity_list** | **list[str]** | Alert severity list for multi-threshold type. | [optional] 
 **snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index 3b87bb7..22346f1 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN | [optional] 
+**categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, KUBERNETES, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN | [optional] 
 **custom_metric_prefix** | **list[str]** | List of custom metric prefix to fetch the data from | [optional] 
 **disable_delta_counts** | **bool** | Whether to disable the ingestion of counts for GCP delta metrics. Ingestion is enabled by default. | [optional] 
 **disable_histogram_to_metric_conversion** | **bool** | Whether to disable the ingestion of bucket data for GCP distributions. Ingestion is enabled by default. | [optional] 
diff --git a/docs/SourceSearchRequestContainer.md b/docs/SourceSearchRequestContainer.md
index c8044d4..2e880a2 100644
--- a/docs/SourceSearchRequestContainer.md
+++ b/docs/SourceSearchRequestContainer.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cursor** | **str** | The id (exclusive) from which search results resume returning.  Users should supply an entity &#39;id&#39; to this property.  Its main purpose is to resume where a previous search left off because of the &#39;limit&#39; parameter.  If a user supplies the last id in a set of results to cursor, while keeping the query the same, the system will return the next page of results | [optional] 
+**include_obsolete** | **bool** | Whether to fetch obsolete sources.  Default: false | [optional] 
 **limit** | **int** | The number of results to return.  Default: 100 | [optional] 
 **query** | [**list[SearchQuery]**](SearchQuery.md) | A list of queries by which to limit the search results | [optional] 
 **sort_sources_ascending** | **bool** | Whether to sort source results ascending lexigraphically by id/sourceName.  Default: true | [optional] 
diff --git a/setup.py b/setup.py
index 23543a0..5708136 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.62.28"
+VERSION = "2.63.12"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 115a421..11bfce3 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.62.28/python'
+        self.user_agent = 'Swagger-Codegen/2.63.12/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index c235036..5f0338b 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.62.28".\
+               "SDK Package Version: 2.63.12".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index ee339be..8ba5b83 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -80,6 +80,7 @@ class Alert(object):
         'process_rate_minutes': 'int',
         'query_failing': 'bool',
         'resolve_after_minutes': 'int',
+        'secure_metric_details': 'bool',
         'severity': 'str',
         'severity_list': 'list[str]',
         'snoozed': 'int',
@@ -148,6 +149,7 @@ class Alert(object):
         'process_rate_minutes': 'processRateMinutes',
         'query_failing': 'queryFailing',
         'resolve_after_minutes': 'resolveAfterMinutes',
+        'secure_metric_details': 'secureMetricDetails',
         'severity': 'severity',
         'severity_list': 'severityList',
         'snoozed': 'snoozed',
@@ -166,7 +168,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -218,6 +220,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._process_rate_minutes = None
         self._query_failing = None
         self._resolve_after_minutes = None
+        self._secure_metric_details = None
         self._severity = None
         self._severity_list = None
         self._snoozed = None
@@ -331,6 +334,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.query_failing = query_failing
         if resolve_after_minutes is not None:
             self.resolve_after_minutes = resolve_after_minutes
+        if secure_metric_details is not None:
+            self.secure_metric_details = secure_metric_details
         if severity is not None:
             self.severity = severity
         if severity_list is not None:
@@ -1475,6 +1480,29 @@ def resolve_after_minutes(self, resolve_after_minutes):
 
         self._resolve_after_minutes = resolve_after_minutes
 
+    @property
+    def secure_metric_details(self):
+        """Gets the secure_metric_details of this Alert.  # noqa: E501
+
+        Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security.  # noqa: E501
+
+        :return: The secure_metric_details of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._secure_metric_details
+
+    @secure_metric_details.setter
+    def secure_metric_details(self, secure_metric_details):
+        """Sets the secure_metric_details of this Alert.
+
+        Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security.  # noqa: E501
+
+        :param secure_metric_details: The secure_metric_details of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._secure_metric_details = secure_metric_details
+
     @property
     def severity(self):
         """Gets the severity of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 836413f..8fa01e6 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -79,7 +79,7 @@ def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_
     def categories_to_fetch(self):
         """Gets the categories_to_fetch of this GCPConfiguration.  # noqa: E501
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, KUBERNETES, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN  # noqa: E501
 
         :return: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :rtype: list[str]
@@ -90,12 +90,12 @@ def categories_to_fetch(self):
     def categories_to_fetch(self, categories_to_fetch):
         """Sets the categories_to_fetch of this GCPConfiguration.
 
-        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN  # noqa: E501
+        A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, KUBERNETES, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN  # noqa: E501
 
         :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "KUBERNETES", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
         if not set(categories_to_fetch).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 3b2a55e..be24192 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -69,7 +69,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if not set(response).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index b6dd4d0..2a0c477 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -32,6 +32,7 @@ class SourceSearchRequestContainer(object):
     """
     swagger_types = {
         'cursor': 'str',
+        'include_obsolete': 'bool',
         'limit': 'int',
         'query': 'list[SearchQuery]',
         'sort_sources_ascending': 'bool'
@@ -39,15 +40,17 @@ class SourceSearchRequestContainer(object):
 
     attribute_map = {
         'cursor': 'cursor',
+        'include_obsolete': 'includeObsolete',
         'limit': 'limit',
         'query': 'query',
         'sort_sources_ascending': 'sortSourcesAscending'
     }
 
-    def __init__(self, cursor=None, limit=None, query=None, sort_sources_ascending=None):  # noqa: E501
+    def __init__(self, cursor=None, include_obsolete=None, limit=None, query=None, sort_sources_ascending=None):  # noqa: E501
         """SourceSearchRequestContainer - a model defined in Swagger"""  # noqa: E501
 
         self._cursor = None
+        self._include_obsolete = None
         self._limit = None
         self._query = None
         self._sort_sources_ascending = None
@@ -55,6 +58,8 @@ def __init__(self, cursor=None, limit=None, query=None, sort_sources_ascending=N
 
         if cursor is not None:
             self.cursor = cursor
+        if include_obsolete is not None:
+            self.include_obsolete = include_obsolete
         if limit is not None:
             self.limit = limit
         if query is not None:
@@ -85,6 +90,29 @@ def cursor(self, cursor):
 
         self._cursor = cursor
 
+    @property
+    def include_obsolete(self):
+        """Gets the include_obsolete of this SourceSearchRequestContainer.  # noqa: E501
+
+        Whether to fetch obsolete sources.  Default: false  # noqa: E501
+
+        :return: The include_obsolete of this SourceSearchRequestContainer.  # noqa: E501
+        :rtype: bool
+        """
+        return self._include_obsolete
+
+    @include_obsolete.setter
+    def include_obsolete(self, include_obsolete):
+        """Sets the include_obsolete of this SourceSearchRequestContainer.
+
+        Whether to fetch obsolete sources.  Default: false  # noqa: E501
+
+        :param include_obsolete: The include_obsolete of this SourceSearchRequestContainer.  # noqa: E501
+        :type: bool
+        """
+
+        self._include_obsolete = include_obsolete
+
     @property
     def limit(self):
         """Gets the limit of this SourceSearchRequestContainer.  # noqa: E501

From ef320ed360bf0f14fa7be4b28cb203c39c27f42a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 7 Oct 2020 08:16:20 -0700
Subject: [PATCH 063/161] Autogenerated Update v2.63.16.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 wavefront_api_client/models/chart.py  | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 49f7bf7..7c2451f 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.63.12"
+    "packageVersion": "2.63.16"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index a6ba9cb..49f7bf7 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.62.28"
+    "packageVersion": "2.63.12"
 }
diff --git a/README.md b/README.md
index 6046a98..facb9a2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.63.12
+- Package version: 2.63.16
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 5708136..a23da19 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.63.12"
+VERSION = "2.63.16"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 11bfce3..7f964f7 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.63.12/python'
+        self.user_agent = 'Swagger-Codegen/2.63.16/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 5f0338b..56f5a13 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.63.12".\
+               "SDK Package Version: 2.63.16".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 4b64777..5cc89d1 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -140,7 +140,7 @@ def anomaly_sample_size(self, anomaly_sample_size):
         :param anomaly_sample_size: The anomaly_sample_size of this Chart.  # noqa: E501
         :type: str
         """
-        allowed_values = ["2 8 35"]  # noqa: E501
+        allowed_values = ["2", "8", "35"]  # noqa: E501
         if anomaly_sample_size not in allowed_values:
             raise ValueError(
                 "Invalid value for `anomaly_sample_size` ({0}), must be one of {1}"  # noqa: E501
@@ -169,7 +169,7 @@ def anomaly_severity(self, anomaly_severity):
         :param anomaly_severity: The anomaly_severity of this Chart.  # noqa: E501
         :type: str
         """
-        allowed_values = ["low medium high"]  # noqa: E501
+        allowed_values = ["low", "medium", "high"]  # noqa: E501
         if anomaly_severity not in allowed_values:
             raise ValueError(
                 "Invalid value for `anomaly_severity` ({0}), must be one of {1}"  # noqa: E501
@@ -198,7 +198,7 @@ def anomaly_type(self, anomaly_type):
         :param anomaly_type: The anomaly_type of this Chart.  # noqa: E501
         :type: str
         """
-        allowed_values = ["both low high"]  # noqa: E501
+        allowed_values = ["both", "low", "high"]  # noqa: E501
         if anomaly_type not in allowed_values:
             raise ValueError(
                 "Invalid value for `anomaly_type` ({0}), must be one of {1}"  # noqa: E501

From 715d16f42d5e9b16716813cef64e630e3a1b9d6b Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 13 Oct 2020 08:16:26 -0700
Subject: [PATCH 064/161] Autogenerated Update v2.63.18.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 8 +-------
 setup.py                              | 2 +-
 wavefront_api_client/__init__.py      | 1 -
 wavefront_api_client/api/__init__.py  | 1 -
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 8 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 7c2451f..d28e50f 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.63.16"
+    "packageVersion": "2.63.18"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 49f7bf7..7c2451f 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.63.12"
+    "packageVersion": "2.63.16"
 }
diff --git a/README.md b/README.md
index facb9a2..51e8c15 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.63.16
+- Package version: 2.63.18
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -125,12 +125,6 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
-*AnomalyApi* | [**get_all_anomalies**](docs/AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
-*AnomalyApi* | [**get_anomalies_for_chart_and_param_hash**](docs/AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
-*AnomalyApi* | [**get_chart_anomalies_for_chart**](docs/AnomalyApi.md#get_chart_anomalies_for_chart) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
-*AnomalyApi* | [**get_chart_anomalies_of_one_dashboard**](docs/AnomalyApi.md#get_chart_anomalies_of_one_dashboard) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-*AnomalyApi* | [**get_dashboard_anomalies**](docs/AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
-*AnomalyApi* | [**get_related_anomalies**](docs/AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
 *ApiTokenApi* | [**delete_token_service_account**](docs/ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
diff --git a/setup.py b/setup.py
index a23da19..d2290fb 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.63.16"
+VERSION = "2.63.18"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index b4937ac..14a0cdc 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -18,7 +18,6 @@
 # import apis into sdk package
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
-from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 2f9c997..e5a5ab1 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -5,7 +5,6 @@
 # import apis into api package
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
-from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 7f964f7..6d83463 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.63.16/python'
+        self.user_agent = 'Swagger-Codegen/2.63.18/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 56f5a13..78c1605 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.63.16".\
+               "SDK Package Version: 2.63.18".\
                format(env=sys.platform, pyversion=sys.version)

From 6665852074289fd720b1f0973c2ab440ccb8f6a1 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 16 Oct 2020 08:16:27 -0700
Subject: [PATCH 065/161] Autogenerated Update v2.64.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  24 +-
 docs/Annotation.md                            |   2 +
 docs/IngestionSpyApi.md                       |  54 ++
 docs/MonitoredApplicationApi.md               | 177 ++++++
 docs/MonitoredApplicationDTO.md               |  18 +
 docs/MonitoredServiceApi.md                   | 240 +++++++
 docs/MonitoredServiceDTO.md                   |  19 +
 docs/PagedMonitoredApplicationDTO.md          |  16 +
 docs/PagedMonitoredServiceDTO.md              |  16 +
 ...esponseContainerMonitoredApplicationDTO.md |  11 +
 docs/ResponseContainerMonitoredServiceDTO.md  |  11 +
 ...seContainerPagedMonitoredApplicationDTO.md |  11 +
 ...sponseContainerPagedMonitoredServiceDTO.md |  11 +
 docs/SearchApi.md                             | 334 ++++++++++
 setup.py                                      |   2 +-
 test/test_monitored_application_api.py        |  55 ++
 test/test_monitored_application_dto.py        |  40 ++
 test/test_monitored_service_api.py            |  62 ++
 test/test_monitored_service_dto.py            |  40 ++
 test/test_paged_monitored_application_dto.py  |  40 ++
 test/test_paged_monitored_service_dto.py      |  40 ++
 ...nse_container_monitored_application_dto.py |  40 ++
 ...esponse_container_monitored_service_dto.py |  40 ++
 ...ntainer_paged_monitored_application_dto.py |  40 ++
 ...e_container_paged_monitored_service_dto.py |  40 ++
 wavefront_api_client/__init__.py              |  10 +
 wavefront_api_client/api/__init__.py          |   2 +
 wavefront_api_client/api/ingestion_spy_api.py | 104 ++++
 .../api/monitored_application_api.py          | 327 ++++++++++
 .../api/monitored_service_api.py              | 446 +++++++++++++
 wavefront_api_client/api/search_api.py        | 586 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   8 +
 wavefront_api_client/models/annotation.py     |  56 +-
 .../models/monitored_application_dto.py       | 348 +++++++++++
 .../models/monitored_service_dto.py           | 377 +++++++++++
 .../models/paged_monitored_application_dto.py | 279 +++++++++
 .../models/paged_monitored_service_dto.py     | 279 +++++++++
 ...nse_container_monitored_application_dto.py | 142 +++++
 ...esponse_container_monitored_service_dto.py | 142 +++++
 ...ntainer_paged_monitored_application_dto.py | 142 +++++
 ...e_container_paged_monitored_service_dto.py | 142 +++++
 ...esponse_container_set_business_function.py |   2 +-
 46 files changed, 4775 insertions(+), 8 deletions(-)
 create mode 100644 docs/MonitoredApplicationApi.md
 create mode 100644 docs/MonitoredApplicationDTO.md
 create mode 100644 docs/MonitoredServiceApi.md
 create mode 100644 docs/MonitoredServiceDTO.md
 create mode 100644 docs/PagedMonitoredApplicationDTO.md
 create mode 100644 docs/PagedMonitoredServiceDTO.md
 create mode 100644 docs/ResponseContainerMonitoredApplicationDTO.md
 create mode 100644 docs/ResponseContainerMonitoredServiceDTO.md
 create mode 100644 docs/ResponseContainerPagedMonitoredApplicationDTO.md
 create mode 100644 docs/ResponseContainerPagedMonitoredServiceDTO.md
 create mode 100644 test/test_monitored_application_api.py
 create mode 100644 test/test_monitored_application_dto.py
 create mode 100644 test/test_monitored_service_api.py
 create mode 100644 test/test_monitored_service_dto.py
 create mode 100644 test/test_paged_monitored_application_dto.py
 create mode 100644 test/test_paged_monitored_service_dto.py
 create mode 100644 test/test_response_container_monitored_application_dto.py
 create mode 100644 test/test_response_container_monitored_service_dto.py
 create mode 100644 test/test_response_container_paged_monitored_application_dto.py
 create mode 100644 test/test_response_container_paged_monitored_service_dto.py
 create mode 100644 wavefront_api_client/api/monitored_application_api.py
 create mode 100644 wavefront_api_client/api/monitored_service_api.py
 create mode 100644 wavefront_api_client/models/monitored_application_dto.py
 create mode 100644 wavefront_api_client/models/monitored_service_dto.py
 create mode 100644 wavefront_api_client/models/paged_monitored_application_dto.py
 create mode 100644 wavefront_api_client/models/paged_monitored_service_dto.py
 create mode 100644 wavefront_api_client/models/response_container_monitored_application_dto.py
 create mode 100644 wavefront_api_client/models/response_container_monitored_service_dto.py
 create mode 100644 wavefront_api_client/models/response_container_paged_monitored_application_dto.py
 create mode 100644 wavefront_api_client/models/response_container_paged_monitored_service_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index d28e50f..2e779f8 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.63.18"
+    "packageVersion": "2.64.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 7c2451f..d28e50f 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.63.16"
+    "packageVersion": "2.63.18"
 }
diff --git a/README.md b/README.md
index 51e8c15..9669048 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.63.18
+- Package version: 2.64.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -194,6 +194,7 @@ Class | Method | HTTP request | Description
 *ExternalLinkApi* | [**get_all_external_link**](docs/ExternalLinkApi.md#get_all_external_link) | **GET** /api/v2/extlink | Get all external links for a customer
 *ExternalLinkApi* | [**get_external_link**](docs/ExternalLinkApi.md#get_external_link) | **GET** /api/v2/extlink/{id} | Get a specific external link
 *ExternalLinkApi* | [**update_external_link**](docs/ExternalLinkApi.md#update_external_link) | **PUT** /api/v2/extlink/{id} | Update a specific external link
+*IngestionSpyApi* | [**spy_on_delta_counters**](docs/IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_histograms**](docs/IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_id_creations**](docs/IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 *IngestionSpyApi* | [**spy_on_points**](docs/IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
@@ -222,6 +223,13 @@ Class | Method | HTTP request | Description
 *MetricsPolicyApi* | [**get_metrics_policy_history**](docs/MetricsPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
 *MetricsPolicyApi* | [**revert_metrics_policy_by_version**](docs/MetricsPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
 *MetricsPolicyApi* | [**update_metrics_policy**](docs/MetricsPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
+*MonitoredApplicationApi* | [**get_all_applications**](docs/MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored services
+*MonitoredApplicationApi* | [**get_application**](docs/MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
+*MonitoredApplicationApi* | [**update_service**](docs/MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
+*MonitoredServiceApi* | [**get_all_services**](docs/MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
+*MonitoredServiceApi* | [**get_service**](docs/MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
+*MonitoredServiceApi* | [**get_services_of_application**](docs/MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
+*MonitoredServiceApi* | [**update_service**](docs/MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
 *NotificantApi* | [**get_all_notificants**](docs/NotificantApi.md#get_all_notificants) | **GET** /api/v2/notificant | Get all notification targets for a customer
@@ -280,6 +288,12 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_maintenance_window_entities**](docs/SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facet**](docs/SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 *SearchApi* | [**search_maintenance_window_for_facets**](docs/SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
+*SearchApi* | [**search_monitored_application_entities**](docs/SearchApi.md#search_monitored_application_entities) | **POST** /api/v2/search/monitoredapplication | Search over all the customer&#39;s non-deleted monitored applications
+*SearchApi* | [**search_monitored_application_for_facet**](docs/SearchApi.md#search_monitored_application_for_facet) | **POST** /api/v2/search/monitoredapplication/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored application
+*SearchApi* | [**search_monitored_application_for_facets**](docs/SearchApi.md#search_monitored_application_for_facets) | **POST** /api/v2/search/monitoredapplication/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
+*SearchApi* | [**search_monitored_service_entities**](docs/SearchApi.md#search_monitored_service_entities) | **POST** /api/v2/search/monitoredservice | Search over all the customer&#39;s non-deleted monitored services
+*SearchApi* | [**search_monitored_service_for_facet**](docs/SearchApi.md#search_monitored_service_for_facet) | **POST** /api/v2/search/monitoredservice/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored application
+*SearchApi* | [**search_monitored_service_for_facets**](docs/SearchApi.md#search_monitored_service_for_facets) | **POST** /api/v2/search/monitoredservice/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 *SearchApi* | [**search_notficant_for_facets**](docs/SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 *SearchApi* | [**search_notificant_entities**](docs/SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 *SearchApi* | [**search_notificant_for_facet**](docs/SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -436,7 +450,9 @@ Class | Method | HTTP request | Description
  - [Module](docs/Module.md)
  - [ModuleDescriptor](docs/ModuleDescriptor.md)
  - [ModuleLayer](docs/ModuleLayer.md)
+ - [MonitoredApplicationDTO](docs/MonitoredApplicationDTO.md)
  - [MonitoredCluster](docs/MonitoredCluster.md)
+ - [MonitoredServiceDTO](docs/MonitoredServiceDTO.md)
  - [NewRelicConfiguration](docs/NewRelicConfiguration.md)
  - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
@@ -456,7 +472,9 @@ Class | Method | HTTP request | Description
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
+ - [PagedMonitoredApplicationDTO](docs/PagedMonitoredApplicationDTO.md)
  - [PagedMonitoredCluster](docs/PagedMonitoredCluster.md)
+ - [PagedMonitoredServiceDTO](docs/PagedMonitoredServiceDTO.md)
  - [PagedNotificant](docs/PagedNotificant.md)
  - [PagedProxy](docs/PagedProxy.md)
  - [PagedRelatedEvent](docs/PagedRelatedEvent.md)
@@ -503,7 +521,9 @@ Class | Method | HTTP request | Description
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
  - [ResponseContainerMessage](docs/ResponseContainerMessage.md)
  - [ResponseContainerMetricsPolicyReadModel](docs/ResponseContainerMetricsPolicyReadModel.md)
+ - [ResponseContainerMonitoredApplicationDTO](docs/ResponseContainerMonitoredApplicationDTO.md)
  - [ResponseContainerMonitoredCluster](docs/ResponseContainerMonitoredCluster.md)
+ - [ResponseContainerMonitoredServiceDTO](docs/ResponseContainerMonitoredServiceDTO.md)
  - [ResponseContainerNotificant](docs/ResponseContainerNotificant.md)
  - [ResponseContainerPagedAccount](docs/ResponseContainerPagedAccount.md)
  - [ResponseContainerPagedAlert](docs/ResponseContainerPagedAlert.md)
@@ -520,7 +540,9 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
+ - [ResponseContainerPagedMonitoredApplicationDTO](docs/ResponseContainerPagedMonitoredApplicationDTO.md)
  - [ResponseContainerPagedMonitoredCluster](docs/ResponseContainerPagedMonitoredCluster.md)
+ - [ResponseContainerPagedMonitoredServiceDTO](docs/ResponseContainerPagedMonitoredServiceDTO.md)
  - [ResponseContainerPagedNotificant](docs/ResponseContainerPagedNotificant.md)
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
  - [ResponseContainerPagedRelatedEvent](docs/ResponseContainerPagedRelatedEvent.md)
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IngestionSpyApi.md b/docs/IngestionSpyApi.md
index 0fa8084..d88ad74 100644
--- a/docs/IngestionSpyApi.md
+++ b/docs/IngestionSpyApi.md
@@ -4,12 +4,66 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**spy_on_delta_counters**](IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
 [**spy_on_histograms**](IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 [**spy_on_id_creations**](IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 [**spy_on_points**](IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
 [**spy_on_spans**](IngestionSpyApi.md#spy_on_spans) | **GET** /api/spy/spans | Gets new spans with existing source names and span tags.
 
 
+# **spy_on_delta_counters**
+> spy_on_delta_counters(counter=counter, host=host, counter_tag_key=counter_tag_key, sampling=sampling)
+
+Gets new delta counters that are added to existing time series.
+
+Try it Out button won't work in this case, as it's a streaming API. Endpoint: https://.wavefront.com/api/spy/deltas.  
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+counter = 'counter_example' # str | List a delta counter only if its name starts with the specified case-sensitive prefix.  E.g., counter=orderShirt matches counters named orderShirt and orderShirts, but not OrderShirts. (optional)
+host = 'host_example' # str | List a delta counter only if the name of its source starts with the specified case-sensitive prefix. (optional)
+counter_tag_key = ['counter_tag_key_example'] # list[str] | List a delta counter only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. counterTagKey=cluster&counterTagKey=shard  put cluster in the first line, put shard in the second line as values (optional)
+sampling = 0.01 # float |  (optional) (default to 0.01)
+
+try:
+    # Gets new delta counters that are added to existing time series.
+    api_instance.spy_on_delta_counters(counter=counter, host=host, counter_tag_key=counter_tag_key, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_delta_counters: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **counter** | **str**| List a delta counter only if its name starts with the specified case-sensitive prefix.  E.g., counter&#x3D;orderShirt matches counters named orderShirt and orderShirts, but not OrderShirts. | [optional] 
+ **host** | **str**| List a delta counter only if the name of its source starts with the specified case-sensitive prefix. | [optional] 
+ **counter_tag_key** | [**list[str]**](str.md)| List a delta counter only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. counterTagKey&#x3D;cluster&amp;counterTagKey&#x3D;shard  put cluster in the first line, put shard in the second line as values | [optional] 
+ **sampling** | **float**|  | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **spy_on_histograms**
 > spy_on_histograms(histogram=histogram, host=host, histogram_tag_key=histogram_tag_key, sampling=sampling)
 
diff --git a/docs/MonitoredApplicationApi.md b/docs/MonitoredApplicationApi.md
new file mode 100644
index 0000000..6e2f4bc
--- /dev/null
+++ b/docs/MonitoredApplicationApi.md
@@ -0,0 +1,177 @@
+# wavefront_api_client.MonitoredApplicationApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_all_applications**](MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored services
+[**get_application**](MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
+[**update_service**](MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
+
+
+# **get_all_applications**
+> ResponseContainerPagedMonitoredApplicationDTO get_all_applications(offset=offset, limit=limit)
+
+Get all monitored services
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredApplicationApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all monitored services
+    api_response = api_instance.get_all_applications(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredApplicationApi->get_all_applications: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedMonitoredApplicationDTO**](ResponseContainerPagedMonitoredApplicationDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_application**
+> ResponseContainerMonitoredApplicationDTO get_application(application)
+
+Get a specific application
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredApplicationApi(wavefront_api_client.ApiClient(configuration))
+application = 'application_example' # str | 
+
+try:
+    # Get a specific application
+    api_response = api_instance.get_application(application)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredApplicationApi->get_application: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **application** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMonitoredApplicationDTO**](ResponseContainerMonitoredApplicationDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_service**
+> ResponseContainerMonitoredApplicationDTO update_service(application, body=body)
+
+Update a specific service
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredApplicationApi(wavefront_api_client.ApiClient(configuration))
+application = 'application_example' # str | 
+body = wavefront_api_client.MonitoredApplicationDTO() # MonitoredApplicationDTO | Example Body:  <pre>{   \"application\": \"beachshirts\",   \"satisfiedLatencyMillis\": \"100000\",   \"hidden\": \"false\" }</pre> (optional)
+
+try:
+    # Update a specific service
+    api_response = api_instance.update_service(application, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredApplicationApi->update_service: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **application** | **str**|  | 
+ **body** | [**MonitoredApplicationDTO**](MonitoredApplicationDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMonitoredApplicationDTO**](ResponseContainerMonitoredApplicationDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/MonitoredApplicationDTO.md b/docs/MonitoredApplicationDTO.md
new file mode 100644
index 0000000..0818f65
--- /dev/null
+++ b/docs/MonitoredApplicationDTO.md
@@ -0,0 +1,18 @@
+# MonitoredApplicationDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**application** | **str** | Application Name of the monitored application | 
+**created** | **int** | Created epoch of monitored application | [optional] 
+**hidden** | **bool** | Monitored application is hidden or not | [optional] 
+**last_reported** | **int** | Last reported epoch of monitored application | [optional] 
+**last_updated** | **int** | Last update epoch of monitored application | [optional] 
+**satisfied_latency_millis** | **int** | Satisfied latency of monitored application | [optional] 
+**service_count** | **int** | Number of monitored service of monitored application | [optional] 
+**status** | **str** | Status of monitored application | [optional] 
+**update_user_id** | **str** | Last update user id of monitored application | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/MonitoredServiceApi.md b/docs/MonitoredServiceApi.md
new file mode 100644
index 0000000..ed8dbea
--- /dev/null
+++ b/docs/MonitoredServiceApi.md
@@ -0,0 +1,240 @@
+# wavefront_api_client.MonitoredServiceApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_all_services**](MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
+[**get_service**](MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
+[**get_services_of_application**](MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
+[**update_service**](MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
+
+
+# **get_all_services**
+> ResponseContainerPagedMonitoredServiceDTO get_all_services(offset=offset, limit=limit)
+
+Get all monitored services
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all monitored services
+    api_response = api_instance.get_all_services(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->get_all_services: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedMonitoredServiceDTO**](ResponseContainerPagedMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_service**
+> ResponseContainerMonitoredServiceDTO get_service(application, service)
+
+Get a specific application
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+application = 'application_example' # str | 
+service = 'service_example' # str | 
+
+try:
+    # Get a specific application
+    api_response = api_instance.get_service(application, service)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->get_service: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **application** | **str**|  | 
+ **service** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMonitoredServiceDTO**](ResponseContainerMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_services_of_application**
+> ResponseContainerPagedMonitoredServiceDTO get_services_of_application(application, offset=offset, limit=limit)
+
+Get a specific application
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+application = 'application_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get a specific application
+    api_response = api_instance.get_services_of_application(application, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->get_services_of_application: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **application** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedMonitoredServiceDTO**](ResponseContainerPagedMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_service**
+> ResponseContainerMonitoredServiceDTO update_service(application, service, body=body)
+
+Update a specific service
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+application = 'application_example' # str | 
+service = 'service_example' # str | 
+body = wavefront_api_client.MonitoredServiceDTO() # MonitoredServiceDTO | Example Body:  <pre>{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre> (optional)
+
+try:
+    # Update a specific service
+    api_response = api_instance.update_service(application, service, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->update_service: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **application** | **str**|  | 
+ **service** | **str**|  | 
+ **body** | [**MonitoredServiceDTO**](MonitoredServiceDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;service\&quot;: \&quot;shopping\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMonitoredServiceDTO**](ResponseContainerMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/MonitoredServiceDTO.md b/docs/MonitoredServiceDTO.md
new file mode 100644
index 0000000..d841423
--- /dev/null
+++ b/docs/MonitoredServiceDTO.md
@@ -0,0 +1,19 @@
+# MonitoredServiceDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**application** | **str** | Application Name of the monitored service | 
+**created** | **int** | Created epoch of monitored service | [optional] 
+**custom_dashboard_link** | **str** | Customer dashboard link | [optional] 
+**hidden** | **bool** | Monitored service is hidden or not | [optional] 
+**last_reported** | **int** | Last reported epoch of monitored service | [optional] 
+**last_updated** | **int** | Last update epoch of monitored service | [optional] 
+**satisfied_latency_millis** | **int** | Satisfied latency of monitored service | [optional] 
+**service** | **str** | Service Name of the monitored service | 
+**status** | **str** | Status of monitored service | [optional] 
+**update_user_id** | **str** | Last update user id of monitored service | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedMonitoredApplicationDTO.md b/docs/PagedMonitoredApplicationDTO.md
new file mode 100644
index 0000000..381d2de
--- /dev/null
+++ b/docs/PagedMonitoredApplicationDTO.md
@@ -0,0 +1,16 @@
+# PagedMonitoredApplicationDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[MonitoredApplicationDTO]**](MonitoredApplicationDTO.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedMonitoredServiceDTO.md b/docs/PagedMonitoredServiceDTO.md
new file mode 100644
index 0000000..6b5f582
--- /dev/null
+++ b/docs/PagedMonitoredServiceDTO.md
@@ -0,0 +1,16 @@
+# PagedMonitoredServiceDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[MonitoredServiceDTO]**](MonitoredServiceDTO.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerMonitoredApplicationDTO.md b/docs/ResponseContainerMonitoredApplicationDTO.md
new file mode 100644
index 0000000..50b8813
--- /dev/null
+++ b/docs/ResponseContainerMonitoredApplicationDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerMonitoredApplicationDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**MonitoredApplicationDTO**](MonitoredApplicationDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerMonitoredServiceDTO.md b/docs/ResponseContainerMonitoredServiceDTO.md
new file mode 100644
index 0000000..e48e1dc
--- /dev/null
+++ b/docs/ResponseContainerMonitoredServiceDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerMonitoredServiceDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**MonitoredServiceDTO**](MonitoredServiceDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedMonitoredApplicationDTO.md b/docs/ResponseContainerPagedMonitoredApplicationDTO.md
new file mode 100644
index 0000000..1692390
--- /dev/null
+++ b/docs/ResponseContainerPagedMonitoredApplicationDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedMonitoredApplicationDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedMonitoredApplicationDTO**](PagedMonitoredApplicationDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedMonitoredServiceDTO.md b/docs/ResponseContainerPagedMonitoredServiceDTO.md
new file mode 100644
index 0000000..97bc452
--- /dev/null
+++ b/docs/ResponseContainerPagedMonitoredServiceDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedMonitoredServiceDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedMonitoredServiceDTO**](PagedMonitoredServiceDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index e621a43..d09684e 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -34,6 +34,12 @@ Method | HTTP request | Description
 [**search_maintenance_window_entities**](SearchApi.md#search_maintenance_window_entities) | **POST** /api/v2/search/maintenancewindow | Search over a customer&#39;s maintenance windows
 [**search_maintenance_window_for_facet**](SearchApi.md#search_maintenance_window_for_facet) | **POST** /api/v2/search/maintenancewindow/{facet} | Lists the values of a specific facet over the customer&#39;s maintenance windows
 [**search_maintenance_window_for_facets**](SearchApi.md#search_maintenance_window_for_facets) | **POST** /api/v2/search/maintenancewindow/facets | Lists the values of one or more facets over the customer&#39;s maintenance windows
+[**search_monitored_application_entities**](SearchApi.md#search_monitored_application_entities) | **POST** /api/v2/search/monitoredapplication | Search over all the customer&#39;s non-deleted monitored applications
+[**search_monitored_application_for_facet**](SearchApi.md#search_monitored_application_for_facet) | **POST** /api/v2/search/monitoredapplication/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored application
+[**search_monitored_application_for_facets**](SearchApi.md#search_monitored_application_for_facets) | **POST** /api/v2/search/monitoredapplication/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
+[**search_monitored_service_entities**](SearchApi.md#search_monitored_service_entities) | **POST** /api/v2/search/monitoredservice | Search over all the customer&#39;s non-deleted monitored services
+[**search_monitored_service_for_facet**](SearchApi.md#search_monitored_service_for_facet) | **POST** /api/v2/search/monitoredservice/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted monitored application
+[**search_monitored_service_for_facets**](SearchApi.md#search_monitored_service_for_facets) | **POST** /api/v2/search/monitoredservice/facets | Lists the values of one or more facets over the customer&#39;s non-deleted monitored clusters
 [**search_notficant_for_facets**](SearchApi.md#search_notficant_for_facets) | **POST** /api/v2/search/notificant/facets | Lists the values of one or more facets over the customer&#39;s notificants
 [**search_notificant_entities**](SearchApi.md#search_notificant_entities) | **POST** /api/v2/search/notificant | Search over a customer&#39;s notificants
 [**search_notificant_for_facet**](SearchApi.md#search_notificant_for_facet) | **POST** /api/v2/search/notificant/{facet} | Lists the values of a specific facet over the customer&#39;s notificants
@@ -1714,6 +1720,334 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_monitored_application_entities**
+> ResponseContainerPagedMonitoredApplicationDTO search_monitored_application_entities(body=body)
+
+Search over all the customer's non-deleted monitored applications
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over all the customer's non-deleted monitored applications
+    api_response = api_instance.search_monitored_application_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_application_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedMonitoredApplicationDTO**](ResponseContainerPagedMonitoredApplicationDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_application_for_facet**
+> ResponseContainerFacetResponse search_monitored_application_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted monitored application
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted monitored application
+    api_response = api_instance.search_monitored_application_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_application_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_application_for_facets**
+> ResponseContainerFacetsResponseContainer search_monitored_application_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted monitored clusters
+    api_response = api_instance.search_monitored_application_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_application_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_service_entities**
+> ResponseContainerPagedMonitoredServiceDTO search_monitored_service_entities(body=body)
+
+Search over all the customer's non-deleted monitored services
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over all the customer's non-deleted monitored services
+    api_response = api_instance.search_monitored_service_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_service_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedMonitoredServiceDTO**](ResponseContainerPagedMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_service_for_facet**
+> ResponseContainerFacetResponse search_monitored_service_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted monitored application
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted monitored application
+    api_response = api_instance.search_monitored_service_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_service_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_monitored_service_for_facets**
+> ResponseContainerFacetsResponseContainer search_monitored_service_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted monitored clusters
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted monitored clusters
+    api_response = api_instance.search_monitored_service_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_monitored_service_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_notficant_for_facets**
 > ResponseContainerFacetsResponseContainer search_notficant_for_facets(body=body)
 
diff --git a/setup.py b/setup.py
index d2290fb..f1a9483 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.63.18"
+VERSION = "2.64.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_monitored_application_api.py b/test/test_monitored_application_api.py
new file mode 100644
index 0000000..a1a7085
--- /dev/null
+++ b/test/test_monitored_application_api.py
@@ -0,0 +1,55 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.monitored_application_api import MonitoredApplicationApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMonitoredApplicationApi(unittest.TestCase):
+    """MonitoredApplicationApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.monitored_application_api.MonitoredApplicationApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_all_applications(self):
+        """Test case for get_all_applications
+
+        Get all monitored services  # noqa: E501
+        """
+        pass
+
+    def test_get_application(self):
+        """Test case for get_application
+
+        Get a specific application  # noqa: E501
+        """
+        pass
+
+    def test_update_service(self):
+        """Test case for update_service
+
+        Update a specific service  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_monitored_application_dto.py b/test/test_monitored_application_dto.py
new file mode 100644
index 0000000..34c0189
--- /dev/null
+++ b/test/test_monitored_application_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.monitored_application_dto import MonitoredApplicationDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMonitoredApplicationDTO(unittest.TestCase):
+    """MonitoredApplicationDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMonitoredApplicationDTO(self):
+        """Test MonitoredApplicationDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.monitored_application_dto.MonitoredApplicationDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_monitored_service_api.py b/test/test_monitored_service_api.py
new file mode 100644
index 0000000..4410247
--- /dev/null
+++ b/test/test_monitored_service_api.py
@@ -0,0 +1,62 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.monitored_service_api import MonitoredServiceApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMonitoredServiceApi(unittest.TestCase):
+    """MonitoredServiceApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.monitored_service_api.MonitoredServiceApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_all_services(self):
+        """Test case for get_all_services
+
+        Get all monitored services  # noqa: E501
+        """
+        pass
+
+    def test_get_service(self):
+        """Test case for get_service
+
+        Get a specific application  # noqa: E501
+        """
+        pass
+
+    def test_get_services_of_application(self):
+        """Test case for get_services_of_application
+
+        Get a specific application  # noqa: E501
+        """
+        pass
+
+    def test_update_service(self):
+        """Test case for update_service
+
+        Update a specific service  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_monitored_service_dto.py b/test/test_monitored_service_dto.py
new file mode 100644
index 0000000..166323e
--- /dev/null
+++ b/test/test_monitored_service_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.monitored_service_dto import MonitoredServiceDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestMonitoredServiceDTO(unittest.TestCase):
+    """MonitoredServiceDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMonitoredServiceDTO(self):
+        """Test MonitoredServiceDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.monitored_service_dto.MonitoredServiceDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_monitored_application_dto.py b/test/test_paged_monitored_application_dto.py
new file mode 100644
index 0000000..313ec09
--- /dev/null
+++ b/test/test_paged_monitored_application_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_monitored_application_dto import PagedMonitoredApplicationDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedMonitoredApplicationDTO(unittest.TestCase):
+    """PagedMonitoredApplicationDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedMonitoredApplicationDTO(self):
+        """Test PagedMonitoredApplicationDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_monitored_application_dto.PagedMonitoredApplicationDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_monitored_service_dto.py b/test/test_paged_monitored_service_dto.py
new file mode 100644
index 0000000..1e11694
--- /dev/null
+++ b/test/test_paged_monitored_service_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_monitored_service_dto import PagedMonitoredServiceDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedMonitoredServiceDTO(unittest.TestCase):
+    """PagedMonitoredServiceDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedMonitoredServiceDTO(self):
+        """Test PagedMonitoredServiceDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_monitored_service_dto.PagedMonitoredServiceDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_monitored_application_dto.py b/test/test_response_container_monitored_application_dto.py
new file mode 100644
index 0000000..dea7145
--- /dev/null
+++ b/test/test_response_container_monitored_application_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_monitored_application_dto import ResponseContainerMonitoredApplicationDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMonitoredApplicationDTO(unittest.TestCase):
+    """ResponseContainerMonitoredApplicationDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMonitoredApplicationDTO(self):
+        """Test ResponseContainerMonitoredApplicationDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_monitored_application_dto.ResponseContainerMonitoredApplicationDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_monitored_service_dto.py b/test/test_response_container_monitored_service_dto.py
new file mode 100644
index 0000000..017c0c4
--- /dev/null
+++ b/test/test_response_container_monitored_service_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_monitored_service_dto import ResponseContainerMonitoredServiceDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMonitoredServiceDTO(unittest.TestCase):
+    """ResponseContainerMonitoredServiceDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMonitoredServiceDTO(self):
+        """Test ResponseContainerMonitoredServiceDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_monitored_service_dto.ResponseContainerMonitoredServiceDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_monitored_application_dto.py b/test/test_response_container_paged_monitored_application_dto.py
new file mode 100644
index 0000000..5a37974
--- /dev/null
+++ b/test/test_response_container_paged_monitored_application_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_monitored_application_dto import ResponseContainerPagedMonitoredApplicationDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedMonitoredApplicationDTO(unittest.TestCase):
+    """ResponseContainerPagedMonitoredApplicationDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedMonitoredApplicationDTO(self):
+        """Test ResponseContainerPagedMonitoredApplicationDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_monitored_application_dto.ResponseContainerPagedMonitoredApplicationDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_monitored_service_dto.py b/test/test_response_container_paged_monitored_service_dto.py
new file mode 100644
index 0000000..bd17bca
--- /dev/null
+++ b/test/test_response_container_paged_monitored_service_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_monitored_service_dto import ResponseContainerPagedMonitoredServiceDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedMonitoredServiceDTO(unittest.TestCase):
+    """ResponseContainerPagedMonitoredServiceDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedMonitoredServiceDTO(self):
+        """Test ResponseContainerPagedMonitoredServiceDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_monitored_service_dto.ResponseContainerPagedMonitoredServiceDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 14a0cdc..309d559 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -31,6 +31,8 @@
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
 from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi
+from wavefront_api_client.api.monitored_application_api import MonitoredApplicationApi
+from wavefront_api_client.api.monitored_service_api import MonitoredServiceApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
@@ -115,7 +117,9 @@
 from wavefront_api_client.models.module import Module
 from wavefront_api_client.models.module_descriptor import ModuleDescriptor
 from wavefront_api_client.models.module_layer import ModuleLayer
+from wavefront_api_client.models.monitored_application_dto import MonitoredApplicationDTO
 from wavefront_api_client.models.monitored_cluster import MonitoredCluster
+from wavefront_api_client.models.monitored_service_dto import MonitoredServiceDTO
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
@@ -135,7 +139,9 @@
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
+from wavefront_api_client.models.paged_monitored_application_dto import PagedMonitoredApplicationDTO
 from wavefront_api_client.models.paged_monitored_cluster import PagedMonitoredCluster
+from wavefront_api_client.models.paged_monitored_service_dto import PagedMonitoredServiceDTO
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
@@ -182,7 +188,9 @@
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
 from wavefront_api_client.models.response_container_metrics_policy_read_model import ResponseContainerMetricsPolicyReadModel
+from wavefront_api_client.models.response_container_monitored_application_dto import ResponseContainerMonitoredApplicationDTO
 from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster
+from wavefront_api_client.models.response_container_monitored_service_dto import ResponseContainerMonitoredServiceDTO
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
@@ -199,7 +207,9 @@
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
+from wavefront_api_client.models.response_container_paged_monitored_application_dto import ResponseContainerPagedMonitoredApplicationDTO
 from wavefront_api_client.models.response_container_paged_monitored_cluster import ResponseContainerPagedMonitoredCluster
+from wavefront_api_client.models.response_container_paged_monitored_service_dto import ResponseContainerPagedMonitoredServiceDTO
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index e5a5ab1..c780771 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -18,6 +18,8 @@
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
 from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi
+from wavefront_api_client.api.monitored_application_api import MonitoredApplicationApi
+from wavefront_api_client.api.monitored_service_api import MonitoredServiceApi
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index 1f653e1..cf8ea92 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -33,6 +33,110 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def spy_on_delta_counters(self, **kwargs):  # noqa: E501
+        """Gets new delta counters that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API. Endpoint: https://.wavefront.com/api/spy/deltas.    # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_delta_counters(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str counter: List a delta counter only if its name starts with the specified case-sensitive prefix.  E.g., counter=orderShirt matches counters named orderShirt and orderShirts, but not OrderShirts.
+        :param str host: List a delta counter only if the name of its source starts with the specified case-sensitive prefix.
+        :param list[str] counter_tag_key: List a delta counter only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. counterTagKey=cluster&counterTagKey=shard  put cluster in the first line, put shard in the second line as values
+        :param float sampling:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_delta_counters_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_delta_counters_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_delta_counters_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets new delta counters that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API. Endpoint: https://.wavefront.com/api/spy/deltas.    # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_delta_counters_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str counter: List a delta counter only if its name starts with the specified case-sensitive prefix.  E.g., counter=orderShirt matches counters named orderShirt and orderShirts, but not OrderShirts.
+        :param str host: List a delta counter only if the name of its source starts with the specified case-sensitive prefix.
+        :param list[str] counter_tag_key: List a delta counter only if it has the specified tag key. Add this parameter multiple times to specify multiple tags, e.g. counterTagKey=cluster&counterTagKey=shard  put cluster in the first line, put shard in the second line as values
+        :param float sampling:
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['counter', 'host', 'counter_tag_key', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_delta_counters" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'counter' in params:
+            query_params.append(('counter', params['counter']))  # noqa: E501
+        if 'host' in params:
+            query_params.append(('host', params['host']))  # noqa: E501
+        if 'counter_tag_key' in params:
+            query_params.append(('counterTagKey', params['counter_tag_key']))  # noqa: E501
+            collection_formats['counterTagKey'] = 'multi'  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/deltas', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def spy_on_histograms(self, **kwargs):  # noqa: E501
         """Gets new histograms that are added to existing time series.  # noqa: E501
 
diff --git a/wavefront_api_client/api/monitored_application_api.py b/wavefront_api_client/api/monitored_application_api.py
new file mode 100644
index 0000000..512764f
--- /dev/null
+++ b/wavefront_api_client/api/monitored_application_api.py
@@ -0,0 +1,327 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class MonitoredApplicationApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_all_applications(self, **kwargs):  # noqa: E501
+        """Get all monitored services  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_applications(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_applications_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_applications_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_applications_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all monitored services  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_applications_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_applications" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredapplication', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredApplicationDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_application(self, application, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_application(application, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :return: ResponseContainerMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_application_with_http_info(application, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_application_with_http_info(application, **kwargs)  # noqa: E501
+            return data
+
+    def get_application_with_http_info(self, application, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_application_with_http_info(application, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :return: ResponseContainerMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['application']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_application" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'application' is set
+        if ('application' not in params or
+                params['application'] is None):
+            raise ValueError("Missing the required parameter `application` when calling `get_application`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'application' in params:
+            path_params['application'] = params['application']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredapplication/{application}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredApplicationDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_service(self, application, **kwargs):  # noqa: E501
+        """Update a specific service  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service(application, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param MonitoredApplicationDTO body: Example Body:  <pre>{   \"application\": \"beachshirts\",   \"satisfiedLatencyMillis\": \"100000\",   \"hidden\": \"false\" }</pre>
+        :return: ResponseContainerMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_service_with_http_info(application, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_service_with_http_info(application, **kwargs)  # noqa: E501
+            return data
+
+    def update_service_with_http_info(self, application, **kwargs):  # noqa: E501
+        """Update a specific service  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service_with_http_info(application, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param MonitoredApplicationDTO body: Example Body:  <pre>{   \"application\": \"beachshirts\",   \"satisfiedLatencyMillis\": \"100000\",   \"hidden\": \"false\" }</pre>
+        :return: ResponseContainerMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['application', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_service" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'application' is set
+        if ('application' not in params or
+                params['application'] is None):
+            raise ValueError("Missing the required parameter `application` when calling `update_service`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'application' in params:
+            path_params['application'] = params['application']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredapplication/{application}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredApplicationDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
new file mode 100644
index 0000000..9fdc6c8
--- /dev/null
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -0,0 +1,446 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class MonitoredServiceApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_all_services(self, **kwargs):  # noqa: E501
+        """Get all monitored services  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_services(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_services_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_services_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_services_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all monitored services  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_services_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_services" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_service(self, application, service, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_service(application, service, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param str service: (required)
+        :return: ResponseContainerMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_service_with_http_info(application, service, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_service_with_http_info(application, service, **kwargs)  # noqa: E501
+            return data
+
+    def get_service_with_http_info(self, application, service, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_service_with_http_info(application, service, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param str service: (required)
+        :return: ResponseContainerMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['application', 'service']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_service" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'application' is set
+        if ('application' not in params or
+                params['application'] is None):
+            raise ValueError("Missing the required parameter `application` when calling `get_service`")  # noqa: E501
+        # verify the required parameter 'service' is set
+        if ('service' not in params or
+                params['service'] is None):
+            raise ValueError("Missing the required parameter `service` when calling `get_service`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'application' in params:
+            path_params['application'] = params['application']  # noqa: E501
+        if 'service' in params:
+            path_params['service'] = params['service']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice/{application}/{service}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_services_of_application(self, application, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_services_of_application(application, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_services_of_application_with_http_info(application, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_services_of_application_with_http_info(application, **kwargs)  # noqa: E501
+            return data
+
+    def get_services_of_application_with_http_info(self, application, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_services_of_application_with_http_info(application, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['application', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_services_of_application" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'application' is set
+        if ('application' not in params or
+                params['application'] is None):
+            raise ValueError("Missing the required parameter `application` when calling `get_services_of_application`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'application' in params:
+            path_params['application'] = params['application']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice/{application}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_service(self, application, service, **kwargs):  # noqa: E501
+        """Update a specific service  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service(application, service, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param str service: (required)
+        :param MonitoredServiceDTO body: Example Body:  <pre>{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre>
+        :return: ResponseContainerMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_service_with_http_info(application, service, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_service_with_http_info(application, service, **kwargs)  # noqa: E501
+            return data
+
+    def update_service_with_http_info(self, application, service, **kwargs):  # noqa: E501
+        """Update a specific service  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_service_with_http_info(application, service, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param str service: (required)
+        :param MonitoredServiceDTO body: Example Body:  <pre>{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre>
+        :return: ResponseContainerMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['application', 'service', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_service" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'application' is set
+        if ('application' not in params or
+                params['application'] is None):
+            raise ValueError("Missing the required parameter `application` when calling `update_service`")  # noqa: E501
+        # verify the required parameter 'service' is set
+        if ('service' not in params or
+                params['service'] is None):
+            raise ValueError("Missing the required parameter `service` when calling `update_service`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'application' in params:
+            path_params['application'] = params['application']  # noqa: E501
+        if 'service' in params:
+            path_params['service'] = params['service']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice/{application}/{service}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 6a8d26e..37fc69e 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2963,6 +2963,592 @@ def search_maintenance_window_for_facets_with_http_info(self, **kwargs):  # noqa
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_monitored_application_entities(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored applications  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_application_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_application_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_application_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_application_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored applications  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_application_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredApplicationDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_application_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredapplication', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredApplicationDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_application_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_application_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_application_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_application_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_application_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_application_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_application_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_monitored_application_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredapplication/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_application_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_application_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_application_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_application_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_application_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_application_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_application_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredapplication/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_service_entities(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored services  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_service_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_service_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_service_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_service_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted monitored services  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_service_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_service_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredservice', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_service_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_service_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_service_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_service_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_service_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted monitored application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_service_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_service_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if ('facet' not in params or
+                params['facet'] is None):
+            raise ValueError("Missing the required parameter `facet` when calling `search_monitored_service_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredservice/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_monitored_service_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_service_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_monitored_service_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_monitored_service_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_monitored_service_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_monitored_service_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_monitored_service_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/monitoredservice/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_notficant_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's notificants  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6d83463..df1d671 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.63.18/python'
+        self.user_agent = 'Swagger-Codegen/2.64.3/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 78c1605..4c8f74a 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.63.18".\
+               "SDK Package Version: 2.64.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 3c77afb..93f5c57 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -83,7 +83,9 @@
 from wavefront_api_client.models.module import Module
 from wavefront_api_client.models.module_descriptor import ModuleDescriptor
 from wavefront_api_client.models.module_layer import ModuleLayer
+from wavefront_api_client.models.monitored_application_dto import MonitoredApplicationDTO
 from wavefront_api_client.models.monitored_cluster import MonitoredCluster
+from wavefront_api_client.models.monitored_service_dto import MonitoredServiceDTO
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
@@ -103,7 +105,9 @@
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
+from wavefront_api_client.models.paged_monitored_application_dto import PagedMonitoredApplicationDTO
 from wavefront_api_client.models.paged_monitored_cluster import PagedMonitoredCluster
+from wavefront_api_client.models.paged_monitored_service_dto import PagedMonitoredServiceDTO
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
@@ -150,7 +154,9 @@
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
 from wavefront_api_client.models.response_container_metrics_policy_read_model import ResponseContainerMetricsPolicyReadModel
+from wavefront_api_client.models.response_container_monitored_application_dto import ResponseContainerMonitoredApplicationDTO
 from wavefront_api_client.models.response_container_monitored_cluster import ResponseContainerMonitoredCluster
+from wavefront_api_client.models.response_container_monitored_service_dto import ResponseContainerMonitoredServiceDTO
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
@@ -167,7 +173,9 @@
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
+from wavefront_api_client.models.response_container_paged_monitored_application_dto import ResponseContainerPagedMonitoredApplicationDTO
 from wavefront_api_client.models.response_container_paged_monitored_cluster import ResponseContainerPagedMonitoredCluster
+from wavefront_api_client.models.response_container_paged_monitored_service_dto import ResponseContainerPagedMonitoredServiceDTO
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..927f98e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,15 +31,69 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, key=None, value=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/monitored_application_dto.py b/wavefront_api_client/models/monitored_application_dto.py
new file mode 100644
index 0000000..4ebabeb
--- /dev/null
+++ b/wavefront_api_client/models/monitored_application_dto.py
@@ -0,0 +1,348 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class MonitoredApplicationDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'application': 'str',
+        'created': 'int',
+        'hidden': 'bool',
+        'last_reported': 'int',
+        'last_updated': 'int',
+        'satisfied_latency_millis': 'int',
+        'service_count': 'int',
+        'status': 'str',
+        'update_user_id': 'str'
+    }
+
+    attribute_map = {
+        'application': 'application',
+        'created': 'created',
+        'hidden': 'hidden',
+        'last_reported': 'lastReported',
+        'last_updated': 'lastUpdated',
+        'satisfied_latency_millis': 'satisfiedLatencyMillis',
+        'service_count': 'serviceCount',
+        'status': 'status',
+        'update_user_id': 'updateUserId'
+    }
+
+    def __init__(self, application=None, created=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service_count=None, status=None, update_user_id=None):  # noqa: E501
+        """MonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._application = None
+        self._created = None
+        self._hidden = None
+        self._last_reported = None
+        self._last_updated = None
+        self._satisfied_latency_millis = None
+        self._service_count = None
+        self._status = None
+        self._update_user_id = None
+        self.discriminator = None
+
+        self.application = application
+        if created is not None:
+            self.created = created
+        if hidden is not None:
+            self.hidden = hidden
+        if last_reported is not None:
+            self.last_reported = last_reported
+        if last_updated is not None:
+            self.last_updated = last_updated
+        if satisfied_latency_millis is not None:
+            self.satisfied_latency_millis = satisfied_latency_millis
+        if service_count is not None:
+            self.service_count = service_count
+        if status is not None:
+            self.status = status
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
+
+    @property
+    def application(self):
+        """Gets the application of this MonitoredApplicationDTO.  # noqa: E501
+
+        Application Name of the monitored application  # noqa: E501
+
+        :return: The application of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._application
+
+    @application.setter
+    def application(self, application):
+        """Sets the application of this MonitoredApplicationDTO.
+
+        Application Name of the monitored application  # noqa: E501
+
+        :param application: The application of this MonitoredApplicationDTO.  # noqa: E501
+        :type: str
+        """
+        if application is None:
+            raise ValueError("Invalid value for `application`, must not be `None`")  # noqa: E501
+
+        self._application = application
+
+    @property
+    def created(self):
+        """Gets the created of this MonitoredApplicationDTO.  # noqa: E501
+
+        Created epoch of monitored application  # noqa: E501
+
+        :return: The created of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._created
+
+    @created.setter
+    def created(self, created):
+        """Sets the created of this MonitoredApplicationDTO.
+
+        Created epoch of monitored application  # noqa: E501
+
+        :param created: The created of this MonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._created = created
+
+    @property
+    def hidden(self):
+        """Gets the hidden of this MonitoredApplicationDTO.  # noqa: E501
+
+        Monitored application is hidden or not  # noqa: E501
+
+        :return: The hidden of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this MonitoredApplicationDTO.
+
+        Monitored application is hidden or not  # noqa: E501
+
+        :param hidden: The hidden of this MonitoredApplicationDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def last_reported(self):
+        """Gets the last_reported of this MonitoredApplicationDTO.  # noqa: E501
+
+        Last reported epoch of monitored application  # noqa: E501
+
+        :return: The last_reported of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_reported
+
+    @last_reported.setter
+    def last_reported(self, last_reported):
+        """Sets the last_reported of this MonitoredApplicationDTO.
+
+        Last reported epoch of monitored application  # noqa: E501
+
+        :param last_reported: The last_reported of this MonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._last_reported = last_reported
+
+    @property
+    def last_updated(self):
+        """Gets the last_updated of this MonitoredApplicationDTO.  # noqa: E501
+
+        Last update epoch of monitored application  # noqa: E501
+
+        :return: The last_updated of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated
+
+    @last_updated.setter
+    def last_updated(self, last_updated):
+        """Sets the last_updated of this MonitoredApplicationDTO.
+
+        Last update epoch of monitored application  # noqa: E501
+
+        :param last_updated: The last_updated of this MonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated = last_updated
+
+    @property
+    def satisfied_latency_millis(self):
+        """Gets the satisfied_latency_millis of this MonitoredApplicationDTO.  # noqa: E501
+
+        Satisfied latency of monitored application  # noqa: E501
+
+        :return: The satisfied_latency_millis of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._satisfied_latency_millis
+
+    @satisfied_latency_millis.setter
+    def satisfied_latency_millis(self, satisfied_latency_millis):
+        """Sets the satisfied_latency_millis of this MonitoredApplicationDTO.
+
+        Satisfied latency of monitored application  # noqa: E501
+
+        :param satisfied_latency_millis: The satisfied_latency_millis of this MonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._satisfied_latency_millis = satisfied_latency_millis
+
+    @property
+    def service_count(self):
+        """Gets the service_count of this MonitoredApplicationDTO.  # noqa: E501
+
+        Number of monitored service of monitored application  # noqa: E501
+
+        :return: The service_count of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._service_count
+
+    @service_count.setter
+    def service_count(self, service_count):
+        """Sets the service_count of this MonitoredApplicationDTO.
+
+        Number of monitored service of monitored application  # noqa: E501
+
+        :param service_count: The service_count of this MonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._service_count = service_count
+
+    @property
+    def status(self):
+        """Gets the status of this MonitoredApplicationDTO.  # noqa: E501
+
+        Status of monitored application  # noqa: E501
+
+        :return: The status of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this MonitoredApplicationDTO.
+
+        Status of monitored application  # noqa: E501
+
+        :param status: The status of this MonitoredApplicationDTO.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ACTIVE", "INACTIVE"]  # noqa: E501
+        if status not in allowed_values:
+            raise ValueError(
+                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
+                .format(status, allowed_values)
+            )
+
+        self._status = status
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this MonitoredApplicationDTO.  # noqa: E501
+
+        Last update user id of monitored application  # noqa: E501
+
+        :return: The update_user_id of this MonitoredApplicationDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._update_user_id
+
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this MonitoredApplicationDTO.
+
+        Last update user id of monitored application  # noqa: E501
+
+        :param update_user_id: The update_user_id of this MonitoredApplicationDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._update_user_id = update_user_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(MonitoredApplicationDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, MonitoredApplicationDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
new file mode 100644
index 0000000..f18d14b
--- /dev/null
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -0,0 +1,377 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class MonitoredServiceDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'application': 'str',
+        'created': 'int',
+        'custom_dashboard_link': 'str',
+        'hidden': 'bool',
+        'last_reported': 'int',
+        'last_updated': 'int',
+        'satisfied_latency_millis': 'int',
+        'service': 'str',
+        'status': 'str',
+        'update_user_id': 'str'
+    }
+
+    attribute_map = {
+        'application': 'application',
+        'created': 'created',
+        'custom_dashboard_link': 'customDashboardLink',
+        'hidden': 'hidden',
+        'last_reported': 'lastReported',
+        'last_updated': 'lastUpdated',
+        'satisfied_latency_millis': 'satisfiedLatencyMillis',
+        'service': 'service',
+        'status': 'status',
+        'update_user_id': 'updateUserId'
+    }
+
+    def __init__(self, application=None, created=None, custom_dashboard_link=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service=None, status=None, update_user_id=None):  # noqa: E501
+        """MonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._application = None
+        self._created = None
+        self._custom_dashboard_link = None
+        self._hidden = None
+        self._last_reported = None
+        self._last_updated = None
+        self._satisfied_latency_millis = None
+        self._service = None
+        self._status = None
+        self._update_user_id = None
+        self.discriminator = None
+
+        self.application = application
+        if created is not None:
+            self.created = created
+        if custom_dashboard_link is not None:
+            self.custom_dashboard_link = custom_dashboard_link
+        if hidden is not None:
+            self.hidden = hidden
+        if last_reported is not None:
+            self.last_reported = last_reported
+        if last_updated is not None:
+            self.last_updated = last_updated
+        if satisfied_latency_millis is not None:
+            self.satisfied_latency_millis = satisfied_latency_millis
+        self.service = service
+        if status is not None:
+            self.status = status
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
+
+    @property
+    def application(self):
+        """Gets the application of this MonitoredServiceDTO.  # noqa: E501
+
+        Application Name of the monitored service  # noqa: E501
+
+        :return: The application of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._application
+
+    @application.setter
+    def application(self, application):
+        """Sets the application of this MonitoredServiceDTO.
+
+        Application Name of the monitored service  # noqa: E501
+
+        :param application: The application of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+        if application is None:
+            raise ValueError("Invalid value for `application`, must not be `None`")  # noqa: E501
+
+        self._application = application
+
+    @property
+    def created(self):
+        """Gets the created of this MonitoredServiceDTO.  # noqa: E501
+
+        Created epoch of monitored service  # noqa: E501
+
+        :return: The created of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._created
+
+    @created.setter
+    def created(self, created):
+        """Sets the created of this MonitoredServiceDTO.
+
+        Created epoch of monitored service  # noqa: E501
+
+        :param created: The created of this MonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._created = created
+
+    @property
+    def custom_dashboard_link(self):
+        """Gets the custom_dashboard_link of this MonitoredServiceDTO.  # noqa: E501
+
+        Customer dashboard link  # noqa: E501
+
+        :return: The custom_dashboard_link of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._custom_dashboard_link
+
+    @custom_dashboard_link.setter
+    def custom_dashboard_link(self, custom_dashboard_link):
+        """Sets the custom_dashboard_link of this MonitoredServiceDTO.
+
+        Customer dashboard link  # noqa: E501
+
+        :param custom_dashboard_link: The custom_dashboard_link of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._custom_dashboard_link = custom_dashboard_link
+
+    @property
+    def hidden(self):
+        """Gets the hidden of this MonitoredServiceDTO.  # noqa: E501
+
+        Monitored service is hidden or not  # noqa: E501
+
+        :return: The hidden of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this MonitoredServiceDTO.
+
+        Monitored service is hidden or not  # noqa: E501
+
+        :param hidden: The hidden of this MonitoredServiceDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def last_reported(self):
+        """Gets the last_reported of this MonitoredServiceDTO.  # noqa: E501
+
+        Last reported epoch of monitored service  # noqa: E501
+
+        :return: The last_reported of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_reported
+
+    @last_reported.setter
+    def last_reported(self, last_reported):
+        """Sets the last_reported of this MonitoredServiceDTO.
+
+        Last reported epoch of monitored service  # noqa: E501
+
+        :param last_reported: The last_reported of this MonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._last_reported = last_reported
+
+    @property
+    def last_updated(self):
+        """Gets the last_updated of this MonitoredServiceDTO.  # noqa: E501
+
+        Last update epoch of monitored service  # noqa: E501
+
+        :return: The last_updated of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated
+
+    @last_updated.setter
+    def last_updated(self, last_updated):
+        """Sets the last_updated of this MonitoredServiceDTO.
+
+        Last update epoch of monitored service  # noqa: E501
+
+        :param last_updated: The last_updated of this MonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated = last_updated
+
+    @property
+    def satisfied_latency_millis(self):
+        """Gets the satisfied_latency_millis of this MonitoredServiceDTO.  # noqa: E501
+
+        Satisfied latency of monitored service  # noqa: E501
+
+        :return: The satisfied_latency_millis of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._satisfied_latency_millis
+
+    @satisfied_latency_millis.setter
+    def satisfied_latency_millis(self, satisfied_latency_millis):
+        """Sets the satisfied_latency_millis of this MonitoredServiceDTO.
+
+        Satisfied latency of monitored service  # noqa: E501
+
+        :param satisfied_latency_millis: The satisfied_latency_millis of this MonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._satisfied_latency_millis = satisfied_latency_millis
+
+    @property
+    def service(self):
+        """Gets the service of this MonitoredServiceDTO.  # noqa: E501
+
+        Service Name of the monitored service  # noqa: E501
+
+        :return: The service of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._service
+
+    @service.setter
+    def service(self, service):
+        """Sets the service of this MonitoredServiceDTO.
+
+        Service Name of the monitored service  # noqa: E501
+
+        :param service: The service of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+        if service is None:
+            raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
+
+        self._service = service
+
+    @property
+    def status(self):
+        """Gets the status of this MonitoredServiceDTO.  # noqa: E501
+
+        Status of monitored service  # noqa: E501
+
+        :return: The status of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this MonitoredServiceDTO.
+
+        Status of monitored service  # noqa: E501
+
+        :param status: The status of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ACTIVE", "INACTIVE"]  # noqa: E501
+        if status not in allowed_values:
+            raise ValueError(
+                "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
+                .format(status, allowed_values)
+            )
+
+        self._status = status
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this MonitoredServiceDTO.  # noqa: E501
+
+        Last update user id of monitored service  # noqa: E501
+
+        :return: The update_user_id of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._update_user_id
+
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this MonitoredServiceDTO.
+
+        Last update user id of monitored service  # noqa: E501
+
+        :param update_user_id: The update_user_id of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._update_user_id = update_user_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(MonitoredServiceDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, MonitoredServiceDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged_monitored_application_dto.py b/wavefront_api_client/models/paged_monitored_application_dto.py
new file mode 100644
index 0000000..c8c7584
--- /dev/null
+++ b/wavefront_api_client/models/paged_monitored_application_dto.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedMonitoredApplicationDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[MonitoredApplicationDTO]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedMonitoredApplicationDTO.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: list[MonitoredApplicationDTO]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedMonitoredApplicationDTO.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: list[MonitoredApplicationDTO]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The limit of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedMonitoredApplicationDTO.
+
+
+        :param limit: The limit of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedMonitoredApplicationDTO.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The offset of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedMonitoredApplicationDTO.
+
+
+        :param offset: The offset of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The sort of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedMonitoredApplicationDTO.
+
+
+        :param sort: The sort of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedMonitoredApplicationDTO.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedMonitoredApplicationDTO.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedMonitoredApplicationDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedMonitoredApplicationDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedMonitoredApplicationDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged_monitored_service_dto.py b/wavefront_api_client/models/paged_monitored_service_dto.py
new file mode 100644
index 0000000..21f5e25
--- /dev/null
+++ b/wavefront_api_client/models/paged_monitored_service_dto.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class PagedMonitoredServiceDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[MonitoredServiceDTO]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """PagedMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedMonitoredServiceDTO.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedMonitoredServiceDTO.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedMonitoredServiceDTO.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: list[MonitoredServiceDTO]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedMonitoredServiceDTO.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: list[MonitoredServiceDTO]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The limit of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedMonitoredServiceDTO.
+
+
+        :param limit: The limit of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedMonitoredServiceDTO.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedMonitoredServiceDTO.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The offset of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedMonitoredServiceDTO.
+
+
+        :param offset: The offset of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The sort of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedMonitoredServiceDTO.
+
+
+        :param sort: The sort of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedMonitoredServiceDTO.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedMonitoredServiceDTO.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedMonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedMonitoredServiceDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedMonitoredServiceDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_monitored_application_dto.py b/wavefront_api_client/models/response_container_monitored_application_dto.py
new file mode 100644
index 0000000..c9d966e
--- /dev/null
+++ b/wavefront_api_client/models/response_container_monitored_application_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerMonitoredApplicationDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'MonitoredApplicationDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+        :rtype: MonitoredApplicationDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMonitoredApplicationDTO.
+
+
+        :param response: The response of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+        :type: MonitoredApplicationDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerMonitoredApplicationDTO.
+
+
+        :param status: The status of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerMonitoredApplicationDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerMonitoredApplicationDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_monitored_service_dto.py b/wavefront_api_client/models/response_container_monitored_service_dto.py
new file mode 100644
index 0000000..d1e29fa
--- /dev/null
+++ b/wavefront_api_client/models/response_container_monitored_service_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerMonitoredServiceDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'MonitoredServiceDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+        :rtype: MonitoredServiceDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMonitoredServiceDTO.
+
+
+        :param response: The response of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+        :type: MonitoredServiceDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerMonitoredServiceDTO.
+
+
+        :param status: The status of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerMonitoredServiceDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerMonitoredServiceDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
new file mode 100644
index 0000000..7fcaff8
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedMonitoredApplicationDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedMonitoredApplicationDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: PagedMonitoredApplicationDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedMonitoredApplicationDTO.
+
+
+        :param response: The response of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+        :type: PagedMonitoredApplicationDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedMonitoredApplicationDTO.
+
+
+        :param status: The status of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedMonitoredApplicationDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedMonitoredApplicationDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
new file mode 100644
index 0000000..c8ffb93
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerPagedMonitoredServiceDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedMonitoredServiceDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerPagedMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: PagedMonitoredServiceDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedMonitoredServiceDTO.
+
+
+        :param response: The response of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+        :type: PagedMonitoredServiceDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedMonitoredServiceDTO.
+
+
+        :param status: The status of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedMonitoredServiceDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedMonitoredServiceDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index be24192..376e754 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -69,7 +69,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if not set(response).issubset(set(allowed_values)):
             raise ValueError(
                 "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501

From f8c7b665966fa8cb2a1ab9c7855a714a27bcc1c0 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 23 Oct 2020 08:16:26 -0700
Subject: [PATCH 066/161] Autogenerated Update v2.64.5.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  8 +++-
 docs/Annotation.md                        |  2 -
 setup.py                                  |  2 +-
 wavefront_api_client/__init__.py          |  1 +
 wavefront_api_client/api/__init__.py      |  1 +
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 +----------------------
 10 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 2e779f8..9539a8a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.64.3"
+    "packageVersion": "2.64.5"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index d28e50f..2e779f8 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.63.18"
+    "packageVersion": "2.64.3"
 }
diff --git a/README.md b/README.md
index 9669048..292c5b1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.64.3
+- Package version: 2.64.5
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -125,6 +125,12 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
+*AnomalyApi* | [**get_all_anomalies**](docs/AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
+*AnomalyApi* | [**get_anomalies_for_chart_and_param_hash**](docs/AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
+*AnomalyApi* | [**get_chart_anomalies_for_chart**](docs/AnomalyApi.md#get_chart_anomalies_for_chart) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
+*AnomalyApi* | [**get_chart_anomalies_of_one_dashboard**](docs/AnomalyApi.md#get_chart_anomalies_of_one_dashboard) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
+*AnomalyApi* | [**get_dashboard_anomalies**](docs/AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
+*AnomalyApi* | [**get_related_anomalies**](docs/AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
 *ApiTokenApi* | [**delete_token_service_account**](docs/ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index f1a9483..6094b4b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.64.3"
+VERSION = "2.64.5"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 309d559..acaf1d8 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -18,6 +18,7 @@
 # import apis into sdk package
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index c780771..78b75b5 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -5,6 +5,7 @@
 # import apis into api package
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index df1d671..6f8a125 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.64.3/python'
+        self.user_agent = 'Swagger-Codegen/2.64.5/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 4c8f74a..7af8485 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.64.3".\
+               "SDK Package Version: 2.64.5".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 927f98e..cf05f3e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,69 +31,15 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None):  # noqa: E501
+    def __init__(self):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 706bcde70342264c24ddea151f81c4d4f5f0dba1 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 13 Nov 2020 08:16:23 -0800
Subject: [PATCH 067/161] Autogenerated Update v2.65.6.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   2 +-
 docs/CloudWatchConfiguration.md               |   6 +-
 docs/EC2Configuration.md                      |   4 +
 docs/SourceApi.md                             |   4 +-
 setup.py                                      |   2 +-
 wavefront_api_client/api/source_api.py        |   4 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 .../models/cloud_watch_configuration.py       |  70 +++++++++--
 .../models/ec2_configuration.py               | 118 +++++++++++++++++-
 12 files changed, 196 insertions(+), 22 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 9539a8a..1880545 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.64.5"
+    "packageVersion": "2.65.6"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 2e779f8..9539a8a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.64.3"
+    "packageVersion": "2.64.5"
 }
diff --git a/README.md b/README.md
index 292c5b1..a57d770 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.64.5
+- Package version: 2.65.6
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index d824f31..8a05631 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -4,11 +4,13 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
-**instance_selection_tags** | **dict(str, str)** | A string-&gt;string map of white list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**instance_selection_tags** | **dict(str, str)** | A string-&gt;string map of allow list of AWS instance tag-value pairs (in AWS).  If the instance&#39;s AWS tags match this allow list, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**instance_selection_tags_expr** | **str** | A string expressing the allow list of AWS instance tag-value pairs.  If the instance&#39;s AWS tags match this allow list, CloudWatch data about this instance is ingested.  Multiple entries are OR&#39;ed and also OR&#39;ed with entries from instanceSelectionTags.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
 **namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
-**volume_selection_tags** | **dict(str, str)** | A string-&gt;string map of white list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**volume_selection_tags** | **dict(str, str)** | A string-&gt;string map of allow list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
+**volume_selection_tags_expr** | **str** | A string expressing the allow list of AWS volume tag-value pairs.  If the volume&#39;s AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed and also OR&#39;ed with entries from volumeSelectionTags.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EC2Configuration.md b/docs/EC2Configuration.md
index 73f8e6f..3cd582f 100644
--- a/docs/EC2Configuration.md
+++ b/docs/EC2Configuration.md
@@ -5,6 +5,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
 **host_name_tags** | **list[str]** | A list of AWS instance tags that, when found, will be used as the \&quot;source\&quot; name in a series.  Default: [\&quot;hostname\&quot;, \&quot;host\&quot;, \&quot;name\&quot;].  If no tag in this list is found, the series source is set to the instance id. | [optional] 
+**instance_selection_tags_expr** | **str** | A string expressing the allow list of AWS instance tag-value pairs.  If the instance&#39;s AWS tags match this allow list, data about this instance is ingested from EC2 APIs  Multiple entries are OR&#39;ed.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
+**volume_selection_tags_expr** | **str** | A string expressing the allow list of AWS volume tag-value pairs.  If the volume&#39;s AWS tags match this allow list, Data about this volume is ingested from EBS APIs.  Multiple entries are OR&#39;ed.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SourceApi.md b/docs/SourceApi.md
index 54d176c..2c8d42a 100644
--- a/docs/SourceApi.md
+++ b/docs/SourceApi.md
@@ -205,7 +205,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.SourceApi(wavefront_api_client.ApiClient(configuration))
 cursor = 'cursor_example' # str |  (optional)
-limit = 100 # int |  (optional) (default to 100)
+limit = 100 # int | max limit: 1000 (optional) (default to 100)
 
 try:
     # Get all sources for a customer
@@ -220,7 +220,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **cursor** | **str**|  | [optional] 
- **limit** | **int**|  | [optional] [default to 100]
+ **limit** | **int**| max limit: 1000 | [optional] [default to 100]
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index 6094b4b..05f7984 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.64.5"
+VERSION = "2.65.6"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 3f4ecbc..26f05cc 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -337,7 +337,7 @@ def get_all_source(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str cursor:
-        :param int limit:
+        :param int limit: max limit: 1000
         :return: ResponseContainerPagedSource
                  If the method is called asynchronously,
                  returns the request thread.
@@ -360,7 +360,7 @@ def get_all_source_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str cursor:
-        :param int limit:
+        :param int limit: max limit: 1000
         :return: ResponseContainerPagedSource
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6f8a125..a61e5fd 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.64.5/python'
+        self.user_agent = 'Swagger-Codegen/2.65.6/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 7af8485..937c743 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.64.5".\
+               "SDK Package Version: 2.65.6".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index bf80769..37a684d 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -33,36 +33,44 @@ class CloudWatchConfiguration(object):
     swagger_types = {
         'base_credentials': 'AWSBaseCredentials',
         'instance_selection_tags': 'dict(str, str)',
+        'instance_selection_tags_expr': 'str',
         'metric_filter_regex': 'str',
         'namespaces': 'list[str]',
         'point_tag_filter_regex': 'str',
-        'volume_selection_tags': 'dict(str, str)'
+        'volume_selection_tags': 'dict(str, str)',
+        'volume_selection_tags_expr': 'str'
     }
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
         'instance_selection_tags': 'instanceSelectionTags',
+        'instance_selection_tags_expr': 'instanceSelectionTagsExpr',
         'metric_filter_regex': 'metricFilterRegex',
         'namespaces': 'namespaces',
         'point_tag_filter_regex': 'pointTagFilterRegex',
-        'volume_selection_tags': 'volumeSelectionTags'
+        'volume_selection_tags': 'volumeSelectionTags',
+        'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, instance_selection_tags=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None):  # noqa: E501
+    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None, volume_selection_tags_expr=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
 
         self._base_credentials = None
         self._instance_selection_tags = None
+        self._instance_selection_tags_expr = None
         self._metric_filter_regex = None
         self._namespaces = None
         self._point_tag_filter_regex = None
         self._volume_selection_tags = None
+        self._volume_selection_tags_expr = None
         self.discriminator = None
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
         if instance_selection_tags is not None:
             self.instance_selection_tags = instance_selection_tags
+        if instance_selection_tags_expr is not None:
+            self.instance_selection_tags_expr = instance_selection_tags_expr
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
         if namespaces is not None:
@@ -71,6 +79,8 @@ def __init__(self, base_credentials=None, instance_selection_tags=None, metric_f
             self.point_tag_filter_regex = point_tag_filter_regex
         if volume_selection_tags is not None:
             self.volume_selection_tags = volume_selection_tags
+        if volume_selection_tags_expr is not None:
+            self.volume_selection_tags_expr = volume_selection_tags_expr
 
     @property
     def base_credentials(self):
@@ -97,7 +107,7 @@ def base_credentials(self, base_credentials):
     def instance_selection_tags(self):
         """Gets the instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
 
-        A string->string map of white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of allow list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this allow list, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :return: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :rtype: dict(str, str)
@@ -108,7 +118,7 @@ def instance_selection_tags(self):
     def instance_selection_tags(self, instance_selection_tags):
         """Sets the instance_selection_tags of this CloudWatchConfiguration.
 
-        A string->string map of white list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this whitelist, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of allow list of AWS instance tag-value pairs (in AWS).  If the instance's AWS tags match this allow list, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :param instance_selection_tags: The instance_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :type: dict(str, str)
@@ -116,6 +126,29 @@ def instance_selection_tags(self, instance_selection_tags):
 
         self._instance_selection_tags = instance_selection_tags
 
+    @property
+    def instance_selection_tags_expr(self):
+        """Gets the instance_selection_tags_expr of this CloudWatchConfiguration.  # noqa: E501
+
+        A string expressing the allow list of AWS instance tag-value pairs.  If the instance's AWS tags match this allow list, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed and also OR'ed with entries from instanceSelectionTags.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :return: The instance_selection_tags_expr of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._instance_selection_tags_expr
+
+    @instance_selection_tags_expr.setter
+    def instance_selection_tags_expr(self, instance_selection_tags_expr):
+        """Sets the instance_selection_tags_expr of this CloudWatchConfiguration.
+
+        A string expressing the allow list of AWS instance tag-value pairs.  If the instance's AWS tags match this allow list, CloudWatch data about this instance is ingested.  Multiple entries are OR'ed and also OR'ed with entries from instanceSelectionTags.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :param instance_selection_tags_expr: The instance_selection_tags_expr of this CloudWatchConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._instance_selection_tags_expr = instance_selection_tags_expr
+
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this CloudWatchConfiguration.  # noqa: E501
@@ -189,7 +222,7 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
     def volume_selection_tags(self):
         """Gets the volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
 
-        A string->string map of white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of allow list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :return: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :rtype: dict(str, str)
@@ -200,7 +233,7 @@ def volume_selection_tags(self):
     def volume_selection_tags(self, volume_selection_tags):
         """Sets the volume_selection_tags of this CloudWatchConfiguration.
 
-        A string->string map of white list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this whitelist, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
+        A string->string map of allow list of AWS volume tag-value pairs (in AWS).  If the volume's AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed  # noqa: E501
 
         :param volume_selection_tags: The volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
         :type: dict(str, str)
@@ -208,6 +241,29 @@ def volume_selection_tags(self, volume_selection_tags):
 
         self._volume_selection_tags = volume_selection_tags
 
+    @property
+    def volume_selection_tags_expr(self):
+        """Gets the volume_selection_tags_expr of this CloudWatchConfiguration.  # noqa: E501
+
+        A string expressing the allow list of AWS volume tag-value pairs.  If the volume's AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed and also OR'ed with entries from volumeSelectionTags.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :return: The volume_selection_tags_expr of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._volume_selection_tags_expr
+
+    @volume_selection_tags_expr.setter
+    def volume_selection_tags_expr(self, volume_selection_tags_expr):
+        """Sets the volume_selection_tags_expr of this CloudWatchConfiguration.
+
+        A string expressing the allow list of AWS volume tag-value pairs.  If the volume's AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR'ed and also OR'ed with entries from volumeSelectionTags.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :param volume_selection_tags_expr: The volume_selection_tags_expr of this CloudWatchConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._volume_selection_tags_expr = volume_selection_tags_expr
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index f5fc333..4fb3b63 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -32,25 +32,45 @@ class EC2Configuration(object):
     """
     swagger_types = {
         'base_credentials': 'AWSBaseCredentials',
-        'host_name_tags': 'list[str]'
+        'host_name_tags': 'list[str]',
+        'instance_selection_tags_expr': 'str',
+        'metric_filter_regex': 'str',
+        'point_tag_filter_regex': 'str',
+        'volume_selection_tags_expr': 'str'
     }
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
-        'host_name_tags': 'hostNameTags'
+        'host_name_tags': 'hostNameTags',
+        'instance_selection_tags_expr': 'instanceSelectionTagsExpr',
+        'metric_filter_regex': 'metricFilterRegex',
+        'point_tag_filter_regex': 'pointTagFilterRegex',
+        'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, host_name_tags=None):  # noqa: E501
+    def __init__(self, base_credentials=None, host_name_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, point_tag_filter_regex=None, volume_selection_tags_expr=None):  # noqa: E501
         """EC2Configuration - a model defined in Swagger"""  # noqa: E501
 
         self._base_credentials = None
         self._host_name_tags = None
+        self._instance_selection_tags_expr = None
+        self._metric_filter_regex = None
+        self._point_tag_filter_regex = None
+        self._volume_selection_tags_expr = None
         self.discriminator = None
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
         if host_name_tags is not None:
             self.host_name_tags = host_name_tags
+        if instance_selection_tags_expr is not None:
+            self.instance_selection_tags_expr = instance_selection_tags_expr
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
+        if point_tag_filter_regex is not None:
+            self.point_tag_filter_regex = point_tag_filter_regex
+        if volume_selection_tags_expr is not None:
+            self.volume_selection_tags_expr = volume_selection_tags_expr
 
     @property
     def base_credentials(self):
@@ -96,6 +116,98 @@ def host_name_tags(self, host_name_tags):
 
         self._host_name_tags = host_name_tags
 
+    @property
+    def instance_selection_tags_expr(self):
+        """Gets the instance_selection_tags_expr of this EC2Configuration.  # noqa: E501
+
+        A string expressing the allow list of AWS instance tag-value pairs.  If the instance's AWS tags match this allow list, data about this instance is ingested from EC2 APIs  Multiple entries are OR'ed.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :return: The instance_selection_tags_expr of this EC2Configuration.  # noqa: E501
+        :rtype: str
+        """
+        return self._instance_selection_tags_expr
+
+    @instance_selection_tags_expr.setter
+    def instance_selection_tags_expr(self, instance_selection_tags_expr):
+        """Sets the instance_selection_tags_expr of this EC2Configuration.
+
+        A string expressing the allow list of AWS instance tag-value pairs.  If the instance's AWS tags match this allow list, data about this instance is ingested from EC2 APIs  Multiple entries are OR'ed.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :param instance_selection_tags_expr: The instance_selection_tags_expr of this EC2Configuration.  # noqa: E501
+        :type: str
+        """
+
+        self._instance_selection_tags_expr = instance_selection_tags_expr
+
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this EC2Configuration.  # noqa: E501
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The metric_filter_regex of this EC2Configuration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this EC2Configuration.
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param metric_filter_regex: The metric_filter_regex of this EC2Configuration.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
+    @property
+    def point_tag_filter_regex(self):
+        """Gets the point_tag_filter_regex of this EC2Configuration.  # noqa: E501
+
+        A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The point_tag_filter_regex of this EC2Configuration.  # noqa: E501
+        :rtype: str
+        """
+        return self._point_tag_filter_regex
+
+    @point_tag_filter_regex.setter
+    def point_tag_filter_regex(self, point_tag_filter_regex):
+        """Sets the point_tag_filter_regex of this EC2Configuration.
+
+        A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param point_tag_filter_regex: The point_tag_filter_regex of this EC2Configuration.  # noqa: E501
+        :type: str
+        """
+
+        self._point_tag_filter_regex = point_tag_filter_regex
+
+    @property
+    def volume_selection_tags_expr(self):
+        """Gets the volume_selection_tags_expr of this EC2Configuration.  # noqa: E501
+
+        A string expressing the allow list of AWS volume tag-value pairs.  If the volume's AWS tags match this allow list, Data about this volume is ingested from EBS APIs.  Multiple entries are OR'ed.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :return: The volume_selection_tags_expr of this EC2Configuration.  # noqa: E501
+        :rtype: str
+        """
+        return self._volume_selection_tags_expr
+
+    @volume_selection_tags_expr.setter
+    def volume_selection_tags_expr(self, volume_selection_tags_expr):
+        """Sets the volume_selection_tags_expr of this EC2Configuration.
+
+        A string expressing the allow list of AWS volume tag-value pairs.  If the volume's AWS tags match this allow list, Data about this volume is ingested from EBS APIs.  Multiple entries are OR'ed.  Key-value pairs in the string are separated by commas and in the form k=v.  Example: \"k1=v1, k1=v2, k3=v3\".  # noqa: E501
+
+        :param volume_selection_tags_expr: The volume_selection_tags_expr of this EC2Configuration.  # noqa: E501
+        :type: str
+        """
+
+        self._volume_selection_tags_expr = volume_selection_tags_expr
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 2e5c41246d0df009bc6ae7383ce88e9d8a55469a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 10 Dec 2020 08:16:28 -0800
Subject: [PATCH 068/161] Autogenerated Update v2.65.18.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   4 +-
 docs/Annotation.md                            |   2 +
 docs/KubernetesComponent.md                   |   6 +-
 docs/KubernetesComponentStatus.md             |  12 ++
 setup.py                                      |   2 +-
 test/test_kubernetes_component_status.py      |  40 ++++
 wavefront_api_client/__init__.py              |   2 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   2 +-
 wavefront_api_client/models/annotation.py     |  56 +++++-
 .../models/kubernetes_component.py            |  17 +-
 .../models/kubernetes_component_status.py     | 174 ++++++++++++++++++
 15 files changed, 307 insertions(+), 18 deletions(-)
 create mode 100644 docs/KubernetesComponentStatus.md
 create mode 100644 test/test_kubernetes_component_status.py
 create mode 100644 wavefront_api_client/models/kubernetes_component_status.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 1880545..0c212a9 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.6"
+    "packageVersion": "2.65.18"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9539a8a..1880545 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.64.5"
+    "packageVersion": "2.65.6"
 }
diff --git a/README.md b/README.md
index a57d770..585dcdd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.65.6
+- Package version: 2.65.18
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -411,7 +411,6 @@ Class | Method | HTTP request | Description
  - [CloudIntegration](docs/CloudIntegration.md)
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
- - [ComponentStatus](docs/ComponentStatus.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
  - [Dashboard](docs/Dashboard.md)
  - [DashboardMin](docs/DashboardMin.md)
@@ -445,6 +444,7 @@ Class | Method | HTTP request | Description
  - [IntegrationStatus](docs/IntegrationStatus.md)
  - [JsonNode](docs/JsonNode.md)
  - [KubernetesComponent](docs/KubernetesComponent.md)
+ - [KubernetesComponentStatus](docs/KubernetesComponentStatus.md)
  - [LogicalType](docs/LogicalType.md)
  - [MaintenanceWindow](docs/MaintenanceWindow.md)
  - [Message](docs/Message.md)
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KubernetesComponent.md b/docs/KubernetesComponent.md
index 29fc8fa..28625b2 100644
--- a/docs/KubernetesComponent.md
+++ b/docs/KubernetesComponent.md
@@ -3,9 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**last_updated** | **int** |  | [optional] 
-**name** | **str** |  | [optional] 
-**status** | [**dict(str, ComponentStatus)**](ComponentStatus.md) |  | [optional] 
+**last_updated** | **int** | Last updated time of the monitored cluster component | [optional] 
+**name** | **str** | Name of the monitored cluster component | 
+**status** | [**dict(str, KubernetesComponentStatus)**](KubernetesComponentStatus.md) | Status of the monitored cluster component | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KubernetesComponentStatus.md b/docs/KubernetesComponentStatus.md
new file mode 100644
index 0000000..55d2f03
--- /dev/null
+++ b/docs/KubernetesComponentStatus.md
@@ -0,0 +1,12 @@
+# KubernetesComponentStatus
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** | Description of component status | [optional] 
+**name** | **str** | Name of the component status | 
+**status** | **bool** | Status value | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 05f7984..417d2d7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.65.6"
+VERSION = "2.65.18"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_kubernetes_component_status.py b/test/test_kubernetes_component_status.py
new file mode 100644
index 0000000..267e277
--- /dev/null
+++ b/test/test_kubernetes_component_status.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestKubernetesComponentStatus(unittest.TestCase):
+    """KubernetesComponentStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testKubernetesComponentStatus(self):
+        """Test KubernetesComponentStatus"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.kubernetes_component_status.KubernetesComponentStatus()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index acaf1d8..1980cef 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -73,7 +73,6 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
-from wavefront_api_client.models.component_status import ComponentStatus
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
@@ -107,6 +106,7 @@
 from wavefront_api_client.models.integration_status import IntegrationStatus
 from wavefront_api_client.models.json_node import JsonNode
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
+from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus
 from wavefront_api_client.models.logical_type import LogicalType
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index a61e5fd..40f2aae 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.65.6/python'
+        self.user_agent = 'Swagger-Codegen/2.65.18/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 937c743..aa9557d 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.65.6".\
+               "SDK Package Version: 2.65.18".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 93f5c57..f59ed30 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -38,7 +38,6 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
-from wavefront_api_client.models.component_status import ComponentStatus
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
@@ -72,6 +71,7 @@
 from wavefront_api_client.models.integration_status import IntegrationStatus
 from wavefront_api_client.models.json_node import JsonNode
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
+from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus
 from wavefront_api_client.models.logical_type import LogicalType
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..927f98e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,15 +31,69 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, key=None, value=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
index 2d776f4..dc754e7 100644
--- a/wavefront_api_client/models/kubernetes_component.py
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -33,7 +33,7 @@ class KubernetesComponent(object):
     swagger_types = {
         'last_updated': 'int',
         'name': 'str',
-        'status': 'dict(str, ComponentStatus)'
+        'status': 'dict(str, KubernetesComponentStatus)'
     }
 
     attribute_map = {
@@ -52,8 +52,7 @@ def __init__(self, last_updated=None, name=None, status=None):  # noqa: E501
 
         if last_updated is not None:
             self.last_updated = last_updated
-        if name is not None:
-            self.name = name
+        self.name = name
         if status is not None:
             self.status = status
 
@@ -61,6 +60,7 @@ def __init__(self, last_updated=None, name=None, status=None):  # noqa: E501
     def last_updated(self):
         """Gets the last_updated of this KubernetesComponent.  # noqa: E501
 
+        Last updated time of the monitored cluster component  # noqa: E501
 
         :return: The last_updated of this KubernetesComponent.  # noqa: E501
         :rtype: int
@@ -71,6 +71,7 @@ def last_updated(self):
     def last_updated(self, last_updated):
         """Sets the last_updated of this KubernetesComponent.
 
+        Last updated time of the monitored cluster component  # noqa: E501
 
         :param last_updated: The last_updated of this KubernetesComponent.  # noqa: E501
         :type: int
@@ -82,6 +83,7 @@ def last_updated(self, last_updated):
     def name(self):
         """Gets the name of this KubernetesComponent.  # noqa: E501
 
+        Name of the monitored cluster component  # noqa: E501
 
         :return: The name of this KubernetesComponent.  # noqa: E501
         :rtype: str
@@ -92,10 +94,13 @@ def name(self):
     def name(self, name):
         """Sets the name of this KubernetesComponent.
 
+        Name of the monitored cluster component  # noqa: E501
 
         :param name: The name of this KubernetesComponent.  # noqa: E501
         :type: str
         """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
 
@@ -103,9 +108,10 @@ def name(self, name):
     def status(self):
         """Gets the status of this KubernetesComponent.  # noqa: E501
 
+        Status of the monitored cluster component  # noqa: E501
 
         :return: The status of this KubernetesComponent.  # noqa: E501
-        :rtype: dict(str, ComponentStatus)
+        :rtype: dict(str, KubernetesComponentStatus)
         """
         return self._status
 
@@ -113,9 +119,10 @@ def status(self):
     def status(self, status):
         """Sets the status of this KubernetesComponent.
 
+        Status of the monitored cluster component  # noqa: E501
 
         :param status: The status of this KubernetesComponent.  # noqa: E501
-        :type: dict(str, ComponentStatus)
+        :type: dict(str, KubernetesComponentStatus)
         """
 
         self._status = status
diff --git a/wavefront_api_client/models/kubernetes_component_status.py b/wavefront_api_client/models/kubernetes_component_status.py
new file mode 100644
index 0000000..550e06c
--- /dev/null
+++ b/wavefront_api_client/models/kubernetes_component_status.py
@@ -0,0 +1,174 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class KubernetesComponentStatus(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'name': 'str',
+        'status': 'bool'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'name': 'name',
+        'status': 'status'
+    }
+
+    def __init__(self, description=None, name=None, status=None):  # noqa: E501
+        """KubernetesComponentStatus - a model defined in Swagger"""  # noqa: E501
+
+        self._description = None
+        self._name = None
+        self._status = None
+        self.discriminator = None
+
+        if description is not None:
+            self.description = description
+        self.name = name
+        if status is not None:
+            self.status = status
+
+    @property
+    def description(self):
+        """Gets the description of this KubernetesComponentStatus.  # noqa: E501
+
+        Description of component status  # noqa: E501
+
+        :return: The description of this KubernetesComponentStatus.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this KubernetesComponentStatus.
+
+        Description of component status  # noqa: E501
+
+        :param description: The description of this KubernetesComponentStatus.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def name(self):
+        """Gets the name of this KubernetesComponentStatus.  # noqa: E501
+
+        Name of the component status  # noqa: E501
+
+        :return: The name of this KubernetesComponentStatus.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this KubernetesComponentStatus.
+
+        Name of the component status  # noqa: E501
+
+        :param name: The name of this KubernetesComponentStatus.  # noqa: E501
+        :type: str
+        """
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def status(self):
+        """Gets the status of this KubernetesComponentStatus.  # noqa: E501
+
+        Status value  # noqa: E501
+
+        :return: The status of this KubernetesComponentStatus.  # noqa: E501
+        :rtype: bool
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this KubernetesComponentStatus.
+
+        Status value  # noqa: E501
+
+        :param status: The status of this KubernetesComponentStatus.  # noqa: E501
+        :type: bool
+        """
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(KubernetesComponentStatus, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, KubernetesComponentStatus):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 70c2d5f1aca4d38aea3ec3bfe29c65d7e56e8e27 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 15 Dec 2020 08:16:30 -0800
Subject: [PATCH 069/161] Autogenerated Update v2.65.22.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Annotation.md                        |  2 -
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 +----------------------
 8 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 0c212a9..d0ac6e2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.18"
+    "packageVersion": "2.65.22"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 1880545..0c212a9 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.6"
+    "packageVersion": "2.65.18"
 }
diff --git a/README.md b/README.md
index 585dcdd..947b173 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.65.18
+- Package version: 2.65.22
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index 417d2d7..1aa458c 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.65.18"
+VERSION = "2.65.22"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 40f2aae..f9151a3 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.65.18/python'
+        self.user_agent = 'Swagger-Codegen/2.65.22/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index aa9557d..b24a205 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.65.18".\
+               "SDK Package Version: 2.65.22".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 927f98e..cf05f3e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,69 +31,15 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None):  # noqa: E501
+    def __init__(self):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 19dfc826d6312bfe413f685e417b49fce6ad060f Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Mon, 11 Jan 2021 14:09:21 -0800
Subject: [PATCH 070/161] Update v2.65.27 Generated Using Swagger v2.4.18.

Includes cleanup of obsoleted models.
---
 .swagger-codegen/VERSION                      |    2 +-
 .swagger-codegen/config.json                  |    2 +-
 .swagger-codegen/config.jsone                 |    2 +-
 README.md                                     |    2 +-
 generate_client                               |    2 +-
 setup.py                                      |    2 +-
 .../api/account__service_account_api.py       |  612 ----------
 .../api/monitored_cluster_api.py              | 1028 -----------------
 wavefront_api_client/api/settings_api.py      |  394 -------
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |    2 +-
 wavefront_api_client/models/acl.py            |  178 ---
 .../models/business_action_group_basic_dto.py |  193 ----
 .../models/component_status.py                |  167 ---
 .../models/customer_preferences.py            |  530 ---------
 .../models/customer_preferences_updating.py   |  289 -----
 wavefront_api_client/models/iterable.py       |   87 --
 .../models/iterator_entry_string_json_node.py |   87 --
 .../models/iterator_json_node.py              |   87 --
 .../models/iterator_string.py                 |   87 --
 wavefront_api_client/models/number.py         |   87 --
 .../models/paged_user_group.py                |  282 -----
 .../models/response_container_list_acl.py     |  145 ---
 .../response_container_list_user_group.py     |  145 ---
 ...esponse_container_list_user_group_model.py |  142 ---
 .../response_container_paged_user_group.py    |  145 ---
 .../models/response_container_user_group.py   |  145 ---
 .../response_container_user_hard_delete.py    |  142 ---
 wavefront_api_client/models/stats_model.py    |  479 --------
 wavefront_api_client/models/user.py           |  693 -----------
 .../models/user_hard_delete.py                |  167 ---
 wavefront_api_client/models/user_settings.py  |  407 -------
 32 files changed, 8 insertions(+), 6726 deletions(-)
 delete mode 100644 wavefront_api_client/api/account__service_account_api.py
 delete mode 100644 wavefront_api_client/api/monitored_cluster_api.py
 delete mode 100644 wavefront_api_client/api/settings_api.py
 delete mode 100644 wavefront_api_client/models/acl.py
 delete mode 100644 wavefront_api_client/models/business_action_group_basic_dto.py
 delete mode 100644 wavefront_api_client/models/component_status.py
 delete mode 100644 wavefront_api_client/models/customer_preferences.py
 delete mode 100644 wavefront_api_client/models/customer_preferences_updating.py
 delete mode 100644 wavefront_api_client/models/iterable.py
 delete mode 100644 wavefront_api_client/models/iterator_entry_string_json_node.py
 delete mode 100644 wavefront_api_client/models/iterator_json_node.py
 delete mode 100644 wavefront_api_client/models/iterator_string.py
 delete mode 100644 wavefront_api_client/models/number.py
 delete mode 100644 wavefront_api_client/models/paged_user_group.py
 delete mode 100644 wavefront_api_client/models/response_container_list_acl.py
 delete mode 100644 wavefront_api_client/models/response_container_list_user_group.py
 delete mode 100644 wavefront_api_client/models/response_container_list_user_group_model.py
 delete mode 100644 wavefront_api_client/models/response_container_paged_user_group.py
 delete mode 100644 wavefront_api_client/models/response_container_user_group.py
 delete mode 100644 wavefront_api_client/models/response_container_user_hard_delete.py
 delete mode 100644 wavefront_api_client/models/stats_model.py
 delete mode 100644 wavefront_api_client/models/user.py
 delete mode 100644 wavefront_api_client/models/user_hard_delete.py
 delete mode 100644 wavefront_api_client/models/user_settings.py

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 9b83c55..6381ae0 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.15
\ No newline at end of file
+2.4.18
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index d0ac6e2..38b5c43 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.22"
+    "packageVersion": "2.65.27"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 0c212a9..d0ac6e2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.18"
+    "packageVersion": "2.65.22"
 }
diff --git a/README.md b/README.md
index 947b173..2f3ede4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.65.22
+- Package version: 2.65.27
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 1acb804..02a5cfd 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.15"  # For 3.x use CGEN_VER="3.0.21"
+CGEN_VER="2.4.18"  # For 3.x use CGEN_VER="3.0.21"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 1aa458c..9e18278 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.65.22"
+VERSION = "2.65.27"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/account__service_account_api.py b/wavefront_api_client/api/account__service_account_api.py
deleted file mode 100644
index 4a7a1e9..0000000
--- a/wavefront_api_client/api/account__service_account_api.py
+++ /dev/null
@@ -1,612 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from wavefront_api_client.api_client import ApiClient
-
-
-class AccountServiceAccountApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def activate_account(self, id, **kwargs):  # noqa: E501
-        """Activates the given service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.activate_account(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.activate_account_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.activate_account_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Activates the given service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.activate_account_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method activate_account" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `activate_account`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/serviceaccount/{id}/activate', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerServiceAccount',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def create_service_account(self, **kwargs):  # noqa: E501
-        """Creates a service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_service_account(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param ServiceAccountWrite body:
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.create_service_account_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.create_service_account_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
-        """Creates a service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_service_account_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param ServiceAccountWrite body:
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method create_service_account" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/serviceaccount', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerServiceAccount',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def deactivate_account(self, id, **kwargs):  # noqa: E501
-        """Deactivates the given service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.deactivate_account(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.deactivate_account_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.deactivate_account_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Deactivates the given service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.deactivate_account_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method deactivate_account" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `deactivate_account`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/serviceaccount/{id}/deactivate', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerServiceAccount',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_all_service_accounts(self, **kwargs):  # noqa: E501
-        """Get all service accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_service_accounts(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :return: ResponseContainerListServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_all_service_accounts_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_all_service_accounts_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all service accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_service_accounts_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :return: ResponseContainerListServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = []  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_all_service_accounts" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/serviceaccount', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerListServiceAccount',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_service_account(self, id, **kwargs):  # noqa: E501
-        """Retrieves a service account by identifier  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_service_account(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_service_account_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_service_account_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Retrieves a service account by identifier  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_service_account_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_service_account" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_service_account`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/serviceaccount/{id}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerServiceAccount',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def update_service_account(self, id, **kwargs):  # noqa: E501
-        """Updates the service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_service_account(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param ServiceAccountWrite body:
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.update_service_account_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_service_account_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Updates the service account  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_service_account_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param ServiceAccountWrite body:
-        :return: ResponseContainerServiceAccount
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method update_service_account" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `update_service_account`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/serviceaccount/{id}', 'PUT',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerServiceAccount',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/monitored_cluster_api.py b/wavefront_api_client/api/monitored_cluster_api.py
deleted file mode 100644
index ee84d3b..0000000
--- a/wavefront_api_client/api/monitored_cluster_api.py
+++ /dev/null
@@ -1,1028 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from wavefront_api_client.api_client import ApiClient
-
-
-class MonitoredClusterApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def add_cluster_tag(self, id, tag_value, **kwargs):  # noqa: E501
-        """Add a tag to a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_cluster_tag(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-        else:
-            (data) = self.add_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-            return data
-
-    def add_cluster_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
-        """Add a tag to a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_cluster_tag_with_http_info(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_cluster_tag" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `add_cluster_tag`")  # noqa: E501
-        # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
-            raise ValueError("Missing the required parameter `tag_value` when calling `add_cluster_tag`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'tag_value' in params:
-            path_params['tagValue'] = params['tag_value']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}/tag/{tagValue}', 'PUT',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def create_cluster(self, **kwargs):  # noqa: E501
-        """Create a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_cluster(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.create_cluster_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.create_cluster_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def create_cluster_with_http_info(self, **kwargs):  # noqa: E501
-        """Create a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_cluster_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method create_cluster" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def delete_cluster(self, id, **kwargs):  # noqa: E501
-        """Delete a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.delete_cluster(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.delete_cluster_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.delete_cluster_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def delete_cluster_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Delete a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.delete_cluster_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method delete_cluster" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `delete_cluster`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}', 'DELETE',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_all_cluster(self, **kwargs):  # noqa: E501
-        """Get all monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_cluster(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_all_cluster_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_all_cluster_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_all_cluster_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all monitored clusters  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_cluster_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_all_cluster" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_cluster(self, id, **kwargs):  # noqa: E501
-        """Get a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_cluster(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_cluster_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_cluster_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_cluster_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_cluster_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_cluster" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_cluster`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_cluster_tags(self, id, **kwargs):  # noqa: E501
-        """Get all tags associated with a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_cluster_tags(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerTagsResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_cluster_tags_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get all tags associated with a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_cluster_tags_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :return: ResponseContainerTagsResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_cluster_tags" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `get_cluster_tags`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}/tag', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerTagsResponse',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def merge_clusters(self, id1, id2, **kwargs):  # noqa: E501
-        """Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.merge_clusters(id1, id2, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id1: (required)
-        :param str id2: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.merge_clusters_with_http_info(id1, id2, **kwargs)  # noqa: E501
-        else:
-            (data) = self.merge_clusters_with_http_info(id1, id2, **kwargs)  # noqa: E501
-            return data
-
-    def merge_clusters_with_http_info(self, id1, id2, **kwargs):  # noqa: E501
-        """Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.merge_clusters_with_http_info(id1, id2, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id1: (required)
-        :param str id2: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id1', 'id2']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method merge_clusters" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id1' is set
-        if ('id1' not in params or
-                params['id1'] is None):
-            raise ValueError("Missing the required parameter `id1` when calling `merge_clusters`")  # noqa: E501
-        # verify the required parameter 'id2' is set
-        if ('id2' not in params or
-                params['id2'] is None):
-            raise ValueError("Missing the required parameter `id2` when calling `merge_clusters`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id1' in params:
-            path_params['id1'] = params['id1']  # noqa: E501
-        if 'id2' in params:
-            path_params['id2'] = params['id2']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/merge/{id1}/{id2}', 'PUT',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def remove_cluster_tag(self, id, tag_value, **kwargs):  # noqa: E501
-        """Remove a tag from a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_cluster_tag(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_cluster_tag_with_http_info(id, tag_value, **kwargs)  # noqa: E501
-            return data
-
-    def remove_cluster_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
-        """Remove a tag from a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_cluster_tag_with_http_info(id, tag_value, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param str tag_value: (required)
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'tag_value']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_cluster_tag" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `remove_cluster_tag`")  # noqa: E501
-        # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
-            raise ValueError("Missing the required parameter `tag_value` when calling `remove_cluster_tag`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'tag_value' in params:
-            path_params['tagValue'] = params['tag_value']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}/tag/{tagValue}', 'DELETE',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def set_cluster_tags(self, id, **kwargs):  # noqa: E501
-        """Set all tags associated with a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_cluster_tags(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body:
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.set_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.set_cluster_tags_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def set_cluster_tags_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Set all tags associated with a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.set_cluster_tags_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body:
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method set_cluster_tags" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `set_cluster_tags`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}/tag', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def update_cluster(self, id, **kwargs):  # noqa: E501
-        """Update a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_cluster(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.update_cluster_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.update_cluster_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def update_cluster_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Update a specific cluster  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_cluster_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param MonitoredCluster body: Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre>
-        :return: ResponseContainerMonitoredCluster
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method update_cluster" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `update_cluster`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/monitoredcluster/{id}', 'PUT',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerMonitoredCluster',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/settings_api.py b/wavefront_api_client/api/settings_api.py
deleted file mode 100644
index 1bf89d8..0000000
--- a/wavefront_api_client/api/settings_api.py
+++ /dev/null
@@ -1,394 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from wavefront_api_client.api_client import ApiClient
-
-
-class SettingsApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def get_all_permissions(self, **kwargs):  # noqa: E501
-        """Get all permissions  # noqa: E501
-
-        Returns all permissions' info data  # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_permissions(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :return: list[BusinessActionGroupBasicDTO]
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_all_permissions_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_all_permissions_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_all_permissions_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all permissions  # noqa: E501
-
-        Returns all permissions' info data  # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_permissions_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :return: list[BusinessActionGroupBasicDTO]
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = []  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_all_permissions" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/customer/permissions', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='list[BusinessActionGroupBasicDTO]',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_customer_preferences(self, **kwargs):  # noqa: E501
-        """Get customer preferences  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_customer_preferences(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :return: CustomerPreferences
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_customer_preferences_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_customer_preferences_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_customer_preferences_with_http_info(self, **kwargs):  # noqa: E501
-        """Get customer preferences  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_customer_preferences_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :return: CustomerPreferences
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = []  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_customer_preferences" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/customer/preferences', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='CustomerPreferences',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_default_user_groups(self, **kwargs):  # noqa: E501
-        """Get default user groups customer preferences  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_default_user_groups(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param User body:
-        :return: ResponseContainerListUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_default_user_groups_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_default_user_groups_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_default_user_groups_with_http_info(self, **kwargs):  # noqa: E501
-        """Get default user groups customer preferences  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_default_user_groups_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param User body:
-        :return: ResponseContainerListUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_default_user_groups" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/customer/preferences/defaultUserGroups', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerListUserGroupModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def post_customer_preferences(self, **kwargs):  # noqa: E501
-        """Update selected fields of customer preferences  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.post_customer_preferences(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param CustomerPreferencesUpdating body:
-        :return: CustomerPreferences
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.post_customer_preferences_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.post_customer_preferences_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def post_customer_preferences_with_http_info(self, **kwargs):  # noqa: E501
-        """Update selected fields of customer preferences  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.post_customer_preferences_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param CustomerPreferencesUpdating body:
-        :return: CustomerPreferences
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method post_customer_preferences" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/customer/preferences', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='CustomerPreferences',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index f9151a3..ab7793d 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.65.22/python'
+        self.user_agent = 'Swagger-Codegen/2.65.27/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index b24a205..3ed10d4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.65.22".\
+               "SDK Package Version: 2.65.27".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/acl.py b/wavefront_api_client/models/acl.py
deleted file mode 100644
index 85f76f9..0000000
--- a/wavefront_api_client/models/acl.py
+++ /dev/null
@@ -1,178 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.models.access_control_element import AccessControlElement  # noqa: F401,E501
-
-
-class ACL(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'entity_id': 'str',
-        'modify_acl': 'list[AccessControlElement]',
-        'view_acl': 'list[AccessControlElement]'
-    }
-
-    attribute_map = {
-        'entity_id': 'entityId',
-        'modify_acl': 'modifyAcl',
-        'view_acl': 'viewAcl'
-    }
-
-    def __init__(self, entity_id=None, modify_acl=None, view_acl=None):  # noqa: E501
-        """ACL - a model defined in Swagger"""  # noqa: E501
-
-        self._entity_id = None
-        self._modify_acl = None
-        self._view_acl = None
-        self.discriminator = None
-
-        self.entity_id = entity_id
-        self.modify_acl = modify_acl
-        self.view_acl = view_acl
-
-    @property
-    def entity_id(self):
-        """Gets the entity_id of this ACL.  # noqa: E501
-
-        The entity Id  # noqa: E501
-
-        :return: The entity_id of this ACL.  # noqa: E501
-        :rtype: str
-        """
-        return self._entity_id
-
-    @entity_id.setter
-    def entity_id(self, entity_id):
-        """Sets the entity_id of this ACL.
-
-        The entity Id  # noqa: E501
-
-        :param entity_id: The entity_id of this ACL.  # noqa: E501
-        :type: str
-        """
-        if entity_id is None:
-            raise ValueError("Invalid value for `entity_id`, must not be `None`")  # noqa: E501
-
-        self._entity_id = entity_id
-
-    @property
-    def modify_acl(self):
-        """Gets the modify_acl of this ACL.  # noqa: E501
-
-        List of users and user groups ids that have modify permission  # noqa: E501
-
-        :return: The modify_acl of this ACL.  # noqa: E501
-        :rtype: list[AccessControlElement]
-        """
-        return self._modify_acl
-
-    @modify_acl.setter
-    def modify_acl(self, modify_acl):
-        """Sets the modify_acl of this ACL.
-
-        List of users and user groups ids that have modify permission  # noqa: E501
-
-        :param modify_acl: The modify_acl of this ACL.  # noqa: E501
-        :type: list[AccessControlElement]
-        """
-        if modify_acl is None:
-            raise ValueError("Invalid value for `modify_acl`, must not be `None`")  # noqa: E501
-
-        self._modify_acl = modify_acl
-
-    @property
-    def view_acl(self):
-        """Gets the view_acl of this ACL.  # noqa: E501
-
-        List of users and user group ids that have view permission  # noqa: E501
-
-        :return: The view_acl of this ACL.  # noqa: E501
-        :rtype: list[AccessControlElement]
-        """
-        return self._view_acl
-
-    @view_acl.setter
-    def view_acl(self, view_acl):
-        """Sets the view_acl of this ACL.
-
-        List of users and user group ids that have view permission  # noqa: E501
-
-        :param view_acl: The view_acl of this ACL.  # noqa: E501
-        :type: list[AccessControlElement]
-        """
-        if view_acl is None:
-            raise ValueError("Invalid value for `view_acl`, must not be `None`")  # noqa: E501
-
-        self._view_acl = view_acl
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ACL, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ACL):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/business_action_group_basic_dto.py b/wavefront_api_client/models/business_action_group_basic_dto.py
deleted file mode 100644
index f2dfac6..0000000
--- a/wavefront_api_client/models/business_action_group_basic_dto.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class BusinessActionGroupBasicDTO(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'description': 'str',
-        'display_name': 'str',
-        'group_name': 'str',
-        'required_default': 'bool'
-    }
-
-    attribute_map = {
-        'description': 'description',
-        'display_name': 'displayName',
-        'group_name': 'groupName',
-        'required_default': 'requiredDefault'
-    }
-
-    def __init__(self, description=None, display_name=None, group_name=None, required_default=None):  # noqa: E501
-        """BusinessActionGroupBasicDTO - a model defined in Swagger"""  # noqa: E501
-
-        self._description = None
-        self._display_name = None
-        self._group_name = None
-        self._required_default = None
-        self.discriminator = None
-
-        if description is not None:
-            self.description = description
-        if display_name is not None:
-            self.display_name = display_name
-        if group_name is not None:
-            self.group_name = group_name
-        if required_default is not None:
-            self.required_default = required_default
-
-    @property
-    def description(self):
-        """Gets the description of this BusinessActionGroupBasicDTO.  # noqa: E501
-
-
-        :return: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this BusinessActionGroupBasicDTO.
-
-
-        :param description: The description of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
-    @property
-    def display_name(self):
-        """Gets the display_name of this BusinessActionGroupBasicDTO.  # noqa: E501
-
-
-        :return: The display_name of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._display_name
-
-    @display_name.setter
-    def display_name(self, display_name):
-        """Sets the display_name of this BusinessActionGroupBasicDTO.
-
-
-        :param display_name: The display_name of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._display_name = display_name
-
-    @property
-    def group_name(self):
-        """Gets the group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
-
-
-        :return: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._group_name
-
-    @group_name.setter
-    def group_name(self, group_name):
-        """Sets the group_name of this BusinessActionGroupBasicDTO.
-
-
-        :param group_name: The group_name of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._group_name = group_name
-
-    @property
-    def required_default(self):
-        """Gets the required_default of this BusinessActionGroupBasicDTO.  # noqa: E501
-
-
-        :return: The required_default of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._required_default
-
-    @required_default.setter
-    def required_default(self, required_default):
-        """Sets the required_default of this BusinessActionGroupBasicDTO.
-
-
-        :param required_default: The required_default of this BusinessActionGroupBasicDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._required_default = required_default
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(BusinessActionGroupBasicDTO, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, BusinessActionGroupBasicDTO):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/component_status.py b/wavefront_api_client/models/component_status.py
deleted file mode 100644
index 5f7c72d..0000000
--- a/wavefront_api_client/models/component_status.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class ComponentStatus(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'description': 'str',
-        'name': 'str',
-        'status': 'bool'
-    }
-
-    attribute_map = {
-        'description': 'description',
-        'name': 'name',
-        'status': 'status'
-    }
-
-    def __init__(self, description=None, name=None, status=None):  # noqa: E501
-        """ComponentStatus - a model defined in Swagger"""  # noqa: E501
-
-        self._description = None
-        self._name = None
-        self._status = None
-        self.discriminator = None
-
-        if description is not None:
-            self.description = description
-        if name is not None:
-            self.name = name
-        if status is not None:
-            self.status = status
-
-    @property
-    def description(self):
-        """Gets the description of this ComponentStatus.  # noqa: E501
-
-
-        :return: The description of this ComponentStatus.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this ComponentStatus.
-
-
-        :param description: The description of this ComponentStatus.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
-    @property
-    def name(self):
-        """Gets the name of this ComponentStatus.  # noqa: E501
-
-
-        :return: The name of this ComponentStatus.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ComponentStatus.
-
-
-        :param name: The name of this ComponentStatus.  # noqa: E501
-        :type: str
-        """
-
-        self._name = name
-
-    @property
-    def status(self):
-        """Gets the status of this ComponentStatus.  # noqa: E501
-
-
-        :return: The status of this ComponentStatus.  # noqa: E501
-        :rtype: bool
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ComponentStatus.
-
-
-        :param status: The status of this ComponentStatus.  # noqa: E501
-        :type: bool
-        """
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ComponentStatus, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ComponentStatus):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/customer_preferences.py b/wavefront_api_client/models/customer_preferences.py
deleted file mode 100644
index ad445ec..0000000
--- a/wavefront_api_client/models/customer_preferences.py
+++ /dev/null
@@ -1,530 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class CustomerPreferences(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'blacklisted_emails': 'dict(str, int)',
-        'created_epoch_millis': 'int',
-        'creator_id': 'str',
-        'customer_id': 'str',
-        'default_user_groups': 'list[UserGroupModel]',
-        'deleted': 'bool',
-        'grant_modify_access_to_everyone': 'bool',
-        'hidden_metric_prefixes': 'dict(str, int)',
-        'hide_ts_when_querybuilder_shown': 'bool',
-        'id': 'str',
-        'invite_permissions': 'list[str]',
-        'landing_dashboard_slug': 'str',
-        'show_onboarding': 'bool',
-        'show_querybuilder_by_default': 'bool',
-        'updated_epoch_millis': 'int',
-        'updater_id': 'str'
-    }
-
-    attribute_map = {
-        'blacklisted_emails': 'blacklistedEmails',
-        'created_epoch_millis': 'createdEpochMillis',
-        'creator_id': 'creatorId',
-        'customer_id': 'customerId',
-        'default_user_groups': 'defaultUserGroups',
-        'deleted': 'deleted',
-        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
-        'hidden_metric_prefixes': 'hiddenMetricPrefixes',
-        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
-        'id': 'id',
-        'invite_permissions': 'invitePermissions',
-        'landing_dashboard_slug': 'landingDashboardSlug',
-        'show_onboarding': 'showOnboarding',
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId'
-    }
-
-    def __init__(self, blacklisted_emails=None, created_epoch_millis=None, creator_id=None, customer_id=None, default_user_groups=None, deleted=None, grant_modify_access_to_everyone=None, hidden_metric_prefixes=None, hide_ts_when_querybuilder_shown=None, id=None, invite_permissions=None, landing_dashboard_slug=None, show_onboarding=None, show_querybuilder_by_default=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
-        """CustomerPreferences - a model defined in Swagger"""  # noqa: E501
-
-        self._blacklisted_emails = None
-        self._created_epoch_millis = None
-        self._creator_id = None
-        self._customer_id = None
-        self._default_user_groups = None
-        self._deleted = None
-        self._grant_modify_access_to_everyone = None
-        self._hidden_metric_prefixes = None
-        self._hide_ts_when_querybuilder_shown = None
-        self._id = None
-        self._invite_permissions = None
-        self._landing_dashboard_slug = None
-        self._show_onboarding = None
-        self._show_querybuilder_by_default = None
-        self._updated_epoch_millis = None
-        self._updater_id = None
-        self.discriminator = None
-
-        if blacklisted_emails is not None:
-            self.blacklisted_emails = blacklisted_emails
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if creator_id is not None:
-            self.creator_id = creator_id
-        self.customer_id = customer_id
-        if default_user_groups is not None:
-            self.default_user_groups = default_user_groups
-        if deleted is not None:
-            self.deleted = deleted
-        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
-        if hidden_metric_prefixes is not None:
-            self.hidden_metric_prefixes = hidden_metric_prefixes
-        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        if id is not None:
-            self.id = id
-        if invite_permissions is not None:
-            self.invite_permissions = invite_permissions
-        if landing_dashboard_slug is not None:
-            self.landing_dashboard_slug = landing_dashboard_slug
-        self.show_onboarding = show_onboarding
-        self.show_querybuilder_by_default = show_querybuilder_by_default
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        if updater_id is not None:
-            self.updater_id = updater_id
-
-    @property
-    def blacklisted_emails(self):
-        """Gets the blacklisted_emails of this CustomerPreferences.  # noqa: E501
-
-        List of blacklisted emails of the customer  # noqa: E501
-
-        :return: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
-        :rtype: dict(str, int)
-        """
-        return self._blacklisted_emails
-
-    @blacklisted_emails.setter
-    def blacklisted_emails(self, blacklisted_emails):
-        """Sets the blacklisted_emails of this CustomerPreferences.
-
-        List of blacklisted emails of the customer  # noqa: E501
-
-        :param blacklisted_emails: The blacklisted_emails of this CustomerPreferences.  # noqa: E501
-        :type: dict(str, int)
-        """
-
-        self._blacklisted_emails = blacklisted_emails
-
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this CustomerPreferences.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def creator_id(self):
-        """Gets the creator_id of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The creator_id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
-        """
-        return self._creator_id
-
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this CustomerPreferences.
-
-
-        :param creator_id: The creator_id of this CustomerPreferences.  # noqa: E501
-        :type: str
-        """
-
-        self._creator_id = creator_id
-
-    @property
-    def customer_id(self):
-        """Gets the customer_id of this CustomerPreferences.  # noqa: E501
-
-        The id of the customer preferences are attached to  # noqa: E501
-
-        :return: The customer_id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer_id
-
-    @customer_id.setter
-    def customer_id(self, customer_id):
-        """Sets the customer_id of this CustomerPreferences.
-
-        The id of the customer preferences are attached to  # noqa: E501
-
-        :param customer_id: The customer_id of this CustomerPreferences.  # noqa: E501
-        :type: str
-        """
-        if customer_id is None:
-            raise ValueError("Invalid value for `customer_id`, must not be `None`")  # noqa: E501
-
-        self._customer_id = customer_id
-
-    @property
-    def default_user_groups(self):
-        """Gets the default_user_groups of this CustomerPreferences.  # noqa: E501
-
-        List of default user groups of the customer  # noqa: E501
-
-        :return: The default_user_groups of this CustomerPreferences.  # noqa: E501
-        :rtype: list[UserGroupModel]
-        """
-        return self._default_user_groups
-
-    @default_user_groups.setter
-    def default_user_groups(self, default_user_groups):
-        """Sets the default_user_groups of this CustomerPreferences.
-
-        List of default user groups of the customer  # noqa: E501
-
-        :param default_user_groups: The default_user_groups of this CustomerPreferences.  # noqa: E501
-        :type: list[UserGroupModel]
-        """
-
-        self._default_user_groups = default_user_groups
-
-    @property
-    def deleted(self):
-        """Gets the deleted of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The deleted of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this CustomerPreferences.
-
-
-        :param deleted: The deleted of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-
-        self._deleted = deleted
-
-    @property
-    def grant_modify_access_to_everyone(self):
-        """Gets the grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
-
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
-
-        :return: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._grant_modify_access_to_everyone
-
-    @grant_modify_access_to_everyone.setter
-    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
-        """Sets the grant_modify_access_to_everyone of this CustomerPreferences.
-
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
-
-        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if grant_modify_access_to_everyone is None:
-            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
-
-        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
-
-    @property
-    def hidden_metric_prefixes(self):
-        """Gets the hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
-
-        Metric prefixes which should be hidden from user  # noqa: E501
-
-        :return: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
-        :rtype: dict(str, int)
-        """
-        return self._hidden_metric_prefixes
-
-    @hidden_metric_prefixes.setter
-    def hidden_metric_prefixes(self, hidden_metric_prefixes):
-        """Sets the hidden_metric_prefixes of this CustomerPreferences.
-
-        Metric prefixes which should be hidden from user  # noqa: E501
-
-        :param hidden_metric_prefixes: The hidden_metric_prefixes of this CustomerPreferences.  # noqa: E501
-        :type: dict(str, int)
-        """
-
-        self._hidden_metric_prefixes = hidden_metric_prefixes
-
-    @property
-    def hide_ts_when_querybuilder_shown(self):
-        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
-
-        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._hide_ts_when_querybuilder_shown
-
-    @hide_ts_when_querybuilder_shown.setter
-    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
-        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferences.
-
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
-
-        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if hide_ts_when_querybuilder_shown is None:
-            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
-
-        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-
-    @property
-    def id(self):
-        """Gets the id of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this CustomerPreferences.
-
-
-        :param id: The id of this CustomerPreferences.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
-    @property
-    def invite_permissions(self):
-        """Gets the invite_permissions of this CustomerPreferences.  # noqa: E501
-
-        List of permissions that are assigned to newly invited users  # noqa: E501
-
-        :return: The invite_permissions of this CustomerPreferences.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._invite_permissions
-
-    @invite_permissions.setter
-    def invite_permissions(self, invite_permissions):
-        """Sets the invite_permissions of this CustomerPreferences.
-
-        List of permissions that are assigned to newly invited users  # noqa: E501
-
-        :param invite_permissions: The invite_permissions of this CustomerPreferences.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._invite_permissions = invite_permissions
-
-    @property
-    def landing_dashboard_slug(self):
-        """Gets the landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
-
-        Dashboard where user will be redirected from landing page  # noqa: E501
-
-        :return: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
-        :rtype: str
-        """
-        return self._landing_dashboard_slug
-
-    @landing_dashboard_slug.setter
-    def landing_dashboard_slug(self, landing_dashboard_slug):
-        """Sets the landing_dashboard_slug of this CustomerPreferences.
-
-        Dashboard where user will be redirected from landing page  # noqa: E501
-
-        :param landing_dashboard_slug: The landing_dashboard_slug of this CustomerPreferences.  # noqa: E501
-        :type: str
-        """
-
-        self._landing_dashboard_slug = landing_dashboard_slug
-
-    @property
-    def show_onboarding(self):
-        """Gets the show_onboarding of this CustomerPreferences.  # noqa: E501
-
-        Whether to show onboarding for any new user without an override  # noqa: E501
-
-        :return: The show_onboarding of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_onboarding
-
-    @show_onboarding.setter
-    def show_onboarding(self, show_onboarding):
-        """Sets the show_onboarding of this CustomerPreferences.
-
-        Whether to show onboarding for any new user without an override  # noqa: E501
-
-        :param show_onboarding: The show_onboarding of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if show_onboarding is None:
-            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
-
-        self._show_onboarding = show_onboarding
-
-    @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-
-        Whether the Querybuilder is shown by default  # noqa: E501
-
-        :return: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_querybuilder_by_default
-
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this CustomerPreferences.
-
-        Whether the Querybuilder is shown by default  # noqa: E501
-
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferences.  # noqa: E501
-        :type: bool
-        """
-        if show_querybuilder_by_default is None:
-            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
-
-        self._show_querybuilder_by_default = show_querybuilder_by_default
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated_epoch_millis
-
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this CustomerPreferences.
-
-
-        :param updated_epoch_millis: The updated_epoch_millis of this CustomerPreferences.  # noqa: E501
-        :type: int
-        """
-
-        self._updated_epoch_millis = updated_epoch_millis
-
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this CustomerPreferences.  # noqa: E501
-
-
-        :return: The updater_id of this CustomerPreferences.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this CustomerPreferences.
-
-
-        :param updater_id: The updater_id of this CustomerPreferences.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(CustomerPreferences, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, CustomerPreferences):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/customer_preferences_updating.py b/wavefront_api_client/models/customer_preferences_updating.py
deleted file mode 100644
index 21c3110..0000000
--- a/wavefront_api_client/models/customer_preferences_updating.py
+++ /dev/null
@@ -1,289 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class CustomerPreferencesUpdating(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'default_user_groups': 'list[str]',
-        'grant_modify_access_to_everyone': 'bool',
-        'hide_ts_when_querybuilder_shown': 'bool',
-        'invite_permissions': 'list[str]',
-        'landing_dashboard_slug': 'str',
-        'show_onboarding': 'bool',
-        'show_querybuilder_by_default': 'bool'
-    }
-
-    attribute_map = {
-        'default_user_groups': 'defaultUserGroups',
-        'grant_modify_access_to_everyone': 'grantModifyAccessToEveryone',
-        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
-        'invite_permissions': 'invitePermissions',
-        'landing_dashboard_slug': 'landingDashboardSlug',
-        'show_onboarding': 'showOnboarding',
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault'
-    }
-
-    def __init__(self, default_user_groups=None, grant_modify_access_to_everyone=None, hide_ts_when_querybuilder_shown=None, invite_permissions=None, landing_dashboard_slug=None, show_onboarding=None, show_querybuilder_by_default=None):  # noqa: E501
-        """CustomerPreferencesUpdating - a model defined in Swagger"""  # noqa: E501
-
-        self._default_user_groups = None
-        self._grant_modify_access_to_everyone = None
-        self._hide_ts_when_querybuilder_shown = None
-        self._invite_permissions = None
-        self._landing_dashboard_slug = None
-        self._show_onboarding = None
-        self._show_querybuilder_by_default = None
-        self.discriminator = None
-
-        if default_user_groups is not None:
-            self.default_user_groups = default_user_groups
-        self.grant_modify_access_to_everyone = grant_modify_access_to_everyone
-        self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        if invite_permissions is not None:
-            self.invite_permissions = invite_permissions
-        if landing_dashboard_slug is not None:
-            self.landing_dashboard_slug = landing_dashboard_slug
-        self.show_onboarding = show_onboarding
-        self.show_querybuilder_by_default = show_querybuilder_by_default
-
-    @property
-    def default_user_groups(self):
-        """Gets the default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
-
-        List of default user groups of the customer  # noqa: E501
-
-        :return: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._default_user_groups
-
-    @default_user_groups.setter
-    def default_user_groups(self, default_user_groups):
-        """Sets the default_user_groups of this CustomerPreferencesUpdating.
-
-        List of default user groups of the customer  # noqa: E501
-
-        :param default_user_groups: The default_user_groups of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._default_user_groups = default_user_groups
-
-    @property
-    def grant_modify_access_to_everyone(self):
-        """Gets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
-
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
-
-        :return: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: bool
-        """
-        return self._grant_modify_access_to_everyone
-
-    @grant_modify_access_to_everyone.setter
-    def grant_modify_access_to_everyone(self, grant_modify_access_to_everyone):
-        """Sets the grant_modify_access_to_everyone of this CustomerPreferencesUpdating.
-
-        Whether modify access of new entites is granted to Everyone or to the Creator  # noqa: E501
-
-        :param grant_modify_access_to_everyone: The grant_modify_access_to_everyone of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: bool
-        """
-        if grant_modify_access_to_everyone is None:
-            raise ValueError("Invalid value for `grant_modify_access_to_everyone`, must not be `None`")  # noqa: E501
-
-        self._grant_modify_access_to_everyone = grant_modify_access_to_everyone
-
-    @property
-    def hide_ts_when_querybuilder_shown(self):
-        """Gets the hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.  # noqa: E501
-
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
-
-        :return: The hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: bool
-        """
-        return self._hide_ts_when_querybuilder_shown
-
-    @hide_ts_when_querybuilder_shown.setter
-    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
-        """Sets the hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.
-
-        Whether to hide TS source input when Querybuilder is shown  # noqa: E501
-
-        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: bool
-        """
-        if hide_ts_when_querybuilder_shown is None:
-            raise ValueError("Invalid value for `hide_ts_when_querybuilder_shown`, must not be `None`")  # noqa: E501
-
-        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-
-    @property
-    def invite_permissions(self):
-        """Gets the invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
-
-        List of invite permissions to apply for each new user  # noqa: E501
-
-        :return: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._invite_permissions
-
-    @invite_permissions.setter
-    def invite_permissions(self, invite_permissions):
-        """Sets the invite_permissions of this CustomerPreferencesUpdating.
-
-        List of invite permissions to apply for each new user  # noqa: E501
-
-        :param invite_permissions: The invite_permissions of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._invite_permissions = invite_permissions
-
-    @property
-    def landing_dashboard_slug(self):
-        """Gets the landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
-
-        Dashboard where user will be redirected from landing page  # noqa: E501
-
-        :return: The landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: str
-        """
-        return self._landing_dashboard_slug
-
-    @landing_dashboard_slug.setter
-    def landing_dashboard_slug(self, landing_dashboard_slug):
-        """Sets the landing_dashboard_slug of this CustomerPreferencesUpdating.
-
-        Dashboard where user will be redirected from landing page  # noqa: E501
-
-        :param landing_dashboard_slug: The landing_dashboard_slug of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: str
-        """
-
-        self._landing_dashboard_slug = landing_dashboard_slug
-
-    @property
-    def show_onboarding(self):
-        """Gets the show_onboarding of this CustomerPreferencesUpdating.  # noqa: E501
-
-        Whether to show onboarding for any new user without an override  # noqa: E501
-
-        :return: The show_onboarding of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_onboarding
-
-    @show_onboarding.setter
-    def show_onboarding(self, show_onboarding):
-        """Sets the show_onboarding of this CustomerPreferencesUpdating.
-
-        Whether to show onboarding for any new user without an override  # noqa: E501
-
-        :param show_onboarding: The show_onboarding of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: bool
-        """
-        if show_onboarding is None:
-            raise ValueError("Invalid value for `show_onboarding`, must not be `None`")  # noqa: E501
-
-        self._show_onboarding = show_onboarding
-
-    @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
-
-        Whether the Querybuilder is shown by default  # noqa: E501
-
-        :return: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_querybuilder_by_default
-
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this CustomerPreferencesUpdating.
-
-        Whether the Querybuilder is shown by default  # noqa: E501
-
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this CustomerPreferencesUpdating.  # noqa: E501
-        :type: bool
-        """
-        if show_querybuilder_by_default is None:
-            raise ValueError("Invalid value for `show_querybuilder_by_default`, must not be `None`")  # noqa: E501
-
-        self._show_querybuilder_by_default = show_querybuilder_by_default
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(CustomerPreferencesUpdating, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, CustomerPreferencesUpdating):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/iterable.py b/wavefront_api_client/models/iterable.py
deleted file mode 100644
index f57532a..0000000
--- a/wavefront_api_client/models/iterable.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class Iterable(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-    }
-
-    attribute_map = {
-    }
-
-    def __init__(self):  # noqa: E501
-        """Iterable - a model defined in Swagger"""  # noqa: E501
-        self.discriminator = None
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(Iterable, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, Iterable):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/iterator_entry_string_json_node.py b/wavefront_api_client/models/iterator_entry_string_json_node.py
deleted file mode 100644
index bc7bc26..0000000
--- a/wavefront_api_client/models/iterator_entry_string_json_node.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class IteratorEntryStringJsonNode(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-    }
-
-    attribute_map = {
-    }
-
-    def __init__(self):  # noqa: E501
-        """IteratorEntryStringJsonNode - a model defined in Swagger"""  # noqa: E501
-        self.discriminator = None
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(IteratorEntryStringJsonNode, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, IteratorEntryStringJsonNode):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/iterator_json_node.py b/wavefront_api_client/models/iterator_json_node.py
deleted file mode 100644
index 2f2e4bb..0000000
--- a/wavefront_api_client/models/iterator_json_node.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class IteratorJsonNode(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-    }
-
-    attribute_map = {
-    }
-
-    def __init__(self):  # noqa: E501
-        """IteratorJsonNode - a model defined in Swagger"""  # noqa: E501
-        self.discriminator = None
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(IteratorJsonNode, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, IteratorJsonNode):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/iterator_string.py b/wavefront_api_client/models/iterator_string.py
deleted file mode 100644
index a6c1925..0000000
--- a/wavefront_api_client/models/iterator_string.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class IteratorString(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-    }
-
-    attribute_map = {
-    }
-
-    def __init__(self):  # noqa: E501
-        """IteratorString - a model defined in Swagger"""  # noqa: E501
-        self.discriminator = None
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(IteratorString, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, IteratorString):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/number.py b/wavefront_api_client/models/number.py
deleted file mode 100644
index 6856868..0000000
--- a/wavefront_api_client/models/number.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class Number(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-    }
-
-    attribute_map = {
-    }
-
-    def __init__(self):  # noqa: E501
-        """Number - a model defined in Swagger"""  # noqa: E501
-        self.discriminator = None
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(Number, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, Number):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/paged_user_group.py b/wavefront_api_client/models/paged_user_group.py
deleted file mode 100644
index ce65312..0000000
--- a/wavefront_api_client/models/paged_user_group.py
+++ /dev/null
@@ -1,282 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.models.sorting import Sorting  # noqa: F401,E501
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
-
-
-class PagedUserGroup(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'cursor': 'str',
-        'items': 'list[UserGroup]',
-        'limit': 'int',
-        'more_items': 'bool',
-        'offset': 'int',
-        'sort': 'Sorting',
-        'total_items': 'int'
-    }
-
-    attribute_map = {
-        'cursor': 'cursor',
-        'items': 'items',
-        'limit': 'limit',
-        'more_items': 'moreItems',
-        'offset': 'offset',
-        'sort': 'sort',
-        'total_items': 'totalItems'
-    }
-
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
-        """PagedUserGroup - a model defined in Swagger"""  # noqa: E501
-
-        self._cursor = None
-        self._items = None
-        self._limit = None
-        self._more_items = None
-        self._offset = None
-        self._sort = None
-        self._total_items = None
-        self.discriminator = None
-
-        if cursor is not None:
-            self.cursor = cursor
-        if items is not None:
-            self.items = items
-        if limit is not None:
-            self.limit = limit
-        if more_items is not None:
-            self.more_items = more_items
-        if offset is not None:
-            self.offset = offset
-        if sort is not None:
-            self.sort = sort
-        if total_items is not None:
-            self.total_items = total_items
-
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedUserGroup.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedUserGroup.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedUserGroup.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedUserGroup.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def items(self):
-        """Gets the items of this PagedUserGroup.  # noqa: E501
-
-        List of requested items  # noqa: E501
-
-        :return: The items of this PagedUserGroup.  # noqa: E501
-        :rtype: list[UserGroup]
-        """
-        return self._items
-
-    @items.setter
-    def items(self, items):
-        """Sets the items of this PagedUserGroup.
-
-        List of requested items  # noqa: E501
-
-        :param items: The items of this PagedUserGroup.  # noqa: E501
-        :type: list[UserGroup]
-        """
-
-        self._items = items
-
-    @property
-    def limit(self):
-        """Gets the limit of this PagedUserGroup.  # noqa: E501
-
-
-        :return: The limit of this PagedUserGroup.  # noqa: E501
-        :rtype: int
-        """
-        return self._limit
-
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this PagedUserGroup.
-
-
-        :param limit: The limit of this PagedUserGroup.  # noqa: E501
-        :type: int
-        """
-
-        self._limit = limit
-
-    @property
-    def more_items(self):
-        """Gets the more_items of this PagedUserGroup.  # noqa: E501
-
-        Whether more items are available for return by increment offset or cursor  # noqa: E501
-
-        :return: The more_items of this PagedUserGroup.  # noqa: E501
-        :rtype: bool
-        """
-        return self._more_items
-
-    @more_items.setter
-    def more_items(self, more_items):
-        """Sets the more_items of this PagedUserGroup.
-
-        Whether more items are available for return by increment offset or cursor  # noqa: E501
-
-        :param more_items: The more_items of this PagedUserGroup.  # noqa: E501
-        :type: bool
-        """
-
-        self._more_items = more_items
-
-    @property
-    def offset(self):
-        """Gets the offset of this PagedUserGroup.  # noqa: E501
-
-
-        :return: The offset of this PagedUserGroup.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedUserGroup.
-
-
-        :param offset: The offset of this PagedUserGroup.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
-    @property
-    def sort(self):
-        """Gets the sort of this PagedUserGroup.  # noqa: E501
-
-
-        :return: The sort of this PagedUserGroup.  # noqa: E501
-        :rtype: Sorting
-        """
-        return self._sort
-
-    @sort.setter
-    def sort(self, sort):
-        """Sets the sort of this PagedUserGroup.
-
-
-        :param sort: The sort of this PagedUserGroup.  # noqa: E501
-        :type: Sorting
-        """
-
-        self._sort = sort
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedUserGroup.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedUserGroup.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedUserGroup.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedUserGroup.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(PagedUserGroup, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, PagedUserGroup):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_acl.py b/wavefront_api_client/models/response_container_list_acl.py
deleted file mode 100644
index fae89b8..0000000
--- a/wavefront_api_client/models/response_container_list_acl.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.models.acl import ACL  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
-
-class ResponseContainerListACL(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'list[ACL]',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None):  # noqa: E501
-        """ResponseContainerListACL - a model defined in Swagger"""  # noqa: E501
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListACL.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListACL.  # noqa: E501
-        :rtype: list[ACL]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListACL.
-
-
-        :param response: The response of this ResponseContainerListACL.  # noqa: E501
-        :type: list[ACL]
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerListACL.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerListACL.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerListACL.
-
-
-        :param status: The status of this ResponseContainerListACL.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerListACL, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerListACL):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_user_group.py b/wavefront_api_client/models/response_container_list_user_group.py
deleted file mode 100644
index aa53f46..0000000
--- a/wavefront_api_client/models/response_container_list_user_group.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
-
-
-class ResponseContainerListUserGroup(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'list[UserGroup]',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None):  # noqa: E501
-        """ResponseContainerListUserGroup - a model defined in Swagger"""  # noqa: E501
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListUserGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListUserGroup.  # noqa: E501
-        :rtype: list[UserGroup]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListUserGroup.
-
-
-        :param response: The response of this ResponseContainerListUserGroup.  # noqa: E501
-        :type: list[UserGroup]
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerListUserGroup.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerListUserGroup.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerListUserGroup.
-
-
-        :param status: The status of this ResponseContainerListUserGroup.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerListUserGroup, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerListUserGroup):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/response_container_list_user_group_model.py b/wavefront_api_client/models/response_container_list_user_group_model.py
deleted file mode 100644
index 3f9a07d..0000000
--- a/wavefront_api_client/models/response_container_list_user_group_model.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class ResponseContainerListUserGroupModel(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'list[UserGroupModel]',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None):  # noqa: E501
-        """ResponseContainerListUserGroupModel - a model defined in Swagger"""  # noqa: E501
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerListUserGroupModel.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerListUserGroupModel.  # noqa: E501
-        :rtype: list[UserGroupModel]
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerListUserGroupModel.
-
-
-        :param response: The response of this ResponseContainerListUserGroupModel.  # noqa: E501
-        :type: list[UserGroupModel]
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerListUserGroupModel.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerListUserGroupModel.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerListUserGroupModel.
-
-
-        :param status: The status of this ResponseContainerListUserGroupModel.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerListUserGroupModel, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerListUserGroupModel):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/response_container_paged_user_group.py b/wavefront_api_client/models/response_container_paged_user_group.py
deleted file mode 100644
index 4479d73..0000000
--- a/wavefront_api_client/models/response_container_paged_user_group.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.models.paged_user_group import PagedUserGroup  # noqa: F401,E501
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-
-
-class ResponseContainerPagedUserGroup(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'PagedUserGroup',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None):  # noqa: E501
-        """ResponseContainerPagedUserGroup - a model defined in Swagger"""  # noqa: E501
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedUserGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
-        :rtype: PagedUserGroup
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedUserGroup.
-
-
-        :param response: The response of this ResponseContainerPagedUserGroup.  # noqa: E501
-        :type: PagedUserGroup
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerPagedUserGroup.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerPagedUserGroup.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerPagedUserGroup.
-
-
-        :param status: The status of this ResponseContainerPagedUserGroup.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerPagedUserGroup, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerPagedUserGroup):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/response_container_user_group.py b/wavefront_api_client/models/response_container_user_group.py
deleted file mode 100644
index 1a7391a..0000000
--- a/wavefront_api_client/models/response_container_user_group.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.models.response_status import ResponseStatus  # noqa: F401,E501
-from wavefront_api_client.models.user_group import UserGroup  # noqa: F401,E501
-
-
-class ResponseContainerUserGroup(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'UserGroup',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None):  # noqa: E501
-        """ResponseContainerUserGroup - a model defined in Swagger"""  # noqa: E501
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerUserGroup.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerUserGroup.  # noqa: E501
-        :rtype: UserGroup
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerUserGroup.
-
-
-        :param response: The response of this ResponseContainerUserGroup.  # noqa: E501
-        :type: UserGroup
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerUserGroup.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerUserGroup.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerUserGroup.
-
-
-        :param status: The status of this ResponseContainerUserGroup.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerUserGroup, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerUserGroup):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/response_container_user_hard_delete.py b/wavefront_api_client/models/response_container_user_hard_delete.py
deleted file mode 100644
index 421c9a7..0000000
--- a/wavefront_api_client/models/response_container_user_hard_delete.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class ResponseContainerUserHardDelete(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'UserHardDelete',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None):  # noqa: E501
-        """ResponseContainerUserHardDelete - a model defined in Swagger"""  # noqa: E501
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerUserHardDelete.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerUserHardDelete.  # noqa: E501
-        :rtype: UserHardDelete
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerUserHardDelete.
-
-
-        :param response: The response of this ResponseContainerUserHardDelete.  # noqa: E501
-        :type: UserHardDelete
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerUserHardDelete.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerUserHardDelete.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerUserHardDelete.
-
-
-        :param status: The status of this ResponseContainerUserHardDelete.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerUserHardDelete, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerUserHardDelete):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/stats_model.py b/wavefront_api_client/models/stats_model.py
deleted file mode 100644
index eda36f8..0000000
--- a/wavefront_api_client/models/stats_model.py
+++ /dev/null
@@ -1,479 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class StatsModel(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'buffer_keys': 'int',
-        'cached_compacted_keys': 'int',
-        'compacted_keys': 'int',
-        'compacted_points': 'int',
-        'cpu_ns': 'int',
-        'hosts_used': 'int',
-        'keys': 'int',
-        'latency': 'int',
-        'metrics_used': 'int',
-        'points': 'int',
-        'queries': 'int',
-        'query_tasks': 'int',
-        's3_keys': 'int',
-        'skipped_compacted_keys': 'int',
-        'summaries': 'int'
-    }
-
-    attribute_map = {
-        'buffer_keys': 'buffer_keys',
-        'cached_compacted_keys': 'cached_compacted_keys',
-        'compacted_keys': 'compacted_keys',
-        'compacted_points': 'compacted_points',
-        'cpu_ns': 'cpu_ns',
-        'hosts_used': 'hosts_used',
-        'keys': 'keys',
-        'latency': 'latency',
-        'metrics_used': 'metrics_used',
-        'points': 'points',
-        'queries': 'queries',
-        'query_tasks': 'query_tasks',
-        's3_keys': 's3_keys',
-        'skipped_compacted_keys': 'skipped_compacted_keys',
-        'summaries': 'summaries'
-    }
-
-    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, hosts_used=None, keys=None, latency=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, summaries=None):  # noqa: E501
-        """StatsModel - a model defined in Swagger"""  # noqa: E501
-
-        self._buffer_keys = None
-        self._cached_compacted_keys = None
-        self._compacted_keys = None
-        self._compacted_points = None
-        self._cpu_ns = None
-        self._hosts_used = None
-        self._keys = None
-        self._latency = None
-        self._metrics_used = None
-        self._points = None
-        self._queries = None
-        self._query_tasks = None
-        self._s3_keys = None
-        self._skipped_compacted_keys = None
-        self._summaries = None
-        self.discriminator = None
-
-        if buffer_keys is not None:
-            self.buffer_keys = buffer_keys
-        if cached_compacted_keys is not None:
-            self.cached_compacted_keys = cached_compacted_keys
-        if compacted_keys is not None:
-            self.compacted_keys = compacted_keys
-        if compacted_points is not None:
-            self.compacted_points = compacted_points
-        if cpu_ns is not None:
-            self.cpu_ns = cpu_ns
-        if hosts_used is not None:
-            self.hosts_used = hosts_used
-        if keys is not None:
-            self.keys = keys
-        if latency is not None:
-            self.latency = latency
-        if metrics_used is not None:
-            self.metrics_used = metrics_used
-        if points is not None:
-            self.points = points
-        if queries is not None:
-            self.queries = queries
-        if query_tasks is not None:
-            self.query_tasks = query_tasks
-        if s3_keys is not None:
-            self.s3_keys = s3_keys
-        if skipped_compacted_keys is not None:
-            self.skipped_compacted_keys = skipped_compacted_keys
-        if summaries is not None:
-            self.summaries = summaries
-
-    @property
-    def buffer_keys(self):
-        """Gets the buffer_keys of this StatsModel.  # noqa: E501
-
-
-        :return: The buffer_keys of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._buffer_keys
-
-    @buffer_keys.setter
-    def buffer_keys(self, buffer_keys):
-        """Sets the buffer_keys of this StatsModel.
-
-
-        :param buffer_keys: The buffer_keys of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._buffer_keys = buffer_keys
-
-    @property
-    def cached_compacted_keys(self):
-        """Gets the cached_compacted_keys of this StatsModel.  # noqa: E501
-
-
-        :return: The cached_compacted_keys of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._cached_compacted_keys
-
-    @cached_compacted_keys.setter
-    def cached_compacted_keys(self, cached_compacted_keys):
-        """Sets the cached_compacted_keys of this StatsModel.
-
-
-        :param cached_compacted_keys: The cached_compacted_keys of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._cached_compacted_keys = cached_compacted_keys
-
-    @property
-    def compacted_keys(self):
-        """Gets the compacted_keys of this StatsModel.  # noqa: E501
-
-
-        :return: The compacted_keys of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._compacted_keys
-
-    @compacted_keys.setter
-    def compacted_keys(self, compacted_keys):
-        """Sets the compacted_keys of this StatsModel.
-
-
-        :param compacted_keys: The compacted_keys of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._compacted_keys = compacted_keys
-
-    @property
-    def compacted_points(self):
-        """Gets the compacted_points of this StatsModel.  # noqa: E501
-
-
-        :return: The compacted_points of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._compacted_points
-
-    @compacted_points.setter
-    def compacted_points(self, compacted_points):
-        """Sets the compacted_points of this StatsModel.
-
-
-        :param compacted_points: The compacted_points of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._compacted_points = compacted_points
-
-    @property
-    def cpu_ns(self):
-        """Gets the cpu_ns of this StatsModel.  # noqa: E501
-
-
-        :return: The cpu_ns of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._cpu_ns
-
-    @cpu_ns.setter
-    def cpu_ns(self, cpu_ns):
-        """Sets the cpu_ns of this StatsModel.
-
-
-        :param cpu_ns: The cpu_ns of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._cpu_ns = cpu_ns
-
-    @property
-    def hosts_used(self):
-        """Gets the hosts_used of this StatsModel.  # noqa: E501
-
-
-        :return: The hosts_used of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._hosts_used
-
-    @hosts_used.setter
-    def hosts_used(self, hosts_used):
-        """Sets the hosts_used of this StatsModel.
-
-
-        :param hosts_used: The hosts_used of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._hosts_used = hosts_used
-
-    @property
-    def keys(self):
-        """Gets the keys of this StatsModel.  # noqa: E501
-
-
-        :return: The keys of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._keys
-
-    @keys.setter
-    def keys(self, keys):
-        """Sets the keys of this StatsModel.
-
-
-        :param keys: The keys of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._keys = keys
-
-    @property
-    def latency(self):
-        """Gets the latency of this StatsModel.  # noqa: E501
-
-
-        :return: The latency of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._latency
-
-    @latency.setter
-    def latency(self, latency):
-        """Sets the latency of this StatsModel.
-
-
-        :param latency: The latency of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._latency = latency
-
-    @property
-    def metrics_used(self):
-        """Gets the metrics_used of this StatsModel.  # noqa: E501
-
-
-        :return: The metrics_used of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._metrics_used
-
-    @metrics_used.setter
-    def metrics_used(self, metrics_used):
-        """Sets the metrics_used of this StatsModel.
-
-
-        :param metrics_used: The metrics_used of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._metrics_used = metrics_used
-
-    @property
-    def points(self):
-        """Gets the points of this StatsModel.  # noqa: E501
-
-
-        :return: The points of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._points
-
-    @points.setter
-    def points(self, points):
-        """Sets the points of this StatsModel.
-
-
-        :param points: The points of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._points = points
-
-    @property
-    def queries(self):
-        """Gets the queries of this StatsModel.  # noqa: E501
-
-
-        :return: The queries of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._queries
-
-    @queries.setter
-    def queries(self, queries):
-        """Sets the queries of this StatsModel.
-
-
-        :param queries: The queries of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._queries = queries
-
-    @property
-    def query_tasks(self):
-        """Gets the query_tasks of this StatsModel.  # noqa: E501
-
-
-        :return: The query_tasks of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._query_tasks
-
-    @query_tasks.setter
-    def query_tasks(self, query_tasks):
-        """Sets the query_tasks of this StatsModel.
-
-
-        :param query_tasks: The query_tasks of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._query_tasks = query_tasks
-
-    @property
-    def s3_keys(self):
-        """Gets the s3_keys of this StatsModel.  # noqa: E501
-
-
-        :return: The s3_keys of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._s3_keys
-
-    @s3_keys.setter
-    def s3_keys(self, s3_keys):
-        """Sets the s3_keys of this StatsModel.
-
-
-        :param s3_keys: The s3_keys of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._s3_keys = s3_keys
-
-    @property
-    def skipped_compacted_keys(self):
-        """Gets the skipped_compacted_keys of this StatsModel.  # noqa: E501
-
-
-        :return: The skipped_compacted_keys of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._skipped_compacted_keys
-
-    @skipped_compacted_keys.setter
-    def skipped_compacted_keys(self, skipped_compacted_keys):
-        """Sets the skipped_compacted_keys of this StatsModel.
-
-
-        :param skipped_compacted_keys: The skipped_compacted_keys of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._skipped_compacted_keys = skipped_compacted_keys
-
-    @property
-    def summaries(self):
-        """Gets the summaries of this StatsModel.  # noqa: E501
-
-
-        :return: The summaries of this StatsModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._summaries
-
-    @summaries.setter
-    def summaries(self, summaries):
-        """Sets the summaries of this StatsModel.
-
-
-        :param summaries: The summaries of this StatsModel.  # noqa: E501
-        :type: int
-        """
-
-        self._summaries = summaries
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(StatsModel, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, StatsModel):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/user.py b/wavefront_api_client/models/user.py
deleted file mode 100644
index eb46489..0000000
--- a/wavefront_api_client/models/user.py
+++ /dev/null
@@ -1,693 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class User(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'account_type': 'str',
-        'api_token': 'str',
-        'api_token2': 'str',
-        'credential': 'str',
-        'customer': 'str',
-        'description': 'str',
-        'extra_api_tokens': 'list[str]',
-        'groups': 'list[str]',
-        'identifier': 'str',
-        'ingestion_policy_id': 'str',
-        'invalid_password_attempts': 'int',
-        'last_logout': 'int',
-        'last_successful_login': 'int',
-        'last_used': 'int',
-        'old_passwords': 'list[str]',
-        'onboarding_state': 'str',
-        'provider': 'str',
-        'reset_token': 'str',
-        'reset_token_creation_millis': 'int',
-        'settings': 'UserSettings',
-        'sso_id': 'str',
-        'super_admin': 'bool',
-        'user_groups': 'list[str]'
-    }
-
-    attribute_map = {
-        'account_type': 'accountType',
-        'api_token': 'apiToken',
-        'api_token2': 'apiToken2',
-        'credential': 'credential',
-        'customer': 'customer',
-        'description': 'description',
-        'extra_api_tokens': 'extraApiTokens',
-        'groups': 'groups',
-        'identifier': 'identifier',
-        'ingestion_policy_id': 'ingestionPolicyId',
-        'invalid_password_attempts': 'invalidPasswordAttempts',
-        'last_logout': 'lastLogout',
-        'last_successful_login': 'lastSuccessfulLogin',
-        'last_used': 'lastUsed',
-        'old_passwords': 'oldPasswords',
-        'onboarding_state': 'onboardingState',
-        'provider': 'provider',
-        'reset_token': 'resetToken',
-        'reset_token_creation_millis': 'resetTokenCreationMillis',
-        'settings': 'settings',
-        'sso_id': 'ssoId',
-        'super_admin': 'superAdmin',
-        'user_groups': 'userGroups'
-    }
-
-    def __init__(self, account_type=None, api_token=None, api_token2=None, credential=None, customer=None, description=None, extra_api_tokens=None, groups=None, identifier=None, ingestion_policy_id=None, invalid_password_attempts=None, last_logout=None, last_successful_login=None, last_used=None, old_passwords=None, onboarding_state=None, provider=None, reset_token=None, reset_token_creation_millis=None, settings=None, sso_id=None, super_admin=None, user_groups=None):  # noqa: E501
-        """User - a model defined in Swagger"""  # noqa: E501
-
-        self._account_type = None
-        self._api_token = None
-        self._api_token2 = None
-        self._credential = None
-        self._customer = None
-        self._description = None
-        self._extra_api_tokens = None
-        self._groups = None
-        self._identifier = None
-        self._ingestion_policy_id = None
-        self._invalid_password_attempts = None
-        self._last_logout = None
-        self._last_successful_login = None
-        self._last_used = None
-        self._old_passwords = None
-        self._onboarding_state = None
-        self._provider = None
-        self._reset_token = None
-        self._reset_token_creation_millis = None
-        self._settings = None
-        self._sso_id = None
-        self._super_admin = None
-        self._user_groups = None
-        self.discriminator = None
-
-        if account_type is not None:
-            self.account_type = account_type
-        if api_token is not None:
-            self.api_token = api_token
-        if api_token2 is not None:
-            self.api_token2 = api_token2
-        if credential is not None:
-            self.credential = credential
-        if customer is not None:
-            self.customer = customer
-        if description is not None:
-            self.description = description
-        if extra_api_tokens is not None:
-            self.extra_api_tokens = extra_api_tokens
-        if groups is not None:
-            self.groups = groups
-        if identifier is not None:
-            self.identifier = identifier
-        if ingestion_policy_id is not None:
-            self.ingestion_policy_id = ingestion_policy_id
-        if invalid_password_attempts is not None:
-            self.invalid_password_attempts = invalid_password_attempts
-        if last_logout is not None:
-            self.last_logout = last_logout
-        if last_successful_login is not None:
-            self.last_successful_login = last_successful_login
-        if last_used is not None:
-            self.last_used = last_used
-        if old_passwords is not None:
-            self.old_passwords = old_passwords
-        if onboarding_state is not None:
-            self.onboarding_state = onboarding_state
-        if provider is not None:
-            self.provider = provider
-        if reset_token is not None:
-            self.reset_token = reset_token
-        if reset_token_creation_millis is not None:
-            self.reset_token_creation_millis = reset_token_creation_millis
-        if settings is not None:
-            self.settings = settings
-        if sso_id is not None:
-            self.sso_id = sso_id
-        if super_admin is not None:
-            self.super_admin = super_admin
-        if user_groups is not None:
-            self.user_groups = user_groups
-
-    @property
-    def account_type(self):
-        """Gets the account_type of this User.  # noqa: E501
-
-
-        :return: The account_type of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._account_type
-
-    @account_type.setter
-    def account_type(self, account_type):
-        """Sets the account_type of this User.
-
-
-        :param account_type: The account_type of this User.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT"]  # noqa: E501
-        if account_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `account_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(account_type, allowed_values)
-            )
-
-        self._account_type = account_type
-
-    @property
-    def api_token(self):
-        """Gets the api_token of this User.  # noqa: E501
-
-
-        :return: The api_token of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._api_token
-
-    @api_token.setter
-    def api_token(self, api_token):
-        """Sets the api_token of this User.
-
-
-        :param api_token: The api_token of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._api_token = api_token
-
-    @property
-    def api_token2(self):
-        """Gets the api_token2 of this User.  # noqa: E501
-
-
-        :return: The api_token2 of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._api_token2
-
-    @api_token2.setter
-    def api_token2(self, api_token2):
-        """Sets the api_token2 of this User.
-
-
-        :param api_token2: The api_token2 of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._api_token2 = api_token2
-
-    @property
-    def credential(self):
-        """Gets the credential of this User.  # noqa: E501
-
-
-        :return: The credential of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._credential
-
-    @credential.setter
-    def credential(self, credential):
-        """Sets the credential of this User.
-
-
-        :param credential: The credential of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._credential = credential
-
-    @property
-    def customer(self):
-        """Gets the customer of this User.  # noqa: E501
-
-
-        :return: The customer of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer
-
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this User.
-
-
-        :param customer: The customer of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._customer = customer
-
-    @property
-    def description(self):
-        """Gets the description of this User.  # noqa: E501
-
-
-        :return: The description of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this User.
-
-
-        :param description: The description of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
-    @property
-    def extra_api_tokens(self):
-        """Gets the extra_api_tokens of this User.  # noqa: E501
-
-
-        :return: The extra_api_tokens of this User.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._extra_api_tokens
-
-    @extra_api_tokens.setter
-    def extra_api_tokens(self, extra_api_tokens):
-        """Sets the extra_api_tokens of this User.
-
-
-        :param extra_api_tokens: The extra_api_tokens of this User.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._extra_api_tokens = extra_api_tokens
-
-    @property
-    def groups(self):
-        """Gets the groups of this User.  # noqa: E501
-
-
-        :return: The groups of this User.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._groups
-
-    @groups.setter
-    def groups(self, groups):
-        """Sets the groups of this User.
-
-
-        :param groups: The groups of this User.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._groups = groups
-
-    @property
-    def identifier(self):
-        """Gets the identifier of this User.  # noqa: E501
-
-
-        :return: The identifier of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._identifier
-
-    @identifier.setter
-    def identifier(self, identifier):
-        """Sets the identifier of this User.
-
-
-        :param identifier: The identifier of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._identifier = identifier
-
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this User.  # noqa: E501
-
-
-        :return: The ingestion_policy_id of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this User.
-
-
-        :param ingestion_policy_id: The ingestion_policy_id of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._ingestion_policy_id = ingestion_policy_id
-
-    @property
-    def invalid_password_attempts(self):
-        """Gets the invalid_password_attempts of this User.  # noqa: E501
-
-
-        :return: The invalid_password_attempts of this User.  # noqa: E501
-        :rtype: int
-        """
-        return self._invalid_password_attempts
-
-    @invalid_password_attempts.setter
-    def invalid_password_attempts(self, invalid_password_attempts):
-        """Sets the invalid_password_attempts of this User.
-
-
-        :param invalid_password_attempts: The invalid_password_attempts of this User.  # noqa: E501
-        :type: int
-        """
-
-        self._invalid_password_attempts = invalid_password_attempts
-
-    @property
-    def last_logout(self):
-        """Gets the last_logout of this User.  # noqa: E501
-
-
-        :return: The last_logout of this User.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_logout
-
-    @last_logout.setter
-    def last_logout(self, last_logout):
-        """Sets the last_logout of this User.
-
-
-        :param last_logout: The last_logout of this User.  # noqa: E501
-        :type: int
-        """
-
-        self._last_logout = last_logout
-
-    @property
-    def last_successful_login(self):
-        """Gets the last_successful_login of this User.  # noqa: E501
-
-
-        :return: The last_successful_login of this User.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_successful_login
-
-    @last_successful_login.setter
-    def last_successful_login(self, last_successful_login):
-        """Sets the last_successful_login of this User.
-
-
-        :param last_successful_login: The last_successful_login of this User.  # noqa: E501
-        :type: int
-        """
-
-        self._last_successful_login = last_successful_login
-
-    @property
-    def last_used(self):
-        """Gets the last_used of this User.  # noqa: E501
-
-
-        :return: The last_used of this User.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_used
-
-    @last_used.setter
-    def last_used(self, last_used):
-        """Sets the last_used of this User.
-
-
-        :param last_used: The last_used of this User.  # noqa: E501
-        :type: int
-        """
-
-        self._last_used = last_used
-
-    @property
-    def old_passwords(self):
-        """Gets the old_passwords of this User.  # noqa: E501
-
-
-        :return: The old_passwords of this User.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._old_passwords
-
-    @old_passwords.setter
-    def old_passwords(self, old_passwords):
-        """Sets the old_passwords of this User.
-
-
-        :param old_passwords: The old_passwords of this User.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._old_passwords = old_passwords
-
-    @property
-    def onboarding_state(self):
-        """Gets the onboarding_state of this User.  # noqa: E501
-
-
-        :return: The onboarding_state of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._onboarding_state
-
-    @onboarding_state.setter
-    def onboarding_state(self, onboarding_state):
-        """Sets the onboarding_state of this User.
-
-
-        :param onboarding_state: The onboarding_state of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._onboarding_state = onboarding_state
-
-    @property
-    def provider(self):
-        """Gets the provider of this User.  # noqa: E501
-
-
-        :return: The provider of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._provider
-
-    @provider.setter
-    def provider(self, provider):
-        """Sets the provider of this User.
-
-
-        :param provider: The provider of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._provider = provider
-
-    @property
-    def reset_token(self):
-        """Gets the reset_token of this User.  # noqa: E501
-
-
-        :return: The reset_token of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._reset_token
-
-    @reset_token.setter
-    def reset_token(self, reset_token):
-        """Sets the reset_token of this User.
-
-
-        :param reset_token: The reset_token of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._reset_token = reset_token
-
-    @property
-    def reset_token_creation_millis(self):
-        """Gets the reset_token_creation_millis of this User.  # noqa: E501
-
-
-        :return: The reset_token_creation_millis of this User.  # noqa: E501
-        :rtype: int
-        """
-        return self._reset_token_creation_millis
-
-    @reset_token_creation_millis.setter
-    def reset_token_creation_millis(self, reset_token_creation_millis):
-        """Sets the reset_token_creation_millis of this User.
-
-
-        :param reset_token_creation_millis: The reset_token_creation_millis of this User.  # noqa: E501
-        :type: int
-        """
-
-        self._reset_token_creation_millis = reset_token_creation_millis
-
-    @property
-    def settings(self):
-        """Gets the settings of this User.  # noqa: E501
-
-
-        :return: The settings of this User.  # noqa: E501
-        :rtype: UserSettings
-        """
-        return self._settings
-
-    @settings.setter
-    def settings(self, settings):
-        """Sets the settings of this User.
-
-
-        :param settings: The settings of this User.  # noqa: E501
-        :type: UserSettings
-        """
-
-        self._settings = settings
-
-    @property
-    def sso_id(self):
-        """Gets the sso_id of this User.  # noqa: E501
-
-
-        :return: The sso_id of this User.  # noqa: E501
-        :rtype: str
-        """
-        return self._sso_id
-
-    @sso_id.setter
-    def sso_id(self, sso_id):
-        """Sets the sso_id of this User.
-
-
-        :param sso_id: The sso_id of this User.  # noqa: E501
-        :type: str
-        """
-
-        self._sso_id = sso_id
-
-    @property
-    def super_admin(self):
-        """Gets the super_admin of this User.  # noqa: E501
-
-
-        :return: The super_admin of this User.  # noqa: E501
-        :rtype: bool
-        """
-        return self._super_admin
-
-    @super_admin.setter
-    def super_admin(self, super_admin):
-        """Sets the super_admin of this User.
-
-
-        :param super_admin: The super_admin of this User.  # noqa: E501
-        :type: bool
-        """
-
-        self._super_admin = super_admin
-
-    @property
-    def user_groups(self):
-        """Gets the user_groups of this User.  # noqa: E501
-
-
-        :return: The user_groups of this User.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._user_groups
-
-    @user_groups.setter
-    def user_groups(self, user_groups):
-        """Sets the user_groups of this User.
-
-
-        :param user_groups: The user_groups of this User.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._user_groups = user_groups
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(User, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, User):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/user_hard_delete.py b/wavefront_api_client/models/user_hard_delete.py
deleted file mode 100644
index 315f60a..0000000
--- a/wavefront_api_client/models/user_hard_delete.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class UserHardDelete(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'customer_id': 'str',
-        'existing': 'dict(str, Iterable)',
-        'user_id': 'str'
-    }
-
-    attribute_map = {
-        'customer_id': 'customerId',
-        'existing': 'existing',
-        'user_id': 'userId'
-    }
-
-    def __init__(self, customer_id=None, existing=None, user_id=None):  # noqa: E501
-        """UserHardDelete - a model defined in Swagger"""  # noqa: E501
-
-        self._customer_id = None
-        self._existing = None
-        self._user_id = None
-        self.discriminator = None
-
-        if customer_id is not None:
-            self.customer_id = customer_id
-        if existing is not None:
-            self.existing = existing
-        if user_id is not None:
-            self.user_id = user_id
-
-    @property
-    def customer_id(self):
-        """Gets the customer_id of this UserHardDelete.  # noqa: E501
-
-
-        :return: The customer_id of this UserHardDelete.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer_id
-
-    @customer_id.setter
-    def customer_id(self, customer_id):
-        """Sets the customer_id of this UserHardDelete.
-
-
-        :param customer_id: The customer_id of this UserHardDelete.  # noqa: E501
-        :type: str
-        """
-
-        self._customer_id = customer_id
-
-    @property
-    def existing(self):
-        """Gets the existing of this UserHardDelete.  # noqa: E501
-
-
-        :return: The existing of this UserHardDelete.  # noqa: E501
-        :rtype: dict(str, Iterable)
-        """
-        return self._existing
-
-    @existing.setter
-    def existing(self, existing):
-        """Sets the existing of this UserHardDelete.
-
-
-        :param existing: The existing of this UserHardDelete.  # noqa: E501
-        :type: dict(str, Iterable)
-        """
-
-        self._existing = existing
-
-    @property
-    def user_id(self):
-        """Gets the user_id of this UserHardDelete.  # noqa: E501
-
-
-        :return: The user_id of this UserHardDelete.  # noqa: E501
-        :rtype: str
-        """
-        return self._user_id
-
-    @user_id.setter
-    def user_id(self, user_id):
-        """Sets the user_id of this UserHardDelete.
-
-
-        :param user_id: The user_id of this UserHardDelete.  # noqa: E501
-        :type: str
-        """
-
-        self._user_id = user_id
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(UserHardDelete, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, UserHardDelete):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/user_settings.py b/wavefront_api_client/models/user_settings.py
deleted file mode 100644
index ae7b220..0000000
--- a/wavefront_api_client/models/user_settings.py
+++ /dev/null
@@ -1,407 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class UserSettings(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'always_hide_querybuilder': 'bool',
-        'chart_title_scalar': 'int',
-        'favorite_qb_functions': 'list[str]',
-        'hide_ts_when_querybuilder_shown': 'bool',
-        'landing_dashboard_slug': 'str',
-        'preferred_time_zone': 'str',
-        'sample_query_results_by_default': 'bool',
-        'show_onboarding': 'bool',
-        'show_querybuilder_by_default': 'bool',
-        'ui_default': 'str',
-        'use24_hour_time': 'bool',
-        'use_dark_theme': 'bool'
-    }
-
-    attribute_map = {
-        'always_hide_querybuilder': 'alwaysHideQuerybuilder',
-        'chart_title_scalar': 'chartTitleScalar',
-        'favorite_qb_functions': 'favoriteQBFunctions',
-        'hide_ts_when_querybuilder_shown': 'hideTSWhenQuerybuilderShown',
-        'landing_dashboard_slug': 'landingDashboardSlug',
-        'preferred_time_zone': 'preferredTimeZone',
-        'sample_query_results_by_default': 'sampleQueryResultsByDefault',
-        'show_onboarding': 'showOnboarding',
-        'show_querybuilder_by_default': 'showQuerybuilderByDefault',
-        'ui_default': 'uiDefault',
-        'use24_hour_time': 'use24HourTime',
-        'use_dark_theme': 'useDarkTheme'
-    }
-
-    def __init__(self, always_hide_querybuilder=None, chart_title_scalar=None, favorite_qb_functions=None, hide_ts_when_querybuilder_shown=None, landing_dashboard_slug=None, preferred_time_zone=None, sample_query_results_by_default=None, show_onboarding=None, show_querybuilder_by_default=None, ui_default=None, use24_hour_time=None, use_dark_theme=None):  # noqa: E501
-        """UserSettings - a model defined in Swagger"""  # noqa: E501
-
-        self._always_hide_querybuilder = None
-        self._chart_title_scalar = None
-        self._favorite_qb_functions = None
-        self._hide_ts_when_querybuilder_shown = None
-        self._landing_dashboard_slug = None
-        self._preferred_time_zone = None
-        self._sample_query_results_by_default = None
-        self._show_onboarding = None
-        self._show_querybuilder_by_default = None
-        self._ui_default = None
-        self._use24_hour_time = None
-        self._use_dark_theme = None
-        self.discriminator = None
-
-        if always_hide_querybuilder is not None:
-            self.always_hide_querybuilder = always_hide_querybuilder
-        if chart_title_scalar is not None:
-            self.chart_title_scalar = chart_title_scalar
-        if favorite_qb_functions is not None:
-            self.favorite_qb_functions = favorite_qb_functions
-        if hide_ts_when_querybuilder_shown is not None:
-            self.hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-        if landing_dashboard_slug is not None:
-            self.landing_dashboard_slug = landing_dashboard_slug
-        if preferred_time_zone is not None:
-            self.preferred_time_zone = preferred_time_zone
-        if sample_query_results_by_default is not None:
-            self.sample_query_results_by_default = sample_query_results_by_default
-        if show_onboarding is not None:
-            self.show_onboarding = show_onboarding
-        if show_querybuilder_by_default is not None:
-            self.show_querybuilder_by_default = show_querybuilder_by_default
-        if ui_default is not None:
-            self.ui_default = ui_default
-        if use24_hour_time is not None:
-            self.use24_hour_time = use24_hour_time
-        if use_dark_theme is not None:
-            self.use_dark_theme = use_dark_theme
-
-    @property
-    def always_hide_querybuilder(self):
-        """Gets the always_hide_querybuilder of this UserSettings.  # noqa: E501
-
-
-        :return: The always_hide_querybuilder of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._always_hide_querybuilder
-
-    @always_hide_querybuilder.setter
-    def always_hide_querybuilder(self, always_hide_querybuilder):
-        """Sets the always_hide_querybuilder of this UserSettings.
-
-
-        :param always_hide_querybuilder: The always_hide_querybuilder of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._always_hide_querybuilder = always_hide_querybuilder
-
-    @property
-    def chart_title_scalar(self):
-        """Gets the chart_title_scalar of this UserSettings.  # noqa: E501
-
-
-        :return: The chart_title_scalar of this UserSettings.  # noqa: E501
-        :rtype: int
-        """
-        return self._chart_title_scalar
-
-    @chart_title_scalar.setter
-    def chart_title_scalar(self, chart_title_scalar):
-        """Sets the chart_title_scalar of this UserSettings.
-
-
-        :param chart_title_scalar: The chart_title_scalar of this UserSettings.  # noqa: E501
-        :type: int
-        """
-
-        self._chart_title_scalar = chart_title_scalar
-
-    @property
-    def favorite_qb_functions(self):
-        """Gets the favorite_qb_functions of this UserSettings.  # noqa: E501
-
-
-        :return: The favorite_qb_functions of this UserSettings.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._favorite_qb_functions
-
-    @favorite_qb_functions.setter
-    def favorite_qb_functions(self, favorite_qb_functions):
-        """Sets the favorite_qb_functions of this UserSettings.
-
-
-        :param favorite_qb_functions: The favorite_qb_functions of this UserSettings.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._favorite_qb_functions = favorite_qb_functions
-
-    @property
-    def hide_ts_when_querybuilder_shown(self):
-        """Gets the hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
-
-
-        :return: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._hide_ts_when_querybuilder_shown
-
-    @hide_ts_when_querybuilder_shown.setter
-    def hide_ts_when_querybuilder_shown(self, hide_ts_when_querybuilder_shown):
-        """Sets the hide_ts_when_querybuilder_shown of this UserSettings.
-
-
-        :param hide_ts_when_querybuilder_shown: The hide_ts_when_querybuilder_shown of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._hide_ts_when_querybuilder_shown = hide_ts_when_querybuilder_shown
-
-    @property
-    def landing_dashboard_slug(self):
-        """Gets the landing_dashboard_slug of this UserSettings.  # noqa: E501
-
-
-        :return: The landing_dashboard_slug of this UserSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._landing_dashboard_slug
-
-    @landing_dashboard_slug.setter
-    def landing_dashboard_slug(self, landing_dashboard_slug):
-        """Sets the landing_dashboard_slug of this UserSettings.
-
-
-        :param landing_dashboard_slug: The landing_dashboard_slug of this UserSettings.  # noqa: E501
-        :type: str
-        """
-
-        self._landing_dashboard_slug = landing_dashboard_slug
-
-    @property
-    def preferred_time_zone(self):
-        """Gets the preferred_time_zone of this UserSettings.  # noqa: E501
-
-
-        :return: The preferred_time_zone of this UserSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._preferred_time_zone
-
-    @preferred_time_zone.setter
-    def preferred_time_zone(self, preferred_time_zone):
-        """Sets the preferred_time_zone of this UserSettings.
-
-
-        :param preferred_time_zone: The preferred_time_zone of this UserSettings.  # noqa: E501
-        :type: str
-        """
-
-        self._preferred_time_zone = preferred_time_zone
-
-    @property
-    def sample_query_results_by_default(self):
-        """Gets the sample_query_results_by_default of this UserSettings.  # noqa: E501
-
-
-        :return: The sample_query_results_by_default of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._sample_query_results_by_default
-
-    @sample_query_results_by_default.setter
-    def sample_query_results_by_default(self, sample_query_results_by_default):
-        """Sets the sample_query_results_by_default of this UserSettings.
-
-
-        :param sample_query_results_by_default: The sample_query_results_by_default of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._sample_query_results_by_default = sample_query_results_by_default
-
-    @property
-    def show_onboarding(self):
-        """Gets the show_onboarding of this UserSettings.  # noqa: E501
-
-
-        :return: The show_onboarding of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_onboarding
-
-    @show_onboarding.setter
-    def show_onboarding(self, show_onboarding):
-        """Sets the show_onboarding of this UserSettings.
-
-
-        :param show_onboarding: The show_onboarding of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._show_onboarding = show_onboarding
-
-    @property
-    def show_querybuilder_by_default(self):
-        """Gets the show_querybuilder_by_default of this UserSettings.  # noqa: E501
-
-
-        :return: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._show_querybuilder_by_default
-
-    @show_querybuilder_by_default.setter
-    def show_querybuilder_by_default(self, show_querybuilder_by_default):
-        """Sets the show_querybuilder_by_default of this UserSettings.
-
-
-        :param show_querybuilder_by_default: The show_querybuilder_by_default of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._show_querybuilder_by_default = show_querybuilder_by_default
-
-    @property
-    def ui_default(self):
-        """Gets the ui_default of this UserSettings.  # noqa: E501
-
-
-        :return: The ui_default of this UserSettings.  # noqa: E501
-        :rtype: str
-        """
-        return self._ui_default
-
-    @ui_default.setter
-    def ui_default(self, ui_default):
-        """Sets the ui_default of this UserSettings.
-
-
-        :param ui_default: The ui_default of this UserSettings.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["V1", "V2"]  # noqa: E501
-        if ui_default not in allowed_values:
-            raise ValueError(
-                "Invalid value for `ui_default` ({0}), must be one of {1}"  # noqa: E501
-                .format(ui_default, allowed_values)
-            )
-
-        self._ui_default = ui_default
-
-    @property
-    def use24_hour_time(self):
-        """Gets the use24_hour_time of this UserSettings.  # noqa: E501
-
-
-        :return: The use24_hour_time of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._use24_hour_time
-
-    @use24_hour_time.setter
-    def use24_hour_time(self, use24_hour_time):
-        """Sets the use24_hour_time of this UserSettings.
-
-
-        :param use24_hour_time: The use24_hour_time of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._use24_hour_time = use24_hour_time
-
-    @property
-    def use_dark_theme(self):
-        """Gets the use_dark_theme of this UserSettings.  # noqa: E501
-
-
-        :return: The use_dark_theme of this UserSettings.  # noqa: E501
-        :rtype: bool
-        """
-        return self._use_dark_theme
-
-    @use_dark_theme.setter
-    def use_dark_theme(self, use_dark_theme):
-        """Sets the use_dark_theme of this UserSettings.
-
-
-        :param use_dark_theme: The use_dark_theme of this UserSettings.  # noqa: E501
-        :type: bool
-        """
-
-        self._use_dark_theme = use_dark_theme
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(UserSettings, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, UserSettings):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other

From 6bf6b13814f71f0604cd070a2b1a3641acc7ae6f Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Mon, 11 Jan 2021 15:02:50 -0800
Subject: [PATCH 071/161] Remove Tests for Obsolete APIs and Models.

Fixes Failing Build Caused by 19dfc82
---
 .travis.yml                                   |   2 +-
 test/test_account__service_account_api.py     |  76 ----------
 ...t_account__user_and_service_account_api.py |  14 ++
 test/test_acl.py                              |  40 -----
 test/test_alert_api.py                        |  35 +++++
 test/test_anomaly_api.py                      |  12 +-
 test/test_api_token_api.py                    |  28 ++++
 test/test_business_action_group_basic_dto.py  |  40 -----
 test/test_cloud_integration_api.py            |  21 +++
 test/test_component_status.py                 |  40 -----
 test/test_customer_preferences.py             |  40 -----
 test/test_customer_preferences_updating.py    |  40 -----
 test/test_dashboard_api.py                    |  26 ++--
 test/test_event_api.py                        |  28 ++++
 test/test_ingestion_spy_api.py                |   7 +
 test/test_iterable.py                         |  40 -----
 test/test_iterator_entry_string_json_node.py  |  40 -----
 test/test_iterator_json_node.py               |  40 -----
 test/test_iterator_string.py                  |  40 -----
 test/test_monitored_cluster_api.py            | 104 -------------
 test/test_number.py                           |  40 -----
 test/test_paged_user_group.py                 |  40 -----
 test/test_response_container_list_acl.py      |  40 -----
 ...test_response_container_list_user_group.py |  40 -----
 ...esponse_container_list_user_group_model.py |  40 -----
 ...est_response_container_paged_user_group.py |  40 -----
 test/test_response_container_user_group.py    |  40 -----
 ...est_response_container_user_hard_delete.py |  40 -----
 test/test_search_api.py                       | 140 ++++++++++++++++++
 test/test_settings_api.py                     |  62 --------
 test/test_stats_model.py                      |  40 -----
 test/test_user.py                             |  40 -----
 test/test_user_api.py                         |  33 +++--
 test/test_user_group_api.py                   |  20 +--
 test/test_user_hard_delete.py                 |  40 -----
 test/test_user_settings.py                    |  40 -----
 36 files changed, 323 insertions(+), 1125 deletions(-)
 delete mode 100644 test/test_account__service_account_api.py
 delete mode 100644 test/test_acl.py
 delete mode 100644 test/test_business_action_group_basic_dto.py
 delete mode 100644 test/test_component_status.py
 delete mode 100644 test/test_customer_preferences.py
 delete mode 100644 test/test_customer_preferences_updating.py
 delete mode 100644 test/test_iterable.py
 delete mode 100644 test/test_iterator_entry_string_json_node.py
 delete mode 100644 test/test_iterator_json_node.py
 delete mode 100644 test/test_iterator_string.py
 delete mode 100644 test/test_monitored_cluster_api.py
 delete mode 100644 test/test_number.py
 delete mode 100644 test/test_paged_user_group.py
 delete mode 100644 test/test_response_container_list_acl.py
 delete mode 100644 test/test_response_container_list_user_group.py
 delete mode 100644 test/test_response_container_list_user_group_model.py
 delete mode 100644 test/test_response_container_paged_user_group.py
 delete mode 100644 test/test_response_container_user_group.py
 delete mode 100644 test/test_response_container_user_hard_delete.py
 delete mode 100644 test/test_settings_api.py
 delete mode 100644 test/test_stats_model.py
 delete mode 100644 test/test_user.py
 delete mode 100644 test/test_user_hard_delete.py
 delete mode 100644 test/test_user_settings.py

diff --git a/.travis.yml b/.travis.yml
index cd8c625..99eda4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,10 @@ dist: bionic
 language: python
 python:
   - "2.7"
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
 install: "pip install -r requirements.txt"
 script: nosetests
 deploy:
diff --git a/test/test_account__service_account_api.py b/test/test_account__service_account_api.py
deleted file mode 100644
index ffce8a7..0000000
--- a/test/test_account__service_account_api.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.api.account__service_account_api import AccountServiceAccountApi  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestAccountServiceAccountApi(unittest.TestCase):
-    """AccountServiceAccountApi unit test stubs"""
-
-    def setUp(self):
-        self.api = wavefront_api_client.api.account__service_account_api.AccountServiceAccountApi()  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    def test_activate_account(self):
-        """Test case for activate_account
-
-        Activates the given service account  # noqa: E501
-        """
-        pass
-
-    def test_create_service_account(self):
-        """Test case for create_service_account
-
-        Creates a service account  # noqa: E501
-        """
-        pass
-
-    def test_deactivate_account(self):
-        """Test case for deactivate_account
-
-        Deactivates the given service account  # noqa: E501
-        """
-        pass
-
-    def test_get_all_service_accounts(self):
-        """Test case for get_all_service_accounts
-
-        Get all service accounts  # noqa: E501
-        """
-        pass
-
-    def test_get_service_account(self):
-        """Test case for get_service_account
-
-        Retrieves a service account by identifier  # noqa: E501
-        """
-        pass
-
-    def test_update_service_account(self):
-        """Test case for update_service_account
-
-        Updates the service account  # noqa: E501
-        """
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_account__user_and_service_account_api.py b/test/test_account__user_and_service_account_api.py
index 0eda4c4..2e07139 100644
--- a/test/test_account__user_and_service_account_api.py
+++ b/test/test_account__user_and_service_account_api.py
@@ -36,6 +36,13 @@ def test_activate_account(self):
         """
         pass
 
+    def test_add_account_to_roles(self):
+        """Test case for add_account_to_roles
+
+        Adds specific roles to the account (user or service account)  # noqa: E501
+        """
+        pass
+
     def test_add_account_to_user_groups(self):
         """Test case for add_account_to_user_groups
 
@@ -155,6 +162,13 @@ def test_invite_user_accounts(self):
         """
         pass
 
+    def test_remove_account_from_roles(self):
+        """Test case for remove_account_from_roles
+
+        Removes specific roles from the account (user or service account)  # noqa: E501
+        """
+        pass
+
     def test_remove_account_from_user_groups(self):
         """Test case for remove_account_from_user_groups
 
diff --git a/test/test_acl.py b/test/test_acl.py
deleted file mode 100644
index 4a233ae..0000000
--- a/test/test_acl.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.acl import ACL  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestACL(unittest.TestCase):
-    """ACL unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testACL(self):
-        """Test ACL"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.acl.ACL()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_alert_api.py b/test/test_alert_api.py
index d44f872..74e4232 100644
--- a/test/test_alert_api.py
+++ b/test/test_alert_api.py
@@ -29,6 +29,13 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_add_alert_access(self):
+        """Test case for add_alert_access
+
+        Adds the specified ids to the given alerts' ACL  # noqa: E501
+        """
+        pass
+
     def test_add_alert_tag(self):
         """Test case for add_alert_tag
 
@@ -36,6 +43,13 @@ def test_add_alert_tag(self):
         """
         pass
 
+    def test_clone_alert(self):
+        """Test case for clone_alert
+
+        Clones the specified alert  # noqa: E501
+        """
+        pass
+
     def test_create_alert(self):
         """Test case for create_alert
 
@@ -57,6 +71,13 @@ def test_get_alert(self):
         """
         pass
 
+    def test_get_alert_access_control_list(self):
+        """Test case for get_alert_access_control_list
+
+        Get Access Control Lists' union for the specified alerts  # noqa: E501
+        """
+        pass
+
     def test_get_alert_history(self):
         """Test case for get_alert_history
 
@@ -99,6 +120,13 @@ def test_hide_alert(self):
         """
         pass
 
+    def test_remove_alert_access(self):
+        """Test case for remove_alert_access
+
+        Removes the specified ids from the given alerts' ACL  # noqa: E501
+        """
+        pass
+
     def test_remove_alert_tag(self):
         """Test case for remove_alert_tag
 
@@ -106,6 +134,13 @@ def test_remove_alert_tag(self):
         """
         pass
 
+    def test_set_alert_acl(self):
+        """Test case for set_alert_acl
+
+        Set ACL for the specified alerts  # noqa: E501
+        """
+        pass
+
     def test_set_alert_tags(self):
         """Test case for set_alert_tags
 
diff --git a/test/test_anomaly_api.py b/test/test_anomaly_api.py
index 81554e4..30577bc 100644
--- a/test/test_anomaly_api.py
+++ b/test/test_anomaly_api.py
@@ -43,17 +43,17 @@ def test_get_anomalies_for_chart_and_param_hash(self):
         """
         pass
 
-    def test_get_chart_anomalies(self):
-        """Test case for get_chart_anomalies
+    def test_get_chart_anomalies_for_chart(self):
+        """Test case for get_chart_anomalies_for_chart
 
-        Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
+        Get all anomalies for a chart during a time interval  # noqa: E501
         """
         pass
 
-    def test_get_chart_anomalies_0(self):
-        """Test case for get_chart_anomalies_0
+    def test_get_chart_anomalies_of_one_dashboard(self):
+        """Test case for get_chart_anomalies_of_one_dashboard
 
-        Get all anomalies for a chart during a time interval  # noqa: E501
+        Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
         """
         pass
 
diff --git a/test/test_api_token_api.py b/test/test_api_token_api.py
index e4b5ab1..25a342e 100644
--- a/test/test_api_token_api.py
+++ b/test/test_api_token_api.py
@@ -43,6 +43,20 @@ def test_delete_token(self):
         """
         pass
 
+    def test_delete_token_service_account(self):
+        """Test case for delete_token_service_account
+
+        Delete the specified api token of the given service account  # noqa: E501
+        """
+        pass
+
+    def test_generate_token_service_account(self):
+        """Test case for generate_token_service_account
+
+        Create a new api token for the service account  # noqa: E501
+        """
+        pass
+
     def test_get_all_tokens(self):
         """Test case for get_all_tokens
 
@@ -50,6 +64,13 @@ def test_get_all_tokens(self):
         """
         pass
 
+    def test_get_tokens_service_account(self):
+        """Test case for get_tokens_service_account
+
+        Get all api tokens for the given service account  # noqa: E501
+        """
+        pass
+
     def test_update_token_name(self):
         """Test case for update_token_name
 
@@ -57,6 +78,13 @@ def test_update_token_name(self):
         """
         pass
 
+    def test_update_token_name_service_account(self):
+        """Test case for update_token_name_service_account
+
+        Update the name of the specified api token for the given service account  # noqa: E501
+        """
+        pass
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_business_action_group_basic_dto.py b/test/test_business_action_group_basic_dto.py
deleted file mode 100644
index 52708b6..0000000
--- a/test/test_business_action_group_basic_dto.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.business_action_group_basic_dto import BusinessActionGroupBasicDTO  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestBusinessActionGroupBasicDTO(unittest.TestCase):
-    """BusinessActionGroupBasicDTO unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testBusinessActionGroupBasicDTO(self):
-        """Test BusinessActionGroupBasicDTO"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.business_action_group_basic_dto.BusinessActionGroupBasicDTO()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_cloud_integration_api.py b/test/test_cloud_integration_api.py
index c6d7272..09bf5d2 100644
--- a/test/test_cloud_integration_api.py
+++ b/test/test_cloud_integration_api.py
@@ -29,6 +29,13 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_create_aws_external_id(self):
+        """Test case for create_aws_external_id
+
+        Create an external id  # noqa: E501
+        """
+        pass
+
     def test_create_cloud_integration(self):
         """Test case for create_cloud_integration
 
@@ -36,6 +43,13 @@ def test_create_cloud_integration(self):
         """
         pass
 
+    def test_delete_aws_external_id(self):
+        """Test case for delete_aws_external_id
+
+        DELETEs an external id that was created by Wavefront  # noqa: E501
+        """
+        pass
+
     def test_delete_cloud_integration(self):
         """Test case for delete_cloud_integration
 
@@ -64,6 +78,13 @@ def test_get_all_cloud_integration(self):
         """
         pass
 
+    def test_get_aws_external_id(self):
+        """Test case for get_aws_external_id
+
+        GETs (confirms) a valid external id that was created by Wavefront  # noqa: E501
+        """
+        pass
+
     def test_get_cloud_integration(self):
         """Test case for get_cloud_integration
 
diff --git a/test/test_component_status.py b/test/test_component_status.py
deleted file mode 100644
index 65b0b6a..0000000
--- a/test/test_component_status.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.component_status import ComponentStatus  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestComponentStatus(unittest.TestCase):
-    """ComponentStatus unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testComponentStatus(self):
-        """Test ComponentStatus"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.component_status.ComponentStatus()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_customer_preferences.py b/test/test_customer_preferences.py
deleted file mode 100644
index 0caa4a4..0000000
--- a/test/test_customer_preferences.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.customer_preferences import CustomerPreferences  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestCustomerPreferences(unittest.TestCase):
-    """CustomerPreferences unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testCustomerPreferences(self):
-        """Test CustomerPreferences"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.customer_preferences.CustomerPreferences()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_customer_preferences_updating.py b/test/test_customer_preferences_updating.py
deleted file mode 100644
index 5fb2afa..0000000
--- a/test/test_customer_preferences_updating.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.customer_preferences_updating import CustomerPreferencesUpdating  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestCustomerPreferencesUpdating(unittest.TestCase):
-    """CustomerPreferencesUpdating unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testCustomerPreferencesUpdating(self):
-        """Test CustomerPreferencesUpdating"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.customer_preferences_updating.CustomerPreferencesUpdating()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_dashboard_api.py b/test/test_dashboard_api.py
index 7b7ee05..4e676f5 100644
--- a/test/test_dashboard_api.py
+++ b/test/test_dashboard_api.py
@@ -29,8 +29,8 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def test_add_access(self):
-        """Test case for add_access
+    def test_add_dashboard_access(self):
+        """Test case for add_dashboard_access
 
         Adds the specified ids to the given dashboards' ACL  # noqa: E501
         """
@@ -64,13 +64,6 @@ def test_favorite_dashboard(self):
         """
         pass
 
-    def test_get_access_control_list(self):
-        """Test case for get_access_control_list
-
-        Get list of Access Control Lists for the specified dashboards  # noqa: E501
-        """
-        pass
-
     def test_get_all_dashboard(self):
         """Test case for get_all_dashboard
 
@@ -85,6 +78,13 @@ def test_get_dashboard(self):
         """
         pass
 
+    def test_get_dashboard_access_control_list(self):
+        """Test case for get_dashboard_access_control_list
+
+        Get list of Access Control Lists for the specified dashboards  # noqa: E501
+        """
+        pass
+
     def test_get_dashboard_history(self):
         """Test case for get_dashboard_history
 
@@ -106,8 +106,8 @@ def test_get_dashboard_version(self):
         """
         pass
 
-    def test_remove_access(self):
-        """Test case for remove_access
+    def test_remove_dashboard_access(self):
+        """Test case for remove_dashboard_access
 
         Removes the specified ids from the given dashboards' ACL  # noqa: E501
         """
@@ -120,8 +120,8 @@ def test_remove_dashboard_tag(self):
         """
         pass
 
-    def test_set_acl(self):
-        """Test case for set_acl
+    def test_set_dashboard_acl(self):
+        """Test case for set_dashboard_acl
 
         Set ACL for the specified dashboards  # noqa: E501
         """
diff --git a/test/test_event_api.py b/test/test_event_api.py
index 5050ab0..fec472f 100644
--- a/test/test_event_api.py
+++ b/test/test_event_api.py
@@ -57,6 +57,27 @@ def test_delete_event(self):
         """
         pass
 
+    def test_get_alert_event_queries_slug(self):
+        """Test case for get_alert_event_queries_slug
+
+        If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_firing_details(self):
+        """Test case for get_alert_firing_details
+
+        Return details of a particular alert firing, including all the series that fired during the referred alert firing  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_firing_events(self):
+        """Test case for get_alert_firing_events
+
+        Get firings events of an alert within a time range  # noqa: E501
+        """
+        pass
+
     def test_get_all_events_with_time_range(self):
         """Test case for get_all_events_with_time_range
 
@@ -78,6 +99,13 @@ def test_get_event_tags(self):
         """
         pass
 
+    def test_get_related_events_with_time_span(self):
+        """Test case for get_related_events_with_time_span
+
+        List all related events for a specific firing event with a time span of one hour  # noqa: E501
+        """
+        pass
+
     def test_remove_event_tag(self):
         """Test case for remove_event_tag
 
diff --git a/test/test_ingestion_spy_api.py b/test/test_ingestion_spy_api.py
index 1c7bcd6..f4d914e 100644
--- a/test/test_ingestion_spy_api.py
+++ b/test/test_ingestion_spy_api.py
@@ -29,6 +29,13 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_spy_on_delta_counters(self):
+        """Test case for spy_on_delta_counters
+
+        Gets new delta counters that are added to existing time series.  # noqa: E501
+        """
+        pass
+
     def test_spy_on_histograms(self):
         """Test case for spy_on_histograms
 
diff --git a/test/test_iterable.py b/test/test_iterable.py
deleted file mode 100644
index 2885f63..0000000
--- a/test/test_iterable.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.iterable import Iterable  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestIterable(unittest.TestCase):
-    """Iterable unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testIterable(self):
-        """Test Iterable"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.iterable.Iterable()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_iterator_entry_string_json_node.py b/test/test_iterator_entry_string_json_node.py
deleted file mode 100644
index 3287f3b..0000000
--- a/test/test_iterator_entry_string_json_node.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.iterator_entry_string_json_node import IteratorEntryStringJsonNode  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestIteratorEntryStringJsonNode(unittest.TestCase):
-    """IteratorEntryStringJsonNode unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testIteratorEntryStringJsonNode(self):
-        """Test IteratorEntryStringJsonNode"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.iterator_entry_string_json_node.IteratorEntryStringJsonNode()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_iterator_json_node.py b/test/test_iterator_json_node.py
deleted file mode 100644
index 742e685..0000000
--- a/test/test_iterator_json_node.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.iterator_json_node import IteratorJsonNode  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestIteratorJsonNode(unittest.TestCase):
-    """IteratorJsonNode unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testIteratorJsonNode(self):
-        """Test IteratorJsonNode"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.iterator_json_node.IteratorJsonNode()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_iterator_string.py b/test/test_iterator_string.py
deleted file mode 100644
index ff17e8e..0000000
--- a/test/test_iterator_string.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.iterator_string import IteratorString  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestIteratorString(unittest.TestCase):
-    """IteratorString unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testIteratorString(self):
-        """Test IteratorString"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.iterator_string.IteratorString()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_monitored_cluster_api.py b/test/test_monitored_cluster_api.py
deleted file mode 100644
index b216142..0000000
--- a/test/test_monitored_cluster_api.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.api.monitored_cluster_api import MonitoredClusterApi  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestMonitoredClusterApi(unittest.TestCase):
-    """MonitoredClusterApi unit test stubs"""
-
-    def setUp(self):
-        self.api = wavefront_api_client.api.monitored_cluster_api.MonitoredClusterApi()  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    def test_add_cluster_tag(self):
-        """Test case for add_cluster_tag
-
-        Add a tag to a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_create_cluster(self):
-        """Test case for create_cluster
-
-        Create a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_delete_cluster(self):
-        """Test case for delete_cluster
-
-        Delete a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_get_all_cluster(self):
-        """Test case for get_all_cluster
-
-        Get all monitored clusters  # noqa: E501
-        """
-        pass
-
-    def test_get_cluster(self):
-        """Test case for get_cluster
-
-        Get a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_get_cluster_tags(self):
-        """Test case for get_cluster_tags
-
-        Get all tags associated with a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_merge_clusters(self):
-        """Test case for merge_clusters
-
-        Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.  # noqa: E501
-        """
-        pass
-
-    def test_remove_cluster_tag(self):
-        """Test case for remove_cluster_tag
-
-        Remove a tag from a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_set_cluster_tags(self):
-        """Test case for set_cluster_tags
-
-        Set all tags associated with a specific cluster  # noqa: E501
-        """
-        pass
-
-    def test_update_cluster(self):
-        """Test case for update_cluster
-
-        Update a specific cluster  # noqa: E501
-        """
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_number.py b/test/test_number.py
deleted file mode 100644
index c8dcebd..0000000
--- a/test/test_number.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.number import Number  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestNumber(unittest.TestCase):
-    """Number unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testNumber(self):
-        """Test Number"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.number.Number()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_paged_user_group.py b/test/test_paged_user_group.py
deleted file mode 100644
index 959fc96..0000000
--- a/test/test_paged_user_group.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.paged_user_group import PagedUserGroup  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestPagedUserGroup(unittest.TestCase):
-    """PagedUserGroup unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testPagedUserGroup(self):
-        """Test PagedUserGroup"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.paged_user_group.PagedUserGroup()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_list_acl.py b/test/test_response_container_list_acl.py
deleted file mode 100644
index d310d5a..0000000
--- a/test/test_response_container_list_acl.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_list_acl import ResponseContainerListACL  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerListACL(unittest.TestCase):
-    """ResponseContainerListACL unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerListACL(self):
-        """Test ResponseContainerListACL"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_list_acl.ResponseContainerListACL()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_list_user_group.py b/test/test_response_container_list_user_group.py
deleted file mode 100644
index b2b40c6..0000000
--- a/test/test_response_container_list_user_group.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_list_user_group import ResponseContainerListUserGroup  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerListUserGroup(unittest.TestCase):
-    """ResponseContainerListUserGroup unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerListUserGroup(self):
-        """Test ResponseContainerListUserGroup"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_list_user_group.ResponseContainerListUserGroup()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_list_user_group_model.py b/test/test_response_container_list_user_group_model.py
deleted file mode 100644
index c98c25a..0000000
--- a/test/test_response_container_list_user_group_model.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_list_user_group_model import ResponseContainerListUserGroupModel  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerListUserGroupModel(unittest.TestCase):
-    """ResponseContainerListUserGroupModel unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerListUserGroupModel(self):
-        """Test ResponseContainerListUserGroupModel"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_list_user_group_model.ResponseContainerListUserGroupModel()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_paged_user_group.py b/test/test_response_container_paged_user_group.py
deleted file mode 100644
index b308db7..0000000
--- a/test/test_response_container_paged_user_group.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_paged_user_group import ResponseContainerPagedUserGroup  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerPagedUserGroup(unittest.TestCase):
-    """ResponseContainerPagedUserGroup unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerPagedUserGroup(self):
-        """Test ResponseContainerPagedUserGroup"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_paged_user_group.ResponseContainerPagedUserGroup()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_user_group.py b/test/test_response_container_user_group.py
deleted file mode 100644
index 0937994..0000000
--- a/test/test_response_container_user_group.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_user_group import ResponseContainerUserGroup  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerUserGroup(unittest.TestCase):
-    """ResponseContainerUserGroup unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerUserGroup(self):
-        """Test ResponseContainerUserGroup"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_user_group.ResponseContainerUserGroup()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_user_hard_delete.py b/test/test_response_container_user_hard_delete.py
deleted file mode 100644
index 3ed8f1d..0000000
--- a/test/test_response_container_user_hard_delete.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_user_hard_delete import ResponseContainerUserHardDelete  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerUserHardDelete(unittest.TestCase):
-    """ResponseContainerUserHardDelete unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerUserHardDelete(self):
-        """Test ResponseContainerUserHardDelete"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_user_hard_delete.ResponseContainerUserHardDelete()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_search_api.py b/test/test_search_api.py
index b5df1bf..4f403b0 100644
--- a/test/test_search_api.py
+++ b/test/test_search_api.py
@@ -29,6 +29,27 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_search_account_entities(self):
+        """Test case for search_account_entities
+
+        Search over a customer's accounts  # noqa: E501
+        """
+        pass
+
+    def test_search_account_for_facet(self):
+        """Test case for search_account_for_facet
+
+        Lists the values of a specific facet over the customer's accounts  # noqa: E501
+        """
+        pass
+
+    def test_search_account_for_facets(self):
+        """Test case for search_account_for_facets
+
+        Lists the values of one or more facets over the customer's accounts  # noqa: E501
+        """
+        pass
+
     def test_search_alert_deleted_entities(self):
         """Test case for search_alert_deleted_entities
 
@@ -176,6 +197,27 @@ def test_search_external_links_for_facets(self):
         """
         pass
 
+    def test_search_ingestion_policy_entities(self):
+        """Test case for search_ingestion_policy_entities
+
+        Search over a customer's ingestion policies  # noqa: E501
+        """
+        pass
+
+    def test_search_ingestion_policy_for_facet(self):
+        """Test case for search_ingestion_policy_for_facet
+
+        Lists the values of a specific facet over the customer's ingestion policies  # noqa: E501
+        """
+        pass
+
+    def test_search_ingestion_policy_for_facets(self):
+        """Test case for search_ingestion_policy_for_facets
+
+        Lists the values of one or more facets over the customer's ingestion policies  # noqa: E501
+        """
+        pass
+
     def test_search_maintenance_window_entities(self):
         """Test case for search_maintenance_window_entities
 
@@ -197,6 +239,48 @@ def test_search_maintenance_window_for_facets(self):
         """
         pass
 
+    def test_search_monitored_application_entities(self):
+        """Test case for search_monitored_application_entities
+
+        Search over all the customer's non-deleted monitored applications  # noqa: E501
+        """
+        pass
+
+    def test_search_monitored_application_for_facet(self):
+        """Test case for search_monitored_application_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted monitored application  # noqa: E501
+        """
+        pass
+
+    def test_search_monitored_application_for_facets(self):
+        """Test case for search_monitored_application_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+        """
+        pass
+
+    def test_search_monitored_service_entities(self):
+        """Test case for search_monitored_service_entities
+
+        Search over all the customer's non-deleted monitored services  # noqa: E501
+        """
+        pass
+
+    def test_search_monitored_service_for_facet(self):
+        """Test case for search_monitored_service_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted monitored application  # noqa: E501
+        """
+        pass
+
+    def test_search_monitored_service_for_facets(self):
+        """Test case for search_monitored_service_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted monitored clusters  # noqa: E501
+        """
+        pass
+
     def test_search_notficant_for_facets(self):
         """Test case for search_notficant_for_facets
 
@@ -302,6 +386,20 @@ def test_search_registered_query_for_facets(self):
         """
         pass
 
+    def test_search_related_report_event_anomaly_entities(self):
+        """Test case for search_related_report_event_anomaly_entities
+
+        List the related events and anomalies over a firing event  # noqa: E501
+        """
+        pass
+
+    def test_search_related_report_event_entities(self):
+        """Test case for search_related_report_event_entities
+
+        List the related events over a firing event  # noqa: E501
+        """
+        pass
+
     def test_search_report_event_entities(self):
         """Test case for search_report_event_entities
 
@@ -323,6 +421,48 @@ def test_search_report_event_for_facets(self):
         """
         pass
 
+    def test_search_role_entities(self):
+        """Test case for search_role_entities
+
+        Search over a customer's roles  # noqa: E501
+        """
+        pass
+
+    def test_search_role_for_facet(self):
+        """Test case for search_role_for_facet
+
+        Lists the values of a specific facet over the customer's roles  # noqa: E501
+        """
+        pass
+
+    def test_search_role_for_facets(self):
+        """Test case for search_role_for_facets
+
+        Lists the values of one or more facets over the customer's roles  # noqa: E501
+        """
+        pass
+
+    def test_search_service_account_entities(self):
+        """Test case for search_service_account_entities
+
+        Search over a customer's service accounts  # noqa: E501
+        """
+        pass
+
+    def test_search_service_account_for_facet(self):
+        """Test case for search_service_account_for_facet
+
+        Lists the values of a specific facet over the customer's service accounts  # noqa: E501
+        """
+        pass
+
+    def test_search_service_account_for_facets(self):
+        """Test case for search_service_account_for_facets
+
+        Lists the values of one or more facets over the customer's service accounts  # noqa: E501
+        """
+        pass
+
     def test_search_tagged_source_entities(self):
         """Test case for search_tagged_source_entities
 
diff --git a/test/test_settings_api.py b/test/test_settings_api.py
deleted file mode 100644
index 477df3e..0000000
--- a/test/test_settings_api.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.api.settings_api import SettingsApi  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestSettingsApi(unittest.TestCase):
-    """SettingsApi unit test stubs"""
-
-    def setUp(self):
-        self.api = wavefront_api_client.api.settings_api.SettingsApi()  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    def test_get_all_permissions(self):
-        """Test case for get_all_permissions
-
-        Get all permissions  # noqa: E501
-        """
-        pass
-
-    def test_get_customer_preferences(self):
-        """Test case for get_customer_preferences
-
-        Get customer preferences  # noqa: E501
-        """
-        pass
-
-    def test_get_default_user_groups(self):
-        """Test case for get_default_user_groups
-
-        Get default user groups customer preferences  # noqa: E501
-        """
-        pass
-
-    def test_post_customer_preferences(self):
-        """Test case for post_customer_preferences
-
-        Update selected fields of customer preferences  # noqa: E501
-        """
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_stats_model.py b/test/test_stats_model.py
deleted file mode 100644
index b849343..0000000
--- a/test/test_stats_model.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.stats_model import StatsModel  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestStatsModel(unittest.TestCase):
-    """StatsModel unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testStatsModel(self):
-        """Test StatsModel"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.stats_model.StatsModel()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_user.py b/test/test_user.py
deleted file mode 100644
index 82e167e..0000000
--- a/test/test_user.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.user import User  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestUser(unittest.TestCase):
-    """User unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testUser(self):
-        """Test User"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.user.User()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_user_api.py b/test/test_user_api.py
index d782177..0e9d07c 100644
--- a/test/test_user_api.py
+++ b/test/test_user_api.py
@@ -32,7 +32,7 @@ def tearDown(self):
     def test_add_user_to_user_groups(self):
         """Test case for add_user_to_user_groups
 
-        Adds specific user groups to the user  # noqa: E501
+        Adds specific user groups to the user or service account  # noqa: E501
         """
         pass
 
@@ -46,19 +46,19 @@ def test_create_or_update_user(self):
     def test_delete_multiple_users(self):
         """Test case for delete_multiple_users
 
-        Deletes multiple users  # noqa: E501
+        Deletes multiple users or service accounts  # noqa: E501
         """
         pass
 
     def test_delete_user(self):
         """Test case for delete_user
 
-        Deletes a user identified by id  # noqa: E501
+        Deletes a user or service account identified by id  # noqa: E501
         """
         pass
 
-    def test_get_all_user(self):
-        """Test case for get_all_user
+    def test_get_all_users(self):
+        """Test case for get_all_users
 
         Get all users  # noqa: E501
         """
@@ -67,21 +67,28 @@ def test_get_all_user(self):
     def test_get_user(self):
         """Test case for get_user
 
-        Retrieves a user by identifier (email addr)  # noqa: E501
+        Retrieves a user by identifier (email address)  # noqa: E501
+        """
+        pass
+
+    def test_get_user_business_functions(self):
+        """Test case for get_user_business_functions
+
+        Returns business functions of a specific user or service account.  # noqa: E501
         """
         pass
 
     def test_grant_permission_to_users(self):
         """Test case for grant_permission_to_users
 
-        Grants a specific user permission to multiple users  # noqa: E501
+        Grants a specific permission to multiple users or service accounts  # noqa: E501
         """
         pass
 
     def test_grant_user_permission(self):
         """Test case for grant_user_permission
 
-        Grants a specific user permission  # noqa: E501
+        Grants a specific permission to user or service account  # noqa: E501
         """
         pass
 
@@ -95,35 +102,35 @@ def test_invite_users(self):
     def test_remove_user_from_user_groups(self):
         """Test case for remove_user_from_user_groups
 
-        Removes specific user groups from the user  # noqa: E501
+        Removes specific user groups from the user or service account  # noqa: E501
         """
         pass
 
     def test_revoke_permission_from_users(self):
         """Test case for revoke_permission_from_users
 
-        Revokes a specific user permission from multiple users  # noqa: E501
+        Revokes a specific permission from multiple users or service accounts  # noqa: E501
         """
         pass
 
     def test_revoke_user_permission(self):
         """Test case for revoke_user_permission
 
-        Revokes a specific user permission  # noqa: E501
+        Revokes a specific permission from user or service account  # noqa: E501
         """
         pass
 
     def test_update_user(self):
         """Test case for update_user
 
-        Update user with given user groups and permissions.  # noqa: E501
+        Update user with given user groups, permissions and ingestion policy.  # noqa: E501
         """
         pass
 
     def test_validate_users(self):
         """Test case for validate_users
 
-        Returns valid users and invalid identifiers from the given list  # noqa: E501
+        Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
         """
         pass
 
diff --git a/test/test_user_group_api.py b/test/test_user_group_api.py
index 53485cb..9d643ce 100644
--- a/test/test_user_group_api.py
+++ b/test/test_user_group_api.py
@@ -29,6 +29,13 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_add_roles_to_user_group(self):
+        """Test case for add_roles_to_user_group
+
+        Add multiple roles to a specific user group  # noqa: E501
+        """
+        pass
+
     def test_add_users_to_user_group(self):
         """Test case for add_users_to_user_group
 
@@ -64,10 +71,10 @@ def test_get_user_group(self):
         """
         pass
 
-    def test_grant_permission_to_user_groups(self):
-        """Test case for grant_permission_to_user_groups
+    def test_remove_roles_from_user_group(self):
+        """Test case for remove_roles_from_user_group
 
-        Grants a single permission to user group(s)  # noqa: E501
+        Remove multiple roles from a specific user group  # noqa: E501
         """
         pass
 
@@ -78,13 +85,6 @@ def test_remove_users_from_user_group(self):
         """
         pass
 
-    def test_revoke_permission_from_user_groups(self):
-        """Test case for revoke_permission_from_user_groups
-
-        Revokes a single permission from user group(s)  # noqa: E501
-        """
-        pass
-
     def test_update_user_group(self):
         """Test case for update_user_group
 
diff --git a/test/test_user_hard_delete.py b/test/test_user_hard_delete.py
deleted file mode 100644
index af1c2de..0000000
--- a/test/test_user_hard_delete.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.user_hard_delete import UserHardDelete  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestUserHardDelete(unittest.TestCase):
-    """UserHardDelete unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testUserHardDelete(self):
-        """Test UserHardDelete"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.user_hard_delete.UserHardDelete()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_user_settings.py b/test/test_user_settings.py
deleted file mode 100644
index 8986d4f..0000000
--- a/test/test_user_settings.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.user_settings import UserSettings  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestUserSettings(unittest.TestCase):
-    """UserSettings unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testUserSettings(self):
-        """Test UserSettings"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.user_settings.UserSettings()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()

From d6cf914934d47c9b236cdcfd7cd427624fa6d265 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Mon, 25 Jan 2021 08:16:27 -0800
Subject: [PATCH 072/161] Autogenerated Update v2.65.30.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Annotation.md                        |  2 +
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 ++++++++++++++++++++++-
 8 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 38b5c43..cbeeab7 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.27"
+    "packageVersion": "2.65.30"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index d0ac6e2..38b5c43 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.22"
+    "packageVersion": "2.65.27"
 }
diff --git a/README.md b/README.md
index 2f3ede4..9fc6bd2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.65.27
+- Package version: 2.65.30
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index 9e18278..a0575dc 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.65.27"
+VERSION = "2.65.30"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index ab7793d..b181b3f 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.65.27/python'
+        self.user_agent = 'Swagger-Codegen/2.65.30/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 3ed10d4..a1a9d3e 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.65.27".\
+               "SDK Package Version: 2.65.30".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..927f98e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,15 +31,69 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, key=None, value=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From df197d47f7ae18cdaa36a700c58bea5fd7d84469 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 28 Jan 2021 08:16:21 -0800
Subject: [PATCH 073/161] Autogenerated Update v2.65.31.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Annotation.md                        |  2 -
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 +----------------------
 8 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index cbeeab7..457a640 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.30"
+    "packageVersion": "2.65.31"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 38b5c43..cbeeab7 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.27"
+    "packageVersion": "2.65.30"
 }
diff --git a/README.md b/README.md
index 9fc6bd2..a5c5666 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.65.30
+- Package version: 2.65.31
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index a0575dc..011747f 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.65.30"
+VERSION = "2.65.31"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b181b3f..3218d49 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.65.30/python'
+        self.user_agent = 'Swagger-Codegen/2.65.31/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index a1a9d3e..69e4f26 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.65.30".\
+               "SDK Package Version: 2.65.31".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 927f98e..cf05f3e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,69 +31,15 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None):  # noqa: E501
+    def __init__(self):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From bacdeb52752922f9f89a7ef189b67363c8517668 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 12 Feb 2021 08:16:21 -0800
Subject: [PATCH 074/161] Autogenerated Update v2.71.2.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Alert.md                             |  1 +
 docs/Annotation.md                        |  2 +
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/alert.py      | 28 +++++++++++-
 wavefront_api_client/models/annotation.py | 56 ++++++++++++++++++++++-
 10 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 457a640..6fd78fc 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.31"
+    "packageVersion": "2.71.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index cbeeab7..457a640 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.30"
+    "packageVersion": "2.65.31"
 }
diff --git a/README.md b/README.md
index a5c5666..3a9cbc6 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.65.31
+- Package version: 2.71.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index 235cb2d..04cacde 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -22,6 +22,7 @@ Name | Type | Description | Notes
 **display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
 **display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
+**enable_pd_incident_by_series** | **bool** |  | [optional] 
 **evaluate_realtime_data** | **bool** | Whether to alert on the real-time ingestion stream (may be noisy due to late data) | [optional] 
 **event** | [**Event**](Event.md) |  | [optional] 
 **failing_host_label_pair_links** | **list[str]** | List of links to tracing applications that caused a failing series | [optional] 
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index 011747f..d89477d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.65.31"
+VERSION = "2.71.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3218d49..b4e2449 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.65.31/python'
+        self.user_agent = 'Swagger-Codegen/2.71.2/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 69e4f26..c3ad475 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.65.31".\
+               "SDK Package Version: 2.71.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 8ba5b83..5a5b20d 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -50,6 +50,7 @@ class Alert(object):
         'display_expression': 'str',
         'display_expression_qb_enabled': 'bool',
         'display_expression_qb_serialization': 'str',
+        'enable_pd_incident_by_series': 'bool',
         'evaluate_realtime_data': 'bool',
         'event': 'Event',
         'failing_host_label_pair_links': 'list[str]',
@@ -119,6 +120,7 @@ class Alert(object):
         'display_expression': 'displayExpression',
         'display_expression_qb_enabled': 'displayExpressionQBEnabled',
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
+        'enable_pd_incident_by_series': 'enablePDIncidentBySeries',
         'evaluate_realtime_data': 'evaluateRealtimeData',
         'event': 'event',
         'failing_host_label_pair_links': 'failingHostLabelPairLinks',
@@ -168,7 +170,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -190,6 +192,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._display_expression = None
         self._display_expression_qb_enabled = None
         self._display_expression_qb_serialization = None
+        self._enable_pd_incident_by_series = None
         self._evaluate_realtime_data = None
         self._event = None
         self._failing_host_label_pair_links = None
@@ -276,6 +279,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.display_expression_qb_enabled = display_expression_qb_enabled
         if display_expression_qb_serialization is not None:
             self.display_expression_qb_serialization = display_expression_qb_serialization
+        if enable_pd_incident_by_series is not None:
+            self.enable_pd_incident_by_series = enable_pd_incident_by_series
         if evaluate_realtime_data is not None:
             self.evaluate_realtime_data = evaluate_realtime_data
         if event is not None:
@@ -798,6 +803,27 @@ def display_expression_qb_serialization(self, display_expression_qb_serializatio
 
         self._display_expression_qb_serialization = display_expression_qb_serialization
 
+    @property
+    def enable_pd_incident_by_series(self):
+        """Gets the enable_pd_incident_by_series of this Alert.  # noqa: E501
+
+
+        :return: The enable_pd_incident_by_series of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_pd_incident_by_series
+
+    @enable_pd_incident_by_series.setter
+    def enable_pd_incident_by_series(self, enable_pd_incident_by_series):
+        """Sets the enable_pd_incident_by_series of this Alert.
+
+
+        :param enable_pd_incident_by_series: The enable_pd_incident_by_series of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_pd_incident_by_series = enable_pd_incident_by_series
+
     @property
     def evaluate_realtime_data(self):
         """Gets the evaluate_realtime_data of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..927f98e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,15 +31,69 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, key=None, value=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From a176464574fa9042be8984f21c4838e4bb005dc5 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 19 Feb 2021 08:20:54 -0800
Subject: [PATCH 075/161] Autogenerated Update v2.72.1.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/Annotation.md                        |  2 -
 setup.py                                  |  2 +-
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 wavefront_api_client/models/annotation.py | 56 +----------------------
 8 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6fd78fc..1bbd5e7 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.71.2"
+    "packageVersion": "2.72.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 457a640..6fd78fc 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.65.31"
+    "packageVersion": "2.71.2"
 }
diff --git a/README.md b/README.md
index 3a9cbc6..e8872ad 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.71.2
+- Package version: 2.72.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index d89477d..272f06c 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.71.2"
+VERSION = "2.72.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b4e2449..4dc319f 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.71.2/python'
+        self.user_agent = 'Swagger-Codegen/2.72.1/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index c3ad475..8d7efb1 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.71.2".\
+               "SDK Package Version: 2.72.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 927f98e..cf05f3e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,69 +31,15 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None):  # noqa: E501
+    def __init__(self):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 98946cfbaff9cee9549afdb36dbce0aa4d0d0636 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 26 Feb 2021 08:16:23 -0800
Subject: [PATCH 076/161] Autogenerated Update v2.73.1.

---
 .swagger-codegen/config.json                  | 2 +-
 .swagger-codegen/config.jsone                 | 2 +-
 README.md                                     | 2 +-
 setup.py                                      | 2 +-
 wavefront_api_client/api_client.py            | 2 +-
 wavefront_api_client/configuration.py         | 2 +-
 wavefront_api_client/models/chart_settings.py | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 1bbd5e7..0a6c290 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.72.1"
+    "packageVersion": "2.73.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6fd78fc..1bbd5e7 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.71.2"
+    "packageVersion": "2.72.1"
 }
diff --git a/README.md b/README.md
index e8872ad..82e0430 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.72.1
+- Package version: 2.73.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 272f06c..63685bf 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.72.1"
+VERSION = "2.73.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4dc319f..99428fc 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.72.1/python'
+        self.user_agent = 'Swagger-Codegen/2.73.1/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 8d7efb1..7f4ce29 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.72.1".\
+               "SDK Package Version: 2.73.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index c75d8e0..d867e59 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1453,7 +1453,7 @@ def type(self, type):
         """
         if type is None:
             raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
-        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list", "histogram", "heatmap", "gauge"]  # noqa: E501
+        allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list", "histogram", "heatmap", "gauge", "pie"]  # noqa: E501
         if type not in allowed_values:
             raise ValueError(
                 "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501

From 48d6c9d41ac7b3931f6393c3117151f58b8f96b9 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 5 Mar 2021 08:16:37 -0800
Subject: [PATCH 077/161] Autogenerated Update v2.75.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  24 +-
 docs/AccessPolicy.md                          |  12 +
 docs/AccessPolicyApi.md                       | 169 ++++++++++
 docs/AccessPolicyRuleDTO.md                   |  13 +
 docs/AlertApi.md                              |  20 +-
 docs/ResponseContainerAccessPolicy.md         |  11 +
 docs/ResponseContainerAccessPolicyAction.md   |  11 +
 setup.py                                      |   2 +-
 test/test_access_policy.py                    |  40 +++
 test/test_access_policy_api.py                |  55 +++
 test/test_access_policy_rule_dto.py           |  40 +++
 test/test_response_container_access_policy.py |  40 +++
 ...response_container_access_policy_action.py |  40 +++
 wavefront_api_client/__init__.py              |   6 +-
 wavefront_api_client/api/__init__.py          |   2 +-
 wavefront_api_client/api/access_policy_api.py | 315 ++++++++++++++++++
 wavefront_api_client/api/alert_api.py         |  20 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   4 +
 wavefront_api_client/models/access_policy.py  | 167 ++++++++++
 .../models/access_policy_rule_dto.py          | 199 +++++++++++
 .../response_container_access_policy.py       | 142 ++++++++
 ...response_container_access_policy_action.py | 148 ++++++++
 26 files changed, 1449 insertions(+), 39 deletions(-)
 create mode 100644 docs/AccessPolicy.md
 create mode 100644 docs/AccessPolicyApi.md
 create mode 100644 docs/AccessPolicyRuleDTO.md
 create mode 100644 docs/ResponseContainerAccessPolicy.md
 create mode 100644 docs/ResponseContainerAccessPolicyAction.md
 create mode 100644 test/test_access_policy.py
 create mode 100644 test/test_access_policy_api.py
 create mode 100644 test/test_access_policy_rule_dto.py
 create mode 100644 test/test_response_container_access_policy.py
 create mode 100644 test/test_response_container_access_policy_action.py
 create mode 100644 wavefront_api_client/api/access_policy_api.py
 create mode 100644 wavefront_api_client/models/access_policy.py
 create mode 100644 wavefront_api_client/models/access_policy_rule_dto.py
 create mode 100644 wavefront_api_client/models/response_container_access_policy.py
 create mode 100644 wavefront_api_client/models/response_container_access_policy_action.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 0a6c290..6554cdc 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.73.1"
+    "packageVersion": "2.75.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 1bbd5e7..0a6c290 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.72.1"
+    "packageVersion": "2.73.1"
 }
diff --git a/README.md b/README.md
index 82e0430..057f058 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.73.1
+- Package version: 2.75.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -58,15 +58,14 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+api_instance = wavefront_api_client.AccessPolicyApi(wavefront_api_client.ApiClient(configuration))
 
 try:
-    # Activates the given service account
-    api_response = api_instance.activate_account(id)
+    # Get the access policy
+    api_response = api_instance.get_access_policy()
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->activate_account: %s\n" % e)
+    print("Exception when calling AccessPolicyApi->get_access_policy: %s\n" % e)
 
 ```
 
@@ -76,6 +75,9 @@ All URIs are relative to *https://localhost*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*AccessPolicyApi* | [**get_access_policy**](docs/AccessPolicyApi.md#get_access_policy) | **GET** /api/v2/accesspolicy | Get the access policy
+*AccessPolicyApi* | [**update_access_policy**](docs/AccessPolicyApi.md#update_access_policy) | **PUT** /api/v2/accesspolicy | Update the access policy
+*AccessPolicyApi* | [**validate_url**](docs/AccessPolicyApi.md#validate_url) | **GET** /api/v2/accesspolicy/validate | Validate a given url and ip address
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
@@ -125,12 +127,6 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
-*AnomalyApi* | [**get_all_anomalies**](docs/AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
-*AnomalyApi* | [**get_anomalies_for_chart_and_param_hash**](docs/AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
-*AnomalyApi* | [**get_chart_anomalies_for_chart**](docs/AnomalyApi.md#get_chart_anomalies_for_chart) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
-*AnomalyApi* | [**get_chart_anomalies_of_one_dashboard**](docs/AnomalyApi.md#get_chart_anomalies_of_one_dashboard) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-*AnomalyApi* | [**get_dashboard_anomalies**](docs/AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
-*AnomalyApi* | [**get_related_anomalies**](docs/AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
 *ApiTokenApi* | [**delete_token_service_account**](docs/ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
@@ -393,6 +389,8 @@ Class | Method | HTTP request | Description
  - [AccessControlListReadDTO](docs/AccessControlListReadDTO.md)
  - [AccessControlListSimple](docs/AccessControlListSimple.md)
  - [AccessControlListWriteDTO](docs/AccessControlListWriteDTO.md)
+ - [AccessPolicy](docs/AccessPolicy.md)
+ - [AccessPolicyRuleDTO](docs/AccessPolicyRuleDTO.md)
  - [Account](docs/Account.md)
  - [Alert](docs/Alert.md)
  - [AlertMin](docs/AlertMin.md)
@@ -503,6 +501,8 @@ Class | Method | HTTP request | Description
  - [RelatedEventTimeRange](docs/RelatedEventTimeRange.md)
  - [ReportEventAnomalyDTO](docs/ReportEventAnomalyDTO.md)
  - [ResponseContainer](docs/ResponseContainer.md)
+ - [ResponseContainerAccessPolicy](docs/ResponseContainerAccessPolicy.md)
+ - [ResponseContainerAccessPolicyAction](docs/ResponseContainerAccessPolicyAction.md)
  - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
  - [ResponseContainerCloudIntegration](docs/ResponseContainerCloudIntegration.md)
diff --git a/docs/AccessPolicy.md b/docs/AccessPolicy.md
new file mode 100644
index 0000000..1a940aa
--- /dev/null
+++ b/docs/AccessPolicy.md
@@ -0,0 +1,12 @@
+# AccessPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer** | **str** |  | [optional] 
+**last_updated_ms** | **int** |  | [optional] 
+**policy_rules** | [**list[AccessPolicyRuleDTO]**](AccessPolicyRuleDTO.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AccessPolicyApi.md b/docs/AccessPolicyApi.md
new file mode 100644
index 0000000..40ccf24
--- /dev/null
+++ b/docs/AccessPolicyApi.md
@@ -0,0 +1,169 @@
+# wavefront_api_client.AccessPolicyApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_access_policy**](AccessPolicyApi.md#get_access_policy) | **GET** /api/v2/accesspolicy | Get the access policy
+[**update_access_policy**](AccessPolicyApi.md#update_access_policy) | **PUT** /api/v2/accesspolicy | Update the access policy
+[**validate_url**](AccessPolicyApi.md#validate_url) | **GET** /api/v2/accesspolicy/validate | Validate a given url and ip address
+
+
+# **get_access_policy**
+> ResponseContainerAccessPolicy get_access_policy()
+
+Get the access policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccessPolicyApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get the access policy
+    api_response = api_instance.get_access_policy()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccessPolicyApi->get_access_policy: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerAccessPolicy**](ResponseContainerAccessPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_access_policy**
+> ResponseContainerAccessPolicy update_access_policy(body=body)
+
+Update the access policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccessPolicyApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.AccessPolicy() # AccessPolicy | Example Body:  <pre>{  \"policyRules\": [{    \"name\": \"rule name\",    \"description\": \"desc\",    \"action\": \"ALLOW\",    \"subnet\": \"12.148.72.0/23\"  }] }</pre> (optional)
+
+try:
+    # Update the access policy
+    api_response = api_instance.update_access_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccessPolicyApi->update_access_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**AccessPolicy**](AccessPolicy.md)| Example Body:  &lt;pre&gt;{  \&quot;policyRules\&quot;: [{    \&quot;name\&quot;: \&quot;rule name\&quot;,    \&quot;description\&quot;: \&quot;desc\&quot;,    \&quot;action\&quot;: \&quot;ALLOW\&quot;,    \&quot;subnet\&quot;: \&quot;12.148.72.0/23\&quot;  }] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerAccessPolicy**](ResponseContainerAccessPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **validate_url**
+> ResponseContainerAccessPolicyAction validate_url(ip=ip)
+
+Validate a given url and ip address
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccessPolicyApi(wavefront_api_client.ApiClient(configuration))
+ip = 'ip_example' # str |  (optional)
+
+try:
+    # Validate a given url and ip address
+    api_response = api_instance.validate_url(ip=ip)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccessPolicyApi->validate_url: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **ip** | **str**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerAccessPolicyAction**](ResponseContainerAccessPolicyAction.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/AccessPolicyRuleDTO.md b/docs/AccessPolicyRuleDTO.md
new file mode 100644
index 0000000..82916c6
--- /dev/null
+++ b/docs/AccessPolicyRuleDTO.md
@@ -0,0 +1,13 @@
+# AccessPolicyRuleDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**action** | **str** |  | [optional] 
+**description** | **str** |  | [optional] 
+**name** | **str** |  | [optional] 
+**subnet** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 68170ae..21037ec 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -105,7 +105,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
+tag_value = 'tag_value_example' # str | Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
 
 try:
     # Add a tag to a specific alert
@@ -120,7 +120,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **tag_value** | **str**|  | 
+ **tag_value** | **str**| Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | 
 
 ### Return type
 
@@ -218,7 +218,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Create a specific alert
@@ -232,7 +232,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
@@ -818,7 +818,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
+tag_value = 'tag_value_example' # str | Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
 
 try:
     # Remove a tag from a specific alert
@@ -833,7 +833,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **tag_value** | **str**|  | 
+ **tag_value** | **str**| Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | 
 
 ### Return type
 
@@ -927,7 +927,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Set all tags associated with a specific alert
@@ -942,7 +942,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**|  | [optional] 
+ **body** | **list[str]**| Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
@@ -1201,7 +1201,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.Alert() # Alert | Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Update a specific alert
@@ -1216,7 +1216,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**Alert**](Alert.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
diff --git a/docs/ResponseContainerAccessPolicy.md b/docs/ResponseContainerAccessPolicy.md
new file mode 100644
index 0000000..d483310
--- /dev/null
+++ b/docs/ResponseContainerAccessPolicy.md
@@ -0,0 +1,11 @@
+# ResponseContainerAccessPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**AccessPolicy**](AccessPolicy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerAccessPolicyAction.md b/docs/ResponseContainerAccessPolicyAction.md
new file mode 100644
index 0000000..2926d65
--- /dev/null
+++ b/docs/ResponseContainerAccessPolicyAction.md
@@ -0,0 +1,11 @@
+# ResponseContainerAccessPolicyAction
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | **str** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 63685bf..4be57cd 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.73.1"
+VERSION = "2.75.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_access_policy.py b/test/test_access_policy.py
new file mode 100644
index 0000000..d9d1ef2
--- /dev/null
+++ b/test/test_access_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.access_policy import AccessPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessPolicy(unittest.TestCase):
+    """AccessPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccessPolicy(self):
+        """Test AccessPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.access_policy.AccessPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_access_policy_api.py b/test/test_access_policy_api.py
new file mode 100644
index 0000000..daf36c6
--- /dev/null
+++ b/test/test_access_policy_api.py
@@ -0,0 +1,55 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.access_policy_api import AccessPolicyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessPolicyApi(unittest.TestCase):
+    """AccessPolicyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.access_policy_api.AccessPolicyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_access_policy(self):
+        """Test case for get_access_policy
+
+        Get the access policy  # noqa: E501
+        """
+        pass
+
+    def test_update_access_policy(self):
+        """Test case for update_access_policy
+
+        Update the access policy  # noqa: E501
+        """
+        pass
+
+    def test_validate_url(self):
+        """Test case for validate_url
+
+        Validate a given url and ip address  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_access_policy_rule_dto.py b/test/test_access_policy_rule_dto.py
new file mode 100644
index 0000000..f75802a
--- /dev/null
+++ b/test/test_access_policy_rule_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAccessPolicyRuleDTO(unittest.TestCase):
+    """AccessPolicyRuleDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAccessPolicyRuleDTO(self):
+        """Test AccessPolicyRuleDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.access_policy_rule_dto.AccessPolicyRuleDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_access_policy.py b/test/test_response_container_access_policy.py
new file mode 100644
index 0000000..b71acee
--- /dev/null
+++ b/test/test_response_container_access_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_access_policy import ResponseContainerAccessPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerAccessPolicy(unittest.TestCase):
+    """ResponseContainerAccessPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerAccessPolicy(self):
+        """Test ResponseContainerAccessPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_access_policy.ResponseContainerAccessPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_access_policy_action.py b/test/test_response_container_access_policy_action.py
new file mode 100644
index 0000000..febcda7
--- /dev/null
+++ b/test/test_response_container_access_policy_action.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerAccessPolicyAction(unittest.TestCase):
+    """ResponseContainerAccessPolicyAction unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerAccessPolicyAction(self):
+        """Test ResponseContainerAccessPolicyAction"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_access_policy_action.ResponseContainerAccessPolicyAction()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 1980cef..19fd77c 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -16,9 +16,9 @@
 from __future__ import absolute_import
 
 # import apis into sdk package
+from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
-from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
@@ -55,6 +55,8 @@
 from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO
 from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
+from wavefront_api_client.models.access_policy import AccessPolicy
+from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.alert_min import AlertMin
@@ -165,6 +167,8 @@
 from wavefront_api_client.models.related_event_time_range import RelatedEventTimeRange
 from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO
 from wavefront_api_client.models.response_container import ResponseContainer
+from wavefront_api_client.models.response_container_access_policy import ResponseContainerAccessPolicy
+from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 78b75b5..a01b0bd 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -3,9 +3,9 @@
 # flake8: noqa
 
 # import apis into api package
+from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
-from wavefront_api_client.api.anomaly_api import AnomalyApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api/access_policy_api.py b/wavefront_api_client/api/access_policy_api.py
new file mode 100644
index 0000000..fe91ffd
--- /dev/null
+++ b/wavefront_api_client/api/access_policy_api.py
@@ -0,0 +1,315 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class AccessPolicyApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_access_policy(self, **kwargs):  # noqa: E501
+        """Get the access policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_access_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerAccessPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_access_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_access_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_access_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Get the access policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_access_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerAccessPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_access_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/accesspolicy', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAccessPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_access_policy(self, **kwargs):  # noqa: E501
+        """Update the access policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_access_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param AccessPolicy body: Example Body:  <pre>{  \"policyRules\": [{    \"name\": \"rule name\",    \"description\": \"desc\",    \"action\": \"ALLOW\",    \"subnet\": \"12.148.72.0/23\"  }] }</pre>
+        :return: ResponseContainerAccessPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_access_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.update_access_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def update_access_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Update the access policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_access_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param AccessPolicy body: Example Body:  <pre>{  \"policyRules\": [{    \"name\": \"rule name\",    \"description\": \"desc\",    \"action\": \"ALLOW\",    \"subnet\": \"12.148.72.0/23\"  }] }</pre>
+        :return: ResponseContainerAccessPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_access_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/accesspolicy', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAccessPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def validate_url(self, **kwargs):  # noqa: E501
+        """Validate a given url and ip address  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.validate_url(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str ip:
+        :return: ResponseContainerAccessPolicyAction
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.validate_url_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.validate_url_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def validate_url_with_http_info(self, **kwargs):  # noqa: E501
+        """Validate a given url and ip address  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.validate_url_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str ip:
+        :return: ResponseContainerAccessPolicyAction
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['ip']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method validate_url" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'ip' in params:
+            query_params.append(('ip', params['ip']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/accesspolicy/validate', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAccessPolicyAction',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 2c263dd..20afb80 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -139,7 +139,7 @@ def add_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param str tag_value: (required)
+        :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -162,7 +162,7 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param str tag_value: (required)
+        :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -352,7 +352,7 @@ def create_alert(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre>
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -374,7 +374,7 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre>
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1407,7 +1407,7 @@ def remove_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param str tag_value: (required)
+        :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1430,7 +1430,7 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
 
         :param async_req bool
         :param str id: (required)
-        :param str tag_value: (required)
+        :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1605,7 +1605,7 @@ def set_alert_tags(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body:
+        :param list[str] body: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1628,7 +1628,7 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body:
+        :param list[str] body: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2092,7 +2092,7 @@ def update_alert(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2115,7 +2115,7 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre>
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 99428fc..75ad413 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.73.1/python'
+        self.user_agent = 'Swagger-Codegen/2.75.2/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 7f4ce29..cba03bf 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.73.1".\
+               "SDK Package Version: 2.75.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index f59ed30..2b2c02d 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -20,6 +20,8 @@
 from wavefront_api_client.models.access_control_list_read_dto import AccessControlListReadDTO
 from wavefront_api_client.models.access_control_list_simple import AccessControlListSimple
 from wavefront_api_client.models.access_control_list_write_dto import AccessControlListWriteDTO
+from wavefront_api_client.models.access_policy import AccessPolicy
+from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
 from wavefront_api_client.models.alert_min import AlertMin
@@ -130,6 +132,8 @@
 from wavefront_api_client.models.related_event_time_range import RelatedEventTimeRange
 from wavefront_api_client.models.report_event_anomaly_dto import ReportEventAnomalyDTO
 from wavefront_api_client.models.response_container import ResponseContainer
+from wavefront_api_client.models.response_container_access_policy import ResponseContainerAccessPolicy
+from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
diff --git a/wavefront_api_client/models/access_policy.py b/wavefront_api_client/models/access_policy.py
new file mode 100644
index 0000000..3efadd8
--- /dev/null
+++ b/wavefront_api_client/models/access_policy.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AccessPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer': 'str',
+        'last_updated_ms': 'int',
+        'policy_rules': 'list[AccessPolicyRuleDTO]'
+    }
+
+    attribute_map = {
+        'customer': 'customer',
+        'last_updated_ms': 'lastUpdatedMs',
+        'policy_rules': 'policyRules'
+    }
+
+    def __init__(self, customer=None, last_updated_ms=None, policy_rules=None):  # noqa: E501
+        """AccessPolicy - a model defined in Swagger"""  # noqa: E501
+
+        self._customer = None
+        self._last_updated_ms = None
+        self._policy_rules = None
+        self.discriminator = None
+
+        if customer is not None:
+            self.customer = customer
+        if last_updated_ms is not None:
+            self.last_updated_ms = last_updated_ms
+        if policy_rules is not None:
+            self.policy_rules = policy_rules
+
+    @property
+    def customer(self):
+        """Gets the customer of this AccessPolicy.  # noqa: E501
+
+
+        :return: The customer of this AccessPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this AccessPolicy.
+
+
+        :param customer: The customer of this AccessPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def last_updated_ms(self):
+        """Gets the last_updated_ms of this AccessPolicy.  # noqa: E501
+
+
+        :return: The last_updated_ms of this AccessPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated_ms
+
+    @last_updated_ms.setter
+    def last_updated_ms(self, last_updated_ms):
+        """Sets the last_updated_ms of this AccessPolicy.
+
+
+        :param last_updated_ms: The last_updated_ms of this AccessPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated_ms = last_updated_ms
+
+    @property
+    def policy_rules(self):
+        """Gets the policy_rules of this AccessPolicy.  # noqa: E501
+
+
+        :return: The policy_rules of this AccessPolicy.  # noqa: E501
+        :rtype: list[AccessPolicyRuleDTO]
+        """
+        return self._policy_rules
+
+    @policy_rules.setter
+    def policy_rules(self, policy_rules):
+        """Sets the policy_rules of this AccessPolicy.
+
+
+        :param policy_rules: The policy_rules of this AccessPolicy.  # noqa: E501
+        :type: list[AccessPolicyRuleDTO]
+        """
+
+        self._policy_rules = policy_rules
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessPolicy):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/access_policy_rule_dto.py b/wavefront_api_client/models/access_policy_rule_dto.py
new file mode 100644
index 0000000..20b0149
--- /dev/null
+++ b/wavefront_api_client/models/access_policy_rule_dto.py
@@ -0,0 +1,199 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class AccessPolicyRuleDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'action': 'str',
+        'description': 'str',
+        'name': 'str',
+        'subnet': 'str'
+    }
+
+    attribute_map = {
+        'action': 'action',
+        'description': 'description',
+        'name': 'name',
+        'subnet': 'subnet'
+    }
+
+    def __init__(self, action=None, description=None, name=None, subnet=None):  # noqa: E501
+        """AccessPolicyRuleDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._action = None
+        self._description = None
+        self._name = None
+        self._subnet = None
+        self.discriminator = None
+
+        if action is not None:
+            self.action = action
+        if description is not None:
+            self.description = description
+        if name is not None:
+            self.name = name
+        if subnet is not None:
+            self.subnet = subnet
+
+    @property
+    def action(self):
+        """Gets the action of this AccessPolicyRuleDTO.  # noqa: E501
+
+
+        :return: The action of this AccessPolicyRuleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._action
+
+    @action.setter
+    def action(self, action):
+        """Sets the action of this AccessPolicyRuleDTO.
+
+
+        :param action: The action of this AccessPolicyRuleDTO.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ALLOW", "DENY"]  # noqa: E501
+        if action not in allowed_values:
+            raise ValueError(
+                "Invalid value for `action` ({0}), must be one of {1}"  # noqa: E501
+                .format(action, allowed_values)
+            )
+
+        self._action = action
+
+    @property
+    def description(self):
+        """Gets the description of this AccessPolicyRuleDTO.  # noqa: E501
+
+
+        :return: The description of this AccessPolicyRuleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this AccessPolicyRuleDTO.
+
+
+        :param description: The description of this AccessPolicyRuleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def name(self):
+        """Gets the name of this AccessPolicyRuleDTO.  # noqa: E501
+
+
+        :return: The name of this AccessPolicyRuleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this AccessPolicyRuleDTO.
+
+
+        :param name: The name of this AccessPolicyRuleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def subnet(self):
+        """Gets the subnet of this AccessPolicyRuleDTO.  # noqa: E501
+
+
+        :return: The subnet of this AccessPolicyRuleDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._subnet
+
+    @subnet.setter
+    def subnet(self, subnet):
+        """Sets the subnet of this AccessPolicyRuleDTO.
+
+
+        :param subnet: The subnet of this AccessPolicyRuleDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._subnet = subnet
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AccessPolicyRuleDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AccessPolicyRuleDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_access_policy.py b/wavefront_api_client/models/response_container_access_policy.py
new file mode 100644
index 0000000..1004c39
--- /dev/null
+++ b/wavefront_api_client/models/response_container_access_policy.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerAccessPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'AccessPolicy',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerAccessPolicy - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerAccessPolicy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerAccessPolicy.  # noqa: E501
+        :rtype: AccessPolicy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerAccessPolicy.
+
+
+        :param response: The response of this ResponseContainerAccessPolicy.  # noqa: E501
+        :type: AccessPolicy
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerAccessPolicy.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerAccessPolicy.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerAccessPolicy.
+
+
+        :param status: The status of this ResponseContainerAccessPolicy.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerAccessPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerAccessPolicy):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_access_policy_action.py b/wavefront_api_client/models/response_container_access_policy_action.py
new file mode 100644
index 0000000..68a6fdf
--- /dev/null
+++ b/wavefront_api_client/models/response_container_access_policy_action.py
@@ -0,0 +1,148 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerAccessPolicyAction(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'str',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerAccessPolicyAction - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerAccessPolicyAction.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerAccessPolicyAction.  # noqa: E501
+        :rtype: str
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerAccessPolicyAction.
+
+
+        :param response: The response of this ResponseContainerAccessPolicyAction.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ALLOW", "DENY"]  # noqa: E501
+        if response not in allowed_values:
+            raise ValueError(
+                "Invalid value for `response` ({0}), must be one of {1}"  # noqa: E501
+                .format(response, allowed_values)
+            )
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerAccessPolicyAction.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerAccessPolicyAction.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerAccessPolicyAction.
+
+
+        :param status: The status of this ResponseContainerAccessPolicyAction.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerAccessPolicyAction, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerAccessPolicyAction):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 451987a7b2ed61240fbd1616eabae1ab2c2e9d71 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sun, 14 Mar 2021 08:16:27 -0700
Subject: [PATCH 078/161] Autogenerated Update v2.76.1.

---
 .swagger-codegen/config.json          |  2 +-
 .swagger-codegen/config.jsone         |  2 +-
 README.md                             |  2 +-
 docs/Alert.md                         |  1 +
 setup.py                              |  2 +-
 wavefront_api_client/api_client.py    |  2 +-
 wavefront_api_client/configuration.py |  2 +-
 wavefront_api_client/models/alert.py  | 28 ++++++++++++++++++++++++++-
 8 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6554cdc..fb4511c 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.75.2"
+    "packageVersion": "2.76.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 0a6c290..6554cdc 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.73.1"
+    "packageVersion": "2.75.2"
 }
diff --git a/README.md b/README.md
index 057f058..cdb580d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.75.2
+- Package version: 2.76.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index 04cacde..3025b37 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -61,6 +61,7 @@ Name | Type | Description | Notes
 **status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
 **system_alert_version** | **int** | If this is a system alert, the version of it | [optional] 
 **system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
+**tagpaths** | **list[str]** |  | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
 **target_endpoints** | **list[str]** |  | [optional] 
diff --git a/setup.py b/setup.py
index 4be57cd..a0633c3 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.75.2"
+VERSION = "2.76.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 75ad413..0a21de3 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.75.2/python'
+        self.user_agent = 'Swagger-Codegen/2.76.1/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index cba03bf..09d2dd1 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.75.2".\
+               "SDK Package Version: 2.76.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 5a5b20d..eef2a07 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -89,6 +89,7 @@ class Alert(object):
         'status': 'list[str]',
         'system_alert_version': 'int',
         'system_owned': 'bool',
+        'tagpaths': 'list[str]',
         'tags': 'WFTags',
         'target': 'str',
         'target_endpoints': 'list[str]',
@@ -159,6 +160,7 @@ class Alert(object):
         'status': 'status',
         'system_alert_version': 'systemAlertVersion',
         'system_owned': 'systemOwned',
+        'tagpaths': 'tagpaths',
         'tags': 'tags',
         'target': 'target',
         'target_endpoints': 'targetEndpoints',
@@ -170,7 +172,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -231,6 +233,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._status = None
         self._system_alert_version = None
         self._system_owned = None
+        self._tagpaths = None
         self._tags = None
         self._target = None
         self._target_endpoints = None
@@ -355,6 +358,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.system_alert_version = system_alert_version
         if system_owned is not None:
             self.system_owned = system_owned
+        if tagpaths is not None:
+            self.tagpaths = tagpaths
         if tags is not None:
             self.tags = tags
         if target is not None:
@@ -1703,6 +1708,27 @@ def system_owned(self, system_owned):
 
         self._system_owned = system_owned
 
+    @property
+    def tagpaths(self):
+        """Gets the tagpaths of this Alert.  # noqa: E501
+
+
+        :return: The tagpaths of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tagpaths
+
+    @tagpaths.setter
+    def tagpaths(self, tagpaths):
+        """Sets the tagpaths of this Alert.
+
+
+        :param tagpaths: The tagpaths of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tagpaths = tagpaths
+
     @property
     def tags(self):
         """Gets the tags of this Alert.  # noqa: E501

From fbbc72b9314bc54342b2a26fbbfb693c455d4d63 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 27 Mar 2021 08:16:22 -0700
Subject: [PATCH 079/161] Autogenerated Update v2.78.2.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/Annotation.md                            |  2 +
 docs/CloudIntegration.md                      |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/annotation.py     | 56 ++++++++++++++++++-
 .../models/cloud_integration.py               | 28 +++++++++-
 10 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index fb4511c..f1f276f 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.76.1"
+    "packageVersion": "2.78.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6554cdc..fb4511c 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.75.2"
+    "packageVersion": "2.76.1"
 }
diff --git a/README.md b/README.md
index cdb580d..e44ae7e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.76.1
+- Package version: 2.78.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index f379fe1..2b796ea 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -28,6 +28,7 @@ Name | Type | Description | Notes
 **last_received_data_point_ms** | **int** | Time that this integration last received a data point, in epoch millis | [optional] 
 **name** | **str** | The human-readable name of this integration | 
 **new_relic** | [**NewRelicConfiguration**](NewRelicConfiguration.md) |  | [optional] 
+**reuse_external_id_credential** | **str** |  | [optional] 
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
 **service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
diff --git a/setup.py b/setup.py
index a0633c3..a53dfe7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.76.1"
+VERSION = "2.78.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 0a21de3..c124a8e 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.76.1/python'
+        self.user_agent = 'Swagger-Codegen/2.78.2/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 09d2dd1..889cee6 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.76.1".\
+               "SDK Package Version: 2.78.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..927f98e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,15 +31,69 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, key=None, value=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 258ecf1..c880451 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -56,6 +56,7 @@ class CloudIntegration(object):
         'last_received_data_point_ms': 'int',
         'name': 'str',
         'new_relic': 'NewRelicConfiguration',
+        'reuse_external_id_credential': 'str',
         'service': 'str',
         'service_refresh_rate_in_mins': 'int',
         'tesla': 'TeslaConfiguration',
@@ -89,6 +90,7 @@ class CloudIntegration(object):
         'last_received_data_point_ms': 'lastReceivedDataPointMs',
         'name': 'name',
         'new_relic': 'newRelic',
+        'reuse_external_id_credential': 'reuseExternalIdCredential',
         'service': 'service',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'tesla': 'tesla',
@@ -96,7 +98,7 @@ class CloudIntegration(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
 
         self._additional_tags = None
@@ -124,6 +126,7 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._last_received_data_point_ms = None
         self._name = None
         self._new_relic = None
+        self._reuse_external_id_credential = None
         self._service = None
         self._service_refresh_rate_in_mins = None
         self._tesla = None
@@ -180,6 +183,8 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self.name = name
         if new_relic is not None:
             self.new_relic = new_relic
+        if reuse_external_id_credential is not None:
+            self.reuse_external_id_credential = reuse_external_id_credential
         self.service = service
         if service_refresh_rate_in_mins is not None:
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
@@ -735,6 +740,27 @@ def new_relic(self, new_relic):
 
         self._new_relic = new_relic
 
+    @property
+    def reuse_external_id_credential(self):
+        """Gets the reuse_external_id_credential of this CloudIntegration.  # noqa: E501
+
+
+        :return: The reuse_external_id_credential of this CloudIntegration.  # noqa: E501
+        :rtype: str
+        """
+        return self._reuse_external_id_credential
+
+    @reuse_external_id_credential.setter
+    def reuse_external_id_credential(self, reuse_external_id_credential):
+        """Sets the reuse_external_id_credential of this CloudIntegration.
+
+
+        :param reuse_external_id_credential: The reuse_external_id_credential of this CloudIntegration.  # noqa: E501
+        :type: str
+        """
+
+        self._reuse_external_id_credential = reuse_external_id_credential
+
     @property
     def service(self):
         """Gets the service of this CloudIntegration.  # noqa: E501

From f789c4c648b36f6a21d2d15e945cd207a9063d8c Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 7 Apr 2021 08:16:23 -0700
Subject: [PATCH 080/161] Autogenerated Update v2.79.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  3 +-
 docs/Alert.md                                 |  2 +
 docs/Annotation.md                            |  2 -
 docs/MonitoredServiceApi.md                   | 55 +++++++++++
 setup.py                                      |  2 +-
 .../api/monitored_service_api.py              | 95 +++++++++++++++++++
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/alert.py          | 58 ++++++++++-
 wavefront_api_client/models/annotation.py     | 56 +----------
 12 files changed, 217 insertions(+), 64 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f1f276f..b5d1f2d 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.78.2"
+    "packageVersion": "2.79.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index fb4511c..f1f276f 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.76.1"
+    "packageVersion": "2.78.2"
 }
diff --git a/README.md b/README.md
index e44ae7e..6d4d5d2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.78.2
+- Package version: 2.79.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -228,6 +228,7 @@ Class | Method | HTTP request | Description
 *MonitoredApplicationApi* | [**get_all_applications**](docs/MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored services
 *MonitoredApplicationApi* | [**get_application**](docs/MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
 *MonitoredApplicationApi* | [**update_service**](docs/MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
+*MonitoredServiceApi* | [**batch_update**](docs/MonitoredServiceApi.md#batch_update) | **PUT** /api/v2/monitoredservice/services | Update multiple applications and services in a batch. Batch size is limited to 100.
 *MonitoredServiceApi* | [**get_all_services**](docs/MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
 *MonitoredServiceApi* | [**get_service**](docs/MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
 *MonitoredServiceApi* | [**get_services_of_application**](docs/MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
diff --git a/docs/Alert.md b/docs/Alert.md
index 3025b37..ef2050c 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **alerts_last_day** | **int** |  | [optional] 
 **alerts_last_month** | **int** |  | [optional] 
 **alerts_last_week** | **int** |  | [optional] 
+**application** | **list[str]** | Lists the applications from the failingHostLabelPair of the alert. | [optional] 
 **condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
@@ -54,6 +55,7 @@ Name | Type | Description | Notes
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
 **secure_metric_details** | **bool** | Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security. | [optional] 
+**service** | **list[str]** | Lists the services from the failingHostLabelPair of the alert. | [optional] 
 **severity** | **str** | Severity of the alert | [optional] 
 **severity_list** | **list[str]** | Alert severity list for multi-threshold type. | [optional] 
 **snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MonitoredServiceApi.md b/docs/MonitoredServiceApi.md
index ed8dbea..127d6f9 100644
--- a/docs/MonitoredServiceApi.md
+++ b/docs/MonitoredServiceApi.md
@@ -4,12 +4,67 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**batch_update**](MonitoredServiceApi.md#batch_update) | **PUT** /api/v2/monitoredservice/services | Update multiple applications and services in a batch. Batch size is limited to 100.
 [**get_all_services**](MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
 [**get_service**](MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
 [**get_services_of_application**](MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
 [**update_service**](MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
 
 
+# **batch_update**
+> ResponseContainer batch_update(body=body)
+
+Update multiple applications and services in a batch. Batch size is limited to 100.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.MonitoredServiceDTO()] # list[MonitoredServiceDTO] | Example Body:  <pre>[{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"application\": \"beachshirts\",   \"service\": \"delivery\",   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre> (optional)
+
+try:
+    # Update multiple applications and services in a batch. Batch size is limited to 100.
+    api_response = api_instance.batch_update(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->batch_update: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**list[MonitoredServiceDTO]**](MonitoredServiceDTO.md)| Example Body:  &lt;pre&gt;[{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;service\&quot;: \&quot;shopping\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; },{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;service\&quot;: \&quot;delivery\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }]&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_services**
 > ResponseContainerPagedMonitoredServiceDTO get_all_services(offset=offset, limit=limit)
 
diff --git a/setup.py b/setup.py
index a53dfe7..d10febe 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.78.2"
+VERSION = "2.79.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index 9fdc6c8..574bb1e 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -33,6 +33,101 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def batch_update(self, **kwargs):  # noqa: E501
+        """Update multiple applications and services in a batch. Batch size is limited to 100.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.batch_update(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[MonitoredServiceDTO] body: Example Body:  <pre>[{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"application\": \"beachshirts\",   \"service\": \"delivery\",   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.batch_update_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.batch_update_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def batch_update_with_http_info(self, **kwargs):  # noqa: E501
+        """Update multiple applications and services in a batch. Batch size is limited to 100.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.batch_update_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[MonitoredServiceDTO] body: Example Body:  <pre>[{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"application\": \"beachshirts\",   \"service\": \"delivery\",   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method batch_update" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice/services', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_services(self, **kwargs):  # noqa: E501
         """Get all monitored services  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index c124a8e..5139250 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.78.2/python'
+        self.user_agent = 'Swagger-Codegen/2.79.1/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 889cee6..c432149 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.78.2".\
+               "SDK Package Version: 2.79.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index eef2a07..55bcc10 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -38,6 +38,7 @@ class Alert(object):
         'alerts_last_day': 'int',
         'alerts_last_month': 'int',
         'alerts_last_week': 'int',
+        'application': 'list[str]',
         'condition': 'str',
         'condition_qb_enabled': 'bool',
         'condition_qb_serialization': 'str',
@@ -82,6 +83,7 @@ class Alert(object):
         'query_failing': 'bool',
         'resolve_after_minutes': 'int',
         'secure_metric_details': 'bool',
+        'service': 'list[str]',
         'severity': 'str',
         'severity_list': 'list[str]',
         'snoozed': 'int',
@@ -109,6 +111,7 @@ class Alert(object):
         'alerts_last_day': 'alertsLastDay',
         'alerts_last_month': 'alertsLastMonth',
         'alerts_last_week': 'alertsLastWeek',
+        'application': 'application',
         'condition': 'condition',
         'condition_qb_enabled': 'conditionQBEnabled',
         'condition_qb_serialization': 'conditionQBSerialization',
@@ -153,6 +156,7 @@ class Alert(object):
         'query_failing': 'queryFailing',
         'resolve_after_minutes': 'resolveAfterMinutes',
         'secure_metric_details': 'secureMetricDetails',
+        'service': 'service',
         'severity': 'severity',
         'severity_list': 'severityList',
         'snoozed': 'snoozed',
@@ -172,7 +176,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -182,6 +186,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._alerts_last_day = None
         self._alerts_last_month = None
         self._alerts_last_week = None
+        self._application = None
         self._condition = None
         self._condition_qb_enabled = None
         self._condition_qb_serialization = None
@@ -226,6 +231,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._query_failing = None
         self._resolve_after_minutes = None
         self._secure_metric_details = None
+        self._service = None
         self._severity = None
         self._severity_list = None
         self._snoozed = None
@@ -259,6 +265,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.alerts_last_month = alerts_last_month
         if alerts_last_week is not None:
             self.alerts_last_week = alerts_last_week
+        if application is not None:
+            self.application = application
         self.condition = condition
         if condition_qb_enabled is not None:
             self.condition_qb_enabled = condition_qb_enabled
@@ -344,6 +352,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.resolve_after_minutes = resolve_after_minutes
         if secure_metric_details is not None:
             self.secure_metric_details = secure_metric_details
+        if service is not None:
+            self.service = service
         if severity is not None:
             self.severity = severity
         if severity_list is not None:
@@ -538,6 +548,29 @@ def alerts_last_week(self, alerts_last_week):
 
         self._alerts_last_week = alerts_last_week
 
+    @property
+    def application(self):
+        """Gets the application of this Alert.  # noqa: E501
+
+        Lists the applications from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :return: The application of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._application
+
+    @application.setter
+    def application(self, application):
+        """Sets the application of this Alert.
+
+        Lists the applications from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :param application: The application of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._application = application
+
     @property
     def condition(self):
         """Gets the condition of this Alert.  # noqa: E501
@@ -1534,6 +1567,29 @@ def secure_metric_details(self, secure_metric_details):
 
         self._secure_metric_details = secure_metric_details
 
+    @property
+    def service(self):
+        """Gets the service of this Alert.  # noqa: E501
+
+        Lists the services from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :return: The service of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._service
+
+    @service.setter
+    def service(self, service):
+        """Sets the service of this Alert.
+
+        Lists the services from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :param service: The service of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._service = service
+
     @property
     def severity(self):
         """Gets the severity of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 927f98e..cf05f3e 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -31,69 +31,15 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None):  # noqa: E501
+    def __init__(self):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From d5b4143b4d338abb6cc948d6fd5fca963bc1dcbc Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Wed, 7 Apr 2021 10:40:14 -0700
Subject: [PATCH 081/161] Update Travis CI Config. (#61)

---
 .travis.yml | 6 +++---
 setup.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 99eda4b..2764adf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: bionic
+dist: focal
 language: python
 python:
   - "2.7"
@@ -15,11 +15,11 @@ deploy:
   password:
     secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
   on:
-    python: 3.8
+    python: 3.9
 - provider: pypi
   user: wavefront-cs
   password:
     secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
   on:
-    python: 3.8
+    python: 3.9
     tags: true
diff --git a/setup.py b/setup.py
index d10febe..4733039 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.79.1"
+VERSION = "2.79.2"
 # To install the library, run the following
 #
 # python setup.py install

From a755efd17663a8d907b264646cd9b5145bbe7d45 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 17 Apr 2021 08:16:22 -0700
Subject: [PATCH 082/161] Autogenerated Update v2.81.4.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index b5d1f2d..fcd05c2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.79.1"
+    "packageVersion": "2.81.4"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f1f276f..b5d1f2d 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.78.2"
+    "packageVersion": "2.79.1"
 }
diff --git a/README.md b/README.md
index 6d4d5d2..4465b5a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.79.1
+- Package version: 2.81.4
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 4733039..4e4b040 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.79.2"
+VERSION = "2.81.4"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 5139250..1ac7f24 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.79.1/python'
+        self.user_agent = 'Swagger-Codegen/2.81.4/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index c432149..b3c7652 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.79.1".\
+               "SDK Package Version: 2.81.4".\
                format(env=sys.platform, pyversion=sys.version)

From 65f5d8fcd9f2085070ff2706590b9ee592387a48 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 6 May 2021 08:16:32 -0700
Subject: [PATCH 083/161] Autogenerated Update v2.83.7.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   6 +-
 docs/ConversionObject.md                      |  11 +
 docs/Field.md                                 |  10 +
 docs/Schema.md                                |  27 +
 docs/SpecificData.md                          |  13 +
 setup.py                                      |   2 +-
 test/test_conversion_object.py                |  40 ++
 test/test_field.py                            |  40 ++
 test/test_schema.py                           |  40 ++
 test/test_specific_data.py                    |  40 ++
 wavefront_api_client/__init__.py              |   4 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   4 +
 .../models/conversion_object.py               | 141 +++++
 wavefront_api_client/models/field.py          | 115 ++++
 wavefront_api_client/models/schema.py         | 563 ++++++++++++++++++
 wavefront_api_client/models/specific_data.py  | 193 ++++++
 20 files changed, 1251 insertions(+), 6 deletions(-)
 create mode 100644 docs/ConversionObject.md
 create mode 100644 docs/Field.md
 create mode 100644 docs/Schema.md
 create mode 100644 docs/SpecificData.md
 create mode 100644 test/test_conversion_object.py
 create mode 100644 test/test_field.py
 create mode 100644 test/test_schema.py
 create mode 100644 test/test_specific_data.py
 create mode 100644 wavefront_api_client/models/conversion_object.py
 create mode 100644 wavefront_api_client/models/field.py
 create mode 100644 wavefront_api_client/models/schema.py
 create mode 100644 wavefront_api_client/models/specific_data.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index fcd05c2..5e373c7 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.81.4"
+    "packageVersion": "2.83.7"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index b5d1f2d..fcd05c2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.79.1"
+    "packageVersion": "2.81.4"
 }
diff --git a/README.md b/README.md
index 4465b5a..2d1a953 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.81.4
+- Package version: 2.83.7
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -410,6 +410,7 @@ Class | Method | HTTP request | Description
  - [CloudIntegration](docs/CloudIntegration.md)
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
+ - [ConversionObject](docs/ConversionObject.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
  - [Dashboard](docs/Dashboard.md)
  - [DashboardMin](docs/DashboardMin.md)
@@ -427,6 +428,7 @@ Class | Method | HTTP request | Description
  - [FacetsResponseContainer](docs/FacetsResponseContainer.md)
  - [FacetsSearchRequestContainer](docs/FacetsSearchRequestContainer.md)
  - [FastReaderBuilder](docs/FastReaderBuilder.md)
+ - [Field](docs/Field.md)
  - [GCPBillingConfiguration](docs/GCPBillingConfiguration.md)
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
@@ -574,6 +576,7 @@ Class | Method | HTTP request | Description
  - [ResponseStatus](docs/ResponseStatus.md)
  - [RoleDTO](docs/RoleDTO.md)
  - [SavedSearch](docs/SavedSearch.md)
+ - [Schema](docs/Schema.md)
  - [SearchQuery](docs/SearchQuery.md)
  - [ServiceAccount](docs/ServiceAccount.md)
  - [ServiceAccountWrite](docs/ServiceAccountWrite.md)
@@ -583,6 +586,7 @@ Class | Method | HTTP request | Description
  - [SourceLabelPair](docs/SourceLabelPair.md)
  - [SourceSearchRequestContainer](docs/SourceSearchRequestContainer.md)
  - [Span](docs/Span.md)
+ - [SpecificData](docs/SpecificData.md)
  - [StatsModelInternalUse](docs/StatsModelInternalUse.md)
  - [Stripe](docs/Stripe.md)
  - [TagsResponse](docs/TagsResponse.md)
diff --git a/docs/ConversionObject.md b/docs/ConversionObject.md
new file mode 100644
index 0000000..b9190fc
--- /dev/null
+++ b/docs/ConversionObject.md
@@ -0,0 +1,11 @@
+# ConversionObject
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**logical_type_name** | **str** |  | [optional] 
+**recommended_schema** | [**Schema**](Schema.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Field.md b/docs/Field.md
new file mode 100644
index 0000000..493e47a
--- /dev/null
+++ b/docs/Field.md
@@ -0,0 +1,10 @@
+# Field
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**object_props** | **dict(str, object)** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Schema.md b/docs/Schema.md
new file mode 100644
index 0000000..0641889
--- /dev/null
+++ b/docs/Schema.md
@@ -0,0 +1,27 @@
+# Schema
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**aliases** | **list[str]** |  | [optional] 
+**doc** | **str** |  | [optional] 
+**element_type** | [**Schema**](Schema.md) |  | [optional] 
+**enum_default** | **str** |  | [optional] 
+**enum_symbols** | **list[str]** |  | [optional] 
+**error** | **bool** |  | [optional] 
+**fields** | [**list[Field]**](Field.md) |  | [optional] 
+**fixed_size** | **int** |  | [optional] 
+**full_name** | **str** |  | [optional] 
+**logical_type** | [**LogicalType**](LogicalType.md) |  | [optional] 
+**name** | **str** |  | [optional] 
+**namespace** | **str** |  | [optional] 
+**nullable** | **bool** |  | [optional] 
+**object_props** | **dict(str, object)** |  | [optional] 
+**type** | **str** |  | [optional] 
+**types** | [**list[Schema]**](Schema.md) |  | [optional] 
+**union** | **bool** |  | [optional] 
+**value_type** | [**Schema**](Schema.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SpecificData.md b/docs/SpecificData.md
new file mode 100644
index 0000000..8c2eace
--- /dev/null
+++ b/docs/SpecificData.md
@@ -0,0 +1,13 @@
+# SpecificData
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_loader** | [**ClassLoader**](ClassLoader.md) |  | [optional] 
+**conversions** | [**list[ConversionObject]**](ConversionObject.md) |  | [optional] 
+**fast_reader_builder** | [**FastReaderBuilder**](FastReaderBuilder.md) |  | [optional] 
+**fast_reader_enabled** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 4e4b040..6df0029 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.81.4"
+VERSION = "2.83.7"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_conversion_object.py b/test/test_conversion_object.py
new file mode 100644
index 0000000..3e401c0
--- /dev/null
+++ b/test/test_conversion_object.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.conversion_object import ConversionObject  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestConversionObject(unittest.TestCase):
+    """ConversionObject unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testConversionObject(self):
+        """Test ConversionObject"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.conversion_object.ConversionObject()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_field.py b/test/test_field.py
new file mode 100644
index 0000000..84ed8dd
--- /dev/null
+++ b/test/test_field.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.field import Field  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestField(unittest.TestCase):
+    """Field unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testField(self):
+        """Test Field"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.field.Field()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_schema.py b/test/test_schema.py
new file mode 100644
index 0000000..58202d5
--- /dev/null
+++ b/test/test_schema.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.schema import Schema  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSchema(unittest.TestCase):
+    """Schema unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSchema(self):
+        """Test Schema"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.schema.Schema()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_specific_data.py b/test/test_specific_data.py
new file mode 100644
index 0000000..5bc99e6
--- /dev/null
+++ b/test/test_specific_data.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.specific_data import SpecificData  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSpecificData(unittest.TestCase):
+    """SpecificData unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSpecificData(self):
+        """Test SpecificData"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.specific_data.SpecificData()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 19fd77c..1698497 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -75,6 +75,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.conversion_object import ConversionObject
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
@@ -92,6 +93,7 @@
 from wavefront_api_client.models.facets_response_container import FacetsResponseContainer
 from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer
 from wavefront_api_client.models.fast_reader_builder import FastReaderBuilder
+from wavefront_api_client.models.field import Field
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
@@ -239,6 +241,7 @@
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.saved_search import SavedSearch
+from wavefront_api_client.models.schema import Schema
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
 from wavefront_api_client.models.service_account_write import ServiceAccountWrite
@@ -248,6 +251,7 @@
 from wavefront_api_client.models.source_label_pair import SourceLabelPair
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
 from wavefront_api_client.models.span import Span
+from wavefront_api_client.models.specific_data import SpecificData
 from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 1ac7f24..f5078c3 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.81.4/python'
+        self.user_agent = 'Swagger-Codegen/2.83.7/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index b3c7652..b8f5d42 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.81.4".\
+               "SDK Package Version: 2.83.7".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 2b2c02d..c6dd94d 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -40,6 +40,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.conversion_object import ConversionObject
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
 from wavefront_api_client.models.dashboard_min import DashboardMin
@@ -57,6 +58,7 @@
 from wavefront_api_client.models.facets_response_container import FacetsResponseContainer
 from wavefront_api_client.models.facets_search_request_container import FacetsSearchRequestContainer
 from wavefront_api_client.models.fast_reader_builder import FastReaderBuilder
+from wavefront_api_client.models.field import Field
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
@@ -204,6 +206,7 @@
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.saved_search import SavedSearch
+from wavefront_api_client.models.schema import Schema
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
 from wavefront_api_client.models.service_account_write import ServiceAccountWrite
@@ -213,6 +216,7 @@
 from wavefront_api_client.models.source_label_pair import SourceLabelPair
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
 from wavefront_api_client.models.span import Span
+from wavefront_api_client.models.specific_data import SpecificData
 from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
diff --git a/wavefront_api_client/models/conversion_object.py b/wavefront_api_client/models/conversion_object.py
new file mode 100644
index 0000000..eb25250
--- /dev/null
+++ b/wavefront_api_client/models/conversion_object.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ConversionObject(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'logical_type_name': 'str',
+        'recommended_schema': 'Schema'
+    }
+
+    attribute_map = {
+        'logical_type_name': 'logicalTypeName',
+        'recommended_schema': 'recommendedSchema'
+    }
+
+    def __init__(self, logical_type_name=None, recommended_schema=None):  # noqa: E501
+        """ConversionObject - a model defined in Swagger"""  # noqa: E501
+
+        self._logical_type_name = None
+        self._recommended_schema = None
+        self.discriminator = None
+
+        if logical_type_name is not None:
+            self.logical_type_name = logical_type_name
+        if recommended_schema is not None:
+            self.recommended_schema = recommended_schema
+
+    @property
+    def logical_type_name(self):
+        """Gets the logical_type_name of this ConversionObject.  # noqa: E501
+
+
+        :return: The logical_type_name of this ConversionObject.  # noqa: E501
+        :rtype: str
+        """
+        return self._logical_type_name
+
+    @logical_type_name.setter
+    def logical_type_name(self, logical_type_name):
+        """Sets the logical_type_name of this ConversionObject.
+
+
+        :param logical_type_name: The logical_type_name of this ConversionObject.  # noqa: E501
+        :type: str
+        """
+
+        self._logical_type_name = logical_type_name
+
+    @property
+    def recommended_schema(self):
+        """Gets the recommended_schema of this ConversionObject.  # noqa: E501
+
+
+        :return: The recommended_schema of this ConversionObject.  # noqa: E501
+        :rtype: Schema
+        """
+        return self._recommended_schema
+
+    @recommended_schema.setter
+    def recommended_schema(self, recommended_schema):
+        """Sets the recommended_schema of this ConversionObject.
+
+
+        :param recommended_schema: The recommended_schema of this ConversionObject.  # noqa: E501
+        :type: Schema
+        """
+
+        self._recommended_schema = recommended_schema
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ConversionObject, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ConversionObject):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/field.py b/wavefront_api_client/models/field.py
new file mode 100644
index 0000000..eb9fc49
--- /dev/null
+++ b/wavefront_api_client/models/field.py
@@ -0,0 +1,115 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Field(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'object_props': 'dict(str, object)'
+    }
+
+    attribute_map = {
+        'object_props': 'objectProps'
+    }
+
+    def __init__(self, object_props=None):  # noqa: E501
+        """Field - a model defined in Swagger"""  # noqa: E501
+
+        self._object_props = None
+        self.discriminator = None
+
+        if object_props is not None:
+            self.object_props = object_props
+
+    @property
+    def object_props(self):
+        """Gets the object_props of this Field.  # noqa: E501
+
+
+        :return: The object_props of this Field.  # noqa: E501
+        :rtype: dict(str, object)
+        """
+        return self._object_props
+
+    @object_props.setter
+    def object_props(self, object_props):
+        """Sets the object_props of this Field.
+
+
+        :param object_props: The object_props of this Field.  # noqa: E501
+        :type: dict(str, object)
+        """
+
+        self._object_props = object_props
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Field, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Field):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/schema.py b/wavefront_api_client/models/schema.py
new file mode 100644
index 0000000..6fa229e
--- /dev/null
+++ b/wavefront_api_client/models/schema.py
@@ -0,0 +1,563 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Schema(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'aliases': 'list[str]',
+        'doc': 'str',
+        'element_type': 'Schema',
+        'enum_default': 'str',
+        'enum_symbols': 'list[str]',
+        'error': 'bool',
+        'fields': 'list[Field]',
+        'fixed_size': 'int',
+        'full_name': 'str',
+        'logical_type': 'LogicalType',
+        'name': 'str',
+        'namespace': 'str',
+        'nullable': 'bool',
+        'object_props': 'dict(str, object)',
+        'type': 'str',
+        'types': 'list[Schema]',
+        'union': 'bool',
+        'value_type': 'Schema'
+    }
+
+    attribute_map = {
+        'aliases': 'aliases',
+        'doc': 'doc',
+        'element_type': 'elementType',
+        'enum_default': 'enumDefault',
+        'enum_symbols': 'enumSymbols',
+        'error': 'error',
+        'fields': 'fields',
+        'fixed_size': 'fixedSize',
+        'full_name': 'fullName',
+        'logical_type': 'logicalType',
+        'name': 'name',
+        'namespace': 'namespace',
+        'nullable': 'nullable',
+        'object_props': 'objectProps',
+        'type': 'type',
+        'types': 'types',
+        'union': 'union',
+        'value_type': 'valueType'
+    }
+
+    def __init__(self, aliases=None, doc=None, element_type=None, enum_default=None, enum_symbols=None, error=None, fields=None, fixed_size=None, full_name=None, logical_type=None, name=None, namespace=None, nullable=None, object_props=None, type=None, types=None, union=None, value_type=None):  # noqa: E501
+        """Schema - a model defined in Swagger"""  # noqa: E501
+
+        self._aliases = None
+        self._doc = None
+        self._element_type = None
+        self._enum_default = None
+        self._enum_symbols = None
+        self._error = None
+        self._fields = None
+        self._fixed_size = None
+        self._full_name = None
+        self._logical_type = None
+        self._name = None
+        self._namespace = None
+        self._nullable = None
+        self._object_props = None
+        self._type = None
+        self._types = None
+        self._union = None
+        self._value_type = None
+        self.discriminator = None
+
+        if aliases is not None:
+            self.aliases = aliases
+        if doc is not None:
+            self.doc = doc
+        if element_type is not None:
+            self.element_type = element_type
+        if enum_default is not None:
+            self.enum_default = enum_default
+        if enum_symbols is not None:
+            self.enum_symbols = enum_symbols
+        if error is not None:
+            self.error = error
+        if fields is not None:
+            self.fields = fields
+        if fixed_size is not None:
+            self.fixed_size = fixed_size
+        if full_name is not None:
+            self.full_name = full_name
+        if logical_type is not None:
+            self.logical_type = logical_type
+        if name is not None:
+            self.name = name
+        if namespace is not None:
+            self.namespace = namespace
+        if nullable is not None:
+            self.nullable = nullable
+        if object_props is not None:
+            self.object_props = object_props
+        if type is not None:
+            self.type = type
+        if types is not None:
+            self.types = types
+        if union is not None:
+            self.union = union
+        if value_type is not None:
+            self.value_type = value_type
+
+    @property
+    def aliases(self):
+        """Gets the aliases of this Schema.  # noqa: E501
+
+
+        :return: The aliases of this Schema.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._aliases
+
+    @aliases.setter
+    def aliases(self, aliases):
+        """Sets the aliases of this Schema.
+
+
+        :param aliases: The aliases of this Schema.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._aliases = aliases
+
+    @property
+    def doc(self):
+        """Gets the doc of this Schema.  # noqa: E501
+
+
+        :return: The doc of this Schema.  # noqa: E501
+        :rtype: str
+        """
+        return self._doc
+
+    @doc.setter
+    def doc(self, doc):
+        """Sets the doc of this Schema.
+
+
+        :param doc: The doc of this Schema.  # noqa: E501
+        :type: str
+        """
+
+        self._doc = doc
+
+    @property
+    def element_type(self):
+        """Gets the element_type of this Schema.  # noqa: E501
+
+
+        :return: The element_type of this Schema.  # noqa: E501
+        :rtype: Schema
+        """
+        return self._element_type
+
+    @element_type.setter
+    def element_type(self, element_type):
+        """Sets the element_type of this Schema.
+
+
+        :param element_type: The element_type of this Schema.  # noqa: E501
+        :type: Schema
+        """
+
+        self._element_type = element_type
+
+    @property
+    def enum_default(self):
+        """Gets the enum_default of this Schema.  # noqa: E501
+
+
+        :return: The enum_default of this Schema.  # noqa: E501
+        :rtype: str
+        """
+        return self._enum_default
+
+    @enum_default.setter
+    def enum_default(self, enum_default):
+        """Sets the enum_default of this Schema.
+
+
+        :param enum_default: The enum_default of this Schema.  # noqa: E501
+        :type: str
+        """
+
+        self._enum_default = enum_default
+
+    @property
+    def enum_symbols(self):
+        """Gets the enum_symbols of this Schema.  # noqa: E501
+
+
+        :return: The enum_symbols of this Schema.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._enum_symbols
+
+    @enum_symbols.setter
+    def enum_symbols(self, enum_symbols):
+        """Sets the enum_symbols of this Schema.
+
+
+        :param enum_symbols: The enum_symbols of this Schema.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._enum_symbols = enum_symbols
+
+    @property
+    def error(self):
+        """Gets the error of this Schema.  # noqa: E501
+
+
+        :return: The error of this Schema.  # noqa: E501
+        :rtype: bool
+        """
+        return self._error
+
+    @error.setter
+    def error(self, error):
+        """Sets the error of this Schema.
+
+
+        :param error: The error of this Schema.  # noqa: E501
+        :type: bool
+        """
+
+        self._error = error
+
+    @property
+    def fields(self):
+        """Gets the fields of this Schema.  # noqa: E501
+
+
+        :return: The fields of this Schema.  # noqa: E501
+        :rtype: list[Field]
+        """
+        return self._fields
+
+    @fields.setter
+    def fields(self, fields):
+        """Sets the fields of this Schema.
+
+
+        :param fields: The fields of this Schema.  # noqa: E501
+        :type: list[Field]
+        """
+
+        self._fields = fields
+
+    @property
+    def fixed_size(self):
+        """Gets the fixed_size of this Schema.  # noqa: E501
+
+
+        :return: The fixed_size of this Schema.  # noqa: E501
+        :rtype: int
+        """
+        return self._fixed_size
+
+    @fixed_size.setter
+    def fixed_size(self, fixed_size):
+        """Sets the fixed_size of this Schema.
+
+
+        :param fixed_size: The fixed_size of this Schema.  # noqa: E501
+        :type: int
+        """
+
+        self._fixed_size = fixed_size
+
+    @property
+    def full_name(self):
+        """Gets the full_name of this Schema.  # noqa: E501
+
+
+        :return: The full_name of this Schema.  # noqa: E501
+        :rtype: str
+        """
+        return self._full_name
+
+    @full_name.setter
+    def full_name(self, full_name):
+        """Sets the full_name of this Schema.
+
+
+        :param full_name: The full_name of this Schema.  # noqa: E501
+        :type: str
+        """
+
+        self._full_name = full_name
+
+    @property
+    def logical_type(self):
+        """Gets the logical_type of this Schema.  # noqa: E501
+
+
+        :return: The logical_type of this Schema.  # noqa: E501
+        :rtype: LogicalType
+        """
+        return self._logical_type
+
+    @logical_type.setter
+    def logical_type(self, logical_type):
+        """Sets the logical_type of this Schema.
+
+
+        :param logical_type: The logical_type of this Schema.  # noqa: E501
+        :type: LogicalType
+        """
+
+        self._logical_type = logical_type
+
+    @property
+    def name(self):
+        """Gets the name of this Schema.  # noqa: E501
+
+
+        :return: The name of this Schema.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this Schema.
+
+
+        :param name: The name of this Schema.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def namespace(self):
+        """Gets the namespace of this Schema.  # noqa: E501
+
+
+        :return: The namespace of this Schema.  # noqa: E501
+        :rtype: str
+        """
+        return self._namespace
+
+    @namespace.setter
+    def namespace(self, namespace):
+        """Sets the namespace of this Schema.
+
+
+        :param namespace: The namespace of this Schema.  # noqa: E501
+        :type: str
+        """
+
+        self._namespace = namespace
+
+    @property
+    def nullable(self):
+        """Gets the nullable of this Schema.  # noqa: E501
+
+
+        :return: The nullable of this Schema.  # noqa: E501
+        :rtype: bool
+        """
+        return self._nullable
+
+    @nullable.setter
+    def nullable(self, nullable):
+        """Sets the nullable of this Schema.
+
+
+        :param nullable: The nullable of this Schema.  # noqa: E501
+        :type: bool
+        """
+
+        self._nullable = nullable
+
+    @property
+    def object_props(self):
+        """Gets the object_props of this Schema.  # noqa: E501
+
+
+        :return: The object_props of this Schema.  # noqa: E501
+        :rtype: dict(str, object)
+        """
+        return self._object_props
+
+    @object_props.setter
+    def object_props(self, object_props):
+        """Sets the object_props of this Schema.
+
+
+        :param object_props: The object_props of this Schema.  # noqa: E501
+        :type: dict(str, object)
+        """
+
+        self._object_props = object_props
+
+    @property
+    def type(self):
+        """Gets the type of this Schema.  # noqa: E501
+
+
+        :return: The type of this Schema.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this Schema.
+
+
+        :param type: The type of this Schema.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["RECORD", "ENUM", "ARRAY", "MAP", "UNION", "FIXED", "STRING", "BYTES", "INT", "LONG", "FLOAT", "DOUBLE", "BOOLEAN", "NULL"]  # noqa: E501
+        if type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
+
+    @property
+    def types(self):
+        """Gets the types of this Schema.  # noqa: E501
+
+
+        :return: The types of this Schema.  # noqa: E501
+        :rtype: list[Schema]
+        """
+        return self._types
+
+    @types.setter
+    def types(self, types):
+        """Sets the types of this Schema.
+
+
+        :param types: The types of this Schema.  # noqa: E501
+        :type: list[Schema]
+        """
+
+        self._types = types
+
+    @property
+    def union(self):
+        """Gets the union of this Schema.  # noqa: E501
+
+
+        :return: The union of this Schema.  # noqa: E501
+        :rtype: bool
+        """
+        return self._union
+
+    @union.setter
+    def union(self, union):
+        """Sets the union of this Schema.
+
+
+        :param union: The union of this Schema.  # noqa: E501
+        :type: bool
+        """
+
+        self._union = union
+
+    @property
+    def value_type(self):
+        """Gets the value_type of this Schema.  # noqa: E501
+
+
+        :return: The value_type of this Schema.  # noqa: E501
+        :rtype: Schema
+        """
+        return self._value_type
+
+    @value_type.setter
+    def value_type(self, value_type):
+        """Sets the value_type of this Schema.
+
+
+        :param value_type: The value_type of this Schema.  # noqa: E501
+        :type: Schema
+        """
+
+        self._value_type = value_type
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Schema, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Schema):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/specific_data.py b/wavefront_api_client/models/specific_data.py
new file mode 100644
index 0000000..e11b19e
--- /dev/null
+++ b/wavefront_api_client/models/specific_data.py
@@ -0,0 +1,193 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class SpecificData(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'class_loader': 'ClassLoader',
+        'conversions': 'list[ConversionObject]',
+        'fast_reader_builder': 'FastReaderBuilder',
+        'fast_reader_enabled': 'bool'
+    }
+
+    attribute_map = {
+        'class_loader': 'classLoader',
+        'conversions': 'conversions',
+        'fast_reader_builder': 'fastReaderBuilder',
+        'fast_reader_enabled': 'fastReaderEnabled'
+    }
+
+    def __init__(self, class_loader=None, conversions=None, fast_reader_builder=None, fast_reader_enabled=None):  # noqa: E501
+        """SpecificData - a model defined in Swagger"""  # noqa: E501
+
+        self._class_loader = None
+        self._conversions = None
+        self._fast_reader_builder = None
+        self._fast_reader_enabled = None
+        self.discriminator = None
+
+        if class_loader is not None:
+            self.class_loader = class_loader
+        if conversions is not None:
+            self.conversions = conversions
+        if fast_reader_builder is not None:
+            self.fast_reader_builder = fast_reader_builder
+        if fast_reader_enabled is not None:
+            self.fast_reader_enabled = fast_reader_enabled
+
+    @property
+    def class_loader(self):
+        """Gets the class_loader of this SpecificData.  # noqa: E501
+
+
+        :return: The class_loader of this SpecificData.  # noqa: E501
+        :rtype: ClassLoader
+        """
+        return self._class_loader
+
+    @class_loader.setter
+    def class_loader(self, class_loader):
+        """Sets the class_loader of this SpecificData.
+
+
+        :param class_loader: The class_loader of this SpecificData.  # noqa: E501
+        :type: ClassLoader
+        """
+
+        self._class_loader = class_loader
+
+    @property
+    def conversions(self):
+        """Gets the conversions of this SpecificData.  # noqa: E501
+
+
+        :return: The conversions of this SpecificData.  # noqa: E501
+        :rtype: list[ConversionObject]
+        """
+        return self._conversions
+
+    @conversions.setter
+    def conversions(self, conversions):
+        """Sets the conversions of this SpecificData.
+
+
+        :param conversions: The conversions of this SpecificData.  # noqa: E501
+        :type: list[ConversionObject]
+        """
+
+        self._conversions = conversions
+
+    @property
+    def fast_reader_builder(self):
+        """Gets the fast_reader_builder of this SpecificData.  # noqa: E501
+
+
+        :return: The fast_reader_builder of this SpecificData.  # noqa: E501
+        :rtype: FastReaderBuilder
+        """
+        return self._fast_reader_builder
+
+    @fast_reader_builder.setter
+    def fast_reader_builder(self, fast_reader_builder):
+        """Sets the fast_reader_builder of this SpecificData.
+
+
+        :param fast_reader_builder: The fast_reader_builder of this SpecificData.  # noqa: E501
+        :type: FastReaderBuilder
+        """
+
+        self._fast_reader_builder = fast_reader_builder
+
+    @property
+    def fast_reader_enabled(self):
+        """Gets the fast_reader_enabled of this SpecificData.  # noqa: E501
+
+
+        :return: The fast_reader_enabled of this SpecificData.  # noqa: E501
+        :rtype: bool
+        """
+        return self._fast_reader_enabled
+
+    @fast_reader_enabled.setter
+    def fast_reader_enabled(self, fast_reader_enabled):
+        """Sets the fast_reader_enabled of this SpecificData.
+
+
+        :param fast_reader_enabled: The fast_reader_enabled of this SpecificData.  # noqa: E501
+        :type: bool
+        """
+
+        self._fast_reader_enabled = fast_reader_enabled
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SpecificData, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SpecificData):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 9bd358928301669d0980ed05c14be754da419f2f Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 7 May 2021 08:16:22 -0700
Subject: [PATCH 084/161] Autogenerated Update v2.84.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   8 +-
 docs/Alert.md                                 |   2 +
 docs/AlertApi.md                              |  55 ++++
 docs/ChartSettings.md                         |   2 +
 docs/ChartSourceQuery.md                      |   1 +
 docs/Conversion.md                            |  11 +
 docs/Paged.md                                 |  16 +
 docs/QueryApi.md                              |   6 +-
 docs/QueryTypeDTO.md                          |  12 +
 docs/ResponseContainerQueryTypeDTO.md         |  11 +
 setup.py                                      |   2 +-
 test/test_conversion.py                       |  40 +++
 test/test_paged.py                            |  40 +++
 test/test_query_type_dto.py                   |  40 +++
 .../test_response_container_query_type_dto.py |  40 +++
 wavefront_api_client/__init__.py              |   5 +-
 wavefront_api_client/api/alert_api.py         |  95 ++++++
 wavefront_api_client/api/query_api.py         |   6 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   5 +-
 wavefront_api_client/models/alert.py          |  66 ++++-
 wavefront_api_client/models/chart_settings.py |  58 +++-
 .../models/chart_source_query.py              |  36 ++-
 wavefront_api_client/models/conversion.py     | 141 +++++++++
 wavefront_api_client/models/paged.py          | 279 ++++++++++++++++++
 wavefront_api_client/models/query_type_dto.py | 173 +++++++++++
 .../response_container_query_type_dto.py      | 142 +++++++++
 30 files changed, 1285 insertions(+), 15 deletions(-)
 create mode 100644 docs/Conversion.md
 create mode 100644 docs/Paged.md
 create mode 100644 docs/QueryTypeDTO.md
 create mode 100644 docs/ResponseContainerQueryTypeDTO.md
 create mode 100644 test/test_conversion.py
 create mode 100644 test/test_paged.py
 create mode 100644 test/test_query_type_dto.py
 create mode 100644 test/test_response_container_query_type_dto.py
 create mode 100644 wavefront_api_client/models/conversion.py
 create mode 100644 wavefront_api_client/models/paged.py
 create mode 100644 wavefront_api_client/models/query_type_dto.py
 create mode 100644 wavefront_api_client/models/response_container_query_type_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5e373c7..3cd8e57 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.83.7"
+    "packageVersion": "2.84.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index fcd05c2..5e373c7 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.81.4"
+    "packageVersion": "2.83.7"
 }
diff --git a/README.md b/README.md
index 2d1a953..c9fced8 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.83.7
+- Package version: 2.84.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -107,6 +107,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**validate_accounts**](docs/AccountUserAndServiceAccountApi.md#validate_accounts) | **POST** /api/v2/account/validateAccounts | Returns valid accounts (users and service accounts), also invalid identifiers from the given list
 *AlertApi* | [**add_alert_access**](docs/AlertApi.md#add_alert_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 *AlertApi* | [**add_alert_tag**](docs/AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
+*AlertApi* | [**check_query_type**](docs/AlertApi.md#check_query_type) | **POST** /api/v2/alert/checkQuery | Return the type of provided query.
 *AlertApi* | [**clone_alert**](docs/AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 *AlertApi* | [**create_alert**](docs/AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 *AlertApi* | [**delete_alert**](docs/AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
@@ -399,7 +400,6 @@ Class | Method | HTTP request | Description
  - [Annotation](docs/Annotation.md)
  - [Anomaly](docs/Anomaly.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
- - [AvroBackedStandardizedDTO](docs/AvroBackedStandardizedDTO.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
  - [AzureBaseCredentials](docs/AzureBaseCredentials.md)
  - [AzureConfiguration](docs/AzureConfiguration.md)
@@ -410,6 +410,7 @@ Class | Method | HTTP request | Description
  - [CloudIntegration](docs/CloudIntegration.md)
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
+ - [Conversion](docs/Conversion.md)
  - [ConversionObject](docs/ConversionObject.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
  - [Dashboard](docs/Dashboard.md)
@@ -464,6 +465,7 @@ Class | Method | HTTP request | Description
  - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
  - [Package](docs/Package.md)
+ - [Paged](docs/Paged.md)
  - [PagedAccount](docs/PagedAccount.md)
  - [PagedAlert](docs/PagedAlert.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
@@ -497,6 +499,7 @@ Class | Method | HTTP request | Description
  - [Proxy](docs/Proxy.md)
  - [QueryEvent](docs/QueryEvent.md)
  - [QueryResult](docs/QueryResult.md)
+ - [QueryTypeDTO](docs/QueryTypeDTO.md)
  - [RawTimeseries](docs/RawTimeseries.md)
  - [RelatedAnomaly](docs/RelatedAnomaly.md)
  - [RelatedData](docs/RelatedData.md)
@@ -562,6 +565,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
  - [ResponseContainerPagedUserGroupModel](docs/ResponseContainerPagedUserGroupModel.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
+ - [ResponseContainerQueryTypeDTO](docs/ResponseContainerQueryTypeDTO.md)
  - [ResponseContainerRoleDTO](docs/ResponseContainerRoleDTO.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
  - [ResponseContainerServiceAccount](docs/ResponseContainerServiceAccount.md)
diff --git a/docs/Alert.md b/docs/Alert.md
index ef2050c..66dcab5 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -14,6 +14,7 @@ Name | Type | Description | Notes
 **condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
+**condition_query_type** | **str** |  | [optional] 
 **conditions** | **dict(str, str)** | Multi - alert conditions. | [optional] 
 **create_user_id** | **str** |  | [optional] 
 **created** | **int** | When this alert was created, in epoch millis | [optional] 
@@ -23,6 +24,7 @@ Name | Type | Description | Notes
 **display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
 **display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
 **display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
+**display_expression_query_type** | **str** |  | [optional] 
 **enable_pd_incident_by_series** | **bool** |  | [optional] 
 **evaluate_realtime_data** | **bool** | Whether to alert on the real-time ingestion stream (may be noisy due to late data) | [optional] 
 **event** | [**Event**](Event.md) |  | [optional] 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 21037ec..5ae16fd 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -6,6 +6,7 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**add_alert_access**](AlertApi.md#add_alert_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 [**add_alert_tag**](AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
+[**check_query_type**](AlertApi.md#check_query_type) | **POST** /api/v2/alert/checkQuery | Return the type of provided query.
 [**clone_alert**](AlertApi.md#clone_alert) | **POST** /api/v2/alert/{id}/clone | Clones the specified alert
 [**create_alert**](AlertApi.md#create_alert) | **POST** /api/v2/alert | Create a specific alert
 [**delete_alert**](AlertApi.md#delete_alert) | **DELETE** /api/v2/alert/{id} | Delete a specific alert
@@ -137,6 +138,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **check_query_type**
+> ResponseContainerQueryTypeDTO check_query_type(body=body)
+
+Return the type of provided query.
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.QueryTypeDTO() # QueryTypeDTO |  (optional)
+
+try:
+    # Return the type of provided query.
+    api_response = api_instance.check_query_type(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->check_query_type: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**QueryTypeDTO**](QueryTypeDTO.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerQueryTypeDTO**](ResponseContainerQueryTypeDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **clone_alert**
 > ResponseContainerAlert clone_alert(id, name=name, v=v)
 
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index ca3b438..2a65422 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -16,6 +16,8 @@ Name | Type | Description | Notes
 **fixed_legend_filter_sort** | **str** | Whether to display \&quot;Top\&quot;- or \&quot;Bottom\&quot;-ranked series in the fixed legend | [optional] 
 **fixed_legend_hide_label** | **bool** | deprecated | [optional] 
 **fixed_legend_position** | **str** | Where the fixed legend should be displayed with respect to the chart | [optional] 
+**fixed_legend_show_metric_name** | **bool** | Whether to display Metric Name fixed legend | [optional] 
+**fixed_legend_show_source_name** | **bool** | Whether to display Source Name fixed legend | [optional] 
 **fixed_legend_use_raw_stats** | **bool** | If true, the legend uses non-summarized stats instead of summarized | [optional] 
 **group_by_source** | **bool** | For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row | [optional] 
 **invert_dynamic_legend_hover_control** | **bool** | Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed) | [optional] 
diff --git a/docs/ChartSourceQuery.md b/docs/ChartSourceQuery.md
index ce45c11..07b41e6 100644
--- a/docs/ChartSourceQuery.md
+++ b/docs/ChartSourceQuery.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **disabled** | **bool** | Whether the source is disabled | [optional] 
 **name** | **str** | Name of the source | 
 **query** | **str** | Query expression to plot on the chart | 
+**query_type** | **str** | Query type of the source | [optional] 
 **querybuilder_enabled** | **bool** | Whether or not this source line should have the query builder enabled | [optional] 
 **querybuilder_serialization** | **str** | Opaque representation of the querybuilder | [optional] 
 **scatter_plot_source** | **str** | For scatter plots, does this query source the X-axis or the Y-axis | [optional] 
diff --git a/docs/Conversion.md b/docs/Conversion.md
new file mode 100644
index 0000000..75de9b0
--- /dev/null
+++ b/docs/Conversion.md
@@ -0,0 +1,11 @@
+# Conversion
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**logical_type_name** | **str** |  | [optional] 
+**recommended_schema** | [**Schema**](Schema.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Paged.md b/docs/Paged.md
new file mode 100644
index 0000000..f6b0c02
--- /dev/null
+++ b/docs/Paged.md
@@ -0,0 +1,16 @@
+# Paged
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | **list[object]** | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/QueryApi.md b/docs/QueryApi.md
index f40b926..b9c4bd5 100644
--- a/docs/QueryApi.md
+++ b/docs/QueryApi.md
@@ -9,7 +9,7 @@ Method | HTTP request | Description
 
 
 # **query_api**
-> QueryResult query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached, dimension_tuples=dimension_tuples, use_raw_qk=use_raw_qk)
+> QueryResult query_api(q, s, g, n=n, query_type=query_type, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached, dimension_tuples=dimension_tuples, use_raw_qk=use_raw_qk)
 
 Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
 
@@ -35,6 +35,7 @@ q = 'q_example' # str | the query expression to execute
 s = 's_example' # str | the start time of the query window in epoch milliseconds
 g = 'g_example' # str | the granularity of the points returned
 n = 'n_example' # str | name used to identify the query (optional)
+query_type = 'HYBRID' # str | the query type of the query (optional) (default to HYBRID)
 e = 'e_example' # str | the end time of the query window in epoch milliseconds (null to use now) (optional)
 p = 'p_example' # str | the approximate maximum number of points to return (may not limit number of points exactly) (optional)
 i = true # bool | whether series with only points that are outside of the query window will be returned (defaults to true) (optional)
@@ -51,7 +52,7 @@ use_raw_qk = false # bool |  (optional) (default to false)
 
 try:
     # Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
-    api_response = api_instance.query_api(q, s, g, n=n, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached, dimension_tuples=dimension_tuples, use_raw_qk=use_raw_qk)
+    api_response = api_instance.query_api(q, s, g, n=n, query_type=query_type, e=e, p=p, i=i, auto_events=auto_events, summarization=summarization, list_mode=list_mode, strict=strict, view=view, include_obsolete_metrics=include_obsolete_metrics, sorted=sorted, cached=cached, dimension_tuples=dimension_tuples, use_raw_qk=use_raw_qk)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling QueryApi->query_api: %s\n" % e)
@@ -65,6 +66,7 @@ Name | Type | Description  | Notes
  **s** | **str**| the start time of the query window in epoch milliseconds | 
  **g** | **str**| the granularity of the points returned | 
  **n** | **str**| name used to identify the query | [optional] 
+ **query_type** | **str**| the query type of the query | [optional] [default to HYBRID]
  **e** | **str**| the end time of the query window in epoch milliseconds (null to use now) | [optional] 
  **p** | **str**| the approximate maximum number of points to return (may not limit number of points exactly) | [optional] 
  **i** | **bool**| whether series with only points that are outside of the query window will be returned (defaults to true) | [optional] 
diff --git a/docs/QueryTypeDTO.md b/docs/QueryTypeDTO.md
new file mode 100644
index 0000000..315ee7e
--- /dev/null
+++ b/docs/QueryTypeDTO.md
@@ -0,0 +1,12 @@
+# QueryTypeDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**input_query** | **str** |  | [optional] 
+**query_type** | **str** |  | [optional] 
+**translated_input** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerQueryTypeDTO.md b/docs/ResponseContainerQueryTypeDTO.md
new file mode 100644
index 0000000..d16b091
--- /dev/null
+++ b/docs/ResponseContainerQueryTypeDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerQueryTypeDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**QueryTypeDTO**](QueryTypeDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 6df0029..95d5ad7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.83.7"
+VERSION = "2.84.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_conversion.py b/test/test_conversion.py
new file mode 100644
index 0000000..2f8fc76
--- /dev/null
+++ b/test/test_conversion.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.conversion import Conversion  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestConversion(unittest.TestCase):
+    """Conversion unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testConversion(self):
+        """Test Conversion"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.conversion.Conversion()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged.py b/test/test_paged.py
new file mode 100644
index 0000000..ad6960c
--- /dev/null
+++ b/test/test_paged.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged import Paged  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPaged(unittest.TestCase):
+    """Paged unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPaged(self):
+        """Test Paged"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged.Paged()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_query_type_dto.py b/test/test_query_type_dto.py
new file mode 100644
index 0000000..68e4ce1
--- /dev/null
+++ b/test/test_query_type_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.query_type_dto import QueryTypeDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestQueryTypeDTO(unittest.TestCase):
+    """QueryTypeDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testQueryTypeDTO(self):
+        """Test QueryTypeDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.query_type_dto.QueryTypeDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_query_type_dto.py b/test/test_response_container_query_type_dto.py
new file mode 100644
index 0000000..9b940e0
--- /dev/null
+++ b/test/test_response_container_query_type_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerQueryTypeDTO(unittest.TestCase):
+    """ResponseContainerQueryTypeDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerQueryTypeDTO(self):
+        """Test ResponseContainerQueryTypeDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_query_type_dto.ResponseContainerQueryTypeDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 1698497..5c47641 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -64,7 +64,6 @@
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
-from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
@@ -75,6 +74,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.conversion import Conversion
 from wavefront_api_client.models.conversion_object import ConversionObject
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
@@ -129,6 +129,7 @@
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
 from wavefront_api_client.models.package import Package
+from wavefront_api_client.models.paged import Paged
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
@@ -162,6 +163,7 @@
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
+from wavefront_api_client.models.query_type_dto import QueryTypeDTO
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
 from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
@@ -227,6 +229,7 @@
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
+from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO
 from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 20afb80..d558f31 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -235,6 +235,101 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def check_query_type(self, **kwargs):  # noqa: E501
+        """Return the type of provided query.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.check_query_type(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param QueryTypeDTO body:
+        :return: ResponseContainerQueryTypeDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.check_query_type_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.check_query_type_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def check_query_type_with_http_info(self, **kwargs):  # noqa: E501
+        """Return the type of provided query.  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.check_query_type_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param QueryTypeDTO body:
+        :return: ResponseContainerQueryTypeDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method check_query_type" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/checkQuery', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerQueryTypeDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def clone_alert(self, id, **kwargs):  # noqa: E501
         """Clones the specified alert  # noqa: E501
 
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index acc9a93..e2ad456 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -47,6 +47,7 @@ def query_api(self, q, s, g, **kwargs):  # noqa: E501
         :param str s: the start time of the query window in epoch milliseconds (required)
         :param str g: the granularity of the points returned (required)
         :param str n: name used to identify the query
+        :param str query_type: the query type of the query
         :param str e: the end time of the query window in epoch milliseconds (null to use now)
         :param str p: the approximate maximum number of points to return (may not limit number of points exactly)
         :param bool i: whether series with only points that are outside of the query window will be returned (defaults to true)
@@ -85,6 +86,7 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
         :param str s: the start time of the query window in epoch milliseconds (required)
         :param str g: the granularity of the points returned (required)
         :param str n: name used to identify the query
+        :param str query_type: the query type of the query
         :param str e: the end time of the query window in epoch milliseconds (null to use now)
         :param str p: the approximate maximum number of points to return (may not limit number of points exactly)
         :param bool i: whether series with only points that are outside of the query window will be returned (defaults to true)
@@ -103,7 +105,7 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
                  returns the request thread.
         """
 
-        all_params = ['q', 's', 'g', 'n', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'view', 'include_obsolete_metrics', 'sorted', 'cached', 'dimension_tuples', 'use_raw_qk']  # noqa: E501
+        all_params = ['q', 's', 'g', 'n', 'query_type', 'e', 'p', 'i', 'auto_events', 'summarization', 'list_mode', 'strict', 'view', 'include_obsolete_metrics', 'sorted', 'cached', 'dimension_tuples', 'use_raw_qk']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -140,6 +142,8 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
             query_params.append(('n', params['n']))  # noqa: E501
         if 'q' in params:
             query_params.append(('q', params['q']))  # noqa: E501
+        if 'query_type' in params:
+            query_params.append(('queryType', params['query_type']))  # noqa: E501
         if 's' in params:
             query_params.append(('s', params['s']))  # noqa: E501
         if 'e' in params:
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index f5078c3..d2373f5 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.83.7/python'
+        self.user_agent = 'Swagger-Codegen/2.84.3/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index b8f5d42..f125311 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.83.7".\
+               "SDK Package Version: 2.84.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index c6dd94d..e06cf4c 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -29,7 +29,6 @@
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
-from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
@@ -40,6 +39,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.conversion import Conversion
 from wavefront_api_client.models.conversion_object import ConversionObject
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
 from wavefront_api_client.models.dashboard import Dashboard
@@ -94,6 +94,7 @@
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
 from wavefront_api_client.models.package import Package
+from wavefront_api_client.models.paged import Paged
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
@@ -127,6 +128,7 @@
 from wavefront_api_client.models.proxy import Proxy
 from wavefront_api_client.models.query_event import QueryEvent
 from wavefront_api_client.models.query_result import QueryResult
+from wavefront_api_client.models.query_type_dto import QueryTypeDTO
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
 from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
@@ -192,6 +194,7 @@
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
+from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO
 from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 55bcc10..9c54882 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -42,6 +42,7 @@ class Alert(object):
         'condition': 'str',
         'condition_qb_enabled': 'bool',
         'condition_qb_serialization': 'str',
+        'condition_query_type': 'str',
         'conditions': 'dict(str, str)',
         'create_user_id': 'str',
         'created': 'int',
@@ -51,6 +52,7 @@ class Alert(object):
         'display_expression': 'str',
         'display_expression_qb_enabled': 'bool',
         'display_expression_qb_serialization': 'str',
+        'display_expression_query_type': 'str',
         'enable_pd_incident_by_series': 'bool',
         'evaluate_realtime_data': 'bool',
         'event': 'Event',
@@ -115,6 +117,7 @@ class Alert(object):
         'condition': 'condition',
         'condition_qb_enabled': 'conditionQBEnabled',
         'condition_qb_serialization': 'conditionQBSerialization',
+        'condition_query_type': 'conditionQueryType',
         'conditions': 'conditions',
         'create_user_id': 'createUserId',
         'created': 'created',
@@ -124,6 +127,7 @@ class Alert(object):
         'display_expression': 'displayExpression',
         'display_expression_qb_enabled': 'displayExpressionQBEnabled',
         'display_expression_qb_serialization': 'displayExpressionQBSerialization',
+        'display_expression_query_type': 'displayExpressionQueryType',
         'enable_pd_incident_by_series': 'enablePDIncidentBySeries',
         'evaluate_realtime_data': 'evaluateRealtimeData',
         'event': 'event',
@@ -176,7 +180,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -190,6 +194,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._condition = None
         self._condition_qb_enabled = None
         self._condition_qb_serialization = None
+        self._condition_query_type = None
         self._conditions = None
         self._create_user_id = None
         self._created = None
@@ -199,6 +204,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._display_expression = None
         self._display_expression_qb_enabled = None
         self._display_expression_qb_serialization = None
+        self._display_expression_query_type = None
         self._enable_pd_incident_by_series = None
         self._evaluate_realtime_data = None
         self._event = None
@@ -272,6 +278,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.condition_qb_enabled = condition_qb_enabled
         if condition_qb_serialization is not None:
             self.condition_qb_serialization = condition_qb_serialization
+        if condition_query_type is not None:
+            self.condition_query_type = condition_query_type
         if conditions is not None:
             self.conditions = conditions
         if create_user_id is not None:
@@ -290,6 +298,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.display_expression_qb_enabled = display_expression_qb_enabled
         if display_expression_qb_serialization is not None:
             self.display_expression_qb_serialization = display_expression_qb_serialization
+        if display_expression_query_type is not None:
+            self.display_expression_query_type = display_expression_query_type
         if enable_pd_incident_by_series is not None:
             self.enable_pd_incident_by_series = enable_pd_incident_by_series
         if evaluate_realtime_data is not None:
@@ -642,6 +652,33 @@ def condition_qb_serialization(self, condition_qb_serialization):
 
         self._condition_qb_serialization = condition_qb_serialization
 
+    @property
+    def condition_query_type(self):
+        """Gets the condition_query_type of this Alert.  # noqa: E501
+
+
+        :return: The condition_query_type of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._condition_query_type
+
+    @condition_query_type.setter
+    def condition_query_type(self, condition_query_type):
+        """Sets the condition_query_type of this Alert.
+
+
+        :param condition_query_type: The condition_query_type of this Alert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if condition_query_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `condition_query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(condition_query_type, allowed_values)
+            )
+
+        self._condition_query_type = condition_query_type
+
     @property
     def conditions(self):
         """Gets the conditions of this Alert.  # noqa: E501
@@ -841,6 +878,33 @@ def display_expression_qb_serialization(self, display_expression_qb_serializatio
 
         self._display_expression_qb_serialization = display_expression_qb_serialization
 
+    @property
+    def display_expression_query_type(self):
+        """Gets the display_expression_query_type of this Alert.  # noqa: E501
+
+
+        :return: The display_expression_query_type of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._display_expression_query_type
+
+    @display_expression_query_type.setter
+    def display_expression_query_type(self, display_expression_query_type):
+        """Sets the display_expression_query_type of this Alert.
+
+
+        :param display_expression_query_type: The display_expression_query_type of this Alert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if display_expression_query_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `display_expression_query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(display_expression_query_type, allowed_values)
+            )
+
+        self._display_expression_query_type = display_expression_query_type
+
     @property
     def enable_pd_incident_by_series(self):
         """Gets the enable_pd_incident_by_series of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index d867e59..cf7155e 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -44,6 +44,8 @@ class ChartSettings(object):
         'fixed_legend_filter_sort': 'str',
         'fixed_legend_hide_label': 'bool',
         'fixed_legend_position': 'str',
+        'fixed_legend_show_metric_name': 'bool',
+        'fixed_legend_show_source_name': 'bool',
         'fixed_legend_use_raw_stats': 'bool',
         'group_by_source': 'bool',
         'invert_dynamic_legend_hover_control': 'bool',
@@ -106,6 +108,8 @@ class ChartSettings(object):
         'fixed_legend_filter_sort': 'fixedLegendFilterSort',
         'fixed_legend_hide_label': 'fixedLegendHideLabel',
         'fixed_legend_position': 'fixedLegendPosition',
+        'fixed_legend_show_metric_name': 'fixedLegendShowMetricName',
+        'fixed_legend_show_source_name': 'fixedLegendShowSourceName',
         'fixed_legend_use_raw_stats': 'fixedLegendUseRawStats',
         'group_by_source': 'groupBySource',
         'invert_dynamic_legend_hover_control': 'invertDynamicLegendHoverControl',
@@ -154,7 +158,7 @@ class ChartSettings(object):
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
 
         self._auto_column_tags = None
@@ -170,6 +174,8 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
         self._fixed_legend_filter_sort = None
         self._fixed_legend_hide_label = None
         self._fixed_legend_position = None
+        self._fixed_legend_show_metric_name = None
+        self._fixed_legend_show_source_name = None
         self._fixed_legend_use_raw_stats = None
         self._group_by_source = None
         self._invert_dynamic_legend_hover_control = None
@@ -244,6 +250,10 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
             self.fixed_legend_hide_label = fixed_legend_hide_label
         if fixed_legend_position is not None:
             self.fixed_legend_position = fixed_legend_position
+        if fixed_legend_show_metric_name is not None:
+            self.fixed_legend_show_metric_name = fixed_legend_show_metric_name
+        if fixed_legend_show_source_name is not None:
+            self.fixed_legend_show_source_name = fixed_legend_show_source_name
         if fixed_legend_use_raw_stats is not None:
             self.fixed_legend_use_raw_stats = fixed_legend_use_raw_stats
         if group_by_source is not None:
@@ -653,6 +663,52 @@ def fixed_legend_position(self, fixed_legend_position):
 
         self._fixed_legend_position = fixed_legend_position
 
+    @property
+    def fixed_legend_show_metric_name(self):
+        """Gets the fixed_legend_show_metric_name of this ChartSettings.  # noqa: E501
+
+        Whether to display Metric Name fixed legend  # noqa: E501
+
+        :return: The fixed_legend_show_metric_name of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._fixed_legend_show_metric_name
+
+    @fixed_legend_show_metric_name.setter
+    def fixed_legend_show_metric_name(self, fixed_legend_show_metric_name):
+        """Sets the fixed_legend_show_metric_name of this ChartSettings.
+
+        Whether to display Metric Name fixed legend  # noqa: E501
+
+        :param fixed_legend_show_metric_name: The fixed_legend_show_metric_name of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._fixed_legend_show_metric_name = fixed_legend_show_metric_name
+
+    @property
+    def fixed_legend_show_source_name(self):
+        """Gets the fixed_legend_show_source_name of this ChartSettings.  # noqa: E501
+
+        Whether to display Source Name fixed legend  # noqa: E501
+
+        :return: The fixed_legend_show_source_name of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._fixed_legend_show_source_name
+
+    @fixed_legend_show_source_name.setter
+    def fixed_legend_show_source_name(self, fixed_legend_show_source_name):
+        """Sets the fixed_legend_show_source_name of this ChartSettings.
+
+        Whether to display Source Name fixed legend  # noqa: E501
+
+        :param fixed_legend_show_source_name: The fixed_legend_show_source_name of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._fixed_legend_show_source_name = fixed_legend_show_source_name
+
     @property
     def fixed_legend_use_raw_stats(self):
         """Gets the fixed_legend_use_raw_stats of this ChartSettings.  # noqa: E501
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index 3960da3..945f200 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -34,6 +34,7 @@ class ChartSourceQuery(object):
         'disabled': 'bool',
         'name': 'str',
         'query': 'str',
+        'query_type': 'str',
         'querybuilder_enabled': 'bool',
         'querybuilder_serialization': 'str',
         'scatter_plot_source': 'str',
@@ -46,6 +47,7 @@ class ChartSourceQuery(object):
         'disabled': 'disabled',
         'name': 'name',
         'query': 'query',
+        'query_type': 'queryType',
         'querybuilder_enabled': 'querybuilderEnabled',
         'querybuilder_serialization': 'querybuilderSerialization',
         'scatter_plot_source': 'scatterPlotSource',
@@ -54,12 +56,13 @@ class ChartSourceQuery(object):
         'source_description': 'sourceDescription'
     }
 
-    def __init__(self, disabled=None, name=None, query=None, querybuilder_enabled=None, querybuilder_serialization=None, scatter_plot_source=None, secondary_axis=None, source_color=None, source_description=None):  # noqa: E501
+    def __init__(self, disabled=None, name=None, query=None, query_type=None, querybuilder_enabled=None, querybuilder_serialization=None, scatter_plot_source=None, secondary_axis=None, source_color=None, source_description=None):  # noqa: E501
         """ChartSourceQuery - a model defined in Swagger"""  # noqa: E501
 
         self._disabled = None
         self._name = None
         self._query = None
+        self._query_type = None
         self._querybuilder_enabled = None
         self._querybuilder_serialization = None
         self._scatter_plot_source = None
@@ -72,6 +75,8 @@ def __init__(self, disabled=None, name=None, query=None, querybuilder_enabled=No
             self.disabled = disabled
         self.name = name
         self.query = query
+        if query_type is not None:
+            self.query_type = query_type
         if querybuilder_enabled is not None:
             self.querybuilder_enabled = querybuilder_enabled
         if querybuilder_serialization is not None:
@@ -158,6 +163,35 @@ def query(self, query):
 
         self._query = query
 
+    @property
+    def query_type(self):
+        """Gets the query_type of this ChartSourceQuery.  # noqa: E501
+
+        Query type of the source  # noqa: E501
+
+        :return: The query_type of this ChartSourceQuery.  # noqa: E501
+        :rtype: str
+        """
+        return self._query_type
+
+    @query_type.setter
+    def query_type(self, query_type):
+        """Sets the query_type of this ChartSourceQuery.
+
+        Query type of the source  # noqa: E501
+
+        :param query_type: The query_type of this ChartSourceQuery.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if query_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(query_type, allowed_values)
+            )
+
+        self._query_type = query_type
+
     @property
     def querybuilder_enabled(self):
         """Gets the querybuilder_enabled of this ChartSourceQuery.  # noqa: E501
diff --git a/wavefront_api_client/models/conversion.py b/wavefront_api_client/models/conversion.py
new file mode 100644
index 0000000..11e88c1
--- /dev/null
+++ b/wavefront_api_client/models/conversion.py
@@ -0,0 +1,141 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Conversion(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'logical_type_name': 'str',
+        'recommended_schema': 'Schema'
+    }
+
+    attribute_map = {
+        'logical_type_name': 'logicalTypeName',
+        'recommended_schema': 'recommendedSchema'
+    }
+
+    def __init__(self, logical_type_name=None, recommended_schema=None):  # noqa: E501
+        """Conversion - a model defined in Swagger"""  # noqa: E501
+
+        self._logical_type_name = None
+        self._recommended_schema = None
+        self.discriminator = None
+
+        if logical_type_name is not None:
+            self.logical_type_name = logical_type_name
+        if recommended_schema is not None:
+            self.recommended_schema = recommended_schema
+
+    @property
+    def logical_type_name(self):
+        """Gets the logical_type_name of this Conversion.  # noqa: E501
+
+
+        :return: The logical_type_name of this Conversion.  # noqa: E501
+        :rtype: str
+        """
+        return self._logical_type_name
+
+    @logical_type_name.setter
+    def logical_type_name(self, logical_type_name):
+        """Sets the logical_type_name of this Conversion.
+
+
+        :param logical_type_name: The logical_type_name of this Conversion.  # noqa: E501
+        :type: str
+        """
+
+        self._logical_type_name = logical_type_name
+
+    @property
+    def recommended_schema(self):
+        """Gets the recommended_schema of this Conversion.  # noqa: E501
+
+
+        :return: The recommended_schema of this Conversion.  # noqa: E501
+        :rtype: Schema
+        """
+        return self._recommended_schema
+
+    @recommended_schema.setter
+    def recommended_schema(self, recommended_schema):
+        """Sets the recommended_schema of this Conversion.
+
+
+        :param recommended_schema: The recommended_schema of this Conversion.  # noqa: E501
+        :type: Schema
+        """
+
+        self._recommended_schema = recommended_schema
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Conversion, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Conversion):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/paged.py b/wavefront_api_client/models/paged.py
new file mode 100644
index 0000000..d32c0ca
--- /dev/null
+++ b/wavefront_api_client/models/paged.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class Paged(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[object]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+        """Paged - a model defined in Swagger"""  # noqa: E501
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this Paged.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this Paged.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this Paged.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this Paged.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this Paged.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this Paged.  # noqa: E501
+        :rtype: list[object]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this Paged.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this Paged.  # noqa: E501
+        :type: list[object]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this Paged.  # noqa: E501
+
+
+        :return: The limit of this Paged.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this Paged.
+
+
+        :param limit: The limit of this Paged.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this Paged.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this Paged.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this Paged.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this Paged.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this Paged.  # noqa: E501
+
+
+        :return: The offset of this Paged.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this Paged.
+
+
+        :param offset: The offset of this Paged.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this Paged.  # noqa: E501
+
+
+        :return: The sort of this Paged.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this Paged.
+
+
+        :param sort: The sort of this Paged.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this Paged.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this Paged.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this Paged.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this Paged.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Paged, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Paged):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/query_type_dto.py b/wavefront_api_client/models/query_type_dto.py
new file mode 100644
index 0000000..79bcb06
--- /dev/null
+++ b/wavefront_api_client/models/query_type_dto.py
@@ -0,0 +1,173 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class QueryTypeDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'input_query': 'str',
+        'query_type': 'str',
+        'translated_input': 'str'
+    }
+
+    attribute_map = {
+        'input_query': 'inputQuery',
+        'query_type': 'queryType',
+        'translated_input': 'translatedInput'
+    }
+
+    def __init__(self, input_query=None, query_type=None, translated_input=None):  # noqa: E501
+        """QueryTypeDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._input_query = None
+        self._query_type = None
+        self._translated_input = None
+        self.discriminator = None
+
+        if input_query is not None:
+            self.input_query = input_query
+        if query_type is not None:
+            self.query_type = query_type
+        if translated_input is not None:
+            self.translated_input = translated_input
+
+    @property
+    def input_query(self):
+        """Gets the input_query of this QueryTypeDTO.  # noqa: E501
+
+
+        :return: The input_query of this QueryTypeDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._input_query
+
+    @input_query.setter
+    def input_query(self, input_query):
+        """Sets the input_query of this QueryTypeDTO.
+
+
+        :param input_query: The input_query of this QueryTypeDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._input_query = input_query
+
+    @property
+    def query_type(self):
+        """Gets the query_type of this QueryTypeDTO.  # noqa: E501
+
+
+        :return: The query_type of this QueryTypeDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._query_type
+
+    @query_type.setter
+    def query_type(self, query_type):
+        """Sets the query_type of this QueryTypeDTO.
+
+
+        :param query_type: The query_type of this QueryTypeDTO.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if query_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(query_type, allowed_values)
+            )
+
+        self._query_type = query_type
+
+    @property
+    def translated_input(self):
+        """Gets the translated_input of this QueryTypeDTO.  # noqa: E501
+
+
+        :return: The translated_input of this QueryTypeDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._translated_input
+
+    @translated_input.setter
+    def translated_input(self, translated_input):
+        """Sets the translated_input of this QueryTypeDTO.
+
+
+        :param translated_input: The translated_input of this QueryTypeDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._translated_input = translated_input
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(QueryTypeDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, QueryTypeDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/wavefront_api_client/models/response_container_query_type_dto.py b/wavefront_api_client/models/response_container_query_type_dto.py
new file mode 100644
index 0000000..0be47d4
--- /dev/null
+++ b/wavefront_api_client/models/response_container_query_type_dto.py
@@ -0,0 +1,142 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class ResponseContainerQueryTypeDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'QueryTypeDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None):  # noqa: E501
+        """ResponseContainerQueryTypeDTO - a model defined in Swagger"""  # noqa: E501
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerQueryTypeDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerQueryTypeDTO.  # noqa: E501
+        :rtype: QueryTypeDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerQueryTypeDTO.
+
+
+        :param response: The response of this ResponseContainerQueryTypeDTO.  # noqa: E501
+        :type: QueryTypeDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerQueryTypeDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerQueryTypeDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerQueryTypeDTO.
+
+
+        :param status: The status of this ResponseContainerQueryTypeDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerQueryTypeDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerQueryTypeDTO):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 8f7f0c6fc2e8f26f3e07ea09a97fed9e8e556c8d Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 14 May 2021 08:16:24 -0700
Subject: [PATCH 085/161] Autogenerated Update v2.85.1.

---
 .swagger-codegen/config.json          |  2 +-
 .swagger-codegen/config.jsone         |  2 +-
 README.md                             |  4 ++--
 docs/UserApi.md                       | 14 +++++++-------
 setup.py                              |  2 +-
 wavefront_api_client/api/user_api.py  | 18 +++++++++---------
 wavefront_api_client/api_client.py    |  2 +-
 wavefront_api_client/configuration.py |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 3cd8e57..7fbb0fe 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.84.3"
+    "packageVersion": "2.85.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5e373c7..3cd8e57 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.83.7"
+    "packageVersion": "2.84.3"
 }
diff --git a/README.md b/README.md
index c9fced8..ff63abc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.84.3
+- Package version: 2.85.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -354,7 +354,7 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 *UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
-*UserApi* | [**create_or_update_user**](docs/UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
+*UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
 *UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
 *UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 *UserApi* | [**get_all_users**](docs/UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 4869797..eb28796 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -5,7 +5,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**add_user_to_user_groups**](UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
-[**create_or_update_user**](UserApi.md#create_or_update_user) | **POST** /api/v2/user | Creates or updates a user
+[**create_user**](UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
 [**delete_multiple_users**](UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
 [**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
 [**get_all_users**](UserApi.md#get_all_users) | **GET** /api/v2/user | Get all users
@@ -77,10 +77,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **create_or_update_user**
-> UserModel create_or_update_user(send_email=send_email, body=body)
+# **create_user**
+> UserModel create_user(send_email=send_email, body=body)
 
-Creates or updates a user
+Creates an user if the user doesn't already exist.
 
 
 
@@ -104,11 +104,11 @@ send_email = true # bool | Whether to send email notification to the user, if cr
 body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
-    # Creates or updates a user
-    api_response = api_instance.create_or_update_user(send_email=send_email, body=body)
+    # Creates an user if the user doesn't already exist.
+    api_response = api_instance.create_user(send_email=send_email, body=body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling UserApi->create_or_update_user: %s\n" % e)
+    print("Exception when calling UserApi->create_user: %s\n" % e)
 ```
 
 ### Parameters
diff --git a/setup.py b/setup.py
index 95d5ad7..0ba7c65 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.84.3"
+VERSION = "2.85.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index cefea62..bcecaf3 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -136,13 +136,13 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def create_or_update_user(self, **kwargs):  # noqa: E501
-        """Creates or updates a user  # noqa: E501
+    def create_user(self, **kwargs):  # noqa: E501
+        """Creates an user if the user doesn't already exist.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_or_update_user(async_req=True)
+        >>> thread = api.create_user(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -154,18 +154,18 @@ def create_or_update_user(self, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.create_or_update_user_with_http_info(**kwargs)  # noqa: E501
+            return self.create_user_with_http_info(**kwargs)  # noqa: E501
         else:
-            (data) = self.create_or_update_user_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.create_user_with_http_info(**kwargs)  # noqa: E501
             return data
 
-    def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
-        """Creates or updates a user  # noqa: E501
+    def create_user_with_http_info(self, **kwargs):  # noqa: E501
+        """Creates an user if the user doesn't already exist.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_or_update_user_with_http_info(async_req=True)
+        >>> thread = api.create_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -187,7 +187,7 @@ def create_or_update_user_with_http_info(self, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method create_or_update_user" % key
+                    " to method create_user" % key
                 )
             params[key] = val
         del params['kwargs']
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index d2373f5..ee31936 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.84.3/python'
+        self.user_agent = 'Swagger-Codegen/2.85.1/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index f125311..0aaec5a 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.84.3".\
+               "SDK Package Version: 2.85.1".\
                format(env=sys.platform, pyversion=sys.version)

From 4b96d75dda60a77eda3262d17bf8703d968ce3f0 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 27 May 2021 08:16:23 -0700
Subject: [PATCH 086/161] Autogenerated Update v2.87.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/Alert.md                                 |   2 +
 docs/MaintenanceWindow.md                     |   1 +
 docs/TriageDashboard.md                       |  12 ++
 setup.py                                      |   2 +-
 test/test_triage_dashboard.py                 |  40 +++++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 wavefront_api_client/models/alert.py          |  58 +++++-
 .../models/maintenance_window.py              |  30 +++-
 .../models/triage_dashboard.py                | 167 ++++++++++++++++++
 15 files changed, 317 insertions(+), 8 deletions(-)
 create mode 100644 docs/TriageDashboard.md
 create mode 100644 test/test_triage_dashboard.py
 create mode 100644 wavefront_api_client/models/triage_dashboard.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 7fbb0fe..4278229 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.85.1"
+    "packageVersion": "2.87.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 3cd8e57..7fbb0fe 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.84.3"
+    "packageVersion": "2.85.1"
 }
diff --git a/README.md b/README.md
index ff63abc..3e4e8a4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.85.1
+- Package version: 2.87.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -598,6 +598,7 @@ Class | Method | HTTP request | Description
  - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
+ - [TriageDashboard](docs/TriageDashboard.md)
  - [Tuple](docs/Tuple.md)
  - [TupleResult](docs/TupleResult.md)
  - [TupleValueResult](docs/TupleValueResult.md)
diff --git a/docs/Alert.md b/docs/Alert.md
index 66dcab5..c54f886 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -56,6 +56,7 @@ Name | Type | Description | Notes
 **process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
+**runbook_links** | **list[str]** | User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered | [optional] 
 **secure_metric_details** | **bool** | Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security. | [optional] 
 **service** | **list[str]** | Lists the services from the failingHostLabelPair of the alert. | [optional] 
 **severity** | **str** | Severity of the alert | [optional] 
@@ -71,6 +72,7 @@ Name | Type | Description | Notes
 **target_endpoints** | **list[str]** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **targets** | **dict(str, str)** | Targets for severity. | [optional] 
+**triage_dashboards** | [**list[TriageDashboard]**](TriageDashboard.md) | User-supplied dashboard and parameters to create dashboard links | [optional] 
 **update_user_id** | **str** | The user that last updated this alert | [optional] 
 **updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index cb8dbed..20e0bb4 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **id** | **str** |  | [optional] 
 **reason** | **str** | The purpose of this maintenance window | 
 **relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
+**relevant_customer_tags_anded** | **bool** | Whether to AND customer tags listed in relevantCustomerTags. If true, a customer must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a customer must contain one of the tags. Default: false | [optional] 
 **relevant_host_names** | **list[str]** | List of source/host names that will be put into maintenance because of this maintenance window | [optional] 
 **relevant_host_tags** | **list[str]** | List of source/host tags whose matching sources/hosts will be put into maintenance because of this maintenance window | [optional] 
 **relevant_host_tags_anded** | **bool** | Whether to AND source/host tags listed in relevantHostTags. If true, a source/host must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a source/host must contain one of the tags. Default: false | [optional] 
diff --git a/docs/TriageDashboard.md b/docs/TriageDashboard.md
new file mode 100644
index 0000000..075cbde
--- /dev/null
+++ b/docs/TriageDashboard.md
@@ -0,0 +1,12 @@
+# TriageDashboard
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**dashboard_id** | **str** |  | [optional] 
+**description** | **str** |  | [optional] 
+**parameters** | **dict(str, str)** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 0ba7c65..b56754d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.85.1"
+VERSION = "2.87.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_triage_dashboard.py b/test/test_triage_dashboard.py
new file mode 100644
index 0000000..7c67c15
--- /dev/null
+++ b/test/test_triage_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.triage_dashboard import TriageDashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestTriageDashboard(unittest.TestCase):
+    """TriageDashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testTriageDashboard(self):
+        """Test TriageDashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.triage_dashboard.TriageDashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 5c47641..e30cbb4 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -262,6 +262,7 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
+from wavefront_api_client.models.triage_dashboard import TriageDashboard
 from wavefront_api_client.models.tuple import Tuple
 from wavefront_api_client.models.tuple_result import TupleResult
 from wavefront_api_client.models.tuple_value_result import TupleValueResult
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index ee31936..73e9d89 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.85.1/python'
+        self.user_agent = 'Swagger-Codegen/2.87.2/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 0aaec5a..09f490e 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.85.1".\
+               "SDK Package Version: 2.87.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index e06cf4c..4775766 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -227,6 +227,7 @@
 from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
+from wavefront_api_client.models.triage_dashboard import TriageDashboard
 from wavefront_api_client.models.tuple import Tuple
 from wavefront_api_client.models.tuple_result import TupleResult
 from wavefront_api_client.models.tuple_value_result import TupleValueResult
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 9c54882..2896eca 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -84,6 +84,7 @@ class Alert(object):
         'process_rate_minutes': 'int',
         'query_failing': 'bool',
         'resolve_after_minutes': 'int',
+        'runbook_links': 'list[str]',
         'secure_metric_details': 'bool',
         'service': 'list[str]',
         'severity': 'str',
@@ -99,6 +100,7 @@ class Alert(object):
         'target_endpoints': 'list[str]',
         'target_info': 'list[TargetInfo]',
         'targets': 'dict(str, str)',
+        'triage_dashboards': 'list[TriageDashboard]',
         'update_user_id': 'str',
         'updated': 'int',
         'updated_epoch_millis': 'int',
@@ -159,6 +161,7 @@ class Alert(object):
         'process_rate_minutes': 'processRateMinutes',
         'query_failing': 'queryFailing',
         'resolve_after_minutes': 'resolveAfterMinutes',
+        'runbook_links': 'runbookLinks',
         'secure_metric_details': 'secureMetricDetails',
         'service': 'service',
         'severity': 'severity',
@@ -174,13 +177,14 @@ class Alert(object):
         'target_endpoints': 'targetEndpoints',
         'target_info': 'targetInfo',
         'targets': 'targets',
+        'triage_dashboards': 'triageDashboards',
         'update_user_id': 'updateUserId',
         'updated': 'updated',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
 
         self._acl = None
@@ -236,6 +240,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._process_rate_minutes = None
         self._query_failing = None
         self._resolve_after_minutes = None
+        self._runbook_links = None
         self._secure_metric_details = None
         self._service = None
         self._severity = None
@@ -251,6 +256,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._target_endpoints = None
         self._target_info = None
         self._targets = None
+        self._triage_dashboards = None
         self._update_user_id = None
         self._updated = None
         self._updated_epoch_millis = None
@@ -360,6 +366,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.query_failing = query_failing
         if resolve_after_minutes is not None:
             self.resolve_after_minutes = resolve_after_minutes
+        if runbook_links is not None:
+            self.runbook_links = runbook_links
         if secure_metric_details is not None:
             self.secure_metric_details = secure_metric_details
         if service is not None:
@@ -390,6 +398,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.target_info = target_info
         if targets is not None:
             self.targets = targets
+        if triage_dashboards is not None:
+            self.triage_dashboards = triage_dashboards
         if update_user_id is not None:
             self.update_user_id = update_user_id
         if updated is not None:
@@ -1608,6 +1618,29 @@ def resolve_after_minutes(self, resolve_after_minutes):
 
         self._resolve_after_minutes = resolve_after_minutes
 
+    @property
+    def runbook_links(self):
+        """Gets the runbook_links of this Alert.  # noqa: E501
+
+        User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered  # noqa: E501
+
+        :return: The runbook_links of this Alert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._runbook_links
+
+    @runbook_links.setter
+    def runbook_links(self, runbook_links):
+        """Sets the runbook_links of this Alert.
+
+        User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered  # noqa: E501
+
+        :param runbook_links: The runbook_links of this Alert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._runbook_links = runbook_links
+
     @property
     def secure_metric_details(self):
         """Gets the secure_metric_details of this Alert.  # noqa: E501
@@ -1960,6 +1993,29 @@ def targets(self, targets):
 
         self._targets = targets
 
+    @property
+    def triage_dashboards(self):
+        """Gets the triage_dashboards of this Alert.  # noqa: E501
+
+        User-supplied dashboard and parameters to create dashboard links  # noqa: E501
+
+        :return: The triage_dashboards of this Alert.  # noqa: E501
+        :rtype: list[TriageDashboard]
+        """
+        return self._triage_dashboards
+
+    @triage_dashboards.setter
+    def triage_dashboards(self, triage_dashboards):
+        """Sets the triage_dashboards of this Alert.
+
+        User-supplied dashboard and parameters to create dashboard links  # noqa: E501
+
+        :param triage_dashboards: The triage_dashboards of this Alert.  # noqa: E501
+        :type: list[TriageDashboard]
+        """
+
+        self._triage_dashboards = triage_dashboards
+
     @property
     def update_user_id(self):
         """Gets the update_user_id of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index a037c1f..c16397e 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -40,6 +40,7 @@ class MaintenanceWindow(object):
         'id': 'str',
         'reason': 'str',
         'relevant_customer_tags': 'list[str]',
+        'relevant_customer_tags_anded': 'bool',
         'relevant_host_names': 'list[str]',
         'relevant_host_tags': 'list[str]',
         'relevant_host_tags_anded': 'bool',
@@ -61,6 +62,7 @@ class MaintenanceWindow(object):
         'id': 'id',
         'reason': 'reason',
         'relevant_customer_tags': 'relevantCustomerTags',
+        'relevant_customer_tags_anded': 'relevantCustomerTagsAnded',
         'relevant_host_names': 'relevantHostNames',
         'relevant_host_tags': 'relevantHostTags',
         'relevant_host_tags_anded': 'relevantHostTagsAnded',
@@ -72,7 +74,7 @@ class MaintenanceWindow(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, reason=None, relevant_customer_tags=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, title=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, title=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
 
         self._created_epoch_millis = None
@@ -84,6 +86,7 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
         self._id = None
         self._reason = None
         self._relevant_customer_tags = None
+        self._relevant_customer_tags_anded = None
         self._relevant_host_names = None
         self._relevant_host_tags = None
         self._relevant_host_tags_anded = None
@@ -110,6 +113,8 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
             self.id = id
         self.reason = reason
         self.relevant_customer_tags = relevant_customer_tags
+        if relevant_customer_tags_anded is not None:
+            self.relevant_customer_tags_anded = relevant_customer_tags_anded
         if relevant_host_names is not None:
             self.relevant_host_names = relevant_host_names
         if relevant_host_tags is not None:
@@ -332,6 +337,29 @@ def relevant_customer_tags(self, relevant_customer_tags):
 
         self._relevant_customer_tags = relevant_customer_tags
 
+    @property
+    def relevant_customer_tags_anded(self):
+        """Gets the relevant_customer_tags_anded of this MaintenanceWindow.  # noqa: E501
+
+        Whether to AND customer tags listed in relevantCustomerTags. If true, a customer must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a customer must contain one of the tags. Default: false  # noqa: E501
+
+        :return: The relevant_customer_tags_anded of this MaintenanceWindow.  # noqa: E501
+        :rtype: bool
+        """
+        return self._relevant_customer_tags_anded
+
+    @relevant_customer_tags_anded.setter
+    def relevant_customer_tags_anded(self, relevant_customer_tags_anded):
+        """Sets the relevant_customer_tags_anded of this MaintenanceWindow.
+
+        Whether to AND customer tags listed in relevantCustomerTags. If true, a customer must contain all tags in order for the maintenance window to apply.  If false, the tags are OR'ed, and a customer must contain one of the tags. Default: false  # noqa: E501
+
+        :param relevant_customer_tags_anded: The relevant_customer_tags_anded of this MaintenanceWindow.  # noqa: E501
+        :type: bool
+        """
+
+        self._relevant_customer_tags_anded = relevant_customer_tags_anded
+
     @property
     def relevant_host_names(self):
         """Gets the relevant_host_names of this MaintenanceWindow.  # noqa: E501
diff --git a/wavefront_api_client/models/triage_dashboard.py b/wavefront_api_client/models/triage_dashboard.py
new file mode 100644
index 0000000..fc49e10
--- /dev/null
+++ b/wavefront_api_client/models/triage_dashboard.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+
+class TriageDashboard(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'dashboard_id': 'str',
+        'description': 'str',
+        'parameters': 'dict(str, str)'
+    }
+
+    attribute_map = {
+        'dashboard_id': 'dashboardId',
+        'description': 'description',
+        'parameters': 'parameters'
+    }
+
+    def __init__(self, dashboard_id=None, description=None, parameters=None):  # noqa: E501
+        """TriageDashboard - a model defined in Swagger"""  # noqa: E501
+
+        self._dashboard_id = None
+        self._description = None
+        self._parameters = None
+        self.discriminator = None
+
+        if dashboard_id is not None:
+            self.dashboard_id = dashboard_id
+        if description is not None:
+            self.description = description
+        if parameters is not None:
+            self.parameters = parameters
+
+    @property
+    def dashboard_id(self):
+        """Gets the dashboard_id of this TriageDashboard.  # noqa: E501
+
+
+        :return: The dashboard_id of this TriageDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._dashboard_id
+
+    @dashboard_id.setter
+    def dashboard_id(self, dashboard_id):
+        """Sets the dashboard_id of this TriageDashboard.
+
+
+        :param dashboard_id: The dashboard_id of this TriageDashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._dashboard_id = dashboard_id
+
+    @property
+    def description(self):
+        """Gets the description of this TriageDashboard.  # noqa: E501
+
+
+        :return: The description of this TriageDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this TriageDashboard.
+
+
+        :param description: The description of this TriageDashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def parameters(self):
+        """Gets the parameters of this TriageDashboard.  # noqa: E501
+
+
+        :return: The parameters of this TriageDashboard.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._parameters
+
+    @parameters.setter
+    def parameters(self, parameters):
+        """Sets the parameters of this TriageDashboard.
+
+
+        :param parameters: The parameters of this TriageDashboard.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._parameters = parameters
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(TriageDashboard, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, TriageDashboard):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

From 29d7e84fb760cd0ee080b8ff5d6b1329a194d340 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 5 Jun 2021 08:16:33 -0700
Subject: [PATCH 087/161] Autogenerated Update v2.88.5.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 docs/Alert.md                         | 2 +-
 docs/AlertApi.md                      | 8 ++++----
 setup.py                              | 2 +-
 wavefront_api_client/api/alert_api.py | 8 ++++----
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 wavefront_api_client/models/alert.py  | 4 ++--
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 4278229..a3b89b6 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.87.2"
+    "packageVersion": "2.88.5"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 7fbb0fe..4278229 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.85.1"
+    "packageVersion": "2.87.2"
 }
diff --git a/README.md b/README.md
index 3e4e8a4..6d1fb5d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.87.2
+- Package version: 2.88.5
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index c54f886..52df36b 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -68,7 +68,7 @@ Name | Type | Description | Notes
 **system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
 **tagpaths** | **list[str]** |  | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
-**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes | [optional] 
+**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}) | [optional] 
 **target_endpoints** | **list[str]** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **targets** | **dict(str, str)** | Targets for severity. | [optional] 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 5ae16fd..5591d51 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -273,7 +273,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Create a specific alert
@@ -287,7 +287,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
@@ -1256,7 +1256,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Update a specific alert
@@ -1271,7 +1271,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;success@simulator.amazonses.com\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index b56754d..b23af2e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.87.2"
+VERSION = "2.88.5"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index d558f31..0851b86 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -447,7 +447,7 @@ def create_alert(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -469,7 +469,7 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2187,7 +2187,7 @@ def update_alert(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2210,7 +2210,7 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"success@simulator.amazonses.com\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 73e9d89..853228a 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.87.2/python'
+        self.user_agent = 'Swagger-Codegen/2.88.5/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 09f490e..18338a3 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.87.2".\
+               "SDK Package Version: 2.88.5".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 2896eca..feeea1e 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -1907,7 +1907,7 @@ def tags(self, tags):
     def target(self):
         """Gets the target of this Alert.  # noqa: E501
 
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID})  # noqa: E501
 
         :return: The target of this Alert.  # noqa: E501
         :rtype: str
@@ -1918,7 +1918,7 @@ def target(self):
     def target(self, target):
         """Sets the target of this Alert.
 
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID})  # noqa: E501
 
         :param target: The target of this Alert.  # noqa: E501
         :type: str

From 5930610e72a0db1d47e3aec35781c70db6d97e4b Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 29 Jun 2021 08:16:32 -0700
Subject: [PATCH 088/161] Autogenerated Update v2.91.2.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 docs/AlertApi.md                      | 4 ++--
 setup.py                              | 2 +-
 wavefront_api_client/api/alert_api.py | 4 ++--
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index a3b89b6..5106359 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.88.5"
+    "packageVersion": "2.91.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 4278229..a3b89b6 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.87.2"
+    "packageVersion": "2.88.5"
 }
diff --git a/README.md b/README.md
index 6d1fb5d..7cd3b43 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.88.5
+- Package version: 2.91.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 5591d51..1d27a3f 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -1256,7 +1256,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Update a specific alert
@@ -1271,7 +1271,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;id\&quot;: \&quot;1459375928550\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 5\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;resolveAfterMinutes\&quot;: 2,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index b23af2e..e339967 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.88.5"
+VERSION = "2.91.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 0851b86..4611347 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -2187,7 +2187,7 @@ def update_alert(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2210,7 +2210,7 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 853228a..d615215 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.88.5/python'
+        self.user_agent = 'Swagger-Codegen/2.91.2/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 18338a3..e10f8b8 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.88.5".\
+               "SDK Package Version: 2.91.2".\
                format(env=sys.platform, pyversion=sys.version)

From e4d77ddf54a94b8358f4f250be99caad7e238c12 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 22 Jul 2021 08:21:18 -0700
Subject: [PATCH 089/161] Autogenerated Update v2.95.1.

---
 .swagger-codegen/config.json               | 2 +-
 .swagger-codegen/config.jsone              | 2 +-
 README.md                                  | 2 +-
 docs/NotificantApi.md                      | 6 ++++--
 docs/WebhookApi.md                         | 6 ++++--
 setup.py                                   | 2 +-
 wavefront_api_client/api/notificant_api.py | 6 +++++-
 wavefront_api_client/api/webhook_api.py    | 6 +++++-
 wavefront_api_client/api_client.py         | 2 +-
 wavefront_api_client/configuration.py      | 2 +-
 10 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5106359..315a1d4 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.91.2"
+    "packageVersion": "2.95.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index a3b89b6..5106359 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.88.5"
+    "packageVersion": "2.91.2"
 }
diff --git a/README.md b/README.md
index 7cd3b43..c3ca5db 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.91.2
+- Package version: 2.95.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/NotificantApi.md b/docs/NotificantApi.md
index 7583471..44fe217 100644
--- a/docs/NotificantApi.md
+++ b/docs/NotificantApi.md
@@ -67,7 +67,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_notificant**
-> ResponseContainerNotificant delete_notificant(id)
+> ResponseContainerNotificant delete_notificant(id, unlink=unlink)
 
 Delete a specific notification target
 
@@ -90,10 +90,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.NotificantApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+unlink = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific notification target
-    api_response = api_instance.delete_notificant(id)
+    api_response = api_instance.delete_notificant(id, unlink=unlink)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling NotificantApi->delete_notificant: %s\n" % e)
@@ -104,6 +105,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **unlink** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/docs/WebhookApi.md b/docs/WebhookApi.md
index b86d3df..42476ca 100644
--- a/docs/WebhookApi.md
+++ b/docs/WebhookApi.md
@@ -66,7 +66,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_webhook**
-> ResponseContainerNotificant delete_webhook(id)
+> ResponseContainerNotificant delete_webhook(id, unlink=unlink)
 
 Delete a specific webhook
 
@@ -89,10 +89,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.WebhookApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
+unlink = false # bool |  (optional) (default to false)
 
 try:
     # Delete a specific webhook
-    api_response = api_instance.delete_webhook(id)
+    api_response = api_instance.delete_webhook(id, unlink=unlink)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling WebhookApi->delete_webhook: %s\n" % e)
@@ -103,6 +104,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
+ **unlink** | **bool**|  | [optional] [default to false]
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index e339967..5be07a8 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.91.2"
+VERSION = "2.95.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 3b0c062..17da9d2 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -139,6 +139,7 @@ def delete_notificant(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool unlink:
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
@@ -161,12 +162,13 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool unlink:
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'unlink']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -193,6 +195,8 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'unlink' in params:
+            query_params.append(('unlink', params['unlink']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 9179a5b..da578a5 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -139,6 +139,7 @@ def delete_webhook(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool unlink:
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
@@ -161,12 +162,13 @@ def delete_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
+        :param bool unlink:
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id']  # noqa: E501
+        all_params = ['id', 'unlink']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -193,6 +195,8 @@ def delete_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'unlink' in params:
+            query_params.append(('unlink', params['unlink']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index d615215..445db6d 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.91.2/python'
+        self.user_agent = 'Swagger-Codegen/2.95.1/python'
 
     def __del__(self):
         if self._pool is not None:
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e10f8b8..699e1cb 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -248,5 +248,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.91.2".\
+               "SDK Package Version: 2.95.1".\
                format(env=sys.platform, pyversion=sys.version)

From 7ccf8cca82394bfc8891bc667eb88012d1b23f4b Mon Sep 17 00:00:00 2001
From: Artem Ustinov <artem.ustinov@gmail.com>
Date: Tue, 27 Jul 2021 15:04:29 -0700
Subject: [PATCH 090/161] Autogenerated Update v2.95.2.

---
 .swagger-codegen/VERSION                      |   2 +-
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   2 +-
 generate_client                               |   2 +-
 setup.py                                      |   2 +-
 .../account__user_and_service_account_api.py  |  76 ++++++-------
 wavefront_api_client/api/alert_api.py         |  72 ++++++------
 wavefront_api_client/api/api_token_api.py     |  32 +++---
 .../api/cloud_integration_api.py              |  32 +++---
 wavefront_api_client/api/dashboard_api.py     |  60 +++++-----
 .../api/derived_metric_api.py                 |  52 ++++-----
 wavefront_api_client/api/event_api.py         |  56 +++++-----
 wavefront_api_client/api/external_link_api.py |  12 +-
 wavefront_api_client/api/integration_api.py   |  24 ++--
 .../api/maintenance_window_api.py             |  12 +-
 wavefront_api_client/api/message_api.py       |   4 +-
 wavefront_api_client/api/metric_api.py        |   4 +-
 .../api/metrics_policy_api.py                 |   8 +-
 .../api/monitored_application_api.py          |   8 +-
 .../api/monitored_service_api.py              |  20 ++--
 wavefront_api_client/api/notificant_api.py    |  16 +--
 wavefront_api_client/api/proxy_api.py         |  16 +--
 wavefront_api_client/api/query_api.py         |  16 +--
 wavefront_api_client/api/role_api.py          |  28 ++---
 wavefront_api_client/api/saved_search_api.py  |  16 +--
 wavefront_api_client/api/search_api.py        | 104 +++++++++---------
 wavefront_api_client/api/source_api.py        |  44 ++++----
 wavefront_api_client/api/usage_api.py         |  16 +--
 wavefront_api_client/api/user_api.py          |  40 +++----
 wavefront_api_client/api/user_group_api.py    |  28 ++---
 wavefront_api_client/api/webhook_api.py       |  12 +-
 wavefront_api_client/api_client.py            |   5 +-
 wavefront_api_client/configuration.py         |   7 +-
 .../models/access_control_element.py          |  14 ++-
 .../models/access_control_list_read_dto.py    |  14 ++-
 .../models/access_control_list_simple.py      |  14 ++-
 .../models/access_control_list_write_dto.py   |  14 ++-
 wavefront_api_client/models/access_policy.py  |  14 ++-
 .../models/access_policy_rule_dto.py          |  17 ++-
 wavefront_api_client/models/account.py        |  16 ++-
 wavefront_api_client/models/alert.py          |  35 ++++--
 wavefront_api_client/models/alert_min.py      |  14 ++-
 wavefront_api_client/models/alert_route.py    |  23 ++--
 wavefront_api_client/models/annotation.py     |  14 ++-
 wavefront_api_client/models/anomaly.py        |  36 +++---
 .../models/app_dynamics_configuration.py      |  20 +++-
 .../models/aws_base_credentials.py            |  18 ++-
 .../azure_activity_log_configuration.py       |  17 ++-
 .../models/azure_base_credentials.py          |  20 +++-
 .../models/azure_configuration.py             |  14 ++-
 wavefront_api_client/models/chart.py          |  30 +++--
 wavefront_api_client/models/chart_settings.py |  52 ++++++---
 .../models/chart_source_query.py              |  24 ++--
 wavefront_api_client/models/class_loader.py   |  14 ++-
 .../models/cloud_integration.py               |  21 +++-
 .../models/cloud_trail_configuration.py       |  18 ++-
 .../models/cloud_watch_configuration.py       |  14 ++-
 wavefront_api_client/models/conversion.py     |  14 ++-
 .../models/conversion_object.py               |  14 ++-
 .../models/customer_facing_user_object.py     |  22 ++--
 wavefront_api_client/models/dashboard.py      |  25 +++--
 wavefront_api_client/models/dashboard_min.py  |  14 ++-
 .../models/dashboard_parameter_value.py       |  20 +++-
 .../models/dashboard_section.py               |  18 ++-
 .../models/dashboard_section_row.py           |  16 ++-
 .../models/derived_metric_definition.py       |  20 +++-
 .../models/ec2_configuration.py               |  14 ++-
 wavefront_api_client/models/event.py          |  26 +++--
 .../models/event_search_request.py            |  17 ++-
 .../models/event_time_range.py                |  14 ++-
 wavefront_api_client/models/external_link.py  |  20 +++-
 wavefront_api_client/models/facet_response.py |  14 ++-
 .../models/facet_search_request_container.py  |  23 +++-
 .../models/facets_response_container.py       |  14 ++-
 .../models/facets_search_request_container.py |  25 +++--
 .../models/fast_reader_builder.py             |  14 ++-
 wavefront_api_client/models/field.py          |  14 ++-
 .../models/gcp_billing_configuration.py       |  20 +++-
 .../models/gcp_configuration.py               |  21 +++-
 wavefront_api_client/models/history_entry.py  |  14 ++-
 .../models/history_response.py                |  14 ++-
 .../models/ingestion_policy.py                |  14 ++-
 .../models/ingestion_policy_mapping.py        |  18 ++-
 wavefront_api_client/models/install_alerts.py |  14 ++-
 wavefront_api_client/models/integration.py    |  24 ++--
 .../models/integration_alert.py               |  20 +++-
 .../models/integration_alias.py               |  14 ++-
 .../models/integration_dashboard.py           |  20 +++-
 .../models/integration_manifest_group.py      |  20 +++-
 .../models/integration_metrics.py             |  22 ++--
 .../models/integration_status.py              |  23 +++-
 wavefront_api_client/models/json_node.py      |  14 ++-
 .../models/kubernetes_component.py            |  16 ++-
 .../models/kubernetes_component_status.py     |  16 ++-
 wavefront_api_client/models/logical_type.py   |  14 ++-
 .../models/maintenance_window.py              |  27 +++--
 wavefront_api_client/models/message.py        |  39 ++++---
 wavefront_api_client/models/metric_details.py |  14 ++-
 .../models/metric_details_response.py         |  14 ++-
 wavefront_api_client/models/metric_status.py  |  17 ++-
 .../models/metrics_policy_read_model.py       |  14 ++-
 .../models/metrics_policy_write_model.py      |  14 ++-
 wavefront_api_client/models/module.py         |  14 ++-
 .../models/module_descriptor.py               |  14 ++-
 wavefront_api_client/models/module_layer.py   |  14 ++-
 .../models/monitored_application_dto.py       |  19 +++-
 .../models/monitored_cluster.py               |  18 ++-
 .../models/monitored_service_dto.py           |  21 +++-
 .../models/new_relic_configuration.py         |  16 ++-
 .../models/new_relic_metric_filters.py        |  14 ++-
 wavefront_api_client/models/notificant.py     |  35 ++++--
 wavefront_api_client/models/package.py        |  14 ++-
 wavefront_api_client/models/paged.py          |  14 ++-
 wavefront_api_client/models/paged_account.py  |  14 ++-
 wavefront_api_client/models/paged_alert.py    |  14 ++-
 .../models/paged_alert_with_stats.py          |  14 ++-
 wavefront_api_client/models/paged_anomaly.py  |  14 ++-
 .../models/paged_cloud_integration.py         |  14 ++-
 .../paged_customer_facing_user_object.py      |  14 ++-
 .../models/paged_dashboard.py                 |  14 ++-
 .../models/paged_derived_metric_definition.py |  14 ++-
 ...ed_derived_metric_definition_with_stats.py |  14 ++-
 wavefront_api_client/models/paged_event.py    |  14 ++-
 .../models/paged_external_link.py             |  14 ++-
 .../models/paged_ingestion_policy.py          |  14 ++-
 .../models/paged_integration.py               |  14 ++-
 .../models/paged_maintenance_window.py        |  14 ++-
 wavefront_api_client/models/paged_message.py  |  14 ++-
 .../models/paged_monitored_application_dto.py |  14 ++-
 .../models/paged_monitored_cluster.py         |  14 ++-
 .../models/paged_monitored_service_dto.py     |  14 ++-
 .../models/paged_notificant.py                |  14 ++-
 wavefront_api_client/models/paged_proxy.py    |  14 ++-
 .../models/paged_related_event.py             |  14 ++-
 .../models/paged_report_event_anomaly_dto.py  |  14 ++-
 wavefront_api_client/models/paged_role_dto.py |  14 ++-
 .../models/paged_saved_search.py              |  14 ++-
 .../models/paged_service_account.py           |  14 ++-
 wavefront_api_client/models/paged_source.py   |  14 ++-
 .../models/paged_user_group_model.py          |  14 ++-
 wavefront_api_client/models/point.py          |  18 ++-
 .../models/policy_rule_read_model.py          |  19 +++-
 .../models/policy_rule_write_model.py         |  19 +++-
 wavefront_api_client/models/proxy.py          |  19 +++-
 wavefront_api_client/models/query_event.py    |  14 ++-
 wavefront_api_client/models/query_result.py   |  17 ++-
 wavefront_api_client/models/query_type_dto.py |  17 ++-
 wavefront_api_client/models/raw_timeseries.py |  16 ++-
 .../models/related_anomaly.py                 |  36 +++---
 wavefront_api_client/models/related_data.py   |  14 ++-
 wavefront_api_client/models/related_event.py  |  26 +++--
 .../models/related_event_time_range.py        |  14 ++-
 .../models/report_event_anomaly_dto.py        |  14 ++-
 .../models/response_container.py              |  16 ++-
 .../response_container_access_policy.py       |  16 ++-
 ...response_container_access_policy_action.py |  19 +++-
 .../models/response_container_account.py      |  16 ++-
 .../models/response_container_alert.py        |  16 ++-
 .../response_container_cloud_integration.py   |  16 ++-
 .../models/response_container_dashboard.py    |  16 ++-
 ...nse_container_derived_metric_definition.py |  16 ++-
 .../models/response_container_event.py        |  16 ++-
 .../response_container_external_link.py       |  16 ++-
 .../response_container_facet_response.py      |  16 ++-
 ...nse_container_facets_response_container.py |  16 ++-
 .../response_container_history_response.py    |  16 ++-
 .../response_container_ingestion_policy.py    |  16 ++-
 .../models/response_container_integration.py  |  16 ++-
 .../response_container_integration_status.py  |  16 ++-
 ...ainer_list_access_control_list_read_dto.py |  16 ++-
 .../response_container_list_integration.py    |  16 ++-
 ...ntainer_list_integration_manifest_group.py |  16 ++-
 ...response_container_list_service_account.py |  16 ++-
 .../models/response_container_list_string.py  |  16 ++-
 .../response_container_list_user_api_token.py |  16 ++-
 .../response_container_maintenance_window.py  |  16 ++-
 .../response_container_map_string_integer.py  |  16 ++-
 ...container_map_string_integration_status.py |  16 ++-
 .../models/response_container_message.py      |  16 ++-
 ...nse_container_metrics_policy_read_model.py |  16 ++-
 ...nse_container_monitored_application_dto.py |  16 ++-
 .../response_container_monitored_cluster.py   |  16 ++-
 ...esponse_container_monitored_service_dto.py |  16 ++-
 .../models/response_container_notificant.py   |  16 ++-
 .../response_container_paged_account.py       |  16 ++-
 .../models/response_container_paged_alert.py  |  16 ++-
 ...sponse_container_paged_alert_with_stats.py |  16 ++-
 .../response_container_paged_anomaly.py       |  16 ++-
 ...ponse_container_paged_cloud_integration.py |  16 ++-
 ...ainer_paged_customer_facing_user_object.py |  16 ++-
 .../response_container_paged_dashboard.py     |  16 ++-
 ...ntainer_paged_derived_metric_definition.py |  16 ++-
 ...ed_derived_metric_definition_with_stats.py |  16 ++-
 .../models/response_container_paged_event.py  |  16 ++-
 .../response_container_paged_external_link.py |  16 ++-
 ...sponse_container_paged_ingestion_policy.py |  16 ++-
 .../response_container_paged_integration.py   |  16 ++-
 ...onse_container_paged_maintenance_window.py |  16 ++-
 .../response_container_paged_message.py       |  16 ++-
 ...ntainer_paged_monitored_application_dto.py |  16 ++-
 ...ponse_container_paged_monitored_cluster.py |  16 ++-
 ...e_container_paged_monitored_service_dto.py |  16 ++-
 .../response_container_paged_notificant.py    |  16 ++-
 .../models/response_container_paged_proxy.py  |  16 ++-
 .../response_container_paged_related_event.py |  16 ++-
 ...ontainer_paged_report_event_anomaly_dto.py |  16 ++-
 .../response_container_paged_role_dto.py      |  16 ++-
 .../response_container_paged_saved_search.py  |  16 ++-
 ...esponse_container_paged_service_account.py |  16 ++-
 .../models/response_container_paged_source.py |  16 ++-
 ...sponse_container_paged_user_group_model.py |  16 ++-
 .../models/response_container_proxy.py        |  16 ++-
 .../response_container_query_type_dto.py      |  16 ++-
 .../models/response_container_role_dto.py     |  16 ++-
 .../models/response_container_saved_search.py |  16 ++-
 .../response_container_service_account.py     |  16 ++-
 ...esponse_container_set_business_function.py |  19 +++-
 ...esponse_container_set_source_label_pair.py |  16 ++-
 .../models/response_container_source.py       |  16 ++-
 .../models/response_container_string.py       |  16 ++-
 .../response_container_tags_response.py       |  16 ++-
 .../response_container_user_api_token.py      |  16 ++-
 .../response_container_user_group_model.py    |  16 ++-
 .../response_container_validated_users_dto.py |  16 ++-
 .../models/response_status.py                 |  21 +++-
 wavefront_api_client/models/role_dto.py       |  14 ++-
 wavefront_api_client/models/saved_search.py   |  21 +++-
 wavefront_api_client/models/schema.py         |  17 ++-
 wavefront_api_client/models/search_query.py   |  19 +++-
 .../models/service_account.py                 |  18 ++-
 .../models/service_account_write.py           |  16 ++-
 .../models/sortable_search_request.py         |  20 +++-
 wavefront_api_client/models/sorting.py        |  18 ++-
 wavefront_api_client/models/source.py         |  18 ++-
 .../models/source_label_pair.py               |  17 ++-
 .../models/source_search_request_container.py |  14 ++-
 wavefront_api_client/models/span.py           |  14 ++-
 wavefront_api_client/models/specific_data.py  |  14 ++-
 .../models/stats_model_internal_use.py        |  14 ++-
 wavefront_api_client/models/stripe.py         |  22 ++--
 wavefront_api_client/models/tags_response.py  |  14 ++-
 wavefront_api_client/models/target_info.py    |  17 ++-
 .../models/tesla_configuration.py             |  16 ++-
 wavefront_api_client/models/timeseries.py     |  14 ++-
 wavefront_api_client/models/trace.py          |  14 ++-
 .../models/triage_dashboard.py                |  14 ++-
 wavefront_api_client/models/tuple.py          |  14 ++-
 wavefront_api_client/models/tuple_result.py   |  14 ++-
 .../models/tuple_value_result.py              |  14 ++-
 wavefront_api_client/models/user_api_token.py |  16 ++-
 wavefront_api_client/models/user_dto.py       |  14 ++-
 wavefront_api_client/models/user_group.py     |  14 ++-
 .../models/user_group_model.py                |  18 ++-
 .../models/user_group_properties_dto.py       |  14 ++-
 .../models/user_group_write.py                |  20 +++-
 wavefront_api_client/models/user_model.py     |  22 ++--
 .../models/user_request_dto.py                |  14 ++-
 wavefront_api_client/models/user_to_create.py |  20 +++-
 .../models/validated_users_dto.py             |  14 ++-
 wavefront_api_client/models/wf_tags.py        |  14 ++-
 261 files changed, 3284 insertions(+), 1394 deletions(-)

diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 6381ae0..19244e8 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.18
\ No newline at end of file
+2.4.21
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 315a1d4..8e2d773 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.95.1"
+    "packageVersion": "2.95.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5106359..315a1d4 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.91.2"
+    "packageVersion": "2.95.1"
 }
diff --git a/README.md b/README.md
index c3ca5db..ea7ec0f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.95.1
+- Package version: 2.95.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 02a5cfd..6ba81c4 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.18"  # For 3.x use CGEN_VER="3.0.21"
+CGEN_VER="2.4.21"  # For 3.x use CGEN_VER="3.0.27"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 5be07a8..c08bdfb 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.95.1"
+VERSION = "2.95.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index ce42e82..33e37bb 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -87,8 +87,8 @@ def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `activate_account`")  # noqa: E501
 
         collection_formats = {}
@@ -188,8 +188,8 @@ def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_account_to_roles`")  # noqa: E501
 
         collection_formats = {}
@@ -291,8 +291,8 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_account_to_user_groups`")  # noqa: E501
 
         collection_formats = {}
@@ -681,8 +681,8 @@ def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `deactivate_account`")  # noqa: E501
 
         collection_formats = {}
@@ -780,8 +780,8 @@ def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_account`")  # noqa: E501
 
         collection_formats = {}
@@ -970,8 +970,8 @@ def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_account`")  # noqa: E501
 
         collection_formats = {}
@@ -1065,8 +1065,8 @@ def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_account_business_functions`")  # noqa: E501
 
         collection_formats = {}
@@ -1429,8 +1429,8 @@ def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_service_account`")  # noqa: E501
 
         collection_formats = {}
@@ -1524,8 +1524,8 @@ def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_user_account`")  # noqa: E501
 
         collection_formats = {}
@@ -1621,12 +1621,12 @@ def grant_account_permission_with_http_info(self, id, permission, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `grant_account_permission`")  # noqa: E501
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `grant_account_permission`")  # noqa: E501
 
         collection_formats = {}
@@ -1728,8 +1728,8 @@ def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_accounts`")  # noqa: E501
 
         collection_formats = {}
@@ -1926,8 +1926,8 @@ def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_account_from_roles`")  # noqa: E501
 
         collection_formats = {}
@@ -2029,8 +2029,8 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_account_from_user_groups`")  # noqa: E501
 
         collection_formats = {}
@@ -2227,12 +2227,12 @@ def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `revoke_account_permission`")  # noqa: E501
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `revoke_account_permission`")  # noqa: E501
 
         collection_formats = {}
@@ -2334,8 +2334,8 @@ def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_accounts`")  # noqa: E501
 
         collection_formats = {}
@@ -2437,8 +2437,8 @@ def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_service_account`")  # noqa: E501
 
         collection_formats = {}
@@ -2540,8 +2540,8 @@ def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_user_account`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 4611347..7a1bbdd 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -184,12 +184,12 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_alert_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `add_alert_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -388,8 +388,8 @@ def clone_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `clone_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -588,8 +588,8 @@ def delete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -685,8 +685,8 @@ def get_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -876,8 +876,8 @@ def get_alert_history_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_alert_history`")  # noqa: E501
 
         collection_formats = {}
@@ -975,8 +975,8 @@ def get_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_alert_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1072,12 +1072,12 @@ def get_alert_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_alert_version`")  # noqa: E501
         # verify the required parameter 'version' is set
-        if ('version' not in params or
-                params['version'] is None):
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `version` when calling `get_alert_version`")  # noqa: E501
 
         collection_formats = {}
@@ -1355,8 +1355,8 @@ def hide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `hide_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -1547,12 +1547,12 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_alert_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `remove_alert_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -1745,8 +1745,8 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `set_alert_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1848,8 +1848,8 @@ def snooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `snooze_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -1945,8 +1945,8 @@ def undelete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `undelete_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -2040,8 +2040,8 @@ def unhide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `unhide_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -2135,8 +2135,8 @@ def unsnooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `unsnooze_alert`")  # noqa: E501
 
         collection_formats = {}
@@ -2232,8 +2232,8 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_alert`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index c7b3218..b6834ae 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -174,8 +174,8 @@ def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_token`")  # noqa: E501
 
         collection_formats = {}
@@ -271,12 +271,12 @@ def delete_token_service_account_with_http_info(self, id, token, **kwargs):  # n
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_token_service_account`")  # noqa: E501
         # verify the required parameter 'token' is set
-        if ('token' not in params or
-                params['token'] is None):
+        if self.api_client.client_side_validation and ('token' not in params or
+                                                       params['token'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `token` when calling `delete_token_service_account`")  # noqa: E501
 
         collection_formats = {}
@@ -374,8 +374,8 @@ def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `generate_token_service_account`")  # noqa: E501
 
         collection_formats = {}
@@ -558,8 +558,8 @@ def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_tokens_service_account`")  # noqa: E501
 
         collection_formats = {}
@@ -655,8 +655,8 @@ def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_token_name`")  # noqa: E501
 
         collection_formats = {}
@@ -760,12 +760,12 @@ def update_token_name_service_account_with_http_info(self, id, token, **kwargs):
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_token_name_service_account`")  # noqa: E501
         # verify the required parameter 'token' is set
-        if ('token' not in params or
-                params['token'] is None):
+        if self.api_client.client_side_validation and ('token' not in params or
+                                                       params['token'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `token` when calling `update_token_name_service_account`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 339a5d7..dd26796 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -273,8 +273,8 @@ def delete_aws_external_id_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_aws_external_id`")  # noqa: E501
 
         collection_formats = {}
@@ -374,8 +374,8 @@ def delete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_cloud_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -471,8 +471,8 @@ def disable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `disable_cloud_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -566,8 +566,8 @@ def enable_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `enable_cloud_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -756,8 +756,8 @@ def get_aws_external_id_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_aws_external_id`")  # noqa: E501
 
         collection_formats = {}
@@ -855,8 +855,8 @@ def get_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_cloud_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -950,8 +950,8 @@ def undelete_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `undelete_cloud_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -1047,8 +1047,8 @@ def update_cloud_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_cloud_integration`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index 9e421c2..18a6938 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -184,12 +184,12 @@ def add_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_dashboard_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `add_dashboard_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -386,8 +386,8 @@ def delete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_dashboard`")  # noqa: E501
 
         collection_formats = {}
@@ -483,8 +483,8 @@ def favorite_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `favorite_dashboard`")  # noqa: E501
 
         collection_formats = {}
@@ -673,8 +673,8 @@ def get_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_dashboard`")  # noqa: E501
 
         collection_formats = {}
@@ -864,8 +864,8 @@ def get_dashboard_history_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_dashboard_history`")  # noqa: E501
 
         collection_formats = {}
@@ -963,8 +963,8 @@ def get_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_dashboard_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1060,12 +1060,12 @@ def get_dashboard_version_with_http_info(self, id, version, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_dashboard_version`")  # noqa: E501
         # verify the required parameter 'version' is set
-        if ('version' not in params or
-                params['version'] is None):
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `version` when calling `get_dashboard_version`")  # noqa: E501
 
         collection_formats = {}
@@ -1258,12 +1258,12 @@ def remove_dashboard_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_dashboard_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `remove_dashboard_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -1456,8 +1456,8 @@ def set_dashboard_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `set_dashboard_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1557,8 +1557,8 @@ def undelete_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `undelete_dashboard`")  # noqa: E501
 
         collection_formats = {}
@@ -1652,8 +1652,8 @@ def unfavorite_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `unfavorite_dashboard`")  # noqa: E501
 
         collection_formats = {}
@@ -1749,8 +1749,8 @@ def update_dashboard_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_dashboard`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index dd7fc2b..07fd6fc 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -89,12 +89,12 @@ def add_tag_to_derived_metric_with_http_info(self, id, tag_value, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_tag_to_derived_metric`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `add_tag_to_derived_metric`")  # noqa: E501
 
         collection_formats = {}
@@ -291,8 +291,8 @@ def delete_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_derived_metric`")  # noqa: E501
 
         collection_formats = {}
@@ -483,8 +483,8 @@ def get_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_derived_metric`")  # noqa: E501
 
         collection_formats = {}
@@ -580,12 +580,12 @@ def get_derived_metric_by_version_with_http_info(self, id, version, **kwargs):
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_by_version`")  # noqa: E501
         # verify the required parameter 'version' is set
-        if ('version' not in params or
-                params['version'] is None):
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `version` when calling `get_derived_metric_by_version`")  # noqa: E501
 
         collection_formats = {}
@@ -685,8 +685,8 @@ def get_derived_metric_history_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_history`")  # noqa: E501
 
         collection_formats = {}
@@ -784,8 +784,8 @@ def get_derived_metric_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_derived_metric_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -881,12 +881,12 @@ def remove_tag_from_derived_metric_with_http_info(self, id, tag_value, **kwargs)
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_tag_from_derived_metric`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `remove_tag_from_derived_metric`")  # noqa: E501
 
         collection_formats = {}
@@ -984,8 +984,8 @@ def set_derived_metric_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `set_derived_metric_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1085,8 +1085,8 @@ def undelete_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `undelete_derived_metric`")  # noqa: E501
 
         collection_formats = {}
@@ -1182,8 +1182,8 @@ def update_derived_metric_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_derived_metric`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index 7bb58cd..0d91c29 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -89,12 +89,12 @@ def add_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_event_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `add_event_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -194,8 +194,8 @@ def close_event_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `close_event`")  # noqa: E501
 
         collection_formats = {}
@@ -384,8 +384,8 @@ def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_event`")  # noqa: E501
 
         collection_formats = {}
@@ -479,8 +479,8 @@ def get_alert_event_queries_slug_with_http_info(self, id, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_alert_event_queries_slug`")  # noqa: E501
 
         collection_formats = {}
@@ -574,8 +574,8 @@ def get_alert_firing_details_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_alert_firing_details`")  # noqa: E501
 
         collection_formats = {}
@@ -677,8 +677,8 @@ def get_alert_firing_events_with_http_info(self, alert_id, **kwargs):  # noqa: E
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'alert_id' is set
-        if ('alert_id' not in params or
-                params['alert_id'] is None):
+        if self.api_client.client_side_validation and ('alert_id' not in params or
+                                                       params['alert_id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `alert_id` when calling `get_alert_firing_events`")  # noqa: E501
 
         collection_formats = {}
@@ -883,8 +883,8 @@ def get_event_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_event`")  # noqa: E501
 
         collection_formats = {}
@@ -978,8 +978,8 @@ def get_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_event_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1079,8 +1079,8 @@ def get_related_events_with_time_span_with_http_info(self, id, **kwargs):  # noq
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_related_events_with_time_span`")  # noqa: E501
 
         collection_formats = {}
@@ -1182,12 +1182,12 @@ def remove_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_event_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `remove_event_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -1289,8 +1289,8 @@ def set_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `set_event_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1392,8 +1392,8 @@ def update_event_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_event`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index b7820c3..3305b8f 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -182,8 +182,8 @@ def delete_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_external_link`")  # noqa: E501
 
         collection_formats = {}
@@ -376,8 +376,8 @@ def get_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_external_link`")  # noqa: E501
 
         collection_formats = {}
@@ -473,8 +473,8 @@ def update_external_link_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_external_link`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index 72e8d63..e7733a0 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -540,8 +540,8 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -637,8 +637,8 @@ def get_integration_status_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_integration_status`")  # noqa: E501
 
         collection_formats = {}
@@ -734,8 +734,8 @@ def install_all_integration_alerts_with_http_info(self, id, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `install_all_integration_alerts`")  # noqa: E501
 
         collection_formats = {}
@@ -831,8 +831,8 @@ def install_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `install_integration`")  # noqa: E501
 
         collection_formats = {}
@@ -926,8 +926,8 @@ def uninstall_all_integration_alerts_with_http_info(self, id, **kwargs):  # noqa
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `uninstall_all_integration_alerts`")  # noqa: E501
 
         collection_formats = {}
@@ -1021,8 +1021,8 @@ def uninstall_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `uninstall_integration`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index 0dd30a7..81a8eae 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -182,8 +182,8 @@ def delete_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_maintenance_window`")  # noqa: E501
 
         collection_formats = {}
@@ -372,8 +372,8 @@ def get_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_maintenance_window`")  # noqa: E501
 
         collection_formats = {}
@@ -469,8 +469,8 @@ def update_maintenance_window_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_maintenance_window`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index 819e3fa..2999593 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -186,8 +186,8 @@ def user_read_message_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `user_read_message`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index 25a5b09..2c8d374 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -93,8 +93,8 @@ def get_metric_details_with_http_info(self, m, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'm' is set
-        if ('m' not in params or
-                params['m'] is None):
+        if self.api_client.client_side_validation and ('m' not in params or
+                                                       params['m'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `m` when calling `get_metric_details`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/metrics_policy_api.py b/wavefront_api_client/api/metrics_policy_api.py
index 9c3a51c..2cac016 100644
--- a/wavefront_api_client/api/metrics_policy_api.py
+++ b/wavefront_api_client/api/metrics_policy_api.py
@@ -178,8 +178,8 @@ def get_metrics_policy_by_version_with_http_info(self, version, **kwargs):  # no
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'version' is set
-        if ('version' not in params or
-                params['version'] is None):
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `version` when calling `get_metrics_policy_by_version`")  # noqa: E501
 
         collection_formats = {}
@@ -376,8 +376,8 @@ def revert_metrics_policy_by_version_with_http_info(self, version, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'version' is set
-        if ('version' not in params or
-                params['version'] is None):
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `version` when calling `revert_metrics_policy_by_version`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/monitored_application_api.py b/wavefront_api_client/api/monitored_application_api.py
index 512764f..d2565ec 100644
--- a/wavefront_api_client/api/monitored_application_api.py
+++ b/wavefront_api_client/api/monitored_application_api.py
@@ -182,8 +182,8 @@ def get_application_with_http_info(self, application, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'application' is set
-        if ('application' not in params or
-                params['application'] is None):
+        if self.api_client.client_side_validation and ('application' not in params or
+                                                       params['application'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `application` when calling `get_application`")  # noqa: E501
 
         collection_formats = {}
@@ -279,8 +279,8 @@ def update_service_with_http_info(self, application, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'application' is set
-        if ('application' not in params or
-                params['application'] is None):
+        if self.api_client.client_side_validation and ('application' not in params or
+                                                       params['application'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `application` when calling `update_service`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index 574bb1e..66d280b 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -279,12 +279,12 @@ def get_service_with_http_info(self, application, service, **kwargs):  # noqa: E
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'application' is set
-        if ('application' not in params or
-                params['application'] is None):
+        if self.api_client.client_side_validation and ('application' not in params or
+                                                       params['application'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `application` when calling `get_service`")  # noqa: E501
         # verify the required parameter 'service' is set
-        if ('service' not in params or
-                params['service'] is None):
+        if self.api_client.client_side_validation and ('service' not in params or
+                                                       params['service'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `service` when calling `get_service`")  # noqa: E501
 
         collection_formats = {}
@@ -384,8 +384,8 @@ def get_services_of_application_with_http_info(self, application, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'application' is set
-        if ('application' not in params or
-                params['application'] is None):
+        if self.api_client.client_side_validation and ('application' not in params or
+                                                       params['application'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `application` when calling `get_services_of_application`")  # noqa: E501
 
         collection_formats = {}
@@ -487,12 +487,12 @@ def update_service_with_http_info(self, application, service, **kwargs):  # noqa
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'application' is set
-        if ('application' not in params or
-                params['application'] is None):
+        if self.api_client.client_side_validation and ('application' not in params or
+                                                       params['application'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `application` when calling `update_service`")  # noqa: E501
         # verify the required parameter 'service' is set
-        if ('service' not in params or
-                params['service'] is None):
+        if self.api_client.client_side_validation and ('service' not in params or
+                                                       params['service'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `service` when calling `update_service`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 17da9d2..d93fd6a 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -184,8 +184,8 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_notificant`")  # noqa: E501
 
         collection_formats = {}
@@ -376,8 +376,8 @@ def get_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_notificant`")  # noqa: E501
 
         collection_formats = {}
@@ -471,8 +471,8 @@ def test_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `test_notificant`")  # noqa: E501
 
         collection_formats = {}
@@ -568,8 +568,8 @@ def update_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_notificant`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 4e2addc..a5f2eb7 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -89,8 +89,8 @@ def delete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_proxy`")  # noqa: E501
 
         collection_formats = {}
@@ -281,8 +281,8 @@ def get_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_proxy`")  # noqa: E501
 
         collection_formats = {}
@@ -376,8 +376,8 @@ def undelete_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `undelete_proxy`")  # noqa: E501
 
         collection_formats = {}
@@ -473,8 +473,8 @@ def update_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_proxy`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index e2ad456..cc96f5e 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -121,16 +121,16 @@ def query_api_with_http_info(self, q, s, g, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'q' is set
-        if ('q' not in params or
-                params['q'] is None):
+        if self.api_client.client_side_validation and ('q' not in params or
+                                                       params['q'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `q` when calling `query_api`")  # noqa: E501
         # verify the required parameter 's' is set
-        if ('s' not in params or
-                params['s'] is None):
+        if self.api_client.client_side_validation and ('s' not in params or
+                                                       params['s'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `s` when calling `query_api`")  # noqa: E501
         # verify the required parameter 'g' is set
-        if ('g' not in params or
-                params['g'] is None):
+        if self.api_client.client_side_validation and ('g' not in params or
+                                                       params['g'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `g` when calling `query_api`")  # noqa: E501
 
         collection_formats = {}
@@ -267,8 +267,8 @@ def query_raw_with_http_info(self, metric, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'metric' is set
-        if ('metric' not in params or
-                params['metric'] is None):
+        if self.api_client.client_side_validation and ('metric' not in params or
+                                                       params['metric'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `metric` when calling `query_raw`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index 190386e..7485144 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -89,8 +89,8 @@ def add_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_assignees`")  # noqa: E501
 
         collection_formats = {}
@@ -285,8 +285,8 @@ def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_role`")  # noqa: E501
 
         collection_formats = {}
@@ -483,8 +483,8 @@ def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_role`")  # noqa: E501
 
         collection_formats = {}
@@ -584,8 +584,8 @@ def grant_permission_to_roles_with_http_info(self, permission, **kwargs):  # noq
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_roles`")  # noqa: E501
 
         collection_formats = {}
@@ -687,8 +687,8 @@ def remove_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_assignees`")  # noqa: E501
 
         collection_formats = {}
@@ -790,8 +790,8 @@ def revoke_permission_from_roles_with_http_info(self, permission, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_roles`")  # noqa: E501
 
         collection_formats = {}
@@ -893,8 +893,8 @@ def update_role_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_role`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index 6be1843..ca94819 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -182,8 +182,8 @@ def delete_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_saved_search`")  # noqa: E501
 
         collection_formats = {}
@@ -281,8 +281,8 @@ def get_all_entity_type_saved_searches_with_http_info(self, entitytype, **kwargs
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'entitytype' is set
-        if ('entitytype' not in params or
-                params['entitytype'] is None):
+        if self.api_client.client_side_validation and ('entitytype' not in params or
+                                                       params['entitytype'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `entitytype` when calling `get_all_entity_type_saved_searches`")  # noqa: E501
 
         collection_formats = {}
@@ -475,8 +475,8 @@ def get_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_saved_search`")  # noqa: E501
 
         collection_formats = {}
@@ -572,8 +572,8 @@ def update_saved_search_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_saved_search`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 37fc69e..406c531 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -184,8 +184,8 @@ def search_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E50
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_account_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -477,8 +477,8 @@ def search_alert_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_alert_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -770,8 +770,8 @@ def search_alert_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_alert_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -1063,8 +1063,8 @@ def search_cloud_integration_deleted_for_facet_with_http_info(self, facet, **kwa
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_cloud_integration_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -1356,8 +1356,8 @@ def search_cloud_integration_for_facet_with_http_info(self, facet, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_cloud_integration_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -1649,8 +1649,8 @@ def search_dashboard_deleted_for_facet_with_http_info(self, facet, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_dashboard_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -1942,8 +1942,8 @@ def search_dashboard_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_dashboard_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -2235,8 +2235,8 @@ def search_external_links_for_facet_with_http_info(self, facet, **kwargs):  # no
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_external_links_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -2528,8 +2528,8 @@ def search_ingestion_policy_for_facet_with_http_info(self, facet, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_ingestion_policy_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -2821,8 +2821,8 @@ def search_maintenance_window_for_facet_with_http_info(self, facet, **kwargs):
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_maintenance_window_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -3114,8 +3114,8 @@ def search_monitored_application_for_facet_with_http_info(self, facet, **kwargs)
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_monitored_application_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -3407,8 +3407,8 @@ def search_monitored_service_for_facet_with_http_info(self, facet, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_monitored_service_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -3795,8 +3795,8 @@ def search_notificant_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_notificant_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -3993,8 +3993,8 @@ def search_proxy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noq
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_proxy_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -4286,8 +4286,8 @@ def search_proxy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_proxy_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -4579,8 +4579,8 @@ def search_registered_query_deleted_for_facet_with_http_info(self, facet, **kwar
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_deleted_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -4872,8 +4872,8 @@ def search_registered_query_for_facet_with_http_info(self, facet, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_registered_query_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -5070,8 +5070,8 @@ def search_related_report_event_anomaly_entities_with_http_info(self, event_id,
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'event_id' is set
-        if ('event_id' not in params or
-                params['event_id'] is None):
+        if self.api_client.client_side_validation and ('event_id' not in params or
+                                                       params['event_id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `event_id` when calling `search_related_report_event_anomaly_entities`")  # noqa: E501
 
         collection_formats = {}
@@ -5173,8 +5173,8 @@ def search_related_report_event_entities_with_http_info(self, event_id, **kwargs
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'event_id' is set
-        if ('event_id' not in params or
-                params['event_id'] is None):
+        if self.api_client.client_side_validation and ('event_id' not in params or
+                                                       params['event_id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `event_id` when calling `search_related_report_event_entities`")  # noqa: E501
 
         collection_formats = {}
@@ -5371,8 +5371,8 @@ def search_report_event_for_facet_with_http_info(self, facet, **kwargs):  # noqa
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_report_event_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -5664,8 +5664,8 @@ def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_role_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -5957,8 +5957,8 @@ def search_service_account_for_facet_with_http_info(self, facet, **kwargs):  # n
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_service_account_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -6250,8 +6250,8 @@ def search_tagged_source_for_facet_with_http_info(self, facet, **kwargs):  # noq
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_tagged_source_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -6543,8 +6543,8 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_user_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -6836,8 +6836,8 @@ def search_user_group_for_facet_with_http_info(self, facet, **kwargs):  # noqa:
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_user_group_for_facet`")  # noqa: E501
 
         collection_formats = {}
@@ -7129,8 +7129,8 @@ def search_web_hook_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'facet' is set
-        if ('facet' not in params or
-                params['facet'] is None):
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `facet` when calling `search_web_hook_for_facet`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 26f05cc..abdcc39 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -89,12 +89,12 @@ def add_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_source_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `add_source_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -285,8 +285,8 @@ def delete_source_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_source`")  # noqa: E501
 
         collection_formats = {}
@@ -475,8 +475,8 @@ def get_source_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_source`")  # noqa: E501
 
         collection_formats = {}
@@ -570,8 +570,8 @@ def get_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_source_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -665,8 +665,8 @@ def remove_description_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_description`")  # noqa: E501
 
         collection_formats = {}
@@ -762,12 +762,12 @@ def remove_source_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_source_tag`")  # noqa: E501
         # verify the required parameter 'tag_value' is set
-        if ('tag_value' not in params or
-                params['tag_value'] is None):
+        if self.api_client.client_side_validation and ('tag_value' not in params or
+                                                       params['tag_value'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `tag_value` when calling `remove_source_tag`")  # noqa: E501
 
         collection_formats = {}
@@ -869,8 +869,8 @@ def set_description_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `set_description`")  # noqa: E501
 
         collection_formats = {}
@@ -972,8 +972,8 @@ def set_source_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `set_source_tags`")  # noqa: E501
 
         collection_formats = {}
@@ -1075,8 +1075,8 @@ def update_source_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_source`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index a32a671..81790ac 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -182,8 +182,8 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_ingestion_policy`")  # noqa: E501
 
         collection_formats = {}
@@ -279,8 +279,8 @@ def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'start_time' is set
-        if ('start_time' not in params or
-                params['start_time'] is None):
+        if self.api_client.client_side_validation and ('start_time' not in params or
+                                                       params['start_time'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `start_time` when calling `export_csv`")  # noqa: E501
 
         collection_formats = {}
@@ -471,8 +471,8 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy`")  # noqa: E501
 
         collection_formats = {}
@@ -568,8 +568,8 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_ingestion_policy`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index bcecaf3..cb0e6fe 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -89,8 +89,8 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_user_to_user_groups`")  # noqa: E501
 
         collection_formats = {}
@@ -384,8 +384,8 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_user`")  # noqa: E501
 
         collection_formats = {}
@@ -566,8 +566,8 @@ def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_user`")  # noqa: E501
 
         collection_formats = {}
@@ -661,8 +661,8 @@ def get_user_business_functions_with_http_info(self, id, **kwargs):  # noqa: E50
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_user_business_functions`")  # noqa: E501
 
         collection_formats = {}
@@ -758,8 +758,8 @@ def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noq
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_users`")  # noqa: E501
 
         collection_formats = {}
@@ -861,8 +861,8 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `grant_user_permission`")  # noqa: E501
 
         collection_formats = {}
@@ -1059,8 +1059,8 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_user_from_user_groups`")  # noqa: E501
 
         collection_formats = {}
@@ -1162,8 +1162,8 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'permission' is set
-        if ('permission' not in params or
-                params['permission'] is None):
+        if self.api_client.client_side_validation and ('permission' not in params or
+                                                       params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_users`")  # noqa: E501
 
         collection_formats = {}
@@ -1265,8 +1265,8 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `revoke_user_permission`")  # noqa: E501
 
         collection_formats = {}
@@ -1368,8 +1368,8 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_user`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index 482a12e..4249697 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -89,8 +89,8 @@ def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_roles_to_user_group`")  # noqa: E501
 
         collection_formats = {}
@@ -192,8 +192,8 @@ def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_users_to_user_group`")  # noqa: E501
 
         collection_formats = {}
@@ -388,8 +388,8 @@ def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_user_group`")  # noqa: E501
 
         collection_formats = {}
@@ -578,8 +578,8 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_user_group`")  # noqa: E501
 
         collection_formats = {}
@@ -675,8 +675,8 @@ def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_roles_from_user_group`")  # noqa: E501
 
         collection_formats = {}
@@ -778,8 +778,8 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_users_from_user_group`")  # noqa: E501
 
         collection_formats = {}
@@ -881,8 +881,8 @@ def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_user_group`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index da578a5..7b16a7a 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -184,8 +184,8 @@ def delete_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `delete_webhook`")  # noqa: E501
 
         collection_formats = {}
@@ -376,8 +376,8 @@ def get_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `get_webhook`")  # noqa: E501
 
         collection_formats = {}
@@ -473,8 +473,8 @@ def update_webhook_with_http_info(self, id, **kwargs):  # noqa: E501
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_webhook`")  # noqa: E501
 
         collection_formats = {}
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 445db6d..b56fbec 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,8 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.95.1/python'
+        self.user_agent = 'Swagger-Codegen/2.95.2/python'
+        self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
         if self._pool is not None:
@@ -533,7 +534,7 @@ def __deserialize_file(self, response):
                                  content_disposition).group(1)
             path = os.path.join(os.path.dirname(path), filename)
 
-        with open(path, "wb") as f:
+        with open(path, "w") as f:
             f.write(response.data)
 
         return path
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 699e1cb..65a60d4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -96,6 +96,9 @@ def __init__(self):
         # Safe chars for path_param
         self.safe_chars_for_path_param = ''
 
+        # Disable client side validation
+        self.client_side_validation = True
+
     @classmethod
     def set_default(cls, default):
         cls._default = default
@@ -205,7 +208,7 @@ def get_api_key_with_prefix(self, identifier):
 
         if self.refresh_api_key_hook:
             self.refresh_api_key_hook(self)
-        
+
         key = self.api_key.get(identifier)
         if key:
             prefix = self.api_key_prefix.get(identifier)
@@ -248,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.95.1".\
+               "SDK Package Version: 2.95.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index aca9c9d..498a7e4 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AccessControlElement(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class AccessControlElement(object):
         'name': 'name'
     }
 
-    def __init__(self, description=None, id=None, name=None):  # noqa: E501
+    def __init__(self, description=None, id=None, name=None, _configuration=None):  # noqa: E501
         """AccessControlElement - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._description = None
         self._id = None
@@ -160,8 +165,11 @@ def __eq__(self, other):
         if not isinstance(other, AccessControlElement):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AccessControlElement):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/access_control_list_read_dto.py b/wavefront_api_client/models/access_control_list_read_dto.py
index 6da025c..3ad3ebf 100644
--- a/wavefront_api_client/models/access_control_list_read_dto.py
+++ b/wavefront_api_client/models/access_control_list_read_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AccessControlListReadDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class AccessControlListReadDTO(object):
         'view_acl': 'viewAcl'
     }
 
-    def __init__(self, entity_id=None, modify_acl=None, view_acl=None):  # noqa: E501
+    def __init__(self, entity_id=None, modify_acl=None, view_acl=None, _configuration=None):  # noqa: E501
         """AccessControlListReadDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._entity_id = None
         self._modify_acl = None
@@ -166,8 +171,11 @@ def __eq__(self, other):
         if not isinstance(other, AccessControlListReadDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AccessControlListReadDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
index 0703002..4afc7f3 100644
--- a/wavefront_api_client/models/access_control_list_simple.py
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AccessControlListSimple(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class AccessControlListSimple(object):
         'can_view': 'canView'
     }
 
-    def __init__(self, can_modify=None, can_view=None):  # noqa: E501
+    def __init__(self, can_modify=None, can_view=None, _configuration=None):  # noqa: E501
         """AccessControlListSimple - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._can_modify = None
         self._can_view = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, AccessControlListSimple):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AccessControlListSimple):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/access_control_list_write_dto.py b/wavefront_api_client/models/access_control_list_write_dto.py
index 0350d2c..2f38361 100644
--- a/wavefront_api_client/models/access_control_list_write_dto.py
+++ b/wavefront_api_client/models/access_control_list_write_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AccessControlListWriteDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class AccessControlListWriteDTO(object):
         'view_acl': 'viewAcl'
     }
 
-    def __init__(self, entity_id=None, modify_acl=None, view_acl=None):  # noqa: E501
+    def __init__(self, entity_id=None, modify_acl=None, view_acl=None, _configuration=None):  # noqa: E501
         """AccessControlListWriteDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._entity_id = None
         self._modify_acl = None
@@ -166,8 +171,11 @@ def __eq__(self, other):
         if not isinstance(other, AccessControlListWriteDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AccessControlListWriteDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/access_policy.py b/wavefront_api_client/models/access_policy.py
index 3efadd8..81a5f64 100644
--- a/wavefront_api_client/models/access_policy.py
+++ b/wavefront_api_client/models/access_policy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AccessPolicy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class AccessPolicy(object):
         'policy_rules': 'policyRules'
     }
 
-    def __init__(self, customer=None, last_updated_ms=None, policy_rules=None):  # noqa: E501
+    def __init__(self, customer=None, last_updated_ms=None, policy_rules=None, _configuration=None):  # noqa: E501
         """AccessPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._last_updated_ms = None
@@ -160,8 +165,11 @@ def __eq__(self, other):
         if not isinstance(other, AccessPolicy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AccessPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/access_policy_rule_dto.py b/wavefront_api_client/models/access_policy_rule_dto.py
index 20b0149..6da1bbb 100644
--- a/wavefront_api_client/models/access_policy_rule_dto.py
+++ b/wavefront_api_client/models/access_policy_rule_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AccessPolicyRuleDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class AccessPolicyRuleDTO(object):
         'subnet': 'subnet'
     }
 
-    def __init__(self, action=None, description=None, name=None, subnet=None):  # noqa: E501
+    def __init__(self, action=None, description=None, name=None, subnet=None, _configuration=None):  # noqa: E501
         """AccessPolicyRuleDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._action = None
         self._description = None
@@ -81,7 +86,8 @@ def action(self, action):
         :type: str
         """
         allowed_values = ["ALLOW", "DENY"]  # noqa: E501
-        if action not in allowed_values:
+        if (self._configuration.client_side_validation and
+                action not in allowed_values):
             raise ValueError(
                 "Invalid value for `action` ({0}), must be one of {1}"  # noqa: E501
                 .format(action, allowed_values)
@@ -192,8 +198,11 @@ def __eq__(self, other):
         if not isinstance(other, AccessPolicyRuleDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AccessPolicyRuleDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index be04322..0c82d06 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Account(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class Account(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, roles=None, united_permissions=None, united_roles=None, user_groups=None):  # noqa: E501
+    def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, roles=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """Account - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._groups = None
         self._identifier = None
@@ -119,7 +124,7 @@ def identifier(self, identifier):
         :param identifier: The identifier of this Account.  # noqa: E501
         :type: str
         """
-        if identifier is None:
+        if self._configuration.client_side_validation and identifier is None:
             raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
         self._identifier = identifier
@@ -279,8 +284,11 @@ def __eq__(self, other):
         if not isinstance(other, Account):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Account):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index feeea1e..d58b4b2 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Alert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -184,8 +186,11 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._acl = None
         self._active_maintenance_windows = None
@@ -497,7 +502,8 @@ def alert_type(self, alert_type):
         :type: str
         """
         allowed_values = ["CLASSIC", "THRESHOLD"]  # noqa: E501
-        if alert_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                alert_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `alert_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(alert_type, allowed_values)
@@ -611,7 +617,7 @@ def condition(self, condition):
         :param condition: The condition of this Alert.  # noqa: E501
         :type: str
         """
-        if condition is None:
+        if self._configuration.client_side_validation and condition is None:
             raise ValueError("Invalid value for `condition`, must not be `None`")  # noqa: E501
 
         self._condition = condition
@@ -681,7 +687,8 @@ def condition_query_type(self, condition_query_type):
         :type: str
         """
         allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
-        if condition_query_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                condition_query_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `condition_query_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(condition_query_type, allowed_values)
@@ -907,7 +914,8 @@ def display_expression_query_type(self, display_expression_query_type):
         :type: str
         """
         allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
-        if display_expression_query_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                display_expression_query_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `display_expression_query_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(display_expression_query_type, allowed_values)
@@ -1339,7 +1347,7 @@ def minutes(self, minutes):
         :param minutes: The minutes of this Alert.  # noqa: E501
         :type: int
         """
-        if minutes is None:
+        if self._configuration.client_side_validation and minutes is None:
             raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
         self._minutes = minutes
@@ -1385,7 +1393,7 @@ def name(self, name):
         :param name: The name of this Alert.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -1708,7 +1716,8 @@ def severity(self, severity):
         :type: str
         """
         allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
+        if (self._configuration.client_side_validation and
+                severity not in allowed_values):
             raise ValueError(
                 "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
                 .format(severity, allowed_values)
@@ -1737,7 +1746,8 @@ def severity_list(self, severity_list):
         :type: list[str]
         """
         allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
-        if not set(severity_list).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(severity_list).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `severity_list` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(severity_list) - set(allowed_values))),  # noqa: E501
@@ -2144,8 +2154,11 @@ def __eq__(self, other):
         if not isinstance(other, Alert):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Alert):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_min.py b/wavefront_api_client/models/alert_min.py
index e9638f3..2f6c414 100644
--- a/wavefront_api_client/models/alert_min.py
+++ b/wavefront_api_client/models/alert_min.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AlertMin(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class AlertMin(object):
         'name': 'name'
     }
 
-    def __init__(self, id=None, name=None):  # noqa: E501
+    def __init__(self, id=None, name=None, _configuration=None):  # noqa: E501
         """AlertMin - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._id = None
         self._name = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, AlertMin):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AlertMin):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_route.py b/wavefront_api_client/models/alert_route.py
index d7af86f..b79bbe2 100644
--- a/wavefront_api_client/models/alert_route.py
+++ b/wavefront_api_client/models/alert_route.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AlertRoute(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class AlertRoute(object):
         'target': 'target'
     }
 
-    def __init__(self, filter=None, method=None, target=None):  # noqa: E501
+    def __init__(self, filter=None, method=None, target=None, _configuration=None):  # noqa: E501
         """AlertRoute - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._filter = None
         self._method = None
@@ -74,7 +79,7 @@ def filter(self, filter):
         :param filter: The filter of this AlertRoute.  # noqa: E501
         :type: str
         """
-        if filter is None:
+        if self._configuration.client_side_validation and filter is None:
             raise ValueError("Invalid value for `filter`, must not be `None`")  # noqa: E501
 
         self._filter = filter
@@ -99,10 +104,11 @@ def method(self, method):
         :param method: The method of this AlertRoute.  # noqa: E501
         :type: str
         """
-        if method is None:
+        if self._configuration.client_side_validation and method is None:
             raise ValueError("Invalid value for `method`, must not be `None`")  # noqa: E501
         allowed_values = ["WEBHOOK", "PAGERDUTY", "EMAIL"]  # noqa: E501
-        if method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                method not in allowed_values):
             raise ValueError(
                 "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
                 .format(method, allowed_values)
@@ -130,7 +136,7 @@ def target(self, target):
         :param target: The target of this AlertRoute.  # noqa: E501
         :type: str
         """
-        if target is None:
+        if self._configuration.client_side_validation and target is None:
             raise ValueError("Invalid value for `target`, must not be `None`")  # noqa: E501
 
         self._target = target
@@ -175,8 +181,11 @@ def __eq__(self, other):
         if not isinstance(other, AlertRoute):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AlertRoute):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index cf05f3e..0e7a6ac 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Annotation(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -36,8 +38,11 @@ class Annotation(object):
     attribute_map = {
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, _configuration=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
         self.discriminator = None
 
     def to_dict(self):
@@ -80,8 +85,11 @@ def __eq__(self, other):
         if not isinstance(other, Annotation):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Annotation):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/anomaly.py b/wavefront_api_client/models/anomaly.py
index a5b8d38..580a39e 100644
--- a/wavefront_api_client/models/anomaly.py
+++ b/wavefront_api_client/models/anomaly.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Anomaly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -84,8 +86,11 @@ class Anomaly(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, chart_hash=None, chart_link=None, col=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_id=None, deleted=None, end_ms=None, hosts_used=None, id=None, image_link=None, metrics_used=None, model=None, original_stripes=None, param_hash=None, query_hash=None, _query_params=None, row=None, section=None, start_ms=None, updated_epoch_millis=None, updated_ms=None, updater_id=None):  # noqa: E501
+    def __init__(self, chart_hash=None, chart_link=None, col=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_id=None, deleted=None, end_ms=None, hosts_used=None, id=None, image_link=None, metrics_used=None, model=None, original_stripes=None, param_hash=None, query_hash=None, _query_params=None, row=None, section=None, start_ms=None, updated_epoch_millis=None, updated_ms=None, updater_id=None, _configuration=None):  # noqa: E501
         """Anomaly - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._chart_hash = None
         self._chart_link = None
@@ -171,7 +176,7 @@ def chart_hash(self, chart_hash):
         :param chart_hash: The chart_hash of this Anomaly.  # noqa: E501
         :type: str
         """
-        if chart_hash is None:
+        if self._configuration.client_side_validation and chart_hash is None:
             raise ValueError("Invalid value for `chart_hash`, must not be `None`")  # noqa: E501
 
         self._chart_hash = chart_hash
@@ -219,7 +224,7 @@ def col(self, col):
         :param col: The col of this Anomaly.  # noqa: E501
         :type: int
         """
-        if col is None:
+        if self._configuration.client_side_validation and col is None:
             raise ValueError("Invalid value for `col`, must not be `None`")  # noqa: E501
 
         self._col = col
@@ -309,7 +314,7 @@ def dashboard_id(self, dashboard_id):
         :param dashboard_id: The dashboard_id of this Anomaly.  # noqa: E501
         :type: str
         """
-        if dashboard_id is None:
+        if self._configuration.client_side_validation and dashboard_id is None:
             raise ValueError("Invalid value for `dashboard_id`, must not be `None`")  # noqa: E501
 
         self._dashboard_id = dashboard_id
@@ -355,7 +360,7 @@ def end_ms(self, end_ms):
         :param end_ms: The end_ms of this Anomaly.  # noqa: E501
         :type: int
         """
-        if end_ms is None:
+        if self._configuration.client_side_validation and end_ms is None:
             raise ValueError("Invalid value for `end_ms`, must not be `None`")  # noqa: E501
 
         self._end_ms = end_ms
@@ -518,7 +523,7 @@ def param_hash(self, param_hash):
         :param param_hash: The param_hash of this Anomaly.  # noqa: E501
         :type: str
         """
-        if param_hash is None:
+        if self._configuration.client_side_validation and param_hash is None:
             raise ValueError("Invalid value for `param_hash`, must not be `None`")  # noqa: E501
 
         self._param_hash = param_hash
@@ -543,7 +548,7 @@ def query_hash(self, query_hash):
         :param query_hash: The query_hash of this Anomaly.  # noqa: E501
         :type: str
         """
-        if query_hash is None:
+        if self._configuration.client_side_validation and query_hash is None:
             raise ValueError("Invalid value for `query_hash`, must not be `None`")  # noqa: E501
 
         self._query_hash = query_hash
@@ -568,7 +573,7 @@ def _query_params(self, _query_params):
         :param _query_params: The _query_params of this Anomaly.  # noqa: E501
         :type: dict(str, str)
         """
-        if _query_params is None:
+        if self._configuration.client_side_validation and _query_params is None:
             raise ValueError("Invalid value for `_query_params`, must not be `None`")  # noqa: E501
 
         self.__query_params = _query_params
@@ -593,7 +598,7 @@ def row(self, row):
         :param row: The row of this Anomaly.  # noqa: E501
         :type: int
         """
-        if row is None:
+        if self._configuration.client_side_validation and row is None:
             raise ValueError("Invalid value for `row`, must not be `None`")  # noqa: E501
 
         self._row = row
@@ -618,7 +623,7 @@ def section(self, section):
         :param section: The section of this Anomaly.  # noqa: E501
         :type: int
         """
-        if section is None:
+        if self._configuration.client_side_validation and section is None:
             raise ValueError("Invalid value for `section`, must not be `None`")  # noqa: E501
 
         self._section = section
@@ -643,7 +648,7 @@ def start_ms(self, start_ms):
         :param start_ms: The start_ms of this Anomaly.  # noqa: E501
         :type: int
         """
-        if start_ms is None:
+        if self._configuration.client_side_validation and start_ms is None:
             raise ValueError("Invalid value for `start_ms`, must not be `None`")  # noqa: E501
 
         self._start_ms = start_ms
@@ -689,7 +694,7 @@ def updated_ms(self, updated_ms):
         :param updated_ms: The updated_ms of this Anomaly.  # noqa: E501
         :type: int
         """
-        if updated_ms is None:
+        if self._configuration.client_side_validation and updated_ms is None:
             raise ValueError("Invalid value for `updated_ms`, must not be `None`")  # noqa: E501
 
         self._updated_ms = updated_ms
@@ -755,8 +760,11 @@ def __eq__(self, other):
         if not isinstance(other, Anomaly):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Anomaly):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/app_dynamics_configuration.py b/wavefront_api_client/models/app_dynamics_configuration.py
index e500467..d5026e6 100644
--- a/wavefront_api_client/models/app_dynamics_configuration.py
+++ b/wavefront_api_client/models/app_dynamics_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AppDynamicsConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -60,8 +62,11 @@ class AppDynamicsConfiguration(object):
         'user_name': 'userName'
     }
 
-    def __init__(self, app_filter_regex=None, controller_name=None, enable_app_infra_metrics=None, enable_backend_metrics=None, enable_business_trx_metrics=None, enable_error_metrics=None, enable_individual_node_metrics=None, enable_overall_perf_metrics=None, enable_rollup=None, enable_service_endpoint_metrics=None, encrypted_password=None, user_name=None):  # noqa: E501
+    def __init__(self, app_filter_regex=None, controller_name=None, enable_app_infra_metrics=None, enable_backend_metrics=None, enable_business_trx_metrics=None, enable_error_metrics=None, enable_individual_node_metrics=None, enable_overall_perf_metrics=None, enable_rollup=None, enable_service_endpoint_metrics=None, encrypted_password=None, user_name=None, _configuration=None):  # noqa: E501
         """AppDynamicsConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._app_filter_regex = None
         self._controller_name = None
@@ -142,7 +147,7 @@ def controller_name(self, controller_name):
         :param controller_name: The controller_name of this AppDynamicsConfiguration.  # noqa: E501
         :type: str
         """
-        if controller_name is None:
+        if self._configuration.client_side_validation and controller_name is None:
             raise ValueError("Invalid value for `controller_name`, must not be `None`")  # noqa: E501
 
         self._controller_name = controller_name
@@ -351,7 +356,7 @@ def encrypted_password(self, encrypted_password):
         :param encrypted_password: The encrypted_password of this AppDynamicsConfiguration.  # noqa: E501
         :type: str
         """
-        if encrypted_password is None:
+        if self._configuration.client_side_validation and encrypted_password is None:
             raise ValueError("Invalid value for `encrypted_password`, must not be `None`")  # noqa: E501
 
         self._encrypted_password = encrypted_password
@@ -376,7 +381,7 @@ def user_name(self, user_name):
         :param user_name: The user_name of this AppDynamicsConfiguration.  # noqa: E501
         :type: str
         """
-        if user_name is None:
+        if self._configuration.client_side_validation and user_name is None:
             raise ValueError("Invalid value for `user_name`, must not be `None`")  # noqa: E501
 
         self._user_name = user_name
@@ -421,8 +426,11 @@ def __eq__(self, other):
         if not isinstance(other, AppDynamicsConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AppDynamicsConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index 1e2c6d9..5bc5f06 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AWSBaseCredentials(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class AWSBaseCredentials(object):
         'role_arn': 'roleArn'
     }
 
-    def __init__(self, external_id=None, role_arn=None):  # noqa: E501
+    def __init__(self, external_id=None, role_arn=None, _configuration=None):  # noqa: E501
         """AWSBaseCredentials - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._external_id = None
         self._role_arn = None
@@ -70,7 +75,7 @@ def external_id(self, external_id):
         :param external_id: The external_id of this AWSBaseCredentials.  # noqa: E501
         :type: str
         """
-        if external_id is None:
+        if self._configuration.client_side_validation and external_id is None:
             raise ValueError("Invalid value for `external_id`, must not be `None`")  # noqa: E501
 
         self._external_id = external_id
@@ -95,7 +100,7 @@ def role_arn(self, role_arn):
         :param role_arn: The role_arn of this AWSBaseCredentials.  # noqa: E501
         :type: str
         """
-        if role_arn is None:
+        if self._configuration.client_side_validation and role_arn is None:
             raise ValueError("Invalid value for `role_arn`, must not be `None`")  # noqa: E501
 
         self._role_arn = role_arn
@@ -140,8 +145,11 @@ def __eq__(self, other):
         if not isinstance(other, AWSBaseCredentials):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AWSBaseCredentials):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index 6d7d989..ef4b8b7 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AzureActivityLogConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class AzureActivityLogConfiguration(object):
         'category_filter': 'categoryFilter'
     }
 
-    def __init__(self, base_credentials=None, category_filter=None):  # noqa: E501
+    def __init__(self, base_credentials=None, category_filter=None, _configuration=None):  # noqa: E501
         """AzureActivityLogConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._base_credentials = None
         self._category_filter = None
@@ -94,7 +99,8 @@ def category_filter(self, category_filter):
         :type: list[str]
         """
         allowed_values = ["ADMINISTRATIVE", "SERVICEHEALTH", "ALERT", "AUTOSCALE", "SECURITY"]  # noqa: E501
-        if not set(category_filter).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(category_filter).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `category_filter` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(category_filter) - set(allowed_values))),  # noqa: E501
@@ -143,8 +149,11 @@ def __eq__(self, other):
         if not isinstance(other, AzureActivityLogConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AzureActivityLogConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 9b0a780..905c997 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AzureBaseCredentials(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class AzureBaseCredentials(object):
         'tenant': 'tenant'
     }
 
-    def __init__(self, client_id=None, client_secret=None, tenant=None):  # noqa: E501
+    def __init__(self, client_id=None, client_secret=None, tenant=None, _configuration=None):  # noqa: E501
         """AzureBaseCredentials - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._client_id = None
         self._client_secret = None
@@ -74,7 +79,7 @@ def client_id(self, client_id):
         :param client_id: The client_id of this AzureBaseCredentials.  # noqa: E501
         :type: str
         """
-        if client_id is None:
+        if self._configuration.client_side_validation and client_id is None:
             raise ValueError("Invalid value for `client_id`, must not be `None`")  # noqa: E501
 
         self._client_id = client_id
@@ -99,7 +104,7 @@ def client_secret(self, client_secret):
         :param client_secret: The client_secret of this AzureBaseCredentials.  # noqa: E501
         :type: str
         """
-        if client_secret is None:
+        if self._configuration.client_side_validation and client_secret is None:
             raise ValueError("Invalid value for `client_secret`, must not be `None`")  # noqa: E501
 
         self._client_secret = client_secret
@@ -124,7 +129,7 @@ def tenant(self, tenant):
         :param tenant: The tenant of this AzureBaseCredentials.  # noqa: E501
         :type: str
         """
-        if tenant is None:
+        if self._configuration.client_side_validation and tenant is None:
             raise ValueError("Invalid value for `tenant`, must not be `None`")  # noqa: E501
 
         self._tenant = tenant
@@ -169,8 +174,11 @@ def __eq__(self, other):
         if not isinstance(other, AzureBaseCredentials):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AzureBaseCredentials):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index ca92d8e..8cfde64 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class AzureConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class AzureConfiguration(object):
         'resource_group_filter': 'resourceGroupFilter'
     }
 
-    def __init__(self, base_credentials=None, category_filter=None, metric_filter_regex=None, resource_group_filter=None):  # noqa: E501
+    def __init__(self, base_credentials=None, category_filter=None, metric_filter_regex=None, resource_group_filter=None, _configuration=None):  # noqa: E501
         """AzureConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._base_credentials = None
         self._category_filter = None
@@ -192,8 +197,11 @@ def __eq__(self, other):
         if not isinstance(other, AzureConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, AzureConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 5cc89d1..39c1133 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Chart(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -68,8 +70,11 @@ class Chart(object):
         'units': 'units'
     }
 
-    def __init__(self, anomaly_sample_size=None, anomaly_severity=None, anomaly_type=None, base=None, chart_attributes=None, chart_settings=None, description=None, display_confidence_bounds=None, filter_out_non_anomalies=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None):  # noqa: E501
+    def __init__(self, anomaly_sample_size=None, anomaly_severity=None, anomaly_type=None, base=None, chart_attributes=None, chart_settings=None, description=None, display_confidence_bounds=None, filter_out_non_anomalies=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None, _configuration=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._anomaly_sample_size = None
         self._anomaly_severity = None
@@ -141,7 +146,8 @@ def anomaly_sample_size(self, anomaly_sample_size):
         :type: str
         """
         allowed_values = ["2", "8", "35"]  # noqa: E501
-        if anomaly_sample_size not in allowed_values:
+        if (self._configuration.client_side_validation and
+                anomaly_sample_size not in allowed_values):
             raise ValueError(
                 "Invalid value for `anomaly_sample_size` ({0}), must be one of {1}"  # noqa: E501
                 .format(anomaly_sample_size, allowed_values)
@@ -170,7 +176,8 @@ def anomaly_severity(self, anomaly_severity):
         :type: str
         """
         allowed_values = ["low", "medium", "high"]  # noqa: E501
-        if anomaly_severity not in allowed_values:
+        if (self._configuration.client_side_validation and
+                anomaly_severity not in allowed_values):
             raise ValueError(
                 "Invalid value for `anomaly_severity` ({0}), must be one of {1}"  # noqa: E501
                 .format(anomaly_severity, allowed_values)
@@ -199,7 +206,8 @@ def anomaly_type(self, anomaly_type):
         :type: str
         """
         allowed_values = ["both", "low", "high"]  # noqa: E501
-        if anomaly_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                anomaly_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `anomaly_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(anomaly_type, allowed_values)
@@ -409,7 +417,7 @@ def name(self, name):
         :param name: The name of this Chart.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -457,7 +465,7 @@ def sources(self, sources):
         :param sources: The sources of this Chart.  # noqa: E501
         :type: list[ChartSourceQuery]
         """
-        if sources is None:
+        if self._configuration.client_side_validation and sources is None:
             raise ValueError("Invalid value for `sources`, must not be `None`")  # noqa: E501
 
         self._sources = sources
@@ -483,7 +491,8 @@ def summarization(self, summarization):
         :type: str
         """
         allowed_values = ["MEAN", "MEDIAN", "MIN", "MAX", "SUM", "COUNT", "LAST", "FIRST"]  # noqa: E501
-        if summarization not in allowed_values:
+        if (self._configuration.client_side_validation and
+                summarization not in allowed_values):
             raise ValueError(
                 "Invalid value for `summarization` ({0}), must be one of {1}"  # noqa: E501
                 .format(summarization, allowed_values)
@@ -554,8 +563,11 @@ def __eq__(self, other):
         if not isinstance(other, Chart):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Chart):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index cf7155e..690823d 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ChartSettings(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -158,8 +160,11 @@ class ChartSettings(object):
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._auto_column_tags = None
         self._chart_default_color = None
@@ -551,7 +556,8 @@ def fixed_legend_filter_field(self, fixed_legend_filter_field):
         :type: str
         """
         allowed_values = ["CURRENT", "MEAN", "MEDIAN", "SUM", "MIN", "MAX", "COUNT"]  # noqa: E501
-        if fixed_legend_filter_field not in allowed_values:
+        if (self._configuration.client_side_validation and
+                fixed_legend_filter_field not in allowed_values):
             raise ValueError(
                 "Invalid value for `fixed_legend_filter_field` ({0}), must be one of {1}"  # noqa: E501
                 .format(fixed_legend_filter_field, allowed_values)
@@ -603,7 +609,8 @@ def fixed_legend_filter_sort(self, fixed_legend_filter_sort):
         :type: str
         """
         allowed_values = ["TOP", "BOTTOM"]  # noqa: E501
-        if fixed_legend_filter_sort not in allowed_values:
+        if (self._configuration.client_side_validation and
+                fixed_legend_filter_sort not in allowed_values):
             raise ValueError(
                 "Invalid value for `fixed_legend_filter_sort` ({0}), must be one of {1}"  # noqa: E501
                 .format(fixed_legend_filter_sort, allowed_values)
@@ -655,7 +662,8 @@ def fixed_legend_position(self, fixed_legend_position):
         :type: str
         """
         allowed_values = ["RIGHT", "TOP", "LEFT", "BOTTOM"]  # noqa: E501
-        if fixed_legend_position not in allowed_values:
+        if (self._configuration.client_side_validation and
+                fixed_legend_position not in allowed_values):
             raise ValueError(
                 "Invalid value for `fixed_legend_position` ({0}), must be one of {1}"  # noqa: E501
                 .format(fixed_legend_position, allowed_values)
@@ -799,7 +807,8 @@ def line_type(self, line_type):
         :type: str
         """
         allowed_values = ["linear", "step-before", "step-after", "basis", "cardinal", "monotone"]  # noqa: E501
-        if line_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                line_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `line_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(line_type, allowed_values)
@@ -1081,7 +1090,8 @@ def sparkline_display_horizontal_position(self, sparkline_display_horizontal_pos
         :type: str
         """
         allowed_values = ["MIDDLE", "LEFT", "RIGHT"]  # noqa: E501
-        if sparkline_display_horizontal_position not in allowed_values:
+        if (self._configuration.client_side_validation and
+                sparkline_display_horizontal_position not in allowed_values):
             raise ValueError(
                 "Invalid value for `sparkline_display_horizontal_position` ({0}), must be one of {1}"  # noqa: E501
                 .format(sparkline_display_horizontal_position, allowed_values)
@@ -1156,7 +1166,8 @@ def sparkline_display_value_type(self, sparkline_display_value_type):
         :type: str
         """
         allowed_values = ["VALUE", "LABEL"]  # noqa: E501
-        if sparkline_display_value_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                sparkline_display_value_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `sparkline_display_value_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(sparkline_display_value_type, allowed_values)
@@ -1254,7 +1265,8 @@ def sparkline_size(self, sparkline_size):
         :type: str
         """
         allowed_values = ["BACKGROUND", "BOTTOM", "NONE"]  # noqa: E501
-        if sparkline_size not in allowed_values:
+        if (self._configuration.client_side_validation and
+                sparkline_size not in allowed_values):
             raise ValueError(
                 "Invalid value for `sparkline_size` ({0}), must be one of {1}"  # noqa: E501
                 .format(sparkline_size, allowed_values)
@@ -1283,7 +1295,8 @@ def sparkline_value_color_map_apply_to(self, sparkline_value_color_map_apply_to)
         :type: str
         """
         allowed_values = ["TEXT", "BACKGROUND"]  # noqa: E501
-        if sparkline_value_color_map_apply_to not in allowed_values:
+        if (self._configuration.client_side_validation and
+                sparkline_value_color_map_apply_to not in allowed_values):
             raise ValueError(
                 "Invalid value for `sparkline_value_color_map_apply_to` ({0}), must be one of {1}"  # noqa: E501
                 .format(sparkline_value_color_map_apply_to, allowed_values)
@@ -1427,7 +1440,8 @@ def stack_type(self, stack_type):
         :type: str
         """
         allowed_values = ["zero", "expand", "wiggle", "silhouette", "bars"]  # noqa: E501
-        if stack_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                stack_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `stack_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(stack_type, allowed_values)
@@ -1456,7 +1470,8 @@ def tag_mode(self, tag_mode):
         :type: str
         """
         allowed_values = ["all", "top", "custom"]  # noqa: E501
-        if tag_mode not in allowed_values:
+        if (self._configuration.client_side_validation and
+                tag_mode not in allowed_values):
             raise ValueError(
                 "Invalid value for `tag_mode` ({0}), must be one of {1}"  # noqa: E501
                 .format(tag_mode, allowed_values)
@@ -1507,10 +1522,11 @@ def type(self, type):
         :param type: The type of this ChartSettings.  # noqa: E501
         :type: str
         """
-        if type is None:
+        if self._configuration.client_side_validation and type is None:
             raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
         allowed_values = ["line", "scatterplot", "stacked-area", "stacked-column", "table", "scatterplot-xy", "markdown-widget", "sparkline", "globe", "nodemap", "top-k", "status-list", "histogram", "heatmap", "gauge", "pie"]  # noqa: E501
-        if type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                type not in allowed_values):
             raise ValueError(
                 "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
                 .format(type, allowed_values)
@@ -1562,7 +1578,8 @@ def windowing(self, windowing):
         :type: str
         """
         allowed_values = ["full", "last"]  # noqa: E501
-        if windowing not in allowed_values:
+        if (self._configuration.client_side_validation and
+                windowing not in allowed_values):
             raise ValueError(
                 "Invalid value for `windowing` ({0}), must be one of {1}"  # noqa: E501
                 .format(windowing, allowed_values)
@@ -1863,8 +1880,11 @@ def __eq__(self, other):
         if not isinstance(other, ChartSettings):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ChartSettings):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index 945f200..d2aa3af 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ChartSourceQuery(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class ChartSourceQuery(object):
         'source_description': 'sourceDescription'
     }
 
-    def __init__(self, disabled=None, name=None, query=None, query_type=None, querybuilder_enabled=None, querybuilder_serialization=None, scatter_plot_source=None, secondary_axis=None, source_color=None, source_description=None):  # noqa: E501
+    def __init__(self, disabled=None, name=None, query=None, query_type=None, querybuilder_enabled=None, querybuilder_serialization=None, scatter_plot_source=None, secondary_axis=None, source_color=None, source_description=None, _configuration=None):  # noqa: E501
         """ChartSourceQuery - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._disabled = None
         self._name = None
@@ -133,7 +138,7 @@ def name(self, name):
         :param name: The name of this ChartSourceQuery.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -158,7 +163,7 @@ def query(self, query):
         :param query: The query of this ChartSourceQuery.  # noqa: E501
         :type: str
         """
-        if query is None:
+        if self._configuration.client_side_validation and query is None:
             raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
         self._query = query
@@ -184,7 +189,8 @@ def query_type(self, query_type):
         :type: str
         """
         allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
-        if query_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                query_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `query_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(query_type, allowed_values)
@@ -259,7 +265,8 @@ def scatter_plot_source(self, scatter_plot_source):
         :type: str
         """
         allowed_values = ["X", "Y"]  # noqa: E501
-        if scatter_plot_source not in allowed_values:
+        if (self._configuration.client_side_validation and
+                scatter_plot_source not in allowed_values):
             raise ValueError(
                 "Invalid value for `scatter_plot_source` ({0}), must be one of {1}"  # noqa: E501
                 .format(scatter_plot_source, allowed_values)
@@ -376,8 +383,11 @@ def __eq__(self, other):
         if not isinstance(other, ChartSourceQuery):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ChartSourceQuery):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/class_loader.py b/wavefront_api_client/models/class_loader.py
index b4d9278..374468f 100644
--- a/wavefront_api_client/models/class_loader.py
+++ b/wavefront_api_client/models/class_loader.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ClassLoader(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class ClassLoader(object):
         'unnamed_module': 'unnamedModule'
     }
 
-    def __init__(self, defined_packages=None, name=None, parent=None, registered_as_parallel_capable=None, unnamed_module=None):  # noqa: E501
+    def __init__(self, defined_packages=None, name=None, parent=None, registered_as_parallel_capable=None, unnamed_module=None, _configuration=None):  # noqa: E501
         """ClassLoader - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._defined_packages = None
         self._name = None
@@ -212,8 +217,11 @@ def __eq__(self, other):
         if not isinstance(other, ClassLoader):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ClassLoader):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index c880451..1314933 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class CloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -98,8 +100,11 @@ class CloudIntegration(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._additional_tags = None
         self._app_dynamics = None
@@ -714,7 +719,7 @@ def name(self, name):
         :param name: The name of this CloudIntegration.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -781,10 +786,11 @@ def service(self, service):
         :param service: The service of this CloudIntegration.  # noqa: E501
         :type: str
         """
-        if service is None:
+        if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
         allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS"]  # noqa: E501
-        if service not in allowed_values:
+        if (self._configuration.client_side_validation and
+                service not in allowed_values):
             raise ValueError(
                 "Invalid value for `service` ({0}), must be one of {1}"  # noqa: E501
                 .format(service, allowed_values)
@@ -918,8 +924,11 @@ def __eq__(self, other):
         if not isinstance(other, CloudIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, CloudIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index 51ed7be..e5a1eaa 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class CloudTrailConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class CloudTrailConfiguration(object):
         'region': 'region'
     }
 
-    def __init__(self, base_credentials=None, bucket_name=None, filter_rule=None, prefix=None, region=None):  # noqa: E501
+    def __init__(self, base_credentials=None, bucket_name=None, filter_rule=None, prefix=None, region=None, _configuration=None):  # noqa: E501
         """CloudTrailConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._base_credentials = None
         self._bucket_name = None
@@ -106,7 +111,7 @@ def bucket_name(self, bucket_name):
         :param bucket_name: The bucket_name of this CloudTrailConfiguration.  # noqa: E501
         :type: str
         """
-        if bucket_name is None:
+        if self._configuration.client_side_validation and bucket_name is None:
             raise ValueError("Invalid value for `bucket_name`, must not be `None`")  # noqa: E501
 
         self._bucket_name = bucket_name
@@ -177,7 +182,7 @@ def region(self, region):
         :param region: The region of this CloudTrailConfiguration.  # noqa: E501
         :type: str
         """
-        if region is None:
+        if self._configuration.client_side_validation and region is None:
             raise ValueError("Invalid value for `region`, must not be `None`")  # noqa: E501
 
         self._region = region
@@ -222,8 +227,11 @@ def __eq__(self, other):
         if not isinstance(other, CloudTrailConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, CloudTrailConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 37a684d..b694f54 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class CloudWatchConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class CloudWatchConfiguration(object):
         'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None, volume_selection_tags_expr=None):  # noqa: E501
+    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._base_credentials = None
         self._instance_selection_tags = None
@@ -304,8 +309,11 @@ def __eq__(self, other):
         if not isinstance(other, CloudWatchConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, CloudWatchConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/conversion.py b/wavefront_api_client/models/conversion.py
index 11e88c1..5ba17e7 100644
--- a/wavefront_api_client/models/conversion.py
+++ b/wavefront_api_client/models/conversion.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Conversion(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class Conversion(object):
         'recommended_schema': 'recommendedSchema'
     }
 
-    def __init__(self, logical_type_name=None, recommended_schema=None):  # noqa: E501
+    def __init__(self, logical_type_name=None, recommended_schema=None, _configuration=None):  # noqa: E501
         """Conversion - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._logical_type_name = None
         self._recommended_schema = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, Conversion):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Conversion):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/conversion_object.py b/wavefront_api_client/models/conversion_object.py
index eb25250..adf5e9a 100644
--- a/wavefront_api_client/models/conversion_object.py
+++ b/wavefront_api_client/models/conversion_object.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ConversionObject(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ConversionObject(object):
         'recommended_schema': 'recommendedSchema'
     }
 
-    def __init__(self, logical_type_name=None, recommended_schema=None):  # noqa: E501
+    def __init__(self, logical_type_name=None, recommended_schema=None, _configuration=None):  # noqa: E501
         """ConversionObject - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._logical_type_name = None
         self._recommended_schema = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, ConversionObject):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ConversionObject):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index 66d076b..7719530 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class CustomerFacingUserObject(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -60,8 +62,11 @@ class CustomerFacingUserObject(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, ingestion_policy_id=None, last_successful_login=None, _self=None, united_permissions=None, united_roles=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, ingestion_policy_id=None, last_successful_login=None, _self=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._escaped_identifier = None
@@ -118,7 +123,7 @@ def customer(self, customer):
         :param customer: The customer of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if customer is None:
+        if self._configuration.client_side_validation and customer is None:
             raise ValueError("Invalid value for `customer`, must not be `None`")  # noqa: E501
 
         self._customer = customer
@@ -212,7 +217,7 @@ def id(self, id):
         :param id: The id of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if id is None:
+        if self._configuration.client_side_validation and id is None:
             raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
         self._id = id
@@ -237,7 +242,7 @@ def identifier(self, identifier):
         :param identifier: The identifier of this CustomerFacingUserObject.  # noqa: E501
         :type: str
         """
-        if identifier is None:
+        if self._configuration.client_side_validation and identifier is None:
             raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
         self._identifier = identifier
@@ -308,7 +313,7 @@ def _self(self, _self):
         :param _self: The _self of this CustomerFacingUserObject.  # noqa: E501
         :type: bool
         """
-        if _self is None:
+        if self._configuration.client_side_validation and _self is None:
             raise ValueError("Invalid value for `_self`, must not be `None`")  # noqa: E501
 
         self.__self = _self
@@ -422,8 +427,11 @@ def __eq__(self, other):
         if not isinstance(other, CustomerFacingUserObject):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, CustomerFacingUserObject):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 1f5ae5e..bf65fea 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Dashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -112,8 +114,11 @@ class Dashboard(object):
         'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None):  # noqa: E501
+    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._acl = None
         self._chart_title_bg_color = None
@@ -609,7 +614,8 @@ def event_filter_type(self, event_filter_type):
         :type: str
         """
         allowed_values = ["BYCHART", "AUTOMATIC", "ALL", "NONE", "BYDASHBOARD", "BYCHARTANDDASHBOARD"]  # noqa: E501
-        if event_filter_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                event_filter_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `event_filter_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(event_filter_type, allowed_values)
@@ -725,7 +731,7 @@ def id(self, id):
         :param id: The id of this Dashboard.  # noqa: E501
         :type: str
         """
-        if id is None:
+        if self._configuration.client_side_validation and id is None:
             raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
         self._id = id
@@ -773,7 +779,7 @@ def name(self, name):
         :param name: The name of this Dashboard.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -907,7 +913,7 @@ def sections(self, sections):
         :param sections: The sections of this Dashboard.  # noqa: E501
         :type: list[DashboardSection]
         """
-        if sections is None:
+        if self._configuration.client_side_validation and sections is None:
             raise ValueError("Invalid value for `sections`, must not be `None`")  # noqa: E501
 
         self._sections = sections
@@ -1018,7 +1024,7 @@ def url(self, url):
         :param url: The url of this Dashboard.  # noqa: E501
         :type: str
         """
-        if url is None:
+        if self._configuration.client_side_validation and url is None:
             raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
 
         self._url = url
@@ -1126,8 +1132,11 @@ def __eq__(self, other):
         if not isinstance(other, Dashboard):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Dashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/dashboard_min.py b/wavefront_api_client/models/dashboard_min.py
index a4dc115..1b46e8b 100644
--- a/wavefront_api_client/models/dashboard_min.py
+++ b/wavefront_api_client/models/dashboard_min.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class DashboardMin(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class DashboardMin(object):
         'name': 'name'
     }
 
-    def __init__(self, description=None, id=None, name=None):  # noqa: E501
+    def __init__(self, description=None, id=None, name=None, _configuration=None):  # noqa: E501
         """DashboardMin - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._description = None
         self._id = None
@@ -166,8 +171,11 @@ def __eq__(self, other):
         if not isinstance(other, DashboardMin):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, DashboardMin):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index 61de122..c71fe7a 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class DashboardParameterValue(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -66,8 +68,11 @@ class DashboardParameterValue(object):
         'values_to_readable_strings': 'valuesToReadableStrings'
     }
 
-    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, order=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, tags_black_list_regex=None, value_ordering=None, values_to_readable_strings=None):  # noqa: E501
+    def __init__(self, allow_all=None, default_value=None, description=None, dynamic_field_type=None, hide_from_view=None, label=None, multivalue=None, order=None, parameter_type=None, query_value=None, reverse_dyn_sort=None, tag_key=None, tags_black_list_regex=None, value_ordering=None, values_to_readable_strings=None, _configuration=None):  # noqa: E501
         """DashboardParameterValue - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._allow_all = None
         self._default_value = None
@@ -199,7 +204,8 @@ def dynamic_field_type(self, dynamic_field_type):
         :type: str
         """
         allowed_values = ["SOURCE", "SOURCE_TAG", "METRIC_NAME", "TAG_KEY", "MATCHING_SOURCE_TAG"]  # noqa: E501
-        if dynamic_field_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                dynamic_field_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `dynamic_field_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(dynamic_field_type, allowed_values)
@@ -310,7 +316,8 @@ def parameter_type(self, parameter_type):
         :type: str
         """
         allowed_values = ["SIMPLE", "LIST", "DYNAMIC"]  # noqa: E501
-        if parameter_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                parameter_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `parameter_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(parameter_type, allowed_values)
@@ -488,8 +495,11 @@ def __eq__(self, other):
         if not isinstance(other, DashboardParameterValue):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, DashboardParameterValue):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index 560bad4..c5a2b30 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class DashboardSection(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class DashboardSection(object):
         'section_filter': 'sectionFilter'
     }
 
-    def __init__(self, name=None, rows=None, section_filter=None):  # noqa: E501
+    def __init__(self, name=None, rows=None, section_filter=None, _configuration=None):  # noqa: E501
         """DashboardSection - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._name = None
         self._rows = None
@@ -75,7 +80,7 @@ def name(self, name):
         :param name: The name of this DashboardSection.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -100,7 +105,7 @@ def rows(self, rows):
         :param rows: The rows of this DashboardSection.  # noqa: E501
         :type: list[DashboardSectionRow]
         """
-        if rows is None:
+        if self._configuration.client_side_validation and rows is None:
             raise ValueError("Invalid value for `rows`, must not be `None`")  # noqa: E501
 
         self._rows = rows
@@ -168,8 +173,11 @@ def __eq__(self, other):
         if not isinstance(other, DashboardSection):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, DashboardSection):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index c2f2b2d..10daeac 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class DashboardSectionRow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class DashboardSectionRow(object):
         'height_factor': 'heightFactor'
     }
 
-    def __init__(self, charts=None, height_factor=None):  # noqa: E501
+    def __init__(self, charts=None, height_factor=None, _configuration=None):  # noqa: E501
         """DashboardSectionRow - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._charts = None
         self._height_factor = None
@@ -71,7 +76,7 @@ def charts(self, charts):
         :param charts: The charts of this DashboardSectionRow.  # noqa: E501
         :type: list[Chart]
         """
-        if charts is None:
+        if self._configuration.client_side_validation and charts is None:
             raise ValueError("Invalid value for `charts`, must not be `None`")  # noqa: E501
 
         self._charts = charts
@@ -139,8 +144,11 @@ def __eq__(self, other):
         if not isinstance(other, DashboardSectionRow):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, DashboardSectionRow):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index bbfab34..e641759 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class DerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -94,8 +96,11 @@ class DerivedMetricDefinition(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, additional_information=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, hosts_used=None, id=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_failed_time=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, points_scanned_at_last_query=None, process_rate_minutes=None, query=None, query_failing=None, query_qb_enabled=None, query_qb_serialization=None, status=None, tags=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, additional_information=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, hosts_used=None, id=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_failed_time=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, points_scanned_at_last_query=None, process_rate_minutes=None, query=None, query_failing=None, query_qb_enabled=None, query_qb_serialization=None, status=None, tags=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """DerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._additional_information = None
         self._create_user_id = None
@@ -537,7 +542,7 @@ def minutes(self, minutes):
         :param minutes: The minutes of this DerivedMetricDefinition.  # noqa: E501
         :type: int
         """
-        if minutes is None:
+        if self._configuration.client_side_validation and minutes is None:
             raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
 
         self._minutes = minutes
@@ -560,7 +565,7 @@ def name(self, name):
         :param name: The name of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -631,7 +636,7 @@ def query(self, query):
         :param query: The query of this DerivedMetricDefinition.  # noqa: E501
         :type: str
         """
-        if query is None:
+        if self._configuration.client_side_validation and query is None:
             raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
         self._query = query
@@ -877,8 +882,11 @@ def __eq__(self, other):
         if not isinstance(other, DerivedMetricDefinition):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, DerivedMetricDefinition):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 4fb3b63..70a1f02 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class EC2Configuration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -48,8 +50,11 @@ class EC2Configuration(object):
         'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, host_name_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, point_tag_filter_regex=None, volume_selection_tags_expr=None):  # noqa: E501
+    def __init__(self, base_credentials=None, host_name_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, point_tag_filter_regex=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
         """EC2Configuration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._base_credentials = None
         self._host_name_tags = None
@@ -248,8 +253,11 @@ def __eq__(self, other):
         if not isinstance(other, EC2Configuration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, EC2Configuration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 0b4d4d6..5fa798d 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Event(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -84,8 +86,11 @@ class Event(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alert_tags = None
         self._annotations = None
@@ -202,7 +207,7 @@ def annotations(self, annotations):
         :param annotations: The annotations of this Event.  # noqa: E501
         :type: dict(str, str)
         """
-        if annotations is None:
+        if self._configuration.client_side_validation and annotations is None:
             raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
 
         self._annotations = annotations
@@ -331,7 +336,8 @@ def creator_type(self, creator_type):
         :type: list[str]
         """
         allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
-        if not set(creator_type).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(creator_type).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
@@ -519,7 +525,7 @@ def name(self, name):
         :param name: The name of this Event.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -543,7 +549,8 @@ def running_state(self, running_state):
         :type: str
         """
         allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
+        if (self._configuration.client_side_validation and
+                running_state not in allowed_values):
             raise ValueError(
                 "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
                 .format(running_state, allowed_values)
@@ -571,7 +578,7 @@ def start_time(self, start_time):
         :param start_time: The start_time of this Event.  # noqa: E501
         :type: int
         """
-        if start_time is None:
+        if self._configuration.client_side_validation and start_time is None:
             raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
 
         self._start_time = start_time
@@ -748,8 +755,11 @@ def __eq__(self, other):
         if not isinstance(other, Event):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Event):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index c5693dd..56798c6 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class EventSearchRequest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class EventSearchRequest(object):
         'time_range': 'timeRange'
     }
 
-    def __init__(self, cursor=None, limit=None, query=None, related_event_time_range=None, sort_score_method=None, sort_time_ascending=None, time_range=None):  # noqa: E501
+    def __init__(self, cursor=None, limit=None, query=None, related_event_time_range=None, sort_score_method=None, sort_time_ascending=None, time_range=None, _configuration=None):  # noqa: E501
         """EventSearchRequest - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._limit = None
@@ -188,7 +193,8 @@ def sort_score_method(self, sort_score_method):
         :type: str
         """
         allowed_values = ["SCORE_ASC", "SCORE_DES", "NONE"]  # noqa: E501
-        if sort_score_method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                sort_score_method not in allowed_values):
             raise ValueError(
                 "Invalid value for `sort_score_method` ({0}), must be one of {1}"  # noqa: E501
                 .format(sort_score_method, allowed_values)
@@ -280,8 +286,11 @@ def __eq__(self, other):
         if not isinstance(other, EventSearchRequest):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, EventSearchRequest):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/event_time_range.py b/wavefront_api_client/models/event_time_range.py
index 4ca623b..ad0b37e 100644
--- a/wavefront_api_client/models/event_time_range.py
+++ b/wavefront_api_client/models/event_time_range.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class EventTimeRange(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class EventTimeRange(object):
         'latest_start_time_epoch_millis': 'latestStartTimeEpochMillis'
     }
 
-    def __init__(self, earliest_start_time_epoch_millis=None, latest_start_time_epoch_millis=None):  # noqa: E501
+    def __init__(self, earliest_start_time_epoch_millis=None, latest_start_time_epoch_millis=None, _configuration=None):  # noqa: E501
         """EventTimeRange - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._earliest_start_time_epoch_millis = None
         self._latest_start_time_epoch_millis = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, EventTimeRange):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, EventTimeRange):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index fa79b5c..36ca942 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -60,8 +62,11 @@ class ExternalLink(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, id=None, is_log_integration=None, metric_filter_regex=None, name=None, point_tag_filter_regexes=None, source_filter_regex=None, template=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, id=None, is_log_integration=None, metric_filter_regex=None, name=None, point_tag_filter_regexes=None, source_filter_regex=None, template=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """ExternalLink - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._creator_id = None
@@ -161,7 +166,7 @@ def description(self, description):
         :param description: The description of this ExternalLink.  # noqa: E501
         :type: str
         """
-        if description is None:
+        if self._configuration.client_side_validation and description is None:
             raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
         self._description = description
@@ -253,7 +258,7 @@ def name(self, name):
         :param name: The name of this ExternalLink.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -324,7 +329,7 @@ def template(self, template):
         :param template: The template of this ExternalLink.  # noqa: E501
         :type: str
         """
-        if template is None:
+        if self._configuration.client_side_validation and template is None:
             raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
 
         self._template = template
@@ -411,8 +416,11 @@ def __eq__(self, other):
         if not isinstance(other, ExternalLink):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ExternalLink):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index b28bef9..bbf0e48 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class FacetResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class FacetResponse(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """FacetResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, FacetResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, FacetResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index f4deeb3..12be18b 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class FacetSearchRequestContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class FacetSearchRequestContainer(object):
         'query': 'query'
     }
 
-    def __init__(self, facet_query=None, facet_query_matching_method=None, limit=None, offset=None, query=None):  # noqa: E501
+    def __init__(self, facet_query=None, facet_query_matching_method=None, limit=None, offset=None, query=None, _configuration=None):  # noqa: E501
         """FacetSearchRequestContainer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._facet_query = None
         self._facet_query_matching_method = None
@@ -111,7 +116,8 @@ def facet_query_matching_method(self, facet_query_matching_method):
         :type: str
         """
         allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
-        if facet_query_matching_method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                facet_query_matching_method not in allowed_values):
             raise ValueError(
                 "Invalid value for `facet_query_matching_method` ({0}), must be one of {1}"  # noqa: E501
                 .format(facet_query_matching_method, allowed_values)
@@ -139,9 +145,11 @@ def limit(self, limit):
         :param limit: The limit of this FacetSearchRequestContainer.  # noqa: E501
         :type: int
         """
-        if limit is not None and limit > 1000:  # noqa: E501
+        if (self._configuration.client_side_validation and
+                limit is not None and limit > 1000):  # noqa: E501
             raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if limit is not None and limit < 1:  # noqa: E501
+        if (self._configuration.client_side_validation and
+                limit is not None and limit < 1):  # noqa: E501
             raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
@@ -232,8 +240,11 @@ def __eq__(self, other):
         if not isinstance(other, FacetSearchRequestContainer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, FacetSearchRequestContainer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index 04a0b2b..9492f95 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class FacetsResponseContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class FacetsResponseContainer(object):
         'limit': 'limit'
     }
 
-    def __init__(self, facets=None, limit=None):  # noqa: E501
+    def __init__(self, facets=None, limit=None, _configuration=None):  # noqa: E501
         """FacetsResponseContainer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._facets = None
         self._limit = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, FacetsResponseContainer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, FacetsResponseContainer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index dadf95d..366e467 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class FacetsSearchRequestContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class FacetsSearchRequestContainer(object):
         'query': 'query'
     }
 
-    def __init__(self, facet_query=None, facet_query_matching_method=None, facets=None, limit=None, query=None):  # noqa: E501
+    def __init__(self, facet_query=None, facet_query_matching_method=None, facets=None, limit=None, query=None, _configuration=None):  # noqa: E501
         """FacetsSearchRequestContainer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._facet_query = None
         self._facet_query_matching_method = None
@@ -110,7 +115,8 @@ def facet_query_matching_method(self, facet_query_matching_method):
         :type: str
         """
         allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
-        if facet_query_matching_method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                facet_query_matching_method not in allowed_values):
             raise ValueError(
                 "Invalid value for `facet_query_matching_method` ({0}), must be one of {1}"  # noqa: E501
                 .format(facet_query_matching_method, allowed_values)
@@ -138,7 +144,7 @@ def facets(self, facets):
         :param facets: The facets of this FacetsSearchRequestContainer.  # noqa: E501
         :type: list[str]
         """
-        if facets is None:
+        if self._configuration.client_side_validation and facets is None:
             raise ValueError("Invalid value for `facets`, must not be `None`")  # noqa: E501
 
         self._facets = facets
@@ -163,9 +169,11 @@ def limit(self, limit):
         :param limit: The limit of this FacetsSearchRequestContainer.  # noqa: E501
         :type: int
         """
-        if limit is not None and limit > 1000:  # noqa: E501
+        if (self._configuration.client_side_validation and
+                limit is not None and limit > 1000):  # noqa: E501
             raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if limit is not None and limit < 1:  # noqa: E501
+        if (self._configuration.client_side_validation and
+                limit is not None and limit < 1):  # noqa: E501
             raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
@@ -233,8 +241,11 @@ def __eq__(self, other):
         if not isinstance(other, FacetsSearchRequestContainer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, FacetsSearchRequestContainer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/fast_reader_builder.py b/wavefront_api_client/models/fast_reader_builder.py
index 718f1a3..836bd15 100644
--- a/wavefront_api_client/models/fast_reader_builder.py
+++ b/wavefront_api_client/models/fast_reader_builder.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class FastReaderBuilder(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class FastReaderBuilder(object):
         'key_class_enabled': 'keyClassEnabled'
     }
 
-    def __init__(self, class_prop_enabled=None, key_class_enabled=None):  # noqa: E501
+    def __init__(self, class_prop_enabled=None, key_class_enabled=None, _configuration=None):  # noqa: E501
         """FastReaderBuilder - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._class_prop_enabled = None
         self._key_class_enabled = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, FastReaderBuilder):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, FastReaderBuilder):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/field.py b/wavefront_api_client/models/field.py
index eb9fc49..58e4c6c 100644
--- a/wavefront_api_client/models/field.py
+++ b/wavefront_api_client/models/field.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Field(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -38,8 +40,11 @@ class Field(object):
         'object_props': 'objectProps'
     }
 
-    def __init__(self, object_props=None):  # noqa: E501
+    def __init__(self, object_props=None, _configuration=None):  # noqa: E501
         """Field - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._object_props = None
         self.discriminator = None
@@ -108,8 +113,11 @@ def __eq__(self, other):
         if not isinstance(other, Field):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Field):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index 861e939..99f5807 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class GCPBillingConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class GCPBillingConfiguration(object):
         'project_id': 'projectId'
     }
 
-    def __init__(self, gcp_api_key=None, gcp_json_key=None, project_id=None):  # noqa: E501
+    def __init__(self, gcp_api_key=None, gcp_json_key=None, project_id=None, _configuration=None):  # noqa: E501
         """GCPBillingConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._gcp_api_key = None
         self._gcp_json_key = None
@@ -74,7 +79,7 @@ def gcp_api_key(self, gcp_api_key):
         :param gcp_api_key: The gcp_api_key of this GCPBillingConfiguration.  # noqa: E501
         :type: str
         """
-        if gcp_api_key is None:
+        if self._configuration.client_side_validation and gcp_api_key is None:
             raise ValueError("Invalid value for `gcp_api_key`, must not be `None`")  # noqa: E501
 
         self._gcp_api_key = gcp_api_key
@@ -99,7 +104,7 @@ def gcp_json_key(self, gcp_json_key):
         :param gcp_json_key: The gcp_json_key of this GCPBillingConfiguration.  # noqa: E501
         :type: str
         """
-        if gcp_json_key is None:
+        if self._configuration.client_side_validation and gcp_json_key is None:
             raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
 
         self._gcp_json_key = gcp_json_key
@@ -124,7 +129,7 @@ def project_id(self, project_id):
         :param project_id: The project_id of this GCPBillingConfiguration.  # noqa: E501
         :type: str
         """
-        if project_id is None:
+        if self._configuration.client_side_validation and project_id is None:
             raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
 
         self._project_id = project_id
@@ -169,8 +174,11 @@ def __eq__(self, other):
         if not isinstance(other, GCPBillingConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, GCPBillingConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 8fa01e6..6103371 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class GCPConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class GCPConfiguration(object):
         'project_id': 'projectId'
     }
 
-    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_delta_counts=None, disable_histogram_to_metric_conversion=None, gcp_json_key=None, metric_filter_regex=None, project_id=None):  # noqa: E501
+    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_delta_counts=None, disable_histogram_to_metric_conversion=None, gcp_json_key=None, metric_filter_regex=None, project_id=None, _configuration=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._categories_to_fetch = None
         self._custom_metric_prefix = None
@@ -96,7 +101,8 @@ def categories_to_fetch(self, categories_to_fetch):
         :type: list[str]
         """
         allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "KUBERNETES", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
-        if not set(categories_to_fetch).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(categories_to_fetch).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
@@ -194,7 +200,7 @@ def gcp_json_key(self, gcp_json_key):
         :param gcp_json_key: The gcp_json_key of this GCPConfiguration.  # noqa: E501
         :type: str
         """
-        if gcp_json_key is None:
+        if self._configuration.client_side_validation and gcp_json_key is None:
             raise ValueError("Invalid value for `gcp_json_key`, must not be `None`")  # noqa: E501
 
         self._gcp_json_key = gcp_json_key
@@ -242,7 +248,7 @@ def project_id(self, project_id):
         :param project_id: The project_id of this GCPConfiguration.  # noqa: E501
         :type: str
         """
-        if project_id is None:
+        if self._configuration.client_side_validation and project_id is None:
             raise ValueError("Invalid value for `project_id`, must not be `None`")  # noqa: E501
 
         self._project_id = project_id
@@ -287,8 +293,11 @@ def __eq__(self, other):
         if not isinstance(other, GCPConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, GCPConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index 2d416bb..bab95da 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class HistoryEntry(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -48,8 +50,11 @@ class HistoryEntry(object):
         'version': 'version'
     }
 
-    def __init__(self, change_description=None, id=None, in_trash=None, update_time=None, update_user=None, version=None):  # noqa: E501
+    def __init__(self, change_description=None, id=None, in_trash=None, update_time=None, update_user=None, version=None, _configuration=None):  # noqa: E501
         """HistoryEntry - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._change_description = None
         self._id = None
@@ -238,8 +243,11 @@ def __eq__(self, other):
         if not isinstance(other, HistoryEntry):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, HistoryEntry):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index 15e5231..c3140ec 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class HistoryResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class HistoryResponse(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """HistoryResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, HistoryResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, HistoryResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ingestion_policy.py b/wavefront_api_client/models/ingestion_policy.py
index a0e0862..8727239 100644
--- a/wavefront_api_client/models/ingestion_policy.py
+++ b/wavefront_api_client/models/ingestion_policy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IngestionPolicy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class IngestionPolicy(object):
         'user_account_count': 'userAccountCount'
     }
 
-    def __init__(self, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, name=None, sampled_service_accounts=None, sampled_user_accounts=None, service_account_count=None, user_account_count=None):  # noqa: E501
+    def __init__(self, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, name=None, sampled_service_accounts=None, sampled_user_accounts=None, service_account_count=None, user_account_count=None, _configuration=None):  # noqa: E501
         """IngestionPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._description = None
@@ -362,8 +367,11 @@ def __eq__(self, other):
         if not isinstance(other, IngestionPolicy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IngestionPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ingestion_policy_mapping.py b/wavefront_api_client/models/ingestion_policy_mapping.py
index 7d87529..e715594 100644
--- a/wavefront_api_client/models/ingestion_policy_mapping.py
+++ b/wavefront_api_client/models/ingestion_policy_mapping.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IngestionPolicyMapping(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class IngestionPolicyMapping(object):
         'ingestion_policy_id': 'ingestionPolicyId'
     }
 
-    def __init__(self, accounts=None, ingestion_policy_id=None):  # noqa: E501
+    def __init__(self, accounts=None, ingestion_policy_id=None, _configuration=None):  # noqa: E501
         """IngestionPolicyMapping - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._accounts = None
         self._ingestion_policy_id = None
@@ -70,7 +75,7 @@ def accounts(self, accounts):
         :param accounts: The accounts of this IngestionPolicyMapping.  # noqa: E501
         :type: list[str]
         """
-        if accounts is None:
+        if self._configuration.client_side_validation and accounts is None:
             raise ValueError("Invalid value for `accounts`, must not be `None`")  # noqa: E501
 
         self._accounts = accounts
@@ -95,7 +100,7 @@ def ingestion_policy_id(self, ingestion_policy_id):
         :param ingestion_policy_id: The ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
         :type: str
         """
-        if ingestion_policy_id is None:
+        if self._configuration.client_side_validation and ingestion_policy_id is None:
             raise ValueError("Invalid value for `ingestion_policy_id`, must not be `None`")  # noqa: E501
 
         self._ingestion_policy_id = ingestion_policy_id
@@ -140,8 +145,11 @@ def __eq__(self, other):
         if not isinstance(other, IngestionPolicyMapping):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IngestionPolicyMapping):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/install_alerts.py b/wavefront_api_client/models/install_alerts.py
index c3e3088..7c72492 100644
--- a/wavefront_api_client/models/install_alerts.py
+++ b/wavefront_api_client/models/install_alerts.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class InstallAlerts(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -38,8 +40,11 @@ class InstallAlerts(object):
         'target': 'target'
     }
 
-    def __init__(self, target=None):  # noqa: E501
+    def __init__(self, target=None, _configuration=None):  # noqa: E501
         """InstallAlerts - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._target = None
         self.discriminator = None
@@ -108,8 +113,11 @@ def __eq__(self, other):
         if not isinstance(other, InstallAlerts):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, InstallAlerts):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index e7dee63..8ddb96a 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Integration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -76,8 +78,11 @@ class Integration(object):
         'version': 'version'
     }
 
-    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, hidden=None, icon=None, id=None, metrics=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None):  # noqa: E501
+    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, hidden=None, icon=None, id=None, metrics=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None, _configuration=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alerts = None
         self._alias_integrations = None
@@ -335,7 +340,7 @@ def description(self, description):
         :param description: The description of this Integration.  # noqa: E501
         :type: str
         """
-        if description is None:
+        if self._configuration.client_side_validation and description is None:
             raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
         self._description = description
@@ -360,7 +365,7 @@ def hidden(self, hidden):
         :param hidden: The hidden of this Integration.  # noqa: E501
         :type: bool
         """
-        if hidden is None:
+        if self._configuration.client_side_validation and hidden is None:
             raise ValueError("Invalid value for `hidden`, must not be `None`")  # noqa: E501
 
         self._hidden = hidden
@@ -385,7 +390,7 @@ def icon(self, icon):
         :param icon: The icon of this Integration.  # noqa: E501
         :type: str
         """
-        if icon is None:
+        if self._configuration.client_side_validation and icon is None:
             raise ValueError("Invalid value for `icon`, must not be `None`")  # noqa: E501
 
         self._icon = icon
@@ -452,7 +457,7 @@ def name(self, name):
         :param name: The name of this Integration.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -586,7 +591,7 @@ def version(self, version):
         :param version: The version of this Integration.  # noqa: E501
         :type: str
         """
-        if version is None:
+        if self._configuration.client_side_validation and version is None:
             raise ValueError("Invalid value for `version`, must not be `None`")  # noqa: E501
 
         self._version = version
@@ -631,8 +636,11 @@ def __eq__(self, other):
         if not isinstance(other, Integration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Integration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index b5b09d0..3a38b13 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IntegrationAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class IntegrationAlert(object):
         'url': 'url'
     }
 
-    def __init__(self, alert_min_obj=None, alert_obj=None, description=None, name=None, url=None):  # noqa: E501
+    def __init__(self, alert_min_obj=None, alert_obj=None, description=None, name=None, url=None, _configuration=None):  # noqa: E501
         """IntegrationAlert - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alert_min_obj = None
         self._alert_obj = None
@@ -126,7 +131,7 @@ def description(self, description):
         :param description: The description of this IntegrationAlert.  # noqa: E501
         :type: str
         """
-        if description is None:
+        if self._configuration.client_side_validation and description is None:
             raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
         self._description = description
@@ -151,7 +156,7 @@ def name(self, name):
         :param name: The name of this IntegrationAlert.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -176,7 +181,7 @@ def url(self, url):
         :param url: The url of this IntegrationAlert.  # noqa: E501
         :type: str
         """
-        if url is None:
+        if self._configuration.client_side_validation and url is None:
             raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
 
         self._url = url
@@ -221,8 +226,11 @@ def __eq__(self, other):
         if not isinstance(other, IntegrationAlert):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IntegrationAlert):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index c907820..8f049c6 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IntegrationAlias(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class IntegrationAlias(object):
         'name': 'name'
     }
 
-    def __init__(self, base_url=None, description=None, icon=None, id=None, name=None):  # noqa: E501
+    def __init__(self, base_url=None, description=None, icon=None, id=None, name=None, _configuration=None):  # noqa: E501
         """IntegrationAlias - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._base_url = None
         self._description = None
@@ -222,8 +227,11 @@ def __eq__(self, other):
         if not isinstance(other, IntegrationAlias):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IntegrationAlias):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 1fc1f24..f1a6f45 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IntegrationDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class IntegrationDashboard(object):
         'url': 'url'
     }
 
-    def __init__(self, dashboard_min_obj=None, dashboard_obj=None, description=None, name=None, url=None):  # noqa: E501
+    def __init__(self, dashboard_min_obj=None, dashboard_obj=None, description=None, name=None, url=None, _configuration=None):  # noqa: E501
         """IntegrationDashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._dashboard_min_obj = None
         self._dashboard_obj = None
@@ -126,7 +131,7 @@ def description(self, description):
         :param description: The description of this IntegrationDashboard.  # noqa: E501
         :type: str
         """
-        if description is None:
+        if self._configuration.client_side_validation and description is None:
             raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
         self._description = description
@@ -151,7 +156,7 @@ def name(self, name):
         :param name: The name of this IntegrationDashboard.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -176,7 +181,7 @@ def url(self, url):
         :param url: The url of this IntegrationDashboard.  # noqa: E501
         :type: str
         """
-        if url is None:
+        if self._configuration.client_side_validation and url is None:
             raise ValueError("Invalid value for `url`, must not be `None`")  # noqa: E501
 
         self._url = url
@@ -221,8 +226,11 @@ def __eq__(self, other):
         if not isinstance(other, IntegrationDashboard):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IntegrationDashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 9095d59..26875e7 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IntegrationManifestGroup(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class IntegrationManifestGroup(object):
         'title': 'title'
     }
 
-    def __init__(self, integration_objs=None, integrations=None, subtitle=None, title=None):  # noqa: E501
+    def __init__(self, integration_objs=None, integrations=None, subtitle=None, title=None, _configuration=None):  # noqa: E501
         """IntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._integration_objs = None
         self._integrations = None
@@ -102,7 +107,7 @@ def integrations(self, integrations):
         :param integrations: The integrations of this IntegrationManifestGroup.  # noqa: E501
         :type: list[str]
         """
-        if integrations is None:
+        if self._configuration.client_side_validation and integrations is None:
             raise ValueError("Invalid value for `integrations`, must not be `None`")  # noqa: E501
 
         self._integrations = integrations
@@ -127,7 +132,7 @@ def subtitle(self, subtitle):
         :param subtitle: The subtitle of this IntegrationManifestGroup.  # noqa: E501
         :type: str
         """
-        if subtitle is None:
+        if self._configuration.client_side_validation and subtitle is None:
             raise ValueError("Invalid value for `subtitle`, must not be `None`")  # noqa: E501
 
         self._subtitle = subtitle
@@ -152,7 +157,7 @@ def title(self, title):
         :param title: The title of this IntegrationManifestGroup.  # noqa: E501
         :type: str
         """
-        if title is None:
+        if self._configuration.client_side_validation and title is None:
             raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
         self._title = title
@@ -197,8 +202,11 @@ def __eq__(self, other):
         if not isinstance(other, IntegrationManifestGroup):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IntegrationManifestGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index 2b1db64..f447022 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IntegrationMetrics(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -48,8 +50,11 @@ class IntegrationMetrics(object):
         'required': 'required'
     }
 
-    def __init__(self, chart_objs=None, charts=None, display=None, pps_dimensions=None, prefixes=None, required=None):  # noqa: E501
+    def __init__(self, chart_objs=None, charts=None, display=None, pps_dimensions=None, prefixes=None, required=None, _configuration=None):  # noqa: E501
         """IntegrationMetrics - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._chart_objs = None
         self._charts = None
@@ -111,7 +116,7 @@ def charts(self, charts):
         :param charts: The charts of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if charts is None:
+        if self._configuration.client_side_validation and charts is None:
             raise ValueError("Invalid value for `charts`, must not be `None`")  # noqa: E501
 
         self._charts = charts
@@ -136,7 +141,7 @@ def display(self, display):
         :param display: The display of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if display is None:
+        if self._configuration.client_side_validation and display is None:
             raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
 
         self._display = display
@@ -184,7 +189,7 @@ def prefixes(self, prefixes):
         :param prefixes: The prefixes of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if prefixes is None:
+        if self._configuration.client_side_validation and prefixes is None:
             raise ValueError("Invalid value for `prefixes`, must not be `None`")  # noqa: E501
 
         self._prefixes = prefixes
@@ -209,7 +214,7 @@ def required(self, required):
         :param required: The required of this IntegrationMetrics.  # noqa: E501
         :type: list[str]
         """
-        if required is None:
+        if self._configuration.client_side_validation and required is None:
             raise ValueError("Invalid value for `required`, must not be `None`")  # noqa: E501
 
         self._required = required
@@ -254,8 +259,11 @@ def __eq__(self, other):
         if not isinstance(other, IntegrationMetrics):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IntegrationMetrics):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index da62b50..05e1250 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class IntegrationStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class IntegrationStatus(object):
         'metric_statuses': 'metricStatuses'
     }
 
-    def __init__(self, alert_statuses=None, content_status=None, install_status=None, metric_statuses=None):  # noqa: E501
+    def __init__(self, alert_statuses=None, content_status=None, install_status=None, metric_statuses=None, _configuration=None):  # noqa: E501
         """IntegrationStatus - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alert_statuses = None
         self._content_status = None
@@ -83,7 +88,8 @@ def alert_statuses(self, alert_statuses):
         :type: dict(str, str)
         """
         allowed_values = ["VISIBLE", "HIDDEN", "NOT_LOADED"]  # noqa: E501
-        if not set(alert_statuses.keys()).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(alert_statuses.keys()).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid keys in `alert_statuses` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(alert_statuses.keys()) - set(allowed_values))),  # noqa: E501
@@ -113,7 +119,8 @@ def content_status(self, content_status):
         :type: str
         """
         allowed_values = ["INVALID", "NOT_LOADED", "HIDDEN", "VISIBLE"]  # noqa: E501
-        if content_status not in allowed_values:
+        if (self._configuration.client_side_validation and
+                content_status not in allowed_values):
             raise ValueError(
                 "Invalid value for `content_status` ({0}), must be one of {1}"  # noqa: E501
                 .format(content_status, allowed_values)
@@ -142,7 +149,8 @@ def install_status(self, install_status):
         :type: str
         """
         allowed_values = ["UNDECIDED", "UNINSTALLED", "INSTALLED"]  # noqa: E501
-        if install_status not in allowed_values:
+        if (self._configuration.client_side_validation and
+                install_status not in allowed_values):
             raise ValueError(
                 "Invalid value for `install_status` ({0}), must be one of {1}"  # noqa: E501
                 .format(install_status, allowed_values)
@@ -213,8 +221,11 @@ def __eq__(self, other):
         if not isinstance(other, IntegrationStatus):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, IntegrationStatus):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/json_node.py b/wavefront_api_client/models/json_node.py
index f2e44f3..b0b699d 100644
--- a/wavefront_api_client/models/json_node.py
+++ b/wavefront_api_client/models/json_node.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class JsonNode(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -36,8 +38,11 @@ class JsonNode(object):
     attribute_map = {
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, _configuration=None):  # noqa: E501
         """JsonNode - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
         self.discriminator = None
 
     def to_dict(self):
@@ -80,8 +85,11 @@ def __eq__(self, other):
         if not isinstance(other, JsonNode):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, JsonNode):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
index dc754e7..823fea4 100644
--- a/wavefront_api_client/models/kubernetes_component.py
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class KubernetesComponent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class KubernetesComponent(object):
         'status': 'status'
     }
 
-    def __init__(self, last_updated=None, name=None, status=None):  # noqa: E501
+    def __init__(self, last_updated=None, name=None, status=None, _configuration=None):  # noqa: E501
         """KubernetesComponent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._last_updated = None
         self._name = None
@@ -99,7 +104,7 @@ def name(self, name):
         :param name: The name of this KubernetesComponent.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -167,8 +172,11 @@ def __eq__(self, other):
         if not isinstance(other, KubernetesComponent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, KubernetesComponent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/kubernetes_component_status.py b/wavefront_api_client/models/kubernetes_component_status.py
index 550e06c..4d2a866 100644
--- a/wavefront_api_client/models/kubernetes_component_status.py
+++ b/wavefront_api_client/models/kubernetes_component_status.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class KubernetesComponentStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class KubernetesComponentStatus(object):
         'status': 'status'
     }
 
-    def __init__(self, description=None, name=None, status=None):  # noqa: E501
+    def __init__(self, description=None, name=None, status=None, _configuration=None):  # noqa: E501
         """KubernetesComponentStatus - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._description = None
         self._name = None
@@ -99,7 +104,7 @@ def name(self, name):
         :param name: The name of this KubernetesComponentStatus.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -167,8 +172,11 @@ def __eq__(self, other):
         if not isinstance(other, KubernetesComponentStatus):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, KubernetesComponentStatus):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
index cb2bee3..255f011 100644
--- a/wavefront_api_client/models/logical_type.py
+++ b/wavefront_api_client/models/logical_type.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class LogicalType(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -38,8 +40,11 @@ class LogicalType(object):
         'name': 'name'
     }
 
-    def __init__(self, name=None):  # noqa: E501
+    def __init__(self, name=None, _configuration=None):  # noqa: E501
         """LogicalType - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._name = None
         self.discriminator = None
@@ -108,8 +113,11 @@ def __eq__(self, other):
         if not isinstance(other, LogicalType):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, LogicalType):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index c16397e..597de9d 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -74,8 +76,11 @@ class MaintenanceWindow(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, title=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, title=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._creator_id = None
@@ -215,7 +220,7 @@ def end_time_in_seconds(self, end_time_in_seconds):
         :param end_time_in_seconds: The end_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
-        if end_time_in_seconds is None:
+        if self._configuration.client_side_validation and end_time_in_seconds is None:
             raise ValueError("Invalid value for `end_time_in_seconds`, must not be `None`")  # noqa: E501
 
         self._end_time_in_seconds = end_time_in_seconds
@@ -307,7 +312,7 @@ def reason(self, reason):
         :param reason: The reason of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
-        if reason is None:
+        if self._configuration.client_side_validation and reason is None:
             raise ValueError("Invalid value for `reason`, must not be `None`")  # noqa: E501
 
         self._reason = reason
@@ -332,7 +337,7 @@ def relevant_customer_tags(self, relevant_customer_tags):
         :param relevant_customer_tags: The relevant_customer_tags of this MaintenanceWindow.  # noqa: E501
         :type: list[str]
         """
-        if relevant_customer_tags is None:
+        if self._configuration.client_side_validation and relevant_customer_tags is None:
             raise ValueError("Invalid value for `relevant_customer_tags`, must not be `None`")  # noqa: E501
 
         self._relevant_customer_tags = relevant_customer_tags
@@ -448,7 +453,8 @@ def running_state(self, running_state):
         :type: str
         """
         allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
+        if (self._configuration.client_side_validation and
+                running_state not in allowed_values):
             raise ValueError(
                 "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
                 .format(running_state, allowed_values)
@@ -499,7 +505,7 @@ def start_time_in_seconds(self, start_time_in_seconds):
         :param start_time_in_seconds: The start_time_in_seconds of this MaintenanceWindow.  # noqa: E501
         :type: int
         """
-        if start_time_in_seconds is None:
+        if self._configuration.client_side_validation and start_time_in_seconds is None:
             raise ValueError("Invalid value for `start_time_in_seconds`, must not be `None`")  # noqa: E501
 
         self._start_time_in_seconds = start_time_in_seconds
@@ -524,7 +530,7 @@ def title(self, title):
         :param title: The title of this MaintenanceWindow.  # noqa: E501
         :type: str
         """
-        if title is None:
+        if self._configuration.client_side_validation and title is None:
             raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
         self._title = title
@@ -611,8 +617,11 @@ def __eq__(self, other):
         if not isinstance(other, MaintenanceWindow):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MaintenanceWindow):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 61b3872..b434646 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Message(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -60,8 +62,11 @@ class Message(object):
         'title': 'title'
     }
 
-    def __init__(self, attributes=None, content=None, display=None, end_epoch_millis=None, id=None, read=None, scope=None, severity=None, source=None, start_epoch_millis=None, target=None, title=None):  # noqa: E501
+    def __init__(self, attributes=None, content=None, display=None, end_epoch_millis=None, id=None, read=None, scope=None, severity=None, source=None, start_epoch_millis=None, target=None, title=None, _configuration=None):  # noqa: E501
         """Message - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._attributes = None
         self._content = None
@@ -137,7 +142,7 @@ def content(self, content):
         :param content: The content of this Message.  # noqa: E501
         :type: str
         """
-        if content is None:
+        if self._configuration.client_side_validation and content is None:
             raise ValueError("Invalid value for `content`, must not be `None`")  # noqa: E501
 
         self._content = content
@@ -162,10 +167,11 @@ def display(self, display):
         :param display: The display of this Message.  # noqa: E501
         :type: str
         """
-        if display is None:
+        if self._configuration.client_side_validation and display is None:
             raise ValueError("Invalid value for `display`, must not be `None`")  # noqa: E501
         allowed_values = ["BANNER", "TOASTER", "MODAL"]  # noqa: E501
-        if display not in allowed_values:
+        if (self._configuration.client_side_validation and
+                display not in allowed_values):
             raise ValueError(
                 "Invalid value for `display` ({0}), must be one of {1}"  # noqa: E501
                 .format(display, allowed_values)
@@ -193,7 +199,7 @@ def end_epoch_millis(self, end_epoch_millis):
         :param end_epoch_millis: The end_epoch_millis of this Message.  # noqa: E501
         :type: int
         """
-        if end_epoch_millis is None:
+        if self._configuration.client_side_validation and end_epoch_millis is None:
             raise ValueError("Invalid value for `end_epoch_millis`, must not be `None`")  # noqa: E501
 
         self._end_epoch_millis = end_epoch_millis
@@ -262,10 +268,11 @@ def scope(self, scope):
         :param scope: The scope of this Message.  # noqa: E501
         :type: str
         """
-        if scope is None:
+        if self._configuration.client_side_validation and scope is None:
             raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
         allowed_values = ["CLUSTER", "CUSTOMER", "USER"]  # noqa: E501
-        if scope not in allowed_values:
+        if (self._configuration.client_side_validation and
+                scope not in allowed_values):
             raise ValueError(
                 "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
                 .format(scope, allowed_values)
@@ -293,10 +300,11 @@ def severity(self, severity):
         :param severity: The severity of this Message.  # noqa: E501
         :type: str
         """
-        if severity is None:
+        if self._configuration.client_side_validation and severity is None:
             raise ValueError("Invalid value for `severity`, must not be `None`")  # noqa: E501
         allowed_values = ["MARKETING", "INFO", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
+        if (self._configuration.client_side_validation and
+                severity not in allowed_values):
             raise ValueError(
                 "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
                 .format(severity, allowed_values)
@@ -324,7 +332,7 @@ def source(self, source):
         :param source: The source of this Message.  # noqa: E501
         :type: str
         """
-        if source is None:
+        if self._configuration.client_side_validation and source is None:
             raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
 
         self._source = source
@@ -349,7 +357,7 @@ def start_epoch_millis(self, start_epoch_millis):
         :param start_epoch_millis: The start_epoch_millis of this Message.  # noqa: E501
         :type: int
         """
-        if start_epoch_millis is None:
+        if self._configuration.client_side_validation and start_epoch_millis is None:
             raise ValueError("Invalid value for `start_epoch_millis`, must not be `None`")  # noqa: E501
 
         self._start_epoch_millis = start_epoch_millis
@@ -397,7 +405,7 @@ def title(self, title):
         :param title: The title of this Message.  # noqa: E501
         :type: str
         """
-        if title is None:
+        if self._configuration.client_side_validation and title is None:
             raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
         self._title = title
@@ -442,8 +450,11 @@ def __eq__(self, other):
         if not isinstance(other, Message):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Message):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/metric_details.py b/wavefront_api_client/models/metric_details.py
index 1cfcf24..639e319 100644
--- a/wavefront_api_client/models/metric_details.py
+++ b/wavefront_api_client/models/metric_details.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MetricDetails(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class MetricDetails(object):
         'tags': 'tags'
     }
 
-    def __init__(self, host=None, last_update=None, tags=None):  # noqa: E501
+    def __init__(self, host=None, last_update=None, tags=None, _configuration=None):  # noqa: E501
         """MetricDetails - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._host = None
         self._last_update = None
@@ -166,8 +171,11 @@ def __eq__(self, other):
         if not isinstance(other, MetricDetails):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MetricDetails):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index 9b18115..00ff880 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MetricDetailsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class MetricDetailsResponse(object):
         'hosts': 'hosts'
     }
 
-    def __init__(self, continuation_token=None, hosts=None):  # noqa: E501
+    def __init__(self, continuation_token=None, hosts=None, _configuration=None):  # noqa: E501
         """MetricDetailsResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._continuation_token = None
         self._hosts = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, MetricDetailsResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MetricDetailsResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index 4f892e9..52cc7f1 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MetricStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class MetricStatus(object):
         'status': 'status'
     }
 
-    def __init__(self, ever=None, now=None, recent_except_now=None, status=None):  # noqa: E501
+    def __init__(self, ever=None, now=None, recent_except_now=None, status=None, _configuration=None):  # noqa: E501
         """MetricStatus - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._ever = None
         self._now = None
@@ -144,7 +149,8 @@ def status(self, status):
         :type: str
         """
         allowed_values = ["OK", "PENDING"]  # noqa: E501
-        if status not in allowed_values:
+        if (self._configuration.client_side_validation and
+                status not in allowed_values):
             raise ValueError(
                 "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
                 .format(status, allowed_values)
@@ -192,8 +198,11 @@ def __eq__(self, other):
         if not isinstance(other, MetricStatus):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MetricStatus):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/metrics_policy_read_model.py b/wavefront_api_client/models/metrics_policy_read_model.py
index 49f7f1a..df178ec 100644
--- a/wavefront_api_client/models/metrics_policy_read_model.py
+++ b/wavefront_api_client/models/metrics_policy_read_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MetricsPolicyReadModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class MetricsPolicyReadModel(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MetricsPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._policy_rules = None
@@ -194,8 +199,11 @@ def __eq__(self, other):
         if not isinstance(other, MetricsPolicyReadModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MetricsPolicyReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/metrics_policy_write_model.py b/wavefront_api_client/models/metrics_policy_write_model.py
index 9d617c2..de9bc0d 100644
--- a/wavefront_api_client/models/metrics_policy_write_model.py
+++ b/wavefront_api_client/models/metrics_policy_write_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MetricsPolicyWriteModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class MetricsPolicyWriteModel(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MetricsPolicyWriteModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._policy_rules = None
@@ -194,8 +199,11 @@ def __eq__(self, other):
         if not isinstance(other, MetricsPolicyWriteModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MetricsPolicyWriteModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/module.py b/wavefront_api_client/models/module.py
index 439a7ba..61813e2 100644
--- a/wavefront_api_client/models/module.py
+++ b/wavefront_api_client/models/module.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Module(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class Module(object):
         'packages': 'packages'
     }
 
-    def __init__(self, annotations=None, class_loader=None, declared_annotations=None, descriptor=None, layer=None, name=None, named=None, packages=None):  # noqa: E501
+    def __init__(self, annotations=None, class_loader=None, declared_annotations=None, descriptor=None, layer=None, name=None, named=None, packages=None, _configuration=None):  # noqa: E501
         """Module - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._annotations = None
         self._class_loader = None
@@ -290,8 +295,11 @@ def __eq__(self, other):
         if not isinstance(other, Module):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Module):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/module_descriptor.py b/wavefront_api_client/models/module_descriptor.py
index 64e4caa..722550b 100644
--- a/wavefront_api_client/models/module_descriptor.py
+++ b/wavefront_api_client/models/module_descriptor.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ModuleDescriptor(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ModuleDescriptor(object):
         'open': 'open'
     }
 
-    def __init__(self, automatic=None, open=None):  # noqa: E501
+    def __init__(self, automatic=None, open=None, _configuration=None):  # noqa: E501
         """ModuleDescriptor - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._automatic = None
         self._open = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, ModuleDescriptor):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ModuleDescriptor):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/module_layer.py b/wavefront_api_client/models/module_layer.py
index 1c1be72..839fca0 100644
--- a/wavefront_api_client/models/module_layer.py
+++ b/wavefront_api_client/models/module_layer.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ModuleLayer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -36,8 +38,11 @@ class ModuleLayer(object):
     attribute_map = {
     }
 
-    def __init__(self):  # noqa: E501
+    def __init__(self, _configuration=None):  # noqa: E501
         """ModuleLayer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
         self.discriminator = None
 
     def to_dict(self):
@@ -80,8 +85,11 @@ def __eq__(self, other):
         if not isinstance(other, ModuleLayer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ModuleLayer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/monitored_application_dto.py b/wavefront_api_client/models/monitored_application_dto.py
index 4ebabeb..80689f0 100644
--- a/wavefront_api_client/models/monitored_application_dto.py
+++ b/wavefront_api_client/models/monitored_application_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MonitoredApplicationDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -54,8 +56,11 @@ class MonitoredApplicationDTO(object):
         'update_user_id': 'updateUserId'
     }
 
-    def __init__(self, application=None, created=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service_count=None, status=None, update_user_id=None):  # noqa: E501
+    def __init__(self, application=None, created=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service_count=None, status=None, update_user_id=None, _configuration=None):  # noqa: E501
         """MonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._application = None
         self._created = None
@@ -106,7 +111,7 @@ def application(self, application):
         :param application: The application of this MonitoredApplicationDTO.  # noqa: E501
         :type: str
         """
-        if application is None:
+        if self._configuration.client_side_validation and application is None:
             raise ValueError("Invalid value for `application`, must not be `None`")  # noqa: E501
 
         self._application = application
@@ -270,7 +275,8 @@ def status(self, status):
         :type: str
         """
         allowed_values = ["ACTIVE", "INACTIVE"]  # noqa: E501
-        if status not in allowed_values:
+        if (self._configuration.client_side_validation and
+                status not in allowed_values):
             raise ValueError(
                 "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
                 .format(status, allowed_values)
@@ -341,8 +347,11 @@ def __eq__(self, other):
         if not isinstance(other, MonitoredApplicationDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MonitoredApplicationDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/monitored_cluster.py b/wavefront_api_client/models/monitored_cluster.py
index 9bfffed..6238dd0 100644
--- a/wavefront_api_client/models/monitored_cluster.py
+++ b/wavefront_api_client/models/monitored_cluster.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MonitoredCluster(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -58,8 +60,11 @@ class MonitoredCluster(object):
         'version': 'version'
     }
 
-    def __init__(self, additional_tags=None, alias=None, components=None, deleted=None, id=None, last_updated=None, monitored=None, name=None, platform=None, tags=None, version=None):  # noqa: E501
+    def __init__(self, additional_tags=None, alias=None, components=None, deleted=None, id=None, last_updated=None, monitored=None, name=None, platform=None, tags=None, version=None, _configuration=None):  # noqa: E501
         """MonitoredCluster - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._additional_tags = None
         self._alias = None
@@ -201,7 +206,7 @@ def id(self, id):
         :param id: The id of this MonitoredCluster.  # noqa: E501
         :type: str
         """
-        if id is None:
+        if self._configuration.client_side_validation and id is None:
             raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
         self._id = id
@@ -268,7 +273,7 @@ def name(self, name):
         :param name: The name of this MonitoredCluster.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -380,8 +385,11 @@ def __eq__(self, other):
         if not isinstance(other, MonitoredCluster):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MonitoredCluster):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
index f18d14b..49faa93 100644
--- a/wavefront_api_client/models/monitored_service_dto.py
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class MonitoredServiceDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class MonitoredServiceDTO(object):
         'update_user_id': 'updateUserId'
     }
 
-    def __init__(self, application=None, created=None, custom_dashboard_link=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service=None, status=None, update_user_id=None):  # noqa: E501
+    def __init__(self, application=None, created=None, custom_dashboard_link=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service=None, status=None, update_user_id=None, _configuration=None):  # noqa: E501
         """MonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._application = None
         self._created = None
@@ -110,7 +115,7 @@ def application(self, application):
         :param application: The application of this MonitoredServiceDTO.  # noqa: E501
         :type: str
         """
-        if application is None:
+        if self._configuration.client_side_validation and application is None:
             raise ValueError("Invalid value for `application`, must not be `None`")  # noqa: E501
 
         self._application = application
@@ -273,7 +278,7 @@ def service(self, service):
         :param service: The service of this MonitoredServiceDTO.  # noqa: E501
         :type: str
         """
-        if service is None:
+        if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
 
         self._service = service
@@ -299,7 +304,8 @@ def status(self, status):
         :type: str
         """
         allowed_values = ["ACTIVE", "INACTIVE"]  # noqa: E501
-        if status not in allowed_values:
+        if (self._configuration.client_side_validation and
+                status not in allowed_values):
             raise ValueError(
                 "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
                 .format(status, allowed_values)
@@ -370,8 +376,11 @@ def __eq__(self, other):
         if not isinstance(other, MonitoredServiceDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, MonitoredServiceDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index a16bdbf..dfcb698 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class NewRelicConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class NewRelicConfiguration(object):
         'new_relic_metric_filters': 'newRelicMetricFilters'
     }
 
-    def __init__(self, api_key=None, app_filter_regex=None, host_filter_regex=None, new_relic_metric_filters=None):  # noqa: E501
+    def __init__(self, api_key=None, app_filter_regex=None, host_filter_regex=None, new_relic_metric_filters=None, _configuration=None):  # noqa: E501
         """NewRelicConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._api_key = None
         self._app_filter_regex = None
@@ -81,7 +86,7 @@ def api_key(self, api_key):
         :param api_key: The api_key of this NewRelicConfiguration.  # noqa: E501
         :type: str
         """
-        if api_key is None:
+        if self._configuration.client_side_validation and api_key is None:
             raise ValueError("Invalid value for `api_key`, must not be `None`")  # noqa: E501
 
         self._api_key = api_key
@@ -195,8 +200,11 @@ def __eq__(self, other):
         if not isinstance(other, NewRelicConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, NewRelicConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/new_relic_metric_filters.py b/wavefront_api_client/models/new_relic_metric_filters.py
index 27424a4..b23e6b8 100644
--- a/wavefront_api_client/models/new_relic_metric_filters.py
+++ b/wavefront_api_client/models/new_relic_metric_filters.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class NewRelicMetricFilters(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class NewRelicMetricFilters(object):
         'metric_filter_regex': 'metricFilterRegex'
     }
 
-    def __init__(self, app_name=None, metric_filter_regex=None):  # noqa: E501
+    def __init__(self, app_name=None, metric_filter_regex=None, _configuration=None):  # noqa: E501
         """NewRelicMetricFilters - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._app_name = None
         self._metric_filter_regex = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, NewRelicMetricFilters):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, NewRelicMetricFilters):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index 5eb685c..71fecb6 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Notificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -70,8 +72,11 @@ class Notificant(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None, custom_http_headers=None, customer_id=None, description=None, email_subject=None, id=None, is_html_content=None, method=None, recipient=None, routes=None, template=None, title=None, triggers=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, content_type=None, created_epoch_millis=None, creator_id=None, custom_http_headers=None, customer_id=None, description=None, email_subject=None, id=None, is_html_content=None, method=None, recipient=None, routes=None, template=None, title=None, triggers=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Notificant - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._content_type = None
         self._created_epoch_millis = None
@@ -142,7 +147,8 @@ def content_type(self, content_type):
         :type: str
         """
         allowed_values = ["application/json", "text/html", "text/plain", "application/x-www-form-urlencoded", ""]  # noqa: E501
-        if content_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                content_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `content_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(content_type, allowed_values)
@@ -256,7 +262,7 @@ def description(self, description):
         :param description: The description of this Notificant.  # noqa: E501
         :type: str
         """
-        if description is None:
+        if self._configuration.client_side_validation and description is None:
             raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
         self._description = description
@@ -348,10 +354,11 @@ def method(self, method):
         :param method: The method of this Notificant.  # noqa: E501
         :type: str
         """
-        if method is None:
+        if self._configuration.client_side_validation and method is None:
             raise ValueError("Invalid value for `method`, must not be `None`")  # noqa: E501
         allowed_values = ["WEBHOOK", "EMAIL", "PAGERDUTY"]  # noqa: E501
-        if method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                method not in allowed_values):
             raise ValueError(
                 "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
                 .format(method, allowed_values)
@@ -379,7 +386,7 @@ def recipient(self, recipient):
         :param recipient: The recipient of this Notificant.  # noqa: E501
         :type: str
         """
-        if recipient is None:
+        if self._configuration.client_side_validation and recipient is None:
             raise ValueError("Invalid value for `recipient`, must not be `None`")  # noqa: E501
 
         self._recipient = recipient
@@ -427,7 +434,7 @@ def template(self, template):
         :param template: The template of this Notificant.  # noqa: E501
         :type: str
         """
-        if template is None:
+        if self._configuration.client_side_validation and template is None:
             raise ValueError("Invalid value for `template`, must not be `None`")  # noqa: E501
 
         self._template = template
@@ -452,7 +459,7 @@ def title(self, title):
         :param title: The title of this Notificant.  # noqa: E501
         :type: str
         """
-        if title is None:
+        if self._configuration.client_side_validation and title is None:
             raise ValueError("Invalid value for `title`, must not be `None`")  # noqa: E501
 
         self._title = title
@@ -477,10 +484,11 @@ def triggers(self, triggers):
         :param triggers: The triggers of this Notificant.  # noqa: E501
         :type: list[str]
         """
-        if triggers is None:
+        if self._configuration.client_side_validation and triggers is None:
             raise ValueError("Invalid value for `triggers`, must not be `None`")  # noqa: E501
         allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE", "ALERT_SEVERITY_UPDATE"]  # noqa: E501
-        if not set(triggers).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(triggers).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `triggers` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(triggers) - set(allowed_values))),  # noqa: E501
@@ -571,8 +579,11 @@ def __eq__(self, other):
         if not isinstance(other, Notificant):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Notificant):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/package.py b/wavefront_api_client/models/package.py
index 51a43ea..d94110f 100644
--- a/wavefront_api_client/models/package.py
+++ b/wavefront_api_client/models/package.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Package(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class Package(object):
         'specification_version': 'specificationVersion'
     }
 
-    def __init__(self, annotations=None, declared_annotations=None, implementation_title=None, implementation_vendor=None, implementation_version=None, name=None, sealed=None, specification_title=None, specification_vendor=None, specification_version=None):  # noqa: E501
+    def __init__(self, annotations=None, declared_annotations=None, implementation_title=None, implementation_vendor=None, implementation_version=None, name=None, sealed=None, specification_title=None, specification_vendor=None, specification_version=None, _configuration=None):  # noqa: E501
         """Package - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._annotations = None
         self._declared_annotations = None
@@ -342,8 +347,11 @@ def __eq__(self, other):
         if not isinstance(other, Package):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Package):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged.py b/wavefront_api_client/models/paged.py
index d32c0ca..434f332 100644
--- a/wavefront_api_client/models/paged.py
+++ b/wavefront_api_client/models/paged.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Paged(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class Paged(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """Paged - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, Paged):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Paged):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_account.py b/wavefront_api_client/models/paged_account.py
index 1035cec..0e09b5a 100644
--- a/wavefront_api_client/models/paged_account.py
+++ b/wavefront_api_client/models/paged_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedAccount(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index 7cad4a0..0eafcca 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedAlert(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedAlert - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedAlert):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedAlert):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index 816d6ad..fed1a7f 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedAlertWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class PagedAlertWithStats(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, alert_counts=None, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, alert_counts=None, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedAlertWithStats - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alert_counts = None
         self._cursor = None
@@ -300,8 +305,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedAlertWithStats):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedAlertWithStats):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_anomaly.py b/wavefront_api_client/models/paged_anomaly.py
index 942dbc3..e4f385d 100644
--- a/wavefront_api_client/models/paged_anomaly.py
+++ b/wavefront_api_client/models/paged_anomaly.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedAnomaly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedAnomaly(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedAnomaly - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedAnomaly):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedAnomaly):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index a74759a..8a7d20b 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedCloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedCloudIntegration(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedCloudIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedCloudIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedCloudIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index 3b5150e..edccc27 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedCustomerFacingUserObject(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedCustomerFacingUserObject(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedCustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedCustomerFacingUserObject):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedCustomerFacingUserObject):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index 5888a71..47c9799 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedDashboard(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedDashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedDashboard):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedDashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index aab4d3a..e8df799 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedDerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedDerivedMetricDefinition(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedDerivedMetricDefinition):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedDerivedMetricDefinition):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index c18e788..e60dd22 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedDerivedMetricDefinitionWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class PagedDerivedMetricDefinitionWithStats(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, counts=None, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, counts=None, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedDerivedMetricDefinitionWithStats - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._counts = None
         self._cursor = None
@@ -300,8 +305,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedDerivedMetricDefinitionWithStats):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedDerivedMetricDefinitionWithStats):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index 2575593..5cd8c0d 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedEvent(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index 6da5855..9a8d7b7 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedExternalLink(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedExternalLink - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedExternalLink):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedExternalLink):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_ingestion_policy.py b/wavefront_api_client/models/paged_ingestion_policy.py
index 5044ac5..dc13fdc 100644
--- a/wavefront_api_client/models/paged_ingestion_policy.py
+++ b/wavefront_api_client/models/paged_ingestion_policy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedIngestionPolicy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedIngestionPolicy(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedIngestionPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedIngestionPolicy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedIngestionPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index 1bdfdff..108f56d 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedIntegration(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index db78294..76efada 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedMaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedMaintenanceWindow(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedMaintenanceWindow):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedMaintenanceWindow):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index ea79c9f..09f0c9d 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedMessage(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedMessage(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedMessage - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedMessage):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedMessage):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_monitored_application_dto.py b/wavefront_api_client/models/paged_monitored_application_dto.py
index c8c7584..1eb9212 100644
--- a/wavefront_api_client/models/paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/paged_monitored_application_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedMonitoredApplicationDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedMonitoredApplicationDTO(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedMonitoredApplicationDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedMonitoredApplicationDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_monitored_cluster.py b/wavefront_api_client/models/paged_monitored_cluster.py
index 97f7dbf..150bde1 100644
--- a/wavefront_api_client/models/paged_monitored_cluster.py
+++ b/wavefront_api_client/models/paged_monitored_cluster.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedMonitoredCluster(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedMonitoredCluster(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedMonitoredCluster - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedMonitoredCluster):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedMonitoredCluster):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_monitored_service_dto.py b/wavefront_api_client/models/paged_monitored_service_dto.py
index 21f5e25..4b395bc 100644
--- a/wavefront_api_client/models/paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/paged_monitored_service_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedMonitoredServiceDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedMonitoredServiceDTO(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedMonitoredServiceDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedMonitoredServiceDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 79b79a8..ff97f0b 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedNotificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedNotificant(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedNotificant - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedNotificant):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedNotificant):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index e70f17c..3b78139 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedProxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedProxy(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedProxy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedProxy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedProxy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_related_event.py b/wavefront_api_client/models/paged_related_event.py
index 55881ea..88e1cf8 100644
--- a/wavefront_api_client/models/paged_related_event.py
+++ b/wavefront_api_client/models/paged_related_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedRelatedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedRelatedEvent(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedRelatedEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedRelatedEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedRelatedEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_report_event_anomaly_dto.py b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
index 045da42..f819b58 100644
--- a/wavefront_api_client/models/paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedReportEventAnomalyDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedReportEventAnomalyDTO(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedReportEventAnomalyDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedReportEventAnomalyDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_role_dto.py b/wavefront_api_client/models/paged_role_dto.py
index d2b6c47..2f761ee 100644
--- a/wavefront_api_client/models/paged_role_dto.py
+++ b/wavefront_api_client/models/paged_role_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedRoleDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedRoleDTO(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedRoleDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedRoleDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedRoleDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index b6d3737..a088bed 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedSavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedSavedSearch(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedSavedSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedSavedSearch):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedSavedSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_service_account.py b/wavefront_api_client/models/paged_service_account.py
index 0a34c0e..c3cb709 100644
--- a/wavefront_api_client/models/paged_service_account.py
+++ b/wavefront_api_client/models/paged_service_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedServiceAccount(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedServiceAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedServiceAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedServiceAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index fabc5f9..3fd15ac 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedSource(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedSource(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedSource - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedSource):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedSource):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_user_group_model.py b/wavefront_api_client/models/paged_user_group_model.py
index e441dda..a4c445b 100644
--- a/wavefront_api_client/models/paged_user_group_model.py
+++ b/wavefront_api_client/models/paged_user_group_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PagedUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class PagedUserGroupModel(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """PagedUserGroupModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, PagedUserGroupModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PagedUserGroupModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index 0217fe3..297bb8e 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Point(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class Point(object):
         'value': 'value'
     }
 
-    def __init__(self, timestamp=None, value=None):  # noqa: E501
+    def __init__(self, timestamp=None, value=None, _configuration=None):  # noqa: E501
         """Point - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._timestamp = None
         self._value = None
@@ -70,7 +75,7 @@ def timestamp(self, timestamp):
         :param timestamp: The timestamp of this Point.  # noqa: E501
         :type: int
         """
-        if timestamp is None:
+        if self._configuration.client_side_validation and timestamp is None:
             raise ValueError("Invalid value for `timestamp`, must not be `None`")  # noqa: E501
 
         self._timestamp = timestamp
@@ -93,7 +98,7 @@ def value(self, value):
         :param value: The value of this Point.  # noqa: E501
         :type: float
         """
-        if value is None:
+        if self._configuration.client_side_validation and value is None:
             raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
 
         self._value = value
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, Point):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Point):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/policy_rule_read_model.py b/wavefront_api_client/models/policy_rule_read_model.py
index 7e668ff..0f3c17c 100644
--- a/wavefront_api_client/models/policy_rule_read_model.py
+++ b/wavefront_api_client/models/policy_rule_read_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PolicyRuleReadModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class PolicyRuleReadModel(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, access_type=None, accounts=None, description=None, id=None, name=None, prefixes=None, roles=None, tags=None, tags_anded=None, user_groups=None):  # noqa: E501
+    def __init__(self, access_type=None, accounts=None, description=None, id=None, name=None, prefixes=None, roles=None, tags=None, tags_anded=None, user_groups=None, _configuration=None):  # noqa: E501
         """PolicyRuleReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._access_type = None
         self._accounts = None
@@ -112,7 +117,8 @@ def access_type(self, access_type):
         :type: str
         """
         allowed_values = ["ALLOW", "BLOCK"]  # noqa: E501
-        if access_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                access_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `access_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(access_type, allowed_values)
@@ -207,7 +213,7 @@ def name(self, name):
         :param name: The name of this PolicyRuleReadModel.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -367,8 +373,11 @@ def __eq__(self, other):
         if not isinstance(other, PolicyRuleReadModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PolicyRuleReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/policy_rule_write_model.py b/wavefront_api_client/models/policy_rule_write_model.py
index 6c8e27b..8e11deb 100644
--- a/wavefront_api_client/models/policy_rule_write_model.py
+++ b/wavefront_api_client/models/policy_rule_write_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class PolicyRuleWriteModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class PolicyRuleWriteModel(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, access_type=None, accounts=None, description=None, id=None, name=None, prefixes=None, roles=None, tags=None, tags_anded=None, user_groups=None):  # noqa: E501
+    def __init__(self, access_type=None, accounts=None, description=None, id=None, name=None, prefixes=None, roles=None, tags=None, tags_anded=None, user_groups=None, _configuration=None):  # noqa: E501
         """PolicyRuleWriteModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._access_type = None
         self._accounts = None
@@ -112,7 +117,8 @@ def access_type(self, access_type):
         :type: str
         """
         allowed_values = ["ALLOW", "BLOCK"]  # noqa: E501
-        if access_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                access_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `access_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(access_type, allowed_values)
@@ -207,7 +213,7 @@ def name(self, name):
         :param name: The name of this PolicyRuleWriteModel.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -367,8 +373,11 @@ def __eq__(self, other):
         if not isinstance(other, PolicyRuleWriteModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, PolicyRuleWriteModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 826f7eb..e853862 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Proxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -96,8 +98,11 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None, _configuration=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._bytes_left_for_buffer = None
         self._bytes_per_minute_for_buffer = None
@@ -615,7 +620,7 @@ def name(self, name):
         :param name: The name of this Proxy.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -779,7 +784,8 @@ def status(self, status):
         :type: str
         """
         allowed_values = ["ACTIVE", "STOPPED_UNKNOWN", "STOPPED_BY_SERVER"]  # noqa: E501
-        if status not in allowed_values:
+        if (self._configuration.client_side_validation and
+                status not in allowed_values):
             raise ValueError(
                 "Invalid value for `status` ({0}), must be one of {1}"  # noqa: E501
                 .format(status, allowed_values)
@@ -917,8 +923,11 @@ def __eq__(self, other):
         if not isinstance(other, Proxy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Proxy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index 0d41672..8d718e3 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class QueryEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class QueryEvent(object):
         'tags': 'tags'
     }
 
-    def __init__(self, end=None, hosts=None, is_ephemeral=None, name=None, start=None, summarized=None, tags=None):  # noqa: E501
+    def __init__(self, end=None, hosts=None, is_ephemeral=None, name=None, start=None, summarized=None, tags=None, _configuration=None):  # noqa: E501
         """QueryEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._end = None
         self._hosts = None
@@ -278,8 +283,11 @@ def __eq__(self, other):
         if not isinstance(other, QueryEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, QueryEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index d771787..7249004 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class QueryResult(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -62,8 +64,11 @@ class QueryResult(object):
         'warnings': 'warnings'
     }
 
-    def __init__(self, dimensions=None, error_message=None, error_type=None, events=None, granularity=None, name=None, query=None, spans=None, stats=None, timeseries=None, trace_dimensions=None, traces=None, warnings=None):  # noqa: E501
+    def __init__(self, dimensions=None, error_message=None, error_type=None, events=None, granularity=None, name=None, query=None, spans=None, stats=None, timeseries=None, trace_dimensions=None, traces=None, warnings=None, _configuration=None):  # noqa: E501
         """QueryResult - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._dimensions = None
         self._error_message = None
@@ -174,7 +179,8 @@ def error_type(self, error_type):
         :type: str
         """
         allowed_values = ["N/A", "QuerySyntaxError", "QueryExecutionError", "Timeout"]  # noqa: E501
-        if error_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                error_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `error_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(error_type, allowed_values)
@@ -442,8 +448,11 @@ def __eq__(self, other):
         if not isinstance(other, QueryResult):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, QueryResult):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/query_type_dto.py b/wavefront_api_client/models/query_type_dto.py
index 79bcb06..81015f4 100644
--- a/wavefront_api_client/models/query_type_dto.py
+++ b/wavefront_api_client/models/query_type_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class QueryTypeDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class QueryTypeDTO(object):
         'translated_input': 'translatedInput'
     }
 
-    def __init__(self, input_query=None, query_type=None, translated_input=None):  # noqa: E501
+    def __init__(self, input_query=None, query_type=None, translated_input=None, _configuration=None):  # noqa: E501
         """QueryTypeDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._input_query = None
         self._query_type = None
@@ -97,7 +102,8 @@ def query_type(self, query_type):
         :type: str
         """
         allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
-        if query_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                query_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `query_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(query_type, allowed_values)
@@ -166,8 +172,11 @@ def __eq__(self, other):
         if not isinstance(other, QueryTypeDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, QueryTypeDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index 55e1e89..9c2432d 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class RawTimeseries(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class RawTimeseries(object):
         'tags': 'tags'
     }
 
-    def __init__(self, points=None, tags=None):  # noqa: E501
+    def __init__(self, points=None, tags=None, _configuration=None):  # noqa: E501
         """RawTimeseries - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._points = None
         self._tags = None
@@ -69,7 +74,7 @@ def points(self, points):
         :param points: The points of this RawTimeseries.  # noqa: E501
         :type: list[Point]
         """
-        if points is None:
+        if self._configuration.client_side_validation and points is None:
             raise ValueError("Invalid value for `points`, must not be `None`")  # noqa: E501
 
         self._points = points
@@ -137,8 +142,11 @@ def __eq__(self, other):
         if not isinstance(other, RawTimeseries):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, RawTimeseries):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/related_anomaly.py b/wavefront_api_client/models/related_anomaly.py
index 4958453..a3c44e2 100644
--- a/wavefront_api_client/models/related_anomaly.py
+++ b/wavefront_api_client/models/related_anomaly.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class RelatedAnomaly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -86,8 +88,11 @@ class RelatedAnomaly(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, chart_hash=None, chart_link=None, col=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_id=None, deleted=None, end_ms=None, hosts_used=None, id=None, image_link=None, metrics_used=None, model=None, original_stripes=None, param_hash=None, query_hash=None, _query_params=None, related_data=None, row=None, section=None, start_ms=None, updated_epoch_millis=None, updated_ms=None, updater_id=None):  # noqa: E501
+    def __init__(self, chart_hash=None, chart_link=None, col=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_id=None, deleted=None, end_ms=None, hosts_used=None, id=None, image_link=None, metrics_used=None, model=None, original_stripes=None, param_hash=None, query_hash=None, _query_params=None, related_data=None, row=None, section=None, start_ms=None, updated_epoch_millis=None, updated_ms=None, updater_id=None, _configuration=None):  # noqa: E501
         """RelatedAnomaly - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._chart_hash = None
         self._chart_link = None
@@ -176,7 +181,7 @@ def chart_hash(self, chart_hash):
         :param chart_hash: The chart_hash of this RelatedAnomaly.  # noqa: E501
         :type: str
         """
-        if chart_hash is None:
+        if self._configuration.client_side_validation and chart_hash is None:
             raise ValueError("Invalid value for `chart_hash`, must not be `None`")  # noqa: E501
 
         self._chart_hash = chart_hash
@@ -224,7 +229,7 @@ def col(self, col):
         :param col: The col of this RelatedAnomaly.  # noqa: E501
         :type: int
         """
-        if col is None:
+        if self._configuration.client_side_validation and col is None:
             raise ValueError("Invalid value for `col`, must not be `None`")  # noqa: E501
 
         self._col = col
@@ -314,7 +319,7 @@ def dashboard_id(self, dashboard_id):
         :param dashboard_id: The dashboard_id of this RelatedAnomaly.  # noqa: E501
         :type: str
         """
-        if dashboard_id is None:
+        if self._configuration.client_side_validation and dashboard_id is None:
             raise ValueError("Invalid value for `dashboard_id`, must not be `None`")  # noqa: E501
 
         self._dashboard_id = dashboard_id
@@ -360,7 +365,7 @@ def end_ms(self, end_ms):
         :param end_ms: The end_ms of this RelatedAnomaly.  # noqa: E501
         :type: int
         """
-        if end_ms is None:
+        if self._configuration.client_side_validation and end_ms is None:
             raise ValueError("Invalid value for `end_ms`, must not be `None`")  # noqa: E501
 
         self._end_ms = end_ms
@@ -523,7 +528,7 @@ def param_hash(self, param_hash):
         :param param_hash: The param_hash of this RelatedAnomaly.  # noqa: E501
         :type: str
         """
-        if param_hash is None:
+        if self._configuration.client_side_validation and param_hash is None:
             raise ValueError("Invalid value for `param_hash`, must not be `None`")  # noqa: E501
 
         self._param_hash = param_hash
@@ -548,7 +553,7 @@ def query_hash(self, query_hash):
         :param query_hash: The query_hash of this RelatedAnomaly.  # noqa: E501
         :type: str
         """
-        if query_hash is None:
+        if self._configuration.client_side_validation and query_hash is None:
             raise ValueError("Invalid value for `query_hash`, must not be `None`")  # noqa: E501
 
         self._query_hash = query_hash
@@ -573,7 +578,7 @@ def _query_params(self, _query_params):
         :param _query_params: The _query_params of this RelatedAnomaly.  # noqa: E501
         :type: dict(str, str)
         """
-        if _query_params is None:
+        if self._configuration.client_side_validation and _query_params is None:
             raise ValueError("Invalid value for `_query_params`, must not be `None`")  # noqa: E501
 
         self.__query_params = _query_params
@@ -621,7 +626,7 @@ def row(self, row):
         :param row: The row of this RelatedAnomaly.  # noqa: E501
         :type: int
         """
-        if row is None:
+        if self._configuration.client_side_validation and row is None:
             raise ValueError("Invalid value for `row`, must not be `None`")  # noqa: E501
 
         self._row = row
@@ -646,7 +651,7 @@ def section(self, section):
         :param section: The section of this RelatedAnomaly.  # noqa: E501
         :type: int
         """
-        if section is None:
+        if self._configuration.client_side_validation and section is None:
             raise ValueError("Invalid value for `section`, must not be `None`")  # noqa: E501
 
         self._section = section
@@ -671,7 +676,7 @@ def start_ms(self, start_ms):
         :param start_ms: The start_ms of this RelatedAnomaly.  # noqa: E501
         :type: int
         """
-        if start_ms is None:
+        if self._configuration.client_side_validation and start_ms is None:
             raise ValueError("Invalid value for `start_ms`, must not be `None`")  # noqa: E501
 
         self._start_ms = start_ms
@@ -717,7 +722,7 @@ def updated_ms(self, updated_ms):
         :param updated_ms: The updated_ms of this RelatedAnomaly.  # noqa: E501
         :type: int
         """
-        if updated_ms is None:
+        if self._configuration.client_side_validation and updated_ms is None:
             raise ValueError("Invalid value for `updated_ms`, must not be `None`")  # noqa: E501
 
         self._updated_ms = updated_ms
@@ -783,8 +788,11 @@ def __eq__(self, other):
         if not isinstance(other, RelatedAnomaly):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, RelatedAnomaly):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/related_data.py b/wavefront_api_client/models/related_data.py
index e581ce2..acd3ee1 100644
--- a/wavefront_api_client/models/related_data.py
+++ b/wavefront_api_client/models/related_data.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class RelatedData(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class RelatedData(object):
         'summary': 'summary'
     }
 
-    def __init__(self, alert_description=None, anomaly_chart_link=None, common_dimensions=None, common_metrics=None, common_sources=None, enhanced_score=None, related_id=None, summary=None):  # noqa: E501
+    def __init__(self, alert_description=None, anomaly_chart_link=None, common_dimensions=None, common_metrics=None, common_sources=None, enhanced_score=None, related_id=None, summary=None, _configuration=None):  # noqa: E501
         """RelatedData - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alert_description = None
         self._anomaly_chart_link = None
@@ -306,8 +311,11 @@ def __eq__(self, other):
         if not isinstance(other, RelatedData):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, RelatedData):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index 409845d..57dcc25 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class RelatedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -88,8 +90,11 @@ class RelatedEvent(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, similarity_score=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, similarity_score=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """RelatedEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._alert_tags = None
         self._annotations = None
@@ -212,7 +217,7 @@ def annotations(self, annotations):
         :param annotations: The annotations of this RelatedEvent.  # noqa: E501
         :type: dict(str, str)
         """
-        if annotations is None:
+        if self._configuration.client_side_validation and annotations is None:
             raise ValueError("Invalid value for `annotations`, must not be `None`")  # noqa: E501
 
         self._annotations = annotations
@@ -341,7 +346,8 @@ def creator_type(self, creator_type):
         :type: list[str]
         """
         allowed_values = ["USER", "ALERT", "SYSTEM"]  # noqa: E501
-        if not set(creator_type).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(creator_type).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `creator_type` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(creator_type) - set(allowed_values))),  # noqa: E501
@@ -529,7 +535,7 @@ def name(self, name):
         :param name: The name of this RelatedEvent.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -576,7 +582,8 @@ def running_state(self, running_state):
         :type: str
         """
         allowed_values = ["ONGOING", "PENDING", "ENDED"]  # noqa: E501
-        if running_state not in allowed_values:
+        if (self._configuration.client_side_validation and
+                running_state not in allowed_values):
             raise ValueError(
                 "Invalid value for `running_state` ({0}), must be one of {1}"  # noqa: E501
                 .format(running_state, allowed_values)
@@ -627,7 +634,7 @@ def start_time(self, start_time):
         :param start_time: The start_time of this RelatedEvent.  # noqa: E501
         :type: int
         """
-        if start_time is None:
+        if self._configuration.client_side_validation and start_time is None:
             raise ValueError("Invalid value for `start_time`, must not be `None`")  # noqa: E501
 
         self._start_time = start_time
@@ -804,8 +811,11 @@ def __eq__(self, other):
         if not isinstance(other, RelatedEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, RelatedEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/related_event_time_range.py b/wavefront_api_client/models/related_event_time_range.py
index 9388dad..53bb0a7 100644
--- a/wavefront_api_client/models/related_event_time_range.py
+++ b/wavefront_api_client/models/related_event_time_range.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class RelatedEventTimeRange(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class RelatedEventTimeRange(object):
         'latest_start_time_epoch_millis': 'latestStartTimeEpochMillis'
     }
 
-    def __init__(self, earliest_start_time_epoch_millis=None, latest_start_time_epoch_millis=None):  # noqa: E501
+    def __init__(self, earliest_start_time_epoch_millis=None, latest_start_time_epoch_millis=None, _configuration=None):  # noqa: E501
         """RelatedEventTimeRange - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._earliest_start_time_epoch_millis = None
         self._latest_start_time_epoch_millis = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, RelatedEventTimeRange):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, RelatedEventTimeRange):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/report_event_anomaly_dto.py b/wavefront_api_client/models/report_event_anomaly_dto.py
index 42633e8..069bb9d 100644
--- a/wavefront_api_client/models/report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/report_event_anomaly_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ReportEventAnomalyDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class ReportEventAnomalyDTO(object):
         'similarity_score': 'similarityScore'
     }
 
-    def __init__(self, related_anomaly_dto=None, related_event_dto=None, similarity_score=None):  # noqa: E501
+    def __init__(self, related_anomaly_dto=None, related_event_dto=None, similarity_score=None, _configuration=None):  # noqa: E501
         """ReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._related_anomaly_dto = None
         self._related_event_dto = None
@@ -160,8 +165,11 @@ def __eq__(self, other):
         if not isinstance(other, ReportEventAnomalyDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ReportEventAnomalyDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index 9459f57..9f97c34 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainer(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainer.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_access_policy.py b/wavefront_api_client/models/response_container_access_policy.py
index 1004c39..ef434fd 100644
--- a/wavefront_api_client/models/response_container_access_policy.py
+++ b/wavefront_api_client/models/response_container_access_policy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerAccessPolicy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerAccessPolicy(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAccessPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerAccessPolicy.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerAccessPolicy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerAccessPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_access_policy_action.py b/wavefront_api_client/models/response_container_access_policy_action.py
index 68a6fdf..23adb70 100644
--- a/wavefront_api_client/models/response_container_access_policy_action.py
+++ b/wavefront_api_client/models/response_container_access_policy_action.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerAccessPolicyAction(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerAccessPolicyAction(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAccessPolicyAction - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -70,7 +75,8 @@ def response(self, response):
         :type: str
         """
         allowed_values = ["ALLOW", "DENY"]  # noqa: E501
-        if response not in allowed_values:
+        if (self._configuration.client_side_validation and
+                response not in allowed_values):
             raise ValueError(
                 "Invalid value for `response` ({0}), must be one of {1}"  # noqa: E501
                 .format(response, allowed_values)
@@ -96,7 +102,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerAccessPolicyAction.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -141,8 +147,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerAccessPolicyAction):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerAccessPolicyAction):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_account.py b/wavefront_api_client/models/response_container_account.py
index b974eee..8fb0496 100644
--- a/wavefront_api_client/models/response_container_account.py
+++ b/wavefront_api_client/models/response_container_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerAccount(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerAccount.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index 664fa82..c2026d3 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerAlert(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAlert - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerAlert.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerAlert):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerAlert):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 117823f..1566db1 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerCloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerCloudIntegration(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerCloudIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerCloudIntegration.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerCloudIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerCloudIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index 799aaa0..d97c765 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerDashboard(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerDashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerDashboard.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerDashboard):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerDashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index faa68b7..5533e57 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerDerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerDerivedMetricDefinition(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerDerivedMetricDefinition):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerDerivedMetricDefinition):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 8a76b26..406af25 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerEvent(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerEvent.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index 6fbfec1..ed6e04a 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerExternalLink(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerExternalLink - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerExternalLink.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerExternalLink):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerExternalLink):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index a028b74..27abea9 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerFacetResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerFacetResponse(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerFacetResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerFacetResponse.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerFacetResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerFacetResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 9ba77ab..7174a26 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerFacetsResponseContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerFacetsResponseContainer(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerFacetsResponseContainer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerFacetsResponseContainer.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerFacetsResponseContainer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerFacetsResponseContainer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 757a2a2..5ae5aac 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerHistoryResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerHistoryResponse(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerHistoryResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerHistoryResponse.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerHistoryResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerHistoryResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_ingestion_policy.py b/wavefront_api_client/models/response_container_ingestion_policy.py
index da5748a..2531b0c 100644
--- a/wavefront_api_client/models/response_container_ingestion_policy.py
+++ b/wavefront_api_client/models/response_container_ingestion_policy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerIngestionPolicy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerIngestionPolicy(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerIngestionPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerIngestionPolicy.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerIngestionPolicy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerIngestionPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index 1f4b5ac..e442f8a 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerIntegration(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerIntegration.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 811f242..9e104c5 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerIntegrationStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerIntegrationStatus(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerIntegrationStatus - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerIntegrationStatus.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerIntegrationStatus):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerIntegrationStatus):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
index eb44a09..2626890 100644
--- a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerListAccessControlListReadDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerListAccessControlListReadDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListAccessControlListReadDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerListAccessControlListReadDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerListAccessControlListReadDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index cb412ba..bd89cb6 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerListIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerListIntegration(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerListIntegration.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerListIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerListIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index 7fa28a2..e2b4c2e 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerListIntegrationManifestGroup(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerListIntegrationManifestGroup(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListIntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerListIntegrationManifestGroup):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerListIntegrationManifestGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
index ef3e23f..a064e9b 100644
--- a/wavefront_api_client/models/response_container_list_service_account.py
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerListServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerListServiceAccount(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListServiceAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerListServiceAccount.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerListServiceAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerListServiceAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index b6c68c3..176c9a4 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerListString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerListString(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListString - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerListString.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerListString):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerListString):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
index 3aacbf9..b029a43 100644
--- a/wavefront_api_client/models/response_container_list_user_api_token.py
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerListUserApiToken(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerListUserApiToken(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListUserApiToken - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerListUserApiToken.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerListUserApiToken):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerListUserApiToken):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index 736dee9..2a83318 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMaintenanceWindow(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMaintenanceWindow.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMaintenanceWindow):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMaintenanceWindow):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index b92a9fd..687ed4d 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMapStringInteger(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMapStringInteger(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMapStringInteger - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMapStringInteger.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMapStringInteger):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMapStringInteger):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index d12104d..9ec7528 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMapStringIntegrationStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMapStringIntegrationStatus(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMapStringIntegrationStatus - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMapStringIntegrationStatus):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMapStringIntegrationStatus):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index ba09a7d..9f72a0e 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMessage(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMessage(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMessage - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMessage.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMessage):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMessage):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_metrics_policy_read_model.py b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
index 259fed6..b00aba9 100644
--- a/wavefront_api_client/models/response_container_metrics_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMetricsPolicyReadModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMetricsPolicyReadModel(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMetricsPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMetricsPolicyReadModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMetricsPolicyReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_monitored_application_dto.py b/wavefront_api_client/models/response_container_monitored_application_dto.py
index c9d966e..2ed02c7 100644
--- a/wavefront_api_client/models/response_container_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_application_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMonitoredApplicationDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMonitoredApplicationDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMonitoredApplicationDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMonitoredApplicationDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_monitored_cluster.py b/wavefront_api_client/models/response_container_monitored_cluster.py
index 4233d6b..530b25d 100644
--- a/wavefront_api_client/models/response_container_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_monitored_cluster.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMonitoredCluster(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMonitoredCluster(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMonitoredCluster - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMonitoredCluster.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMonitoredCluster):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMonitoredCluster):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_monitored_service_dto.py b/wavefront_api_client/models/response_container_monitored_service_dto.py
index d1e29fa..d7c1ba4 100644
--- a/wavefront_api_client/models/response_container_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_service_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerMonitoredServiceDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerMonitoredServiceDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerMonitoredServiceDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerMonitoredServiceDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index 6c0a6b9..4b1499a 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerNotificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerNotificant(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerNotificant - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerNotificant.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerNotificant):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerNotificant):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
index 1c0289e..4b3300b 100644
--- a/wavefront_api_client/models/response_container_paged_account.py
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedAccount(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedAccount.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index bac3524..f3891f3 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedAlert(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedAlert(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAlert - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedAlert.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedAlert):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedAlert):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index 8a666ee..3e3a59a 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedAlertWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedAlertWithStats(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAlertWithStats - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedAlertWithStats.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedAlertWithStats):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedAlertWithStats):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_anomaly.py b/wavefront_api_client/models/response_container_paged_anomaly.py
index 2b90f0f..a8019da 100644
--- a/wavefront_api_client/models/response_container_paged_anomaly.py
+++ b/wavefront_api_client/models/response_container_paged_anomaly.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedAnomaly(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedAnomaly(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAnomaly - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedAnomaly.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedAnomaly):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedAnomaly):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index a3bca26..e6ce134 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedCloudIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedCloudIntegration(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedCloudIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedCloudIntegration.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedCloudIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedCloudIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index e1e5b27..776ba1f 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedCustomerFacingUserObject(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedCustomerFacingUserObject(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedCustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedCustomerFacingUserObject):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedCustomerFacingUserObject):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index 7c54e64..3ab650e 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedDashboard(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedDashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedDashboard.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedDashboard):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedDashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index 408534c..6e1f9e7 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedDerivedMetricDefinition(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedDerivedMetricDefinition(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedDerivedMetricDefinition):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedDerivedMetricDefinition):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 52cdea4..564fdd2 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedDerivedMetricDefinitionWithStats(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedDerivedMetricDefinitionWithStats(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedDerivedMetricDefinitionWithStats - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedDerivedMetricDefinitionWithStats):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedDerivedMetricDefinitionWithStats):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index fa8b2d8..a93e58d 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedEvent(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedEvent.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index 1e0b8d7..1aa7085 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedExternalLink(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedExternalLink(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedExternalLink - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedExternalLink.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedExternalLink):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedExternalLink):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy.py b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
index 76613dd..7b80871 100644
--- a/wavefront_api_client/models/response_container_paged_ingestion_policy.py
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedIngestionPolicy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedIngestionPolicy(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedIngestionPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedIngestionPolicy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedIngestionPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 084a775..20417b7 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedIntegration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedIntegration(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedIntegration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedIntegration.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedIntegration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedIntegration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index 6a67c02..7555c9e 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedMaintenanceWindow(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedMaintenanceWindow(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedMaintenanceWindow):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedMaintenanceWindow):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index 1faf24f..bd6f9e9 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedMessage(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedMessage(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMessage - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedMessage.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedMessage):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedMessage):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
index 7fcaff8..a257ba5 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedMonitoredApplicationDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedMonitoredApplicationDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedMonitoredApplicationDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedMonitoredApplicationDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_monitored_cluster.py b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
index 97d36b4..0820c02 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedMonitoredCluster(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedMonitoredCluster(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMonitoredCluster - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedMonitoredCluster):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedMonitoredCluster):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
index c8ffb93..72d9642 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedMonitoredServiceDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedMonitoredServiceDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedMonitoredServiceDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedMonitoredServiceDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index 01c3f45..bcb87db 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedNotificant(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedNotificant(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedNotificant - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedNotificant.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedNotificant):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedNotificant):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index a9a7830..7dbefd7 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedProxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedProxy(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedProxy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedProxy.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedProxy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedProxy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_related_event.py b/wavefront_api_client/models/response_container_paged_related_event.py
index 92bb50c..cfe4de3 100644
--- a/wavefront_api_client/models/response_container_paged_related_event.py
+++ b/wavefront_api_client/models/response_container_paged_related_event.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedRelatedEvent(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedRelatedEvent(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedRelatedEvent - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedRelatedEvent.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedRelatedEvent):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedRelatedEvent):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
index 57712d7..51d587a 100644
--- a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedReportEventAnomalyDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedReportEventAnomalyDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedReportEventAnomalyDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedReportEventAnomalyDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_role_dto.py b/wavefront_api_client/models/response_container_paged_role_dto.py
index 42209c9..59ee746 100644
--- a/wavefront_api_client/models/response_container_paged_role_dto.py
+++ b/wavefront_api_client/models/response_container_paged_role_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedRoleDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedRoleDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedRoleDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedRoleDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedRoleDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedRoleDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 20ca491..bff6bd1 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedSavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedSavedSearch(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSavedSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedSavedSearch.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedSavedSearch):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedSavedSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
index 8f73cdf..6bb4cb4 100644
--- a/wavefront_api_client/models/response_container_paged_service_account.py
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedServiceAccount(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedServiceAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedServiceAccount.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedServiceAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedServiceAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 94106a8..5080536 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedSource(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedSource(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSource - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedSource.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedSource):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedSource):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
index 6e7dc82..bf510c9 100644
--- a/wavefront_api_client/models/response_container_paged_user_group_model.py
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerPagedUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerPagedUserGroupModel(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedUserGroupModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerPagedUserGroupModel.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerPagedUserGroupModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerPagedUserGroupModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index 36b851f..fbc150a 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerProxy(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerProxy(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerProxy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerProxy.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerProxy):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerProxy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_query_type_dto.py b/wavefront_api_client/models/response_container_query_type_dto.py
index 0be47d4..7033e63 100644
--- a/wavefront_api_client/models/response_container_query_type_dto.py
+++ b/wavefront_api_client/models/response_container_query_type_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerQueryTypeDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerQueryTypeDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerQueryTypeDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerQueryTypeDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerQueryTypeDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerQueryTypeDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_role_dto.py b/wavefront_api_client/models/response_container_role_dto.py
index 2473820..0803841 100644
--- a/wavefront_api_client/models/response_container_role_dto.py
+++ b/wavefront_api_client/models/response_container_role_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerRoleDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerRoleDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerRoleDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerRoleDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerRoleDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerRoleDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index 3957e19..41ce641 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerSavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerSavedSearch(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSavedSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerSavedSearch.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerSavedSearch):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerSavedSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
index b2a9367..3408ef3 100644
--- a/wavefront_api_client/models/response_container_service_account.py
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerServiceAccount(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerServiceAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerServiceAccount.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerServiceAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerServiceAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 376e754..0fb4e9b 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerSetBusinessFunction(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerSetBusinessFunction(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSetBusinessFunction - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -70,7 +75,8 @@ def response(self, response):
         :type: list[str]
         """
         allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
-        if not set(response).issubset(set(allowed_values)):
+        if (self._configuration.client_side_validation and
+                not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
                 "Invalid values for `response` [{0}], must be a subset of [{1}]"  # noqa: E501
                 .format(", ".join(map(str, set(response) - set(allowed_values))),  # noqa: E501
@@ -97,7 +103,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -142,8 +148,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerSetBusinessFunction):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerSetBusinessFunction):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_set_source_label_pair.py b/wavefront_api_client/models/response_container_set_source_label_pair.py
index cda7e76..6796dab 100644
--- a/wavefront_api_client/models/response_container_set_source_label_pair.py
+++ b/wavefront_api_client/models/response_container_set_source_label_pair.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerSetSourceLabelPair(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerSetSourceLabelPair(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSetSourceLabelPair - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerSetSourceLabelPair.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerSetSourceLabelPair):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerSetSourceLabelPair):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 1711221..292d155 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerSource(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerSource(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSource - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerSource.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerSource):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerSource):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_string.py b/wavefront_api_client/models/response_container_string.py
index 218805d..d654cd0 100644
--- a/wavefront_api_client/models/response_container_string.py
+++ b/wavefront_api_client/models/response_container_string.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerString(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerString(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerString - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerString.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerString):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerString):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index 317b49a..7c9e2a3 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerTagsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerTagsResponse(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerTagsResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerTagsResponse.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerTagsResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerTagsResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
index c2c3016..7aa5d39 100644
--- a/wavefront_api_client/models/response_container_user_api_token.py
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerUserApiToken(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerUserApiToken(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerUserApiToken - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerUserApiToken.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerUserApiToken):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerUserApiToken):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
index b716904..3597853 100644
--- a/wavefront_api_client/models/response_container_user_group_model.py
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerUserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerUserGroupModel(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerUserGroupModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerUserGroupModel.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerUserGroupModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerUserGroupModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index 0e6dae4..a706e58 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseContainerValidatedUsersDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ResponseContainerValidatedUsersDTO(object):
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None):  # noqa: E501
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerValidatedUsersDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._response = None
         self._status = None
@@ -90,7 +95,7 @@ def status(self, status):
         :param status: The status of this ResponseContainerValidatedUsersDTO.  # noqa: E501
         :type: ResponseStatus
         """
-        if status is None:
+        if self._configuration.client_side_validation and status is None:
             raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
 
         self._status = status
@@ -135,8 +140,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseContainerValidatedUsersDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseContainerValidatedUsersDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index 1caa934..5209709 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ResponseStatus(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class ResponseStatus(object):
         'result': 'result'
     }
 
-    def __init__(self, code=None, message=None, result=None):  # noqa: E501
+    def __init__(self, code=None, message=None, result=None, _configuration=None):  # noqa: E501
         """ResponseStatus - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._code = None
         self._message = None
@@ -75,7 +80,7 @@ def code(self, code):
         :param code: The code of this ResponseStatus.  # noqa: E501
         :type: int
         """
-        if code is None:
+        if self._configuration.client_side_validation and code is None:
             raise ValueError("Invalid value for `code`, must not be `None`")  # noqa: E501
 
         self._code = code
@@ -121,10 +126,11 @@ def result(self, result):
         :param result: The result of this ResponseStatus.  # noqa: E501
         :type: str
         """
-        if result is None:
+        if self._configuration.client_side_validation and result is None:
             raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
         allowed_values = ["OK", "ERROR"]  # noqa: E501
-        if result not in allowed_values:
+        if (self._configuration.client_side_validation and
+                result not in allowed_values):
             raise ValueError(
                 "Invalid value for `result` ({0}), must be one of {1}"  # noqa: E501
                 .format(result, allowed_values)
@@ -172,8 +178,11 @@ def __eq__(self, other):
         if not isinstance(other, ResponseStatus):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ResponseStatus):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
index d1106f8..a8fb11c 100644
--- a/wavefront_api_client/models/role_dto.py
+++ b/wavefront_api_client/models/role_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class RoleDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -60,8 +62,11 @@ class RoleDTO(object):
         'sample_linked_groups': 'sampleLinkedGroups'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, sample_linked_accounts=None, sample_linked_groups=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, sample_linked_accounts=None, sample_linked_groups=None, _configuration=None):  # noqa: E501
         """RoleDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._customer = None
@@ -416,8 +421,11 @@ def __eq__(self, other):
         if not isinstance(other, RoleDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, RoleDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index dd0680d..45ac300 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class SavedSearch(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class SavedSearch(object):
         'user_id': 'userId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, entity_type=None, id=None, query=None, updated_epoch_millis=None, updater_id=None, user_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, entity_type=None, id=None, query=None, updated_epoch_millis=None, updater_id=None, user_id=None, _configuration=None):  # noqa: E501
         """SavedSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._creator_id = None
@@ -142,10 +147,11 @@ def entity_type(self, entity_type):
         :param entity_type: The entity_type of this SavedSearch.  # noqa: E501
         :type: str
         """
-        if entity_type is None:
+        if self._configuration.client_side_validation and entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
         allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE"]  # noqa: E501
-        if entity_type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                entity_type not in allowed_values):
             raise ValueError(
                 "Invalid value for `entity_type` ({0}), must be one of {1}"  # noqa: E501
                 .format(entity_type, allowed_values)
@@ -194,7 +200,7 @@ def query(self, query):
         :param query: The query of this SavedSearch.  # noqa: E501
         :type: dict(str, str)
         """
-        if query is None:
+        if self._configuration.client_side_validation and query is None:
             raise ValueError("Invalid value for `query`, must not be `None`")  # noqa: E501
 
         self._query = query
@@ -304,8 +310,11 @@ def __eq__(self, other):
         if not isinstance(other, SavedSearch):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, SavedSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/schema.py b/wavefront_api_client/models/schema.py
index 6fa229e..3882042 100644
--- a/wavefront_api_client/models/schema.py
+++ b/wavefront_api_client/models/schema.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Schema(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -72,8 +74,11 @@ class Schema(object):
         'value_type': 'valueType'
     }
 
-    def __init__(self, aliases=None, doc=None, element_type=None, enum_default=None, enum_symbols=None, error=None, fields=None, fixed_size=None, full_name=None, logical_type=None, name=None, namespace=None, nullable=None, object_props=None, type=None, types=None, union=None, value_type=None):  # noqa: E501
+    def __init__(self, aliases=None, doc=None, element_type=None, enum_default=None, enum_symbols=None, error=None, fields=None, fixed_size=None, full_name=None, logical_type=None, name=None, namespace=None, nullable=None, object_props=None, type=None, types=None, union=None, value_type=None, _configuration=None):  # noqa: E501
         """Schema - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._aliases = None
         self._doc = None
@@ -445,7 +450,8 @@ def type(self, type):
         :type: str
         """
         allowed_values = ["RECORD", "ENUM", "ARRAY", "MAP", "UNION", "FIXED", "STRING", "BYTES", "INT", "LONG", "FLOAT", "DOUBLE", "BOOLEAN", "NULL"]  # noqa: E501
-        if type not in allowed_values:
+        if (self._configuration.client_side_validation and
+                type not in allowed_values):
             raise ValueError(
                 "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
                 .format(type, allowed_values)
@@ -556,8 +562,11 @@ def __eq__(self, other):
         if not isinstance(other, Schema):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Schema):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index e8342ad..38057c0 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class SearchQuery(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class SearchQuery(object):
         'values': 'values'
     }
 
-    def __init__(self, key=None, matching_method=None, negated=None, value=None, values=None):  # noqa: E501
+    def __init__(self, key=None, matching_method=None, negated=None, value=None, values=None, _configuration=None):  # noqa: E501
         """SearchQuery - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._key = None
         self._matching_method = None
@@ -86,7 +91,7 @@ def key(self, key):
         :param key: The key of this SearchQuery.  # noqa: E501
         :type: str
         """
-        if key is None:
+        if self._configuration.client_side_validation and key is None:
             raise ValueError("Invalid value for `key`, must not be `None`")  # noqa: E501
 
         self._key = key
@@ -112,7 +117,8 @@ def matching_method(self, matching_method):
         :type: str
         """
         allowed_values = ["CONTAINS", "STARTSWITH", "EXACT", "TAGPATH"]  # noqa: E501
-        if matching_method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                matching_method not in allowed_values):
             raise ValueError(
                 "Invalid value for `matching_method` ({0}), must be one of {1}"  # noqa: E501
                 .format(matching_method, allowed_values)
@@ -229,8 +235,11 @@ def __eq__(self, other):
         if not isinstance(other, SearchQuery):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, SearchQuery):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index d6d2cca..371e1c1 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ServiceAccount(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -58,8 +60,11 @@ class ServiceAccount(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """ServiceAccount - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._active = None
         self._description = None
@@ -115,7 +120,7 @@ def active(self, active):
         :param active: The active of this ServiceAccount.  # noqa: E501
         :type: bool
         """
-        if active is None:
+        if self._configuration.client_side_validation and active is None:
             raise ValueError("Invalid value for `active`, must not be `None`")  # noqa: E501
 
         self._active = active
@@ -186,7 +191,7 @@ def identifier(self, identifier):
         :param identifier: The identifier of this ServiceAccount.  # noqa: E501
         :type: str
         """
-        if identifier is None:
+        if self._configuration.client_side_validation and identifier is None:
             raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
         self._identifier = identifier
@@ -392,8 +397,11 @@ def __eq__(self, other):
         if not isinstance(other, ServiceAccount):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ServiceAccount):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index 03f14df..f39e1ce 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ServiceAccountWrite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class ServiceAccountWrite(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, tokens=None, user_groups=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, tokens=None, user_groups=None, _configuration=None):  # noqa: E501
         """ServiceAccountWrite - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._active = None
         self._description = None
@@ -170,7 +175,7 @@ def identifier(self, identifier):
         :param identifier: The identifier of this ServiceAccountWrite.  # noqa: E501
         :type: str
         """
-        if identifier is None:
+        if self._configuration.client_side_validation and identifier is None:
             raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
         self._identifier = identifier
@@ -307,8 +312,11 @@ def __eq__(self, other):
         if not isinstance(other, ServiceAccountWrite):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ServiceAccountWrite):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 9d9a9c7..f5e74a3 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class SortableSearchRequest(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class SortableSearchRequest(object):
         'sort': 'sort'
     }
 
-    def __init__(self, limit=None, offset=None, query=None, sort=None):  # noqa: E501
+    def __init__(self, limit=None, offset=None, query=None, sort=None, _configuration=None):  # noqa: E501
         """SortableSearchRequest - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._limit = None
         self._offset = None
@@ -82,9 +87,11 @@ def limit(self, limit):
         :param limit: The limit of this SortableSearchRequest.  # noqa: E501
         :type: int
         """
-        if limit is not None and limit > 1000:  # noqa: E501
+        if (self._configuration.client_side_validation and
+                limit is not None and limit > 1000):  # noqa: E501
             raise ValueError("Invalid value for `limit`, must be a value less than or equal to `1000`")  # noqa: E501
-        if limit is not None and limit < 1:  # noqa: E501
+        if (self._configuration.client_side_validation and
+                limit is not None and limit < 1):  # noqa: E501
             raise ValueError("Invalid value for `limit`, must be a value greater than or equal to `1`")  # noqa: E501
 
         self._limit = limit
@@ -196,8 +203,11 @@ def __eq__(self, other):
         if not isinstance(other, SortableSearchRequest):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, SortableSearchRequest):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index ff3975f..69987aa 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Sorting(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class Sorting(object):
         'field': 'field'
     }
 
-    def __init__(self, ascending=None, default=None, field=None):  # noqa: E501
+    def __init__(self, ascending=None, default=None, field=None, _configuration=None):  # noqa: E501
         """Sorting - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._ascending = None
         self._default = None
@@ -75,7 +80,7 @@ def ascending(self, ascending):
         :param ascending: The ascending of this Sorting.  # noqa: E501
         :type: bool
         """
-        if ascending is None:
+        if self._configuration.client_side_validation and ascending is None:
             raise ValueError("Invalid value for `ascending`, must not be `None`")  # noqa: E501
 
         self._ascending = ascending
@@ -123,7 +128,7 @@ def field(self, field):
         :param field: The field of this Sorting.  # noqa: E501
         :type: str
         """
-        if field is None:
+        if self._configuration.client_side_validation and field is None:
             raise ValueError("Invalid value for `field`, must not be `None`")  # noqa: E501
 
         self._field = field
@@ -168,8 +173,11 @@ def __eq__(self, other):
         if not isinstance(other, Sorting):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Sorting):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 19cf450..52848f8 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Source(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -56,8 +58,11 @@ class Source(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, hidden=None, id=None, marked_new_epoch_millis=None, source_name=None, tags=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, description=None, hidden=None, id=None, marked_new_epoch_millis=None, source_name=None, tags=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Source - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._creator_id = None
@@ -198,7 +203,7 @@ def id(self, id):
         :param id: The id of this Source.  # noqa: E501
         :type: str
         """
-        if id is None:
+        if self._configuration.client_side_validation and id is None:
             raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
         self._id = id
@@ -246,7 +251,7 @@ def source_name(self, source_name):
         :param source_name: The source_name of this Source.  # noqa: E501
         :type: str
         """
-        if source_name is None:
+        if self._configuration.client_side_validation and source_name is None:
             raise ValueError("Invalid value for `source_name`, must not be `None`")  # noqa: E501
 
         self._source_name = source_name
@@ -356,8 +361,11 @@ def __eq__(self, other):
         if not isinstance(other, Source):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Source):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 145be39..478ab1c 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class SourceLabelPair(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class SourceLabelPair(object):
         'tags': 'tags'
     }
 
-    def __init__(self, firing=None, host=None, label=None, observed=None, severity=None, start_time=None, tags=None):  # noqa: E501
+    def __init__(self, firing=None, host=None, label=None, observed=None, severity=None, start_time=None, tags=None, _configuration=None):  # noqa: E501
         """SourceLabelPair - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._firing = None
         self._host = None
@@ -182,7 +187,8 @@ def severity(self, severity):
         :type: str
         """
         allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
-        if severity not in allowed_values:
+        if (self._configuration.client_side_validation and
+                severity not in allowed_values):
             raise ValueError(
                 "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
                 .format(severity, allowed_values)
@@ -274,8 +280,11 @@ def __eq__(self, other):
         if not isinstance(other, SourceLabelPair):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, SourceLabelPair):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index 2a0c477..a2aa5a5 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class SourceSearchRequestContainer(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class SourceSearchRequestContainer(object):
         'sort_sources_ascending': 'sortSourcesAscending'
     }
 
-    def __init__(self, cursor=None, include_obsolete=None, limit=None, query=None, sort_sources_ascending=None):  # noqa: E501
+    def __init__(self, cursor=None, include_obsolete=None, limit=None, query=None, sort_sources_ascending=None, _configuration=None):  # noqa: E501
         """SourceSearchRequestContainer - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._include_obsolete = None
@@ -222,8 +227,11 @@ def __eq__(self, other):
         if not isinstance(other, SourceSearchRequestContainer):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, SourceSearchRequestContainer):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/span.py b/wavefront_api_client/models/span.py
index a3a4f49..16d115f 100644
--- a/wavefront_api_client/models/span.py
+++ b/wavefront_api_client/models/span.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Span(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class Span(object):
         'trace_id': 'traceId'
     }
 
-    def __init__(self, annotations=None, duration_ms=None, host=None, name=None, span_id=None, start_ms=None, trace_id=None):  # noqa: E501
+    def __init__(self, annotations=None, duration_ms=None, host=None, name=None, span_id=None, start_ms=None, trace_id=None, _configuration=None):  # noqa: E501
         """Span - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._annotations = None
         self._duration_ms = None
@@ -278,8 +283,11 @@ def __eq__(self, other):
         if not isinstance(other, Span):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Span):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/specific_data.py b/wavefront_api_client/models/specific_data.py
index e11b19e..7e6922c 100644
--- a/wavefront_api_client/models/specific_data.py
+++ b/wavefront_api_client/models/specific_data.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class SpecificData(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class SpecificData(object):
         'fast_reader_enabled': 'fastReaderEnabled'
     }
 
-    def __init__(self, class_loader=None, conversions=None, fast_reader_builder=None, fast_reader_enabled=None):  # noqa: E501
+    def __init__(self, class_loader=None, conversions=None, fast_reader_builder=None, fast_reader_enabled=None, _configuration=None):  # noqa: E501
         """SpecificData - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._class_loader = None
         self._conversions = None
@@ -186,8 +191,11 @@ def __eq__(self, other):
         if not isinstance(other, SpecificData):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, SpecificData):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
index 9bca289..c57e2d5 100644
--- a/wavefront_api_client/models/stats_model_internal_use.py
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class StatsModelInternalUse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -74,8 +76,11 @@ class StatsModelInternalUse(object):
         'summaries': 'summaries'
     }
 
-    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, distributions=None, edges=None, hosts_used=None, keys=None, latency=None, metrics=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, spans=None, summaries=None):  # noqa: E501
+    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, distributions=None, edges=None, hosts_used=None, keys=None, latency=None, metrics=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, spans=None, summaries=None, _configuration=None):  # noqa: E501
         """StatsModelInternalUse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._buffer_keys = None
         self._cached_compacted_keys = None
@@ -576,8 +581,11 @@ def __eq__(self, other):
         if not isinstance(other, StatsModelInternalUse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, StatsModelInternalUse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/stripe.py b/wavefront_api_client/models/stripe.py
index 30cff8d..f05d5a4 100644
--- a/wavefront_api_client/models/stripe.py
+++ b/wavefront_api_client/models/stripe.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Stripe(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class Stripe(object):
         'start_ms': 'startMs'
     }
 
-    def __init__(self, end_ms=None, image_link=None, model=None, start_ms=None):  # noqa: E501
+    def __init__(self, end_ms=None, image_link=None, model=None, start_ms=None, _configuration=None):  # noqa: E501
         """Stripe - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._end_ms = None
         self._image_link = None
@@ -78,7 +83,7 @@ def end_ms(self, end_ms):
         :param end_ms: The end_ms of this Stripe.  # noqa: E501
         :type: int
         """
-        if end_ms is None:
+        if self._configuration.client_side_validation and end_ms is None:
             raise ValueError("Invalid value for `end_ms`, must not be `None`")  # noqa: E501
 
         self._end_ms = end_ms
@@ -103,7 +108,7 @@ def image_link(self, image_link):
         :param image_link: The image_link of this Stripe.  # noqa: E501
         :type: str
         """
-        if image_link is None:
+        if self._configuration.client_side_validation and image_link is None:
             raise ValueError("Invalid value for `image_link`, must not be `None`")  # noqa: E501
 
         self._image_link = image_link
@@ -128,7 +133,7 @@ def model(self, model):
         :param model: The model of this Stripe.  # noqa: E501
         :type: str
         """
-        if model is None:
+        if self._configuration.client_side_validation and model is None:
             raise ValueError("Invalid value for `model`, must not be `None`")  # noqa: E501
 
         self._model = model
@@ -153,7 +158,7 @@ def start_ms(self, start_ms):
         :param start_ms: The start_ms of this Stripe.  # noqa: E501
         :type: int
         """
-        if start_ms is None:
+        if self._configuration.client_side_validation and start_ms is None:
             raise ValueError("Invalid value for `start_ms`, must not be `None`")  # noqa: E501
 
         self._start_ms = start_ms
@@ -198,8 +203,11 @@ def __eq__(self, other):
         if not isinstance(other, Stripe):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Stripe):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 5ef14b9..bf922ae 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class TagsResponse(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class TagsResponse(object):
         'total_items': 'totalItems'
     }
 
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None):  # noqa: E501
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
         """TagsResponse - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._cursor = None
         self._items = None
@@ -272,8 +277,11 @@ def __eq__(self, other):
         if not isinstance(other, TagsResponse):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, TagsResponse):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index 8ac8f88..d6bad2b 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class TargetInfo(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class TargetInfo(object):
         'name': 'name'
     }
 
-    def __init__(self, id=None, method=None, name=None):  # noqa: E501
+    def __init__(self, id=None, method=None, name=None, _configuration=None):  # noqa: E501
         """TargetInfo - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._id = None
         self._method = None
@@ -101,7 +106,8 @@ def method(self, method):
         :type: str
         """
         allowed_values = ["EMAIL", "PAGERDUTY", "WEBHOOK"]  # noqa: E501
-        if method not in allowed_values:
+        if (self._configuration.client_side_validation and
+                method not in allowed_values):
             raise ValueError(
                 "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
                 .format(method, allowed_values)
@@ -172,8 +178,11 @@ def __eq__(self, other):
         if not isinstance(other, TargetInfo):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, TargetInfo):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tesla_configuration.py b/wavefront_api_client/models/tesla_configuration.py
index df37c1f..852be56 100644
--- a/wavefront_api_client/models/tesla_configuration.py
+++ b/wavefront_api_client/models/tesla_configuration.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class TeslaConfiguration(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -38,8 +40,11 @@ class TeslaConfiguration(object):
         'email': 'email'
     }
 
-    def __init__(self, email=None):  # noqa: E501
+    def __init__(self, email=None, _configuration=None):  # noqa: E501
         """TeslaConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._email = None
         self.discriminator = None
@@ -66,7 +71,7 @@ def email(self, email):
         :param email: The email of this TeslaConfiguration.  # noqa: E501
         :type: str
         """
-        if email is None:
+        if self._configuration.client_side_validation and email is None:
             raise ValueError("Invalid value for `email`, must not be `None`")  # noqa: E501
 
         self._email = email
@@ -111,8 +116,11 @@ def __eq__(self, other):
         if not isinstance(other, TeslaConfiguration):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, TeslaConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index eeb19b2..62c9e1c 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Timeseries(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class Timeseries(object):
         'tags': 'tags'
     }
 
-    def __init__(self, data=None, host=None, label=None, tags=None):  # noqa: E501
+    def __init__(self, data=None, host=None, label=None, tags=None, _configuration=None):  # noqa: E501
         """Timeseries - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._data = None
         self._host = None
@@ -194,8 +199,11 @@ def __eq__(self, other):
         if not isinstance(other, Timeseries):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Timeseries):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/trace.py b/wavefront_api_client/models/trace.py
index aa28a33..862e5d1 100644
--- a/wavefront_api_client/models/trace.py
+++ b/wavefront_api_client/models/trace.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Trace(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class Trace(object):
         'trace_id': 'traceId'
     }
 
-    def __init__(self, end_ms=None, spans=None, start_ms=None, total_duration_ms=None, trace_id=None):  # noqa: E501
+    def __init__(self, end_ms=None, spans=None, start_ms=None, total_duration_ms=None, trace_id=None, _configuration=None):  # noqa: E501
         """Trace - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._end_ms = None
         self._spans = None
@@ -222,8 +227,11 @@ def __eq__(self, other):
         if not isinstance(other, Trace):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Trace):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/triage_dashboard.py b/wavefront_api_client/models/triage_dashboard.py
index fc49e10..3df50c7 100644
--- a/wavefront_api_client/models/triage_dashboard.py
+++ b/wavefront_api_client/models/triage_dashboard.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class TriageDashboard(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class TriageDashboard(object):
         'parameters': 'parameters'
     }
 
-    def __init__(self, dashboard_id=None, description=None, parameters=None):  # noqa: E501
+    def __init__(self, dashboard_id=None, description=None, parameters=None, _configuration=None):  # noqa: E501
         """TriageDashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._dashboard_id = None
         self._description = None
@@ -160,8 +165,11 @@ def __eq__(self, other):
         if not isinstance(other, TriageDashboard):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, TriageDashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tuple.py b/wavefront_api_client/models/tuple.py
index 2a95ccc..edfd579 100644
--- a/wavefront_api_client/models/tuple.py
+++ b/wavefront_api_client/models/tuple.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class Tuple(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -38,8 +40,11 @@ class Tuple(object):
         'elements': 'elements'
     }
 
-    def __init__(self, elements=None):  # noqa: E501
+    def __init__(self, elements=None, _configuration=None):  # noqa: E501
         """Tuple - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._elements = None
         self.discriminator = None
@@ -108,8 +113,11 @@ def __eq__(self, other):
         if not isinstance(other, Tuple):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, Tuple):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tuple_result.py b/wavefront_api_client/models/tuple_result.py
index 5c328dc..c8aaf49 100644
--- a/wavefront_api_client/models/tuple_result.py
+++ b/wavefront_api_client/models/tuple_result.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class TupleResult(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class TupleResult(object):
         'value_list': 'valueList'
     }
 
-    def __init__(self, key=None, value_list=None):  # noqa: E501
+    def __init__(self, key=None, value_list=None, _configuration=None):  # noqa: E501
         """TupleResult - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._key = None
         self._value_list = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, TupleResult):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, TupleResult):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tuple_value_result.py b/wavefront_api_client/models/tuple_value_result.py
index 8a56fd5..f1ca6e0 100644
--- a/wavefront_api_client/models/tuple_value_result.py
+++ b/wavefront_api_client/models/tuple_value_result.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class TupleValueResult(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class TupleValueResult(object):
         'value': 'value'
     }
 
-    def __init__(self, count=None, value=None):  # noqa: E501
+    def __init__(self, count=None, value=None, _configuration=None):  # noqa: E501
         """TupleValueResult - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._count = None
         self._value = None
@@ -138,8 +143,11 @@ def __eq__(self, other):
         if not isinstance(other, TupleValueResult):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, TupleValueResult):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index dfc90c9..d9ea1b0 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserApiToken(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -42,8 +44,11 @@ class UserApiToken(object):
         'token_name': 'tokenName'
     }
 
-    def __init__(self, last_used=None, token_id=None, token_name=None):  # noqa: E501
+    def __init__(self, last_used=None, token_id=None, token_name=None, _configuration=None):  # noqa: E501
         """UserApiToken - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._last_used = None
         self._token_id = None
@@ -99,7 +104,7 @@ def token_id(self, token_id):
         :param token_id: The token_id of this UserApiToken.  # noqa: E501
         :type: str
         """
-        if token_id is None:
+        if self._configuration.client_side_validation and token_id is None:
             raise ValueError("Invalid value for `token_id`, must not be `None`")  # noqa: E501
 
         self._token_id = token_id
@@ -167,8 +172,11 @@ def __eq__(self, other):
         if not isinstance(other, UserApiToken):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserApiToken):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 0f6dce2..47eaa9b 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class UserDTO(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._groups = None
@@ -290,8 +295,11 @@ def __eq__(self, other):
         if not isinstance(other, UserDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index ce3195b..4514ac1 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserGroup(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -54,8 +56,11 @@ class UserGroup(object):
         'users': 'users'
     }
 
-    def __init__(self, customer=None, description=None, id=None, name=None, permissions=None, properties=None, roles=None, user_count=None, users=None):  # noqa: E501
+    def __init__(self, customer=None, description=None, id=None, name=None, permissions=None, properties=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
         """UserGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._description = None
@@ -334,8 +339,11 @@ def __eq__(self, other):
         if not isinstance(other, UserGroup):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 221323c..c158cbf 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserGroupModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -58,8 +60,11 @@ class UserGroupModel(object):
         'users': 'users'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, properties=None, role_count=None, roles=None, user_count=None, users=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
         """UserGroupModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._customer = None
@@ -205,7 +210,7 @@ def name(self, name):
         :param name: The name of this UserGroupModel.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -230,7 +235,7 @@ def permissions(self, permissions):
         :param permissions: The permissions of this UserGroupModel.  # noqa: E501
         :type: list[str]
         """
-        if permissions is None:
+        if self._configuration.client_side_validation and permissions is None:
             raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
 
         self._permissions = permissions
@@ -390,8 +395,11 @@ def __eq__(self, other):
         if not isinstance(other, UserGroupModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserGroupModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index 8fef78a..cbaa4da 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserGroupPropertiesDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -44,8 +46,11 @@ class UserGroupPropertiesDTO(object):
         'users_editable': 'usersEditable'
     }
 
-    def __init__(self, name_editable=None, permissions_editable=None, roles_editable=None, users_editable=None):  # noqa: E501
+    def __init__(self, name_editable=None, permissions_editable=None, roles_editable=None, users_editable=None, _configuration=None):  # noqa: E501
         """UserGroupPropertiesDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._name_editable = None
         self._permissions_editable = None
@@ -186,8 +191,11 @@ def __eq__(self, other):
         if not isinstance(other, UserGroupPropertiesDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserGroupPropertiesDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index 7ae6ded..d5fe1c8 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserGroupWrite(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -50,8 +52,11 @@ class UserGroupWrite(object):
         'role_i_ds': 'roleIDs'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, role_i_ds=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, role_i_ds=None, _configuration=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._created_epoch_millis = None
         self._customer = None
@@ -184,7 +189,7 @@ def name(self, name):
         :param name: The name of this UserGroupWrite.  # noqa: E501
         :type: str
         """
-        if name is None:
+        if self._configuration.client_side_validation and name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
         self._name = name
@@ -209,7 +214,7 @@ def permissions(self, permissions):
         :param permissions: The permissions of this UserGroupWrite.  # noqa: E501
         :type: list[str]
         """
-        if permissions is None:
+        if self._configuration.client_side_validation and permissions is None:
             raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
 
         self._permissions = permissions
@@ -234,7 +239,7 @@ def role_i_ds(self, role_i_ds):
         :param role_i_ds: The role_i_ds of this UserGroupWrite.  # noqa: E501
         :type: list[str]
         """
-        if role_i_ds is None:
+        if self._configuration.client_side_validation and role_i_ds is None:
             raise ValueError("Invalid value for `role_i_ds`, must not be `None`")  # noqa: E501
 
         self._role_i_ds = role_i_ds
@@ -279,8 +284,11 @@ def __eq__(self, other):
         if not isinstance(other, UserGroupWrite):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserGroupWrite):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 91487f6..08e07bc 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserModel(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class UserModel(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer = None
         self._groups = None
@@ -98,7 +103,7 @@ def customer(self, customer):
         :param customer: The customer of this UserModel.  # noqa: E501
         :type: str
         """
-        if customer is None:
+        if self._configuration.client_side_validation and customer is None:
             raise ValueError("Invalid value for `customer`, must not be `None`")  # noqa: E501
 
         self._customer = customer
@@ -123,7 +128,7 @@ def groups(self, groups):
         :param groups: The groups of this UserModel.  # noqa: E501
         :type: list[str]
         """
-        if groups is None:
+        if self._configuration.client_side_validation and groups is None:
             raise ValueError("Invalid value for `groups`, must not be `None`")  # noqa: E501
 
         self._groups = groups
@@ -148,7 +153,7 @@ def identifier(self, identifier):
         :param identifier: The identifier of this UserModel.  # noqa: E501
         :type: str
         """
-        if identifier is None:
+        if self._configuration.client_side_validation and identifier is None:
             raise ValueError("Invalid value for `identifier`, must not be `None`")  # noqa: E501
 
         self._identifier = identifier
@@ -257,7 +262,7 @@ def user_groups(self, user_groups):
         :param user_groups: The user_groups of this UserModel.  # noqa: E501
         :type: list[UserGroup]
         """
-        if user_groups is None:
+        if self._configuration.client_side_validation and user_groups is None:
             raise ValueError("Invalid value for `user_groups`, must not be `None`")  # noqa: E501
 
         self._user_groups = user_groups
@@ -302,8 +307,11 @@ def __eq__(self, other):
         if not isinstance(other, UserModel):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 65c14b0..258312b 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserRequestDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -52,8 +54,11 @@ class UserRequestDTO(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, sso_id=None, user_groups=None):  # noqa: E501
+    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._credential = None
         self._customer = None
@@ -290,8 +295,11 @@ def __eq__(self, other):
         if not isinstance(other, UserRequestDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserRequestDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index 33921c8..f25dc2e 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class UserToCreate(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -46,8 +48,11 @@ class UserToCreate(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, roles=None, user_groups=None):  # noqa: E501
+    def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserToCreate - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._email_address = None
         self._groups = None
@@ -84,7 +89,7 @@ def email_address(self, email_address):
         :param email_address: The email_address of this UserToCreate.  # noqa: E501
         :type: str
         """
-        if email_address is None:
+        if self._configuration.client_side_validation and email_address is None:
             raise ValueError("Invalid value for `email_address`, must not be `None`")  # noqa: E501
 
         self._email_address = email_address
@@ -109,7 +114,7 @@ def groups(self, groups):
         :param groups: The groups of this UserToCreate.  # noqa: E501
         :type: list[str]
         """
-        if groups is None:
+        if self._configuration.client_side_validation and groups is None:
             raise ValueError("Invalid value for `groups`, must not be `None`")  # noqa: E501
 
         self._groups = groups
@@ -180,7 +185,7 @@ def user_groups(self, user_groups):
         :param user_groups: The user_groups of this UserToCreate.  # noqa: E501
         :type: list[str]
         """
-        if user_groups is None:
+        if self._configuration.client_side_validation and user_groups is None:
             raise ValueError("Invalid value for `user_groups`, must not be `None`")  # noqa: E501
 
         self._user_groups = user_groups
@@ -225,8 +230,11 @@ def __eq__(self, other):
         if not isinstance(other, UserToCreate):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, UserToCreate):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
index 89facca..4b3a5a0 100644
--- a/wavefront_api_client/models/validated_users_dto.py
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class ValidatedUsersDTO(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -40,8 +42,11 @@ class ValidatedUsersDTO(object):
         'valid_users': 'validUsers'
     }
 
-    def __init__(self, invalid_identifiers=None, valid_users=None):  # noqa: E501
+    def __init__(self, invalid_identifiers=None, valid_users=None, _configuration=None):  # noqa: E501
         """ValidatedUsersDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._invalid_identifiers = None
         self._valid_users = None
@@ -134,8 +139,11 @@ def __eq__(self, other):
         if not isinstance(other, ValidatedUsersDTO):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, ValidatedUsersDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/wf_tags.py b/wavefront_api_client/models/wf_tags.py
index 2ede460..6acae83 100644
--- a/wavefront_api_client/models/wf_tags.py
+++ b/wavefront_api_client/models/wf_tags.py
@@ -16,6 +16,8 @@
 
 import six
 
+from wavefront_api_client.configuration import Configuration
+
 
 class WFTags(object):
     """NOTE: This class is auto generated by the swagger code generator program.
@@ -38,8 +40,11 @@ class WFTags(object):
         'customer_tags': 'customerTags'
     }
 
-    def __init__(self, customer_tags=None):  # noqa: E501
+    def __init__(self, customer_tags=None, _configuration=None):  # noqa: E501
         """WFTags - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
 
         self._customer_tags = None
         self.discriminator = None
@@ -110,8 +115,11 @@ def __eq__(self, other):
         if not isinstance(other, WFTags):
             return False
 
-        return self.__dict__ == other.__dict__
+        return self.to_dict() == other.to_dict()
 
     def __ne__(self, other):
         """Returns true if both objects are not equal"""
-        return not self == other
+        if not isinstance(other, WFTags):
+            return True
+
+        return self.to_dict() != other.to_dict()

From c1a10d4cafb042966b8782a12ab419f1f6ed7e28 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 26 Aug 2021 08:16:26 -0700
Subject: [PATCH 091/161] Autogenerated Update v2.100.2.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/MaintenanceWindow.md                     |  2 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/maintenance_window.py              | 58 ++++++++++++++++++-
 8 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 8e2d773..599c77a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.95.2"
+    "packageVersion": "2.100.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 315a1d4..8e2d773 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.95.1"
+    "packageVersion": "2.95.2"
 }
diff --git a/README.md b/README.md
index ea7ec0f..ec5ff02 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.95.2
+- Package version: 2.100.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index 20e0bb4..e8b69e3 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **event_name** | **str** | The name of an event associated with the creation/update of this maintenance window | [optional] 
 **host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
 **id** | **str** |  | [optional] 
+**point_tag_filter** | **str** | Query that filters on point tags of timeseries scanned by alert. | [optional] 
 **reason** | **str** | The purpose of this maintenance window | 
 **relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
 **relevant_customer_tags_anded** | **bool** | Whether to AND customer tags listed in relevantCustomerTags. If true, a customer must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a customer must contain one of the tags. Default: false | [optional] 
@@ -19,6 +20,7 @@ Name | Type | Description | Notes
 **running_state** | **str** |  | [optional] 
 **sort_attr** | **int** | Numeric value used in default sorting | [optional] 
 **start_time_in_seconds** | **int** | The time in epoch seconds when this maintenance window will start | 
+**targets** | **list[str]** | List of targets to notify, overriding the alert&#39;s targets. | [optional] 
 **title** | **str** | Title of this maintenance window | 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index c08bdfb..6677d0a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.95.2"
+VERSION = "2.100.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b56fbec..4158e92 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.95.2/python'
+        self.user_agent = 'Swagger-Codegen/2.100.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 65a60d4..0ceb067 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.95.2".\
+               "SDK Package Version: 2.100.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index 597de9d..ac921a9 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -40,6 +40,7 @@ class MaintenanceWindow(object):
         'event_name': 'str',
         'host_tag_group_host_names_group_anded': 'bool',
         'id': 'str',
+        'point_tag_filter': 'str',
         'reason': 'str',
         'relevant_customer_tags': 'list[str]',
         'relevant_customer_tags_anded': 'bool',
@@ -49,6 +50,7 @@ class MaintenanceWindow(object):
         'running_state': 'str',
         'sort_attr': 'int',
         'start_time_in_seconds': 'int',
+        'targets': 'list[str]',
         'title': 'str',
         'updated_epoch_millis': 'int',
         'updater_id': 'str'
@@ -62,6 +64,7 @@ class MaintenanceWindow(object):
         'event_name': 'eventName',
         'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
         'id': 'id',
+        'point_tag_filter': 'pointTagFilter',
         'reason': 'reason',
         'relevant_customer_tags': 'relevantCustomerTags',
         'relevant_customer_tags_anded': 'relevantCustomerTagsAnded',
@@ -71,12 +74,13 @@ class MaintenanceWindow(object):
         'running_state': 'runningState',
         'sort_attr': 'sortAttr',
         'start_time_in_seconds': 'startTimeInSeconds',
+        'targets': 'targets',
         'title': 'title',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, title=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, point_tag_filter=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, targets=None, title=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -89,6 +93,7 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
         self._event_name = None
         self._host_tag_group_host_names_group_anded = None
         self._id = None
+        self._point_tag_filter = None
         self._reason = None
         self._relevant_customer_tags = None
         self._relevant_customer_tags_anded = None
@@ -98,6 +103,7 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
         self._running_state = None
         self._sort_attr = None
         self._start_time_in_seconds = None
+        self._targets = None
         self._title = None
         self._updated_epoch_millis = None
         self._updater_id = None
@@ -116,6 +122,8 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
             self.host_tag_group_host_names_group_anded = host_tag_group_host_names_group_anded
         if id is not None:
             self.id = id
+        if point_tag_filter is not None:
+            self.point_tag_filter = point_tag_filter
         self.reason = reason
         self.relevant_customer_tags = relevant_customer_tags
         if relevant_customer_tags_anded is not None:
@@ -131,6 +139,8 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
         if sort_attr is not None:
             self.sort_attr = sort_attr
         self.start_time_in_seconds = start_time_in_seconds
+        if targets is not None:
+            self.targets = targets
         self.title = title
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
@@ -292,6 +302,29 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def point_tag_filter(self):
+        """Gets the point_tag_filter of this MaintenanceWindow.  # noqa: E501
+
+        Query that filters on point tags of timeseries scanned by alert.  # noqa: E501
+
+        :return: The point_tag_filter of this MaintenanceWindow.  # noqa: E501
+        :rtype: str
+        """
+        return self._point_tag_filter
+
+    @point_tag_filter.setter
+    def point_tag_filter(self, point_tag_filter):
+        """Sets the point_tag_filter of this MaintenanceWindow.
+
+        Query that filters on point tags of timeseries scanned by alert.  # noqa: E501
+
+        :param point_tag_filter: The point_tag_filter of this MaintenanceWindow.  # noqa: E501
+        :type: str
+        """
+
+        self._point_tag_filter = point_tag_filter
+
     @property
     def reason(self):
         """Gets the reason of this MaintenanceWindow.  # noqa: E501
@@ -510,6 +543,29 @@ def start_time_in_seconds(self, start_time_in_seconds):
 
         self._start_time_in_seconds = start_time_in_seconds
 
+    @property
+    def targets(self):
+        """Gets the targets of this MaintenanceWindow.  # noqa: E501
+
+        List of targets to notify, overriding the alert's targets.  # noqa: E501
+
+        :return: The targets of this MaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._targets
+
+    @targets.setter
+    def targets(self, targets):
+        """Sets the targets of this MaintenanceWindow.
+
+        List of targets to notify, overriding the alert's targets.  # noqa: E501
+
+        :param targets: The targets of this MaintenanceWindow.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._targets = targets
+
     @property
     def title(self):
         """Gets the title of this MaintenanceWindow.  # noqa: E501

From 8f1cc16db4bbaf19bb8d0f8e6994d7e3ecc505a8 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 17 Sep 2021 08:16:27 -0700
Subject: [PATCH 092/161] Autogenerated Update v2.103.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  11 +-
 docs/Event.md                                 |   1 +
 docs/PagedSpanSamplingPolicy.md               |  16 +
 docs/RelatedEvent.md                          |   1 +
 ...esponseContainerPagedSpanSamplingPolicy.md |  11 +
 docs/SearchApi.md                             | 334 ++++++++++
 docs/SpanSamplingPolicy.md                    |  20 +
 setup.py                                      |   2 +-
 test/test_paged_span_sampling_policy.py       |  40 ++
 ...se_container_paged_span_sampling_policy.py |  40 ++
 test/test_span_sampling_policy.py             |  40 ++
 wavefront_api_client/__init__.py              |   3 +
 wavefront_api_client/api/search_api.py        | 586 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   3 +
 wavefront_api_client/models/event.py          |  30 +-
 .../models/paged_span_sampling_policy.py      | 287 +++++++++
 wavefront_api_client/models/related_event.py  |  30 +-
 ...se_container_paged_span_sampling_policy.py | 150 +++++
 .../models/span_sampling_policy.py            | 408 ++++++++++++
 23 files changed, 2013 insertions(+), 8 deletions(-)
 create mode 100644 docs/PagedSpanSamplingPolicy.md
 create mode 100644 docs/ResponseContainerPagedSpanSamplingPolicy.md
 create mode 100644 docs/SpanSamplingPolicy.md
 create mode 100644 test/test_paged_span_sampling_policy.py
 create mode 100644 test/test_response_container_paged_span_sampling_policy.py
 create mode 100644 test/test_span_sampling_policy.py
 create mode 100644 wavefront_api_client/models/paged_span_sampling_policy.py
 create mode 100644 wavefront_api_client/models/response_container_paged_span_sampling_policy.py
 create mode 100644 wavefront_api_client/models/span_sampling_policy.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 599c77a..6dedd19 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.100.2"
+    "packageVersion": "2.103.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 8e2d773..599c77a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.95.2"
+    "packageVersion": "2.100.2"
 }
diff --git a/README.md b/README.md
index ec5ff02..e3f8864 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.100.2
+- Package version: 2.103.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -324,6 +324,12 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_service_account_entities**](docs/SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
 *SearchApi* | [**search_service_account_for_facet**](docs/SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
 *SearchApi* | [**search_service_account_for_facets**](docs/SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
+*SearchApi* | [**search_span_sampling_policy_deleted_entities**](docs/SearchApi.md#search_span_sampling_policy_deleted_entities) | **POST** /api/v2/search/spansamplingpolicy/deleted | Search over a customer&#39;s deleted span sampling policies
+*SearchApi* | [**search_span_sampling_policy_deleted_for_facet**](docs/SearchApi.md#search_span_sampling_policy_deleted_for_facet) | **POST** /api/v2/search/spansamplingpolicy/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted span sampling policies
+*SearchApi* | [**search_span_sampling_policy_deleted_for_facets**](docs/SearchApi.md#search_span_sampling_policy_deleted_for_facets) | **POST** /api/v2/search/spansamplingpolicy/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted span sampling policies
+*SearchApi* | [**search_span_sampling_policy_entities**](docs/SearchApi.md#search_span_sampling_policy_entities) | **POST** /api/v2/search/spansamplingpolicy | Search over a customer&#39;s non-deleted span sampling policies
+*SearchApi* | [**search_span_sampling_policy_for_facet**](docs/SearchApi.md#search_span_sampling_policy_for_facet) | **POST** /api/v2/search/spansamplingpolicy/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted span sampling policies
+*SearchApi* | [**search_span_sampling_policy_for_facets**](docs/SearchApi.md#search_span_sampling_policy_for_facets) | **POST** /api/v2/search/spansamplingpolicy/facets | Lists the values of one or more facets over the customer&#39;s non-deleted span sampling policies
 *SearchApi* | [**search_tagged_source_entities**](docs/SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facet**](docs/SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facets**](docs/SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
@@ -492,6 +498,7 @@ Class | Method | HTTP request | Description
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
  - [PagedServiceAccount](docs/PagedServiceAccount.md)
  - [PagedSource](docs/PagedSource.md)
+ - [PagedSpanSamplingPolicy](docs/PagedSpanSamplingPolicy.md)
  - [PagedUserGroupModel](docs/PagedUserGroupModel.md)
  - [Point](docs/Point.md)
  - [PolicyRuleReadModel](docs/PolicyRuleReadModel.md)
@@ -563,6 +570,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
  - [ResponseContainerPagedServiceAccount](docs/ResponseContainerPagedServiceAccount.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
+ - [ResponseContainerPagedSpanSamplingPolicy](docs/ResponseContainerPagedSpanSamplingPolicy.md)
  - [ResponseContainerPagedUserGroupModel](docs/ResponseContainerPagedUserGroupModel.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
  - [ResponseContainerQueryTypeDTO](docs/ResponseContainerQueryTypeDTO.md)
@@ -590,6 +598,7 @@ Class | Method | HTTP request | Description
  - [SourceLabelPair](docs/SourceLabelPair.md)
  - [SourceSearchRequestContainer](docs/SourceSearchRequestContainer.md)
  - [Span](docs/Span.md)
+ - [SpanSamplingPolicy](docs/SpanSamplingPolicy.md)
  - [SpecificData](docs/SpecificData.md)
  - [StatsModelInternalUse](docs/StatsModelInternalUse.md)
  - [Stripe](docs/Stripe.md)
diff --git a/docs/Event.md b/docs/Event.md
index 13145db..92d1e64 100644
--- a/docs/Event.md
+++ b/docs/Event.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **can_close** | **bool** |  | [optional] 
 **can_delete** | **bool** |  | [optional] 
+**computed_hlps** | [**list[SourceLabelPair]**](SourceLabelPair.md) | All the host/label/tags of the event. | [optional] 
 **created_at** | **int** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
diff --git a/docs/PagedSpanSamplingPolicy.md b/docs/PagedSpanSamplingPolicy.md
new file mode 100644
index 0000000..37ab2f9
--- /dev/null
+++ b/docs/PagedSpanSamplingPolicy.md
@@ -0,0 +1,16 @@
+# PagedSpanSamplingPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[SpanSamplingPolicy]**](SpanSamplingPolicy.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RelatedEvent.md b/docs/RelatedEvent.md
index 6c02099..d82db33 100644
--- a/docs/RelatedEvent.md
+++ b/docs/RelatedEvent.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **annotations** | **dict(str, str)** | A string-&gt;string map of additional annotations on the event | 
 **can_close** | **bool** |  | [optional] 
 **can_delete** | **bool** |  | [optional] 
+**computed_hlps** | [**list[SourceLabelPair]**](SourceLabelPair.md) | All the host/label/tags of the event. | [optional] 
 **created_at** | **int** |  | [optional] 
 **created_epoch_millis** | **int** |  | [optional] 
 **creator_id** | **str** |  | [optional] 
diff --git a/docs/ResponseContainerPagedSpanSamplingPolicy.md b/docs/ResponseContainerPagedSpanSamplingPolicy.md
new file mode 100644
index 0000000..60bbe3f
--- /dev/null
+++ b/docs/ResponseContainerPagedSpanSamplingPolicy.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedSpanSamplingPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedSpanSamplingPolicy**](PagedSpanSamplingPolicy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index d09684e..614ee76 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -66,6 +66,12 @@ Method | HTTP request | Description
 [**search_service_account_entities**](SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
 [**search_service_account_for_facet**](SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
 [**search_service_account_for_facets**](SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
+[**search_span_sampling_policy_deleted_entities**](SearchApi.md#search_span_sampling_policy_deleted_entities) | **POST** /api/v2/search/spansamplingpolicy/deleted | Search over a customer&#39;s deleted span sampling policies
+[**search_span_sampling_policy_deleted_for_facet**](SearchApi.md#search_span_sampling_policy_deleted_for_facet) | **POST** /api/v2/search/spansamplingpolicy/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted span sampling policies
+[**search_span_sampling_policy_deleted_for_facets**](SearchApi.md#search_span_sampling_policy_deleted_for_facets) | **POST** /api/v2/search/spansamplingpolicy/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted span sampling policies
+[**search_span_sampling_policy_entities**](SearchApi.md#search_span_sampling_policy_entities) | **POST** /api/v2/search/spansamplingpolicy | Search over a customer&#39;s non-deleted span sampling policies
+[**search_span_sampling_policy_for_facet**](SearchApi.md#search_span_sampling_policy_for_facet) | **POST** /api/v2/search/spansamplingpolicy/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted span sampling policies
+[**search_span_sampling_policy_for_facets**](SearchApi.md#search_span_sampling_policy_for_facets) | **POST** /api/v2/search/spansamplingpolicy/facets | Lists the values of one or more facets over the customer&#39;s non-deleted span sampling policies
 [**search_tagged_source_entities**](SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 [**search_tagged_source_for_facet**](SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 [**search_tagged_source_for_facets**](SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
@@ -3472,6 +3478,334 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_span_sampling_policy_deleted_entities**
+> ResponseContainerPagedSpanSamplingPolicy search_span_sampling_policy_deleted_entities(body=body)
+
+Search over a customer's deleted span sampling policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's deleted span sampling policies
+    api_response = api_instance.search_span_sampling_policy_deleted_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_span_sampling_policy_deleted_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedSpanSamplingPolicy**](ResponseContainerPagedSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_span_sampling_policy_deleted_for_facet**
+> ResponseContainerFacetResponse search_span_sampling_policy_deleted_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's deleted span sampling policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's deleted span sampling policies
+    api_response = api_instance.search_span_sampling_policy_deleted_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_span_sampling_policy_deleted_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_span_sampling_policy_deleted_for_facets**
+> ResponseContainerFacetsResponseContainer search_span_sampling_policy_deleted_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's deleted span sampling policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's deleted span sampling policies
+    api_response = api_instance.search_span_sampling_policy_deleted_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_span_sampling_policy_deleted_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_span_sampling_policy_entities**
+> ResponseContainerPagedSpanSamplingPolicy search_span_sampling_policy_entities(body=body)
+
+Search over a customer's non-deleted span sampling policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's non-deleted span sampling policies
+    api_response = api_instance.search_span_sampling_policy_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_span_sampling_policy_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedSpanSamplingPolicy**](ResponseContainerPagedSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_span_sampling_policy_for_facet**
+> ResponseContainerFacetResponse search_span_sampling_policy_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted span sampling policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted span sampling policies
+    api_response = api_instance.search_span_sampling_policy_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_span_sampling_policy_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_span_sampling_policy_for_facets**
+> ResponseContainerFacetsResponseContainer search_span_sampling_policy_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted span sampling policies
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted span sampling policies
+    api_response = api_instance.search_span_sampling_policy_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_span_sampling_policy_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_tagged_source_entities**
 > ResponseContainerPagedSource search_tagged_source_entities(body=body)
 
diff --git a/docs/SpanSamplingPolicy.md b/docs/SpanSamplingPolicy.md
new file mode 100644
index 0000000..c5bc880
--- /dev/null
+++ b/docs/SpanSamplingPolicy.md
@@ -0,0 +1,20 @@
+# SpanSamplingPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**active** | **bool** | Whether span sampling policy is active | [optional] 
+**created_epoch_millis** | **int** | Created time of the span sampling policy | [optional] 
+**creator_id** | **str** | Creator user of the span sampling policy | [optional] 
+**deleted** | **bool** | Whether span sampling policy is soft-deleted, can be modified with delete/undelete api | [optional] 
+**description** | **str** | Span sampling policy description | [optional] 
+**expression** | **str** | Span sampling policy expression | 
+**id** | **str** | Unique identifier of the span sampling policy | 
+**name** | **str** | Span sampling policy name | 
+**sampling_percent** | **int** | Sampling percent of policy, 100 means keeping all the spans that matches the policy | [optional] 
+**updated_epoch_millis** | **int** | Last updated time of the span sampling policy | [optional] 
+**updater_id** | **str** | Updater user of the span sampling policy | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 6677d0a..c7ca288 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.100.2"
+VERSION = "2.103.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_paged_span_sampling_policy.py b/test/test_paged_span_sampling_policy.py
new file mode 100644
index 0000000..45a974b
--- /dev/null
+++ b/test/test_paged_span_sampling_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_span_sampling_policy import PagedSpanSamplingPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSpanSamplingPolicy(unittest.TestCase):
+    """PagedSpanSamplingPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSpanSamplingPolicy(self):
+        """Test PagedSpanSamplingPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_span_sampling_policy.PagedSpanSamplingPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_span_sampling_policy.py b/test/test_response_container_paged_span_sampling_policy.py
new file mode 100644
index 0000000..c2cec7b
--- /dev/null
+++ b/test/test_response_container_paged_span_sampling_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_span_sampling_policy import ResponseContainerPagedSpanSamplingPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSpanSamplingPolicy(unittest.TestCase):
+    """ResponseContainerPagedSpanSamplingPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSpanSamplingPolicy(self):
+        """Test ResponseContainerPagedSpanSamplingPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_span_sampling_policy.ResponseContainerPagedSpanSamplingPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_span_sampling_policy.py b/test/test_span_sampling_policy.py
new file mode 100644
index 0000000..821205d
--- /dev/null
+++ b/test/test_span_sampling_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.span_sampling_policy import SpanSamplingPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSpanSamplingPolicy(unittest.TestCase):
+    """SpanSamplingPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSpanSamplingPolicy(self):
+        """Test SpanSamplingPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.span_sampling_policy.SpanSamplingPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index e30cbb4..e15e509 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -156,6 +156,7 @@
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
+from wavefront_api_client.models.paged_span_sampling_policy import PagedSpanSamplingPolicy
 from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
 from wavefront_api_client.models.policy_rule_read_model import PolicyRuleReadModel
@@ -227,6 +228,7 @@
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
+from wavefront_api_client.models.response_container_paged_span_sampling_policy import ResponseContainerPagedSpanSamplingPolicy
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO
@@ -254,6 +256,7 @@
 from wavefront_api_client.models.source_label_pair import SourceLabelPair
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
 from wavefront_api_client.models.span import Span
+from wavefront_api_client.models.span_sampling_policy import SpanSamplingPolicy
 from wavefront_api_client.models.specific_data import SpecificData
 from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
 from wavefront_api_client.models.stripe import Stripe
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 406c531..9eacafc 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -6099,6 +6099,592 @@ def search_service_account_for_facets_with_http_info(self, **kwargs):  # noqa: E
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_span_sampling_policy_deleted_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_deleted_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_span_sampling_policy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_span_sampling_policy_deleted_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_span_sampling_policy_deleted_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_deleted_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_span_sampling_policy_deleted_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/spansamplingpolicy/deleted', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_span_sampling_policy_deleted_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_deleted_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_span_sampling_policy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_span_sampling_policy_deleted_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_span_sampling_policy_deleted_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_deleted_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_span_sampling_policy_deleted_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_span_sampling_policy_deleted_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/spansamplingpolicy/deleted/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_span_sampling_policy_deleted_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_deleted_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_span_sampling_policy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_span_sampling_policy_deleted_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_span_sampling_policy_deleted_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_deleted_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_span_sampling_policy_deleted_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/spansamplingpolicy/deleted/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_span_sampling_policy_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_span_sampling_policy_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_span_sampling_policy_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_span_sampling_policy_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's non-deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_span_sampling_policy_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/spansamplingpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_span_sampling_policy_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_span_sampling_policy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_span_sampling_policy_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_span_sampling_policy_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_span_sampling_policy_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_span_sampling_policy_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/spansamplingpolicy/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_span_sampling_policy_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_span_sampling_policy_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_span_sampling_policy_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_span_sampling_policy_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted span sampling policies  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_span_sampling_policy_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_span_sampling_policy_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/spansamplingpolicy/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_tagged_source_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's sources  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4158e92..abc3feb 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.100.2/python'
+        self.user_agent = 'Swagger-Codegen/2.103.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 0ceb067..1319a11 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.100.2".\
+               "SDK Package Version: 2.103.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 4775766..351dc61 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -121,6 +121,7 @@
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
+from wavefront_api_client.models.paged_span_sampling_policy import PagedSpanSamplingPolicy
 from wavefront_api_client.models.paged_user_group_model import PagedUserGroupModel
 from wavefront_api_client.models.point import Point
 from wavefront_api_client.models.policy_rule_read_model import PolicyRuleReadModel
@@ -192,6 +193,7 @@
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
+from wavefront_api_client.models.response_container_paged_span_sampling_policy import ResponseContainerPagedSpanSamplingPolicy
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO
@@ -219,6 +221,7 @@
 from wavefront_api_client.models.source_label_pair import SourceLabelPair
 from wavefront_api_client.models.source_search_request_container import SourceSearchRequestContainer
 from wavefront_api_client.models.span import Span
+from wavefront_api_client.models.span_sampling_policy import SpanSamplingPolicy
 from wavefront_api_client.models.specific_data import SpecificData
 from wavefront_api_client.models.stats_model_internal_use import StatsModelInternalUse
 from wavefront_api_client.models.stripe import Stripe
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 5fa798d..47d7215 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -37,6 +37,7 @@ class Event(object):
         'annotations': 'dict(str, str)',
         'can_close': 'bool',
         'can_delete': 'bool',
+        'computed_hlps': 'list[SourceLabelPair]',
         'created_at': 'int',
         'created_epoch_millis': 'int',
         'creator_id': 'str',
@@ -64,6 +65,7 @@ class Event(object):
         'annotations': 'annotations',
         'can_close': 'canClose',
         'can_delete': 'canDelete',
+        'computed_hlps': 'computedHlps',
         'created_at': 'createdAt',
         'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
@@ -86,7 +88,7 @@ class Event(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, computed_hlps=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, running_state=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Event - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -96,6 +98,7 @@ def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete
         self._annotations = None
         self._can_close = None
         self._can_delete = None
+        self._computed_hlps = None
         self._created_at = None
         self._created_epoch_millis = None
         self._creator_id = None
@@ -125,6 +128,8 @@ def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete
             self.can_close = can_close
         if can_delete is not None:
             self.can_delete = can_delete
+        if computed_hlps is not None:
+            self.computed_hlps = computed_hlps
         if created_at is not None:
             self.created_at = created_at
         if created_epoch_millis is not None:
@@ -254,6 +259,29 @@ def can_delete(self, can_delete):
 
         self._can_delete = can_delete
 
+    @property
+    def computed_hlps(self):
+        """Gets the computed_hlps of this Event.  # noqa: E501
+
+        All the host/label/tags of the event.  # noqa: E501
+
+        :return: The computed_hlps of this Event.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._computed_hlps
+
+    @computed_hlps.setter
+    def computed_hlps(self, computed_hlps):
+        """Sets the computed_hlps of this Event.
+
+        All the host/label/tags of the event.  # noqa: E501
+
+        :param computed_hlps: The computed_hlps of this Event.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._computed_hlps = computed_hlps
+
     @property
     def created_at(self):
         """Gets the created_at of this Event.  # noqa: E501
diff --git a/wavefront_api_client/models/paged_span_sampling_policy.py b/wavefront_api_client/models/paged_span_sampling_policy.py
new file mode 100644
index 0000000..b9df3df
--- /dev/null
+++ b/wavefront_api_client/models/paged_span_sampling_policy.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedSpanSamplingPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[SpanSamplingPolicy]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedSpanSamplingPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSpanSamplingPolicy.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSpanSamplingPolicy.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedSpanSamplingPolicy.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: list[SpanSamplingPolicy]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedSpanSamplingPolicy.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: list[SpanSamplingPolicy]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The limit of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedSpanSamplingPolicy.
+
+
+        :param limit: The limit of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedSpanSamplingPolicy.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedSpanSamplingPolicy.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The offset of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSpanSamplingPolicy.
+
+
+        :param offset: The offset of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The sort of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedSpanSamplingPolicy.
+
+
+        :param sort: The sort of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSpanSamplingPolicy.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSpanSamplingPolicy.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSpanSamplingPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedSpanSamplingPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedSpanSamplingPolicy):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedSpanSamplingPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index 57dcc25..5e75f45 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -37,6 +37,7 @@ class RelatedEvent(object):
         'annotations': 'dict(str, str)',
         'can_close': 'bool',
         'can_delete': 'bool',
+        'computed_hlps': 'list[SourceLabelPair]',
         'created_at': 'int',
         'created_epoch_millis': 'int',
         'creator_id': 'str',
@@ -66,6 +67,7 @@ class RelatedEvent(object):
         'annotations': 'annotations',
         'can_close': 'canClose',
         'can_delete': 'canDelete',
+        'computed_hlps': 'computedHlps',
         'created_at': 'createdAt',
         'created_epoch_millis': 'createdEpochMillis',
         'creator_id': 'creatorId',
@@ -90,7 +92,7 @@ class RelatedEvent(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, similarity_score=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete=None, computed_hlps=None, created_at=None, created_epoch_millis=None, creator_id=None, creator_type=None, dimensions=None, end_time=None, hosts=None, id=None, is_ephemeral=None, is_user_event=None, metrics_used=None, name=None, related_data=None, running_state=None, similarity_score=None, start_time=None, summarized_events=None, table=None, tags=None, updated_at=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """RelatedEvent - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -100,6 +102,7 @@ def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete
         self._annotations = None
         self._can_close = None
         self._can_delete = None
+        self._computed_hlps = None
         self._created_at = None
         self._created_epoch_millis = None
         self._creator_id = None
@@ -131,6 +134,8 @@ def __init__(self, alert_tags=None, annotations=None, can_close=None, can_delete
             self.can_close = can_close
         if can_delete is not None:
             self.can_delete = can_delete
+        if computed_hlps is not None:
+            self.computed_hlps = computed_hlps
         if created_at is not None:
             self.created_at = created_at
         if created_epoch_millis is not None:
@@ -264,6 +269,29 @@ def can_delete(self, can_delete):
 
         self._can_delete = can_delete
 
+    @property
+    def computed_hlps(self):
+        """Gets the computed_hlps of this RelatedEvent.  # noqa: E501
+
+        All the host/label/tags of the event.  # noqa: E501
+
+        :return: The computed_hlps of this RelatedEvent.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._computed_hlps
+
+    @computed_hlps.setter
+    def computed_hlps(self, computed_hlps):
+        """Sets the computed_hlps of this RelatedEvent.
+
+        All the host/label/tags of the event.  # noqa: E501
+
+        :param computed_hlps: The computed_hlps of this RelatedEvent.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._computed_hlps = computed_hlps
+
     @property
     def created_at(self):
         """Gets the created_at of this RelatedEvent.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
new file mode 100644
index 0000000..a9b285e
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedSpanSamplingPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedSpanSamplingPolicy',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedSpanSamplingPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: PagedSpanSamplingPolicy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSpanSamplingPolicy.
+
+
+        :param response: The response of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+        :type: PagedSpanSamplingPolicy
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedSpanSamplingPolicy.
+
+
+        :param status: The status of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedSpanSamplingPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedSpanSamplingPolicy):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedSpanSamplingPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/span_sampling_policy.py b/wavefront_api_client/models/span_sampling_policy.py
new file mode 100644
index 0000000..1d280a5
--- /dev/null
+++ b/wavefront_api_client/models/span_sampling_policy.py
@@ -0,0 +1,408 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class SpanSamplingPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'active': 'bool',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'description': 'str',
+        'expression': 'str',
+        'id': 'str',
+        'name': 'str',
+        'sampling_percent': 'int',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'active': 'active',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'description': 'description',
+        'expression': 'expression',
+        'id': 'id',
+        'name': 'name',
+        'sampling_percent': 'samplingPercent',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, active=None, created_epoch_millis=None, creator_id=None, deleted=None, description=None, expression=None, id=None, name=None, sampling_percent=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """SpanSamplingPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._active = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._description = None
+        self._expression = None
+        self._id = None
+        self._name = None
+        self._sampling_percent = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if active is not None:
+            self.active = active
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if description is not None:
+            self.description = description
+        self.expression = expression
+        self.id = id
+        self.name = name
+        if sampling_percent is not None:
+            self.sampling_percent = sampling_percent
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def active(self):
+        """Gets the active of this SpanSamplingPolicy.  # noqa: E501
+
+        Whether span sampling policy is active  # noqa: E501
+
+        :return: The active of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._active
+
+    @active.setter
+    def active(self, active):
+        """Sets the active of this SpanSamplingPolicy.
+
+        Whether span sampling policy is active  # noqa: E501
+
+        :param active: The active of this SpanSamplingPolicy.  # noqa: E501
+        :type: bool
+        """
+
+        self._active = active
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this SpanSamplingPolicy.  # noqa: E501
+
+        Created time of the span sampling policy  # noqa: E501
+
+        :return: The created_epoch_millis of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this SpanSamplingPolicy.
+
+        Created time of the span sampling policy  # noqa: E501
+
+        :param created_epoch_millis: The created_epoch_millis of this SpanSamplingPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this SpanSamplingPolicy.  # noqa: E501
+
+        Creator user of the span sampling policy  # noqa: E501
+
+        :return: The creator_id of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this SpanSamplingPolicy.
+
+        Creator user of the span sampling policy  # noqa: E501
+
+        :param creator_id: The creator_id of this SpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this SpanSamplingPolicy.  # noqa: E501
+
+        Whether span sampling policy is soft-deleted, can be modified with delete/undelete api  # noqa: E501
+
+        :return: The deleted of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this SpanSamplingPolicy.
+
+        Whether span sampling policy is soft-deleted, can be modified with delete/undelete api  # noqa: E501
+
+        :param deleted: The deleted of this SpanSamplingPolicy.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def description(self):
+        """Gets the description of this SpanSamplingPolicy.  # noqa: E501
+
+        Span sampling policy description  # noqa: E501
+
+        :return: The description of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this SpanSamplingPolicy.
+
+        Span sampling policy description  # noqa: E501
+
+        :param description: The description of this SpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def expression(self):
+        """Gets the expression of this SpanSamplingPolicy.  # noqa: E501
+
+        Span sampling policy expression  # noqa: E501
+
+        :return: The expression of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._expression
+
+    @expression.setter
+    def expression(self, expression):
+        """Sets the expression of this SpanSamplingPolicy.
+
+        Span sampling policy expression  # noqa: E501
+
+        :param expression: The expression of this SpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and expression is None:
+            raise ValueError("Invalid value for `expression`, must not be `None`")  # noqa: E501
+
+        self._expression = expression
+
+    @property
+    def id(self):
+        """Gets the id of this SpanSamplingPolicy.  # noqa: E501
+
+        Unique identifier of the span sampling policy  # noqa: E501
+
+        :return: The id of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this SpanSamplingPolicy.
+
+        Unique identifier of the span sampling policy  # noqa: E501
+
+        :param id: The id of this SpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this SpanSamplingPolicy.  # noqa: E501
+
+        Span sampling policy name  # noqa: E501
+
+        :return: The name of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this SpanSamplingPolicy.
+
+        Span sampling policy name  # noqa: E501
+
+        :param name: The name of this SpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def sampling_percent(self):
+        """Gets the sampling_percent of this SpanSamplingPolicy.  # noqa: E501
+
+        Sampling percent of policy, 100 means keeping all the spans that matches the policy  # noqa: E501
+
+        :return: The sampling_percent of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._sampling_percent
+
+    @sampling_percent.setter
+    def sampling_percent(self, sampling_percent):
+        """Sets the sampling_percent of this SpanSamplingPolicy.
+
+        Sampling percent of policy, 100 means keeping all the spans that matches the policy  # noqa: E501
+
+        :param sampling_percent: The sampling_percent of this SpanSamplingPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._sampling_percent = sampling_percent
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this SpanSamplingPolicy.  # noqa: E501
+
+        Last updated time of the span sampling policy  # noqa: E501
+
+        :return: The updated_epoch_millis of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this SpanSamplingPolicy.
+
+        Last updated time of the span sampling policy  # noqa: E501
+
+        :param updated_epoch_millis: The updated_epoch_millis of this SpanSamplingPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SpanSamplingPolicy.  # noqa: E501
+
+        Updater user of the span sampling policy  # noqa: E501
+
+        :return: The updater_id of this SpanSamplingPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SpanSamplingPolicy.
+
+        Updater user of the span sampling policy  # noqa: E501
+
+        :param updater_id: The updater_id of this SpanSamplingPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SpanSamplingPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SpanSamplingPolicy):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, SpanSamplingPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()

From 3ca954b587165ffe6d6a9bc0eae5ace7812ee160 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 7 Oct 2021 08:22:32 -0700
Subject: [PATCH 093/161] Autogenerated Update v2.106.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     | 10 +++----
 docs/AccountUserAndServiceAccountApi.md       | 20 ++++++-------
 docs/Alert.md                                 |  1 +
 docs/DerivedMetricDefinition.md               |  1 +
 docs/UserApi.md                               | 20 ++++++-------
 setup.py                                      |  2 +-
 .../account__user_and_service_account_api.py  | 16 +++++-----
 wavefront_api_client/api/user_api.py          | 16 +++++-----
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/alert.py          | 30 ++++++++++++++++++-
 .../models/derived_metric_definition.py       | 28 ++++++++++++++++-
 14 files changed, 104 insertions(+), 48 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6dedd19..f2a2e6c 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.103.0"
+    "packageVersion": "2.106.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 599c77a..6dedd19 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.100.2"
+    "packageVersion": "2.103.0"
 }
diff --git a/README.md b/README.md
index e3f8864..2042844 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.103.0
+- Package version: 2.106.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -80,7 +80,7 @@ Class | Method | HTTP request | Description
 *AccessPolicyApi* | [**validate_url**](docs/AccessPolicyApi.md#validate_url) | **GET** /api/v2/accesspolicy/validate | Validate a given url and ip address
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
@@ -98,7 +98,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**grant_permission_to_accounts**](docs/AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific user groups from the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
@@ -359,7 +359,7 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
-*UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
+*UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific groups to the user or service account
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
 *UserApi* | [**delete_multiple_users**](docs/UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
 *UserApi* | [**delete_user**](docs/UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
@@ -369,7 +369,7 @@ Class | Method | HTTP request | Description
 *UserApi* | [**grant_permission_to_users**](docs/UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 *UserApi* | [**grant_user_permission**](docs/UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 *UserApi* | [**invite_users**](docs/UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
-*UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
+*UserApi* | [**remove_user_from_user_groups**](docs/UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific groups from the user or service account
 *UserApi* | [**revoke_permission_from_users**](docs/UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 *UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index f7068f4..005c671 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -6,7 +6,7 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
-[**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific user groups to the account (user or service account)
+[**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
 [**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
@@ -24,7 +24,7 @@ Method | HTTP request | Description
 [**grant_permission_to_accounts**](AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
-[**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific user groups from the account (user or service account)
+[**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 [**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
@@ -146,7 +146,7 @@ Name | Type | Description  | Notes
 # **add_account_to_user_groups**
 > UserModel add_account_to_user_groups(id, body=body)
 
-Adds specific user groups to the account (user or service account)
+Adds specific groups to the account (user or service account)
 
 
 
@@ -167,10 +167,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be added to the account (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | The list of groups that should be added to the account (optional)
 
 try:
-    # Adds specific user groups to the account (user or service account)
+    # Adds specific groups to the account (user or service account)
     api_response = api_instance.add_account_to_user_groups(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -182,7 +182,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| The list of user groups that should be added to the account | [optional] 
+ **body** | **list[str]**| The list of groups that should be added to the account | [optional] 
 
 ### Return type
 
@@ -1122,7 +1122,7 @@ Name | Type | Description  | Notes
 # **remove_account_from_user_groups**
 > UserModel remove_account_from_user_groups(id, body=body)
 
-Removes specific user groups from the account (user or service account)
+Removes specific groups from the account (user or service account)
 
 
 
@@ -1143,10 +1143,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be removed from the account (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | The list of groups that should be removed from the account (optional)
 
 try:
-    # Removes specific user groups from the account (user or service account)
+    # Removes specific groups from the account (user or service account)
     api_response = api_instance.remove_account_from_user_groups(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -1158,7 +1158,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| The list of user groups that should be removed from the account | [optional] 
+ **body** | **list[str]**| The list of groups that should be removed from the account | [optional] 
 
 ### Return type
 
diff --git a/docs/Alert.md b/docs/Alert.md
index 52df36b..1b43cde 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -55,6 +55,7 @@ Name | Type | Description | Notes
 **prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
 **process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
+**query_syntax_error** | **bool** | Whether there was an query syntax exception when the alert condition last ran | [optional] 
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
 **runbook_links** | **list[str]** | User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered | [optional] 
 **secure_metric_details** | **bool** | Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security. | [optional] 
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index 3dcd218..d7bee97 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -27,6 +27,7 @@ Name | Type | Description | Notes
 **query_qb_enabled** | **bool** | Whether the query was created using the Query Builder. Default false | [optional] 
 **query_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the query.  Applicable only when queryQBEnabled is true | [optional] 
 **status** | **list[str]** | Lists the current state of the derived metric. Can be one or more of: INVALID, ACTIVE, TRASH, NO_DATA | [optional] 
+**tagpaths** | **list[str]** |  | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
 **update_user_id** | **str** | The user that last updated this derived metric definition | [optional] 
 **updated** | **int** | When the derived metric definition was last updated, in epoch millis | [optional] 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index eb28796..6986b7a 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -4,7 +4,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_user_to_user_groups**](UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific user groups to the user or service account
+[**add_user_to_user_groups**](UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific groups to the user or service account
 [**create_user**](UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
 [**delete_multiple_users**](UserApi.md#delete_multiple_users) | **POST** /api/v2/user/deleteUsers | Deletes multiple users or service accounts
 [**delete_user**](UserApi.md#delete_user) | **DELETE** /api/v2/user/{id} | Deletes a user or service account identified by id
@@ -14,7 +14,7 @@ Method | HTTP request | Description
 [**grant_permission_to_users**](UserApi.md#grant_permission_to_users) | **POST** /api/v2/user/grant/{permission} | Grants a specific permission to multiple users or service accounts
 [**grant_user_permission**](UserApi.md#grant_user_permission) | **POST** /api/v2/user/{id}/grant | Grants a specific permission to user or service account
 [**invite_users**](UserApi.md#invite_users) | **POST** /api/v2/user/invite | Invite users with given user groups and permissions.
-[**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific user groups from the user or service account
+[**remove_user_from_user_groups**](UserApi.md#remove_user_from_user_groups) | **POST** /api/v2/user/{id}/removeUserGroups | Removes specific groups from the user or service account
 [**revoke_permission_from_users**](UserApi.md#revoke_permission_from_users) | **POST** /api/v2/user/revoke/{permission} | Revokes a specific permission from multiple users or service accounts
 [**revoke_user_permission**](UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 [**update_user**](UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
@@ -24,7 +24,7 @@ Method | HTTP request | Description
 # **add_user_to_user_groups**
 > UserModel add_user_to_user_groups(id, body=body)
 
-Adds specific user groups to the user or service account
+Adds specific groups to the user or service account
 
 
 
@@ -45,10 +45,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be added to the account (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | The list of groups that should be added to the account (optional)
 
 try:
-    # Adds specific user groups to the user or service account
+    # Adds specific groups to the user or service account
     api_response = api_instance.add_user_to_user_groups(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -60,7 +60,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| The list of user groups that should be added to the account | [optional] 
+ **body** | **list[str]**| The list of groups that should be added to the account | [optional] 
 
 ### Return type
 
@@ -567,7 +567,7 @@ Name | Type | Description  | Notes
 # **remove_user_from_user_groups**
 > UserModel remove_user_from_user_groups(id, body=body)
 
-Removes specific user groups from the user or service account
+Removes specific groups from the user or service account
 
 
 
@@ -588,10 +588,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | The list of user groups that should be removed from the account (optional)
+body = [wavefront_api_client.list[str]()] # list[str] | The list of groups that should be removed from the account (optional)
 
 try:
-    # Removes specific user groups from the user or service account
+    # Removes specific groups from the user or service account
     api_response = api_instance.remove_user_from_user_groups(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -603,7 +603,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| The list of user groups that should be removed from the account | [optional] 
+ **body** | **list[str]**| The list of groups that should be removed from the account | [optional] 
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index c7ca288..212581c 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.103.0"
+VERSION = "2.106.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 33e37bb..e285a15 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -236,7 +236,7 @@ def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
-        """Adds specific user groups to the account (user or service account)  # noqa: E501
+        """Adds specific groups to the account (user or service account)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -246,7 +246,7 @@ def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be added to the account
+        :param list[str] body: The list of groups that should be added to the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -259,7 +259,7 @@ def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
             return data
 
     def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Adds specific user groups to the account (user or service account)  # noqa: E501
+        """Adds specific groups to the account (user or service account)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -269,7 +269,7 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be added to the account
+        :param list[str] body: The list of groups that should be added to the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1974,7 +1974,7 @@ def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
-        """Removes specific user groups from the account (user or service account)  # noqa: E501
+        """Removes specific groups from the account (user or service account)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1984,7 +1984,7 @@ def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be removed from the account
+        :param list[str] body: The list of groups that should be removed from the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1997,7 +1997,7 @@ def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
             return data
 
     def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Removes specific user groups from the account (user or service account)  # noqa: E501
+        """Removes specific groups from the account (user or service account)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2007,7 +2007,7 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be removed from the account
+        :param list[str] body: The list of groups that should be removed from the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index cb0e6fe..d25d2e2 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -34,7 +34,7 @@ def __init__(self, api_client=None):
         self.api_client = api_client
 
     def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
-        """Adds specific user groups to the user or service account  # noqa: E501
+        """Adds specific groups to the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -44,7 +44,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be added to the account
+        :param list[str] body: The list of groups that should be added to the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -57,7 +57,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
             return data
 
     def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Adds specific user groups to the user or service account  # noqa: E501
+        """Adds specific groups to the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -67,7 +67,7 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be added to the account
+        :param list[str] body: The list of groups that should be added to the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1004,7 +1004,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
-        """Removes specific user groups from the user or service account  # noqa: E501
+        """Removes specific groups from the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1014,7 +1014,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be removed from the account
+        :param list[str] body: The list of groups that should be removed from the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1027,7 +1027,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
             return data
 
     def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Removes specific user groups from the user or service account  # noqa: E501
+        """Removes specific groups from the user or service account  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1037,7 +1037,7 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: The list of user groups that should be removed from the account
+        :param list[str] body: The list of groups that should be removed from the account
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index abc3feb..aad35ae 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.103.0/python'
+        self.user_agent = 'Swagger-Codegen/2.106.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 1319a11..6234caa 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.103.0".\
+               "SDK Package Version: 2.106.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index d58b4b2..c4399de 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -85,6 +85,7 @@ class Alert(object):
         'prefiring_host_label_pairs': 'list[SourceLabelPair]',
         'process_rate_minutes': 'int',
         'query_failing': 'bool',
+        'query_syntax_error': 'bool',
         'resolve_after_minutes': 'int',
         'runbook_links': 'list[str]',
         'secure_metric_details': 'bool',
@@ -162,6 +163,7 @@ class Alert(object):
         'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
         'process_rate_minutes': 'processRateMinutes',
         'query_failing': 'queryFailing',
+        'query_syntax_error': 'querySyntaxError',
         'resolve_after_minutes': 'resolveAfterMinutes',
         'runbook_links': 'runbookLinks',
         'secure_metric_details': 'secureMetricDetails',
@@ -186,7 +188,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -244,6 +246,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._prefiring_host_label_pairs = None
         self._process_rate_minutes = None
         self._query_failing = None
+        self._query_syntax_error = None
         self._resolve_after_minutes = None
         self._runbook_links = None
         self._secure_metric_details = None
@@ -369,6 +372,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.process_rate_minutes = process_rate_minutes
         if query_failing is not None:
             self.query_failing = query_failing
+        if query_syntax_error is not None:
+            self.query_syntax_error = query_syntax_error
         if resolve_after_minutes is not None:
             self.resolve_after_minutes = resolve_after_minutes
         if runbook_links is not None:
@@ -1603,6 +1608,29 @@ def query_failing(self, query_failing):
 
         self._query_failing = query_failing
 
+    @property
+    def query_syntax_error(self):
+        """Gets the query_syntax_error of this Alert.  # noqa: E501
+
+        Whether there was an query syntax exception when the alert condition last ran  # noqa: E501
+
+        :return: The query_syntax_error of this Alert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._query_syntax_error
+
+    @query_syntax_error.setter
+    def query_syntax_error(self, query_syntax_error):
+        """Sets the query_syntax_error of this Alert.
+
+        Whether there was an query syntax exception when the alert condition last ran  # noqa: E501
+
+        :param query_syntax_error: The query_syntax_error of this Alert.  # noqa: E501
+        :type: bool
+        """
+
+        self._query_syntax_error = query_syntax_error
+
     @property
     def resolve_after_minutes(self):
         """Gets the resolve_after_minutes of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index e641759..73a67d5 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -57,6 +57,7 @@ class DerivedMetricDefinition(object):
         'query_qb_enabled': 'bool',
         'query_qb_serialization': 'str',
         'status': 'list[str]',
+        'tagpaths': 'list[str]',
         'tags': 'WFTags',
         'update_user_id': 'str',
         'updated': 'int',
@@ -89,6 +90,7 @@ class DerivedMetricDefinition(object):
         'query_qb_enabled': 'queryQBEnabled',
         'query_qb_serialization': 'queryQBSerialization',
         'status': 'status',
+        'tagpaths': 'tagpaths',
         'tags': 'tags',
         'update_user_id': 'updateUserId',
         'updated': 'updated',
@@ -96,7 +98,7 @@ class DerivedMetricDefinition(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, additional_information=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, hosts_used=None, id=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_failed_time=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, points_scanned_at_last_query=None, process_rate_minutes=None, query=None, query_failing=None, query_qb_enabled=None, query_qb_serialization=None, status=None, tags=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_information=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, hosts_used=None, id=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_failed_time=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, name=None, points_scanned_at_last_query=None, process_rate_minutes=None, query=None, query_failing=None, query_qb_enabled=None, query_qb_serialization=None, status=None, tagpaths=None, tags=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """DerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -126,6 +128,7 @@ def __init__(self, additional_information=None, create_user_id=None, created=Non
         self._query_qb_enabled = None
         self._query_qb_serialization = None
         self._status = None
+        self._tagpaths = None
         self._tags = None
         self._update_user_id = None
         self._updated = None
@@ -178,6 +181,8 @@ def __init__(self, additional_information=None, create_user_id=None, created=Non
             self.query_qb_serialization = query_qb_serialization
         if status is not None:
             self.status = status
+        if tagpaths is not None:
+            self.tagpaths = tagpaths
         if tags is not None:
             self.tags = tags
         if update_user_id is not None:
@@ -733,6 +738,27 @@ def status(self, status):
 
         self._status = status
 
+    @property
+    def tagpaths(self):
+        """Gets the tagpaths of this DerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The tagpaths of this DerivedMetricDefinition.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tagpaths
+
+    @tagpaths.setter
+    def tagpaths(self, tagpaths):
+        """Sets the tagpaths of this DerivedMetricDefinition.
+
+
+        :param tagpaths: The tagpaths of this DerivedMetricDefinition.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tagpaths = tagpaths
+
     @property
     def tags(self):
         """Gets the tags of this DerivedMetricDefinition.  # noqa: E501

From e410ce0dd8a2334e995456f4f3d44e0f04664a3a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 14 Oct 2021 08:16:24 -0700
Subject: [PATCH 094/161] Autogenerated Update v2.107.0.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/ChartSettings.md                         |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/chart_settings.py | 30 ++++++++++++++++++-
 8 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f2a2e6c..601e10a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.106.1"
+    "packageVersion": "2.107.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6dedd19..f2a2e6c 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.103.0"
+    "packageVersion": "2.106.1"
 }
diff --git a/README.md b/README.md
index 2042844..17bea8d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.106.1
+- Package version: 2.107.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index 2a65422..2865cc3 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -29,6 +29,7 @@ Name | Type | Description | Notes
 **show_hosts** | **bool** | For the tabular view, whether to display sources.  Default: true | [optional] 
 **show_labels** | **bool** | For the tabular view, whether to display labels.  Default: true | [optional] 
 **show_raw_values** | **bool** | For the tabular view, whether to display raw values.  Default: false | [optional] 
+**show_value_column** | **bool** | For the tabular view, whether to display value column.  Default: true | [optional] 
 **sort_values_descending** | **bool** | For the tabular view, whether to display display values in descending order.  Default: false | [optional] 
 **sparkline_decimal_precision** | **int** | For the single stat view, the decimal precision of the displayed number | [optional] 
 **sparkline_display_color** | **str** | For the single stat view, the color of the displayed text (when not dynamically determined). Values should be in \&quot;rgba(&amp;lt;rval&amp;gt;, &amp;lt;gval&amp;gt;, &amp;lt;bval&amp;gt;, &amp;lt;aval&amp;gt;)\&quot; format | [optional] 
diff --git a/setup.py b/setup.py
index 212581c..d466e89 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.106.1"
+VERSION = "2.107.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index aad35ae..4272d9b 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.106.1/python'
+        self.user_agent = 'Swagger-Codegen/2.107.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 6234caa..832125b 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.106.1".\
+               "SDK Package Version: 2.107.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 690823d..09714fc 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -59,6 +59,7 @@ class ChartSettings(object):
         'show_hosts': 'bool',
         'show_labels': 'bool',
         'show_raw_values': 'bool',
+        'show_value_column': 'bool',
         'sort_values_descending': 'bool',
         'sparkline_decimal_precision': 'int',
         'sparkline_display_color': 'str',
@@ -123,6 +124,7 @@ class ChartSettings(object):
         'show_hosts': 'showHosts',
         'show_labels': 'showLabels',
         'show_raw_values': 'showRawValues',
+        'show_value_column': 'showValueColumn',
         'sort_values_descending': 'sortValuesDescending',
         'sparkline_decimal_precision': 'sparklineDecimalPrecision',
         'sparkline_display_color': 'sparklineDisplayColor',
@@ -160,7 +162,7 @@ class ChartSettings(object):
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, show_value_column=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -192,6 +194,7 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
         self._show_hosts = None
         self._show_labels = None
         self._show_raw_values = None
+        self._show_value_column = None
         self._sort_values_descending = None
         self._sparkline_decimal_precision = None
         self._sparkline_display_color = None
@@ -281,6 +284,8 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
             self.show_labels = show_labels
         if show_raw_values is not None:
             self.show_raw_values = show_raw_values
+        if show_value_column is not None:
+            self.show_value_column = show_value_column
         if sort_values_descending is not None:
             self.sort_values_descending = sort_values_descending
         if sparkline_decimal_precision is not None:
@@ -977,6 +982,29 @@ def show_raw_values(self, show_raw_values):
 
         self._show_raw_values = show_raw_values
 
+    @property
+    def show_value_column(self):
+        """Gets the show_value_column of this ChartSettings.  # noqa: E501
+
+        For the tabular view, whether to display value column.  Default: true  # noqa: E501
+
+        :return: The show_value_column of this ChartSettings.  # noqa: E501
+        :rtype: bool
+        """
+        return self._show_value_column
+
+    @show_value_column.setter
+    def show_value_column(self, show_value_column):
+        """Sets the show_value_column of this ChartSettings.
+
+        For the tabular view, whether to display value column.  Default: true  # noqa: E501
+
+        :param show_value_column: The show_value_column of this ChartSettings.  # noqa: E501
+        :type: bool
+        """
+
+        self._show_value_column = show_value_column
+
     @property
     def sort_values_descending(self):
         """Gets the sort_values_descending of this ChartSettings.  # noqa: E501

From e77b6fdc550e4b3da0816a969a3d7bc4c37b2409 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 22 Oct 2021 08:16:24 -0700
Subject: [PATCH 095/161] Autogenerated Update v2.108.0.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/Chart.md                                 |  1 +
 docs/UserGroup.md                             |  1 -
 docs/UserGroupApi.md                          |  8 ++---
 docs/UserGroupModel.md                        |  1 -
 docs/UserGroupPropertiesDTO.md                |  1 -
 docs/UserGroupWrite.md                        |  1 -
 setup.py                                      |  2 +-
 wavefront_api_client/api/user_group_api.py    |  8 ++---
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/chart.py          | 30 +++++++++++++++++-
 ...esponse_container_set_business_function.py |  2 +-
 wavefront_api_client/models/user_group.py     | 30 +-----------------
 .../models/user_group_model.py                | 31 +------------------
 .../models/user_group_properties_dto.py       | 28 +----------------
 .../models/user_group_write.py                | 31 +------------------
 19 files changed, 49 insertions(+), 136 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 601e10a..44bdd29 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.107.0"
+    "packageVersion": "2.108.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f2a2e6c..601e10a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.106.1"
+    "packageVersion": "2.107.0"
 }
diff --git a/README.md b/README.md
index 17bea8d..254d558 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.107.0
+- Package version: 2.108.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Chart.md b/docs/Chart.md
index 5acdf21..b6ced74 100644
--- a/docs/Chart.md
+++ b/docs/Chart.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**anomaly_detection_on** | **bool** | Whether anomaly detection is on or of, default false | [optional] 
 **anomaly_sample_size** | **str** | The amount of historical data to use for anomaly detection baselining | [optional] 
 **anomaly_severity** | **str** | Anomaly Severity. Default medium | [optional] 
 **anomaly_type** | **str** | Anomaly Type. Default both | [optional] 
diff --git a/docs/UserGroup.md b/docs/UserGroup.md
index 6bb6ed4..76f1fdb 100644
--- a/docs/UserGroup.md
+++ b/docs/UserGroup.md
@@ -7,7 +7,6 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | Unique ID for the user group | [optional] 
 **name** | **str** | Name of the user group | [optional] 
-**permissions** | **list[str]** | Permission assigned to the user group | [optional] 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | List of roles the user group has been linked to | [optional] 
 **user_count** | **int** | Total number of users that are members of the user group | [optional] 
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 2ed537a..2c73a32 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -150,7 +150,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
 
 try:
     # Create a specific user group
@@ -164,7 +164,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;roleIDs\&quot;: [   \&quot;role1\&quot;,   \&quot;role2\&quot;,   \&quot;role3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;roleIDs\&quot;: [   \&quot;role1\&quot;,   \&quot;role2\&quot;,   \&quot;role3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -481,7 +481,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
+body = wavefront_api_client.UserGroupWrite() # UserGroupWrite | Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre> (optional)
 
 try:
     # Update a specific user group
@@ -496,7 +496,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;roleIDs\&quot;: [   \&quot;role1\&quot;,   \&quot;role2\&quot;,   \&quot;role3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**UserGroupWrite**](UserGroupWrite.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;UserGroup identifier\&quot;,   \&quot;name\&quot;: \&quot;UserGroup name\&quot;,   \&quot;roleIDs\&quot;: [   \&quot;role1\&quot;,   \&quot;role2\&quot;,   \&quot;role3\&quot;   ],   \&quot;description\&quot;: \&quot;UserGroup description\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 617a98b..b8cfca6 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -8,7 +8,6 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
 **name** | **str** | The name of the user group | 
-**permissions** | **list[str]** | List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission. | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | List of roles that are linked to the user group. | [optional] 
diff --git a/docs/UserGroupPropertiesDTO.md b/docs/UserGroupPropertiesDTO.md
index b9a6ed0..830cf10 100644
--- a/docs/UserGroupPropertiesDTO.md
+++ b/docs/UserGroupPropertiesDTO.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name_editable** | **bool** |  | [optional] 
-**permissions_editable** | **bool** |  | [optional] 
 **roles_editable** | **bool** |  | [optional] 
 **users_editable** | **bool** |  | [optional] 
 
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
index de03e5e..125285e 100644
--- a/docs/UserGroupWrite.md
+++ b/docs/UserGroupWrite.md
@@ -8,7 +8,6 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
 **name** | **str** | The name of the user group | 
-**permissions** | **list[str]** | List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission. | 
 **role_i_ds** | **list[str]** | List of role IDs the user group has been linked to. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/setup.py b/setup.py
index d466e89..b321821 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.107.0"
+VERSION = "2.108.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index 4249697..6106cee 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -249,7 +249,7 @@ def create_user_group(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -271,7 +271,7 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"name\": \"UserGroup name\",   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -836,7 +836,7 @@ def update_user_group(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -859,7 +859,7 @@ def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
+        :param UserGroupWrite body: Example Body:  <pre>{   \"id\": \"UserGroup identifier\",   \"name\": \"UserGroup name\",   \"roleIDs\": [   \"role1\",   \"role2\",   \"role3\"   ],   \"description\": \"UserGroup description\" }</pre>
         :return: ResponseContainerUserGroupModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4272d9b..3d142a9 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.107.0/python'
+        self.user_agent = 'Swagger-Codegen/2.108.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 832125b..d8179b8 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.107.0".\
+               "SDK Package Version: 2.108.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 39c1133..c206bc3 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -33,6 +33,7 @@ class Chart(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'anomaly_detection_on': 'bool',
         'anomaly_sample_size': 'str',
         'anomaly_severity': 'str',
         'anomaly_type': 'str',
@@ -52,6 +53,7 @@ class Chart(object):
     }
 
     attribute_map = {
+        'anomaly_detection_on': 'anomalyDetectionOn',
         'anomaly_sample_size': 'anomalySampleSize',
         'anomaly_severity': 'anomalySeverity',
         'anomaly_type': 'anomalyType',
@@ -70,12 +72,13 @@ class Chart(object):
         'units': 'units'
     }
 
-    def __init__(self, anomaly_sample_size=None, anomaly_severity=None, anomaly_type=None, base=None, chart_attributes=None, chart_settings=None, description=None, display_confidence_bounds=None, filter_out_non_anomalies=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None, _configuration=None):  # noqa: E501
+    def __init__(self, anomaly_detection_on=None, anomaly_sample_size=None, anomaly_severity=None, anomaly_type=None, base=None, chart_attributes=None, chart_settings=None, description=None, display_confidence_bounds=None, filter_out_non_anomalies=None, include_obsolete_metrics=None, interpolate_points=None, name=None, no_default_events=None, sources=None, summarization=None, units=None, _configuration=None):  # noqa: E501
         """Chart - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._anomaly_detection_on = None
         self._anomaly_sample_size = None
         self._anomaly_severity = None
         self._anomaly_type = None
@@ -94,6 +97,8 @@ def __init__(self, anomaly_sample_size=None, anomaly_severity=None, anomaly_type
         self._units = None
         self.discriminator = None
 
+        if anomaly_detection_on is not None:
+            self.anomaly_detection_on = anomaly_detection_on
         if anomaly_sample_size is not None:
             self.anomaly_sample_size = anomaly_sample_size
         if anomaly_severity is not None:
@@ -125,6 +130,29 @@ def __init__(self, anomaly_sample_size=None, anomaly_severity=None, anomaly_type
         if units is not None:
             self.units = units
 
+    @property
+    def anomaly_detection_on(self):
+        """Gets the anomaly_detection_on of this Chart.  # noqa: E501
+
+        Whether anomaly detection is on or of, default false  # noqa: E501
+
+        :return: The anomaly_detection_on of this Chart.  # noqa: E501
+        :rtype: bool
+        """
+        return self._anomaly_detection_on
+
+    @anomaly_detection_on.setter
+    def anomaly_detection_on(self, anomaly_detection_on):
+        """Sets the anomaly_detection_on of this Chart.
+
+        Whether anomaly detection is on or of, default false  # noqa: E501
+
+        :param anomaly_detection_on: The anomaly_detection_on of this Chart.  # noqa: E501
+        :type: bool
+        """
+
+        self._anomaly_detection_on = anomaly_detection_on
+
     @property
     def anomaly_sample_size(self):
         """Gets the anomaly_sample_size of this Chart.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 0fb4e9b..20205fd 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index 4514ac1..f997b82 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -37,7 +37,6 @@ class UserGroup(object):
         'description': 'str',
         'id': 'str',
         'name': 'str',
-        'permissions': 'list[str]',
         'properties': 'UserGroupPropertiesDTO',
         'roles': 'list[RoleDTO]',
         'user_count': 'int',
@@ -49,14 +48,13 @@ class UserGroup(object):
         'description': 'description',
         'id': 'id',
         'name': 'name',
-        'permissions': 'permissions',
         'properties': 'properties',
         'roles': 'roles',
         'user_count': 'userCount',
         'users': 'users'
     }
 
-    def __init__(self, customer=None, description=None, id=None, name=None, permissions=None, properties=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, description=None, id=None, name=None, properties=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
         """UserGroup - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -66,7 +64,6 @@ def __init__(self, customer=None, description=None, id=None, name=None, permissi
         self._description = None
         self._id = None
         self._name = None
-        self._permissions = None
         self._properties = None
         self._roles = None
         self._user_count = None
@@ -81,8 +78,6 @@ def __init__(self, customer=None, description=None, id=None, name=None, permissi
             self.id = id
         if name is not None:
             self.name = name
-        if permissions is not None:
-            self.permissions = permissions
         if properties is not None:
             self.properties = properties
         if roles is not None:
@@ -184,29 +179,6 @@ def name(self, name):
 
         self._name = name
 
-    @property
-    def permissions(self):
-        """Gets the permissions of this UserGroup.  # noqa: E501
-
-        Permission assigned to the user group  # noqa: E501
-
-        :return: The permissions of this UserGroup.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._permissions
-
-    @permissions.setter
-    def permissions(self, permissions):
-        """Sets the permissions of this UserGroup.
-
-        Permission assigned to the user group  # noqa: E501
-
-        :param permissions: The permissions of this UserGroup.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._permissions = permissions
-
     @property
     def properties(self):
         """Gets the properties of this UserGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index c158cbf..26601e7 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -38,7 +38,6 @@ class UserGroupModel(object):
         'description': 'str',
         'id': 'str',
         'name': 'str',
-        'permissions': 'list[str]',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
         'roles': 'list[RoleDTO]',
@@ -52,7 +51,6 @@ class UserGroupModel(object):
         'description': 'description',
         'id': 'id',
         'name': 'name',
-        'permissions': 'permissions',
         'properties': 'properties',
         'role_count': 'roleCount',
         'roles': 'roles',
@@ -60,7 +58,7 @@ class UserGroupModel(object):
         'users': 'users'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
         """UserGroupModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -71,7 +69,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._description = None
         self._id = None
         self._name = None
-        self._permissions = None
         self._properties = None
         self._role_count = None
         self._roles = None
@@ -88,7 +85,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         if id is not None:
             self.id = id
         self.name = name
-        self.permissions = permissions
         if properties is not None:
             self.properties = properties
         if role_count is not None:
@@ -215,31 +211,6 @@ def name(self, name):
 
         self._name = name
 
-    @property
-    def permissions(self):
-        """Gets the permissions of this UserGroupModel.  # noqa: E501
-
-        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
-
-        :return: The permissions of this UserGroupModel.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._permissions
-
-    @permissions.setter
-    def permissions(self, permissions):
-        """Sets the permissions of this UserGroupModel.
-
-        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
-
-        :param permissions: The permissions of this UserGroupModel.  # noqa: E501
-        :type: list[str]
-        """
-        if self._configuration.client_side_validation and permissions is None:
-            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
-
-        self._permissions = permissions
-
     @property
     def properties(self):
         """Gets the properties of this UserGroupModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index cbaa4da..3eaae5d 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -34,34 +34,29 @@ class UserGroupPropertiesDTO(object):
     """
     swagger_types = {
         'name_editable': 'bool',
-        'permissions_editable': 'bool',
         'roles_editable': 'bool',
         'users_editable': 'bool'
     }
 
     attribute_map = {
         'name_editable': 'nameEditable',
-        'permissions_editable': 'permissionsEditable',
         'roles_editable': 'rolesEditable',
         'users_editable': 'usersEditable'
     }
 
-    def __init__(self, name_editable=None, permissions_editable=None, roles_editable=None, users_editable=None, _configuration=None):  # noqa: E501
+    def __init__(self, name_editable=None, roles_editable=None, users_editable=None, _configuration=None):  # noqa: E501
         """UserGroupPropertiesDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._name_editable = None
-        self._permissions_editable = None
         self._roles_editable = None
         self._users_editable = None
         self.discriminator = None
 
         if name_editable is not None:
             self.name_editable = name_editable
-        if permissions_editable is not None:
-            self.permissions_editable = permissions_editable
         if roles_editable is not None:
             self.roles_editable = roles_editable
         if users_editable is not None:
@@ -88,27 +83,6 @@ def name_editable(self, name_editable):
 
         self._name_editable = name_editable
 
-    @property
-    def permissions_editable(self):
-        """Gets the permissions_editable of this UserGroupPropertiesDTO.  # noqa: E501
-
-
-        :return: The permissions_editable of this UserGroupPropertiesDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._permissions_editable
-
-    @permissions_editable.setter
-    def permissions_editable(self, permissions_editable):
-        """Sets the permissions_editable of this UserGroupPropertiesDTO.
-
-
-        :param permissions_editable: The permissions_editable of this UserGroupPropertiesDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._permissions_editable = permissions_editable
-
     @property
     def roles_editable(self):
         """Gets the roles_editable of this UserGroupPropertiesDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index d5fe1c8..480bc0b 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -38,7 +38,6 @@ class UserGroupWrite(object):
         'description': 'str',
         'id': 'str',
         'name': 'str',
-        'permissions': 'list[str]',
         'role_i_ds': 'list[str]'
     }
 
@@ -48,11 +47,10 @@ class UserGroupWrite(object):
         'description': 'description',
         'id': 'id',
         'name': 'name',
-        'permissions': 'permissions',
         'role_i_ds': 'roleIDs'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, permissions=None, role_i_ds=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, role_i_ds=None, _configuration=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -63,7 +61,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._description = None
         self._id = None
         self._name = None
-        self._permissions = None
         self._role_i_ds = None
         self.discriminator = None
 
@@ -76,7 +73,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         if id is not None:
             self.id = id
         self.name = name
-        self.permissions = permissions
         self.role_i_ds = role_i_ds
 
     @property
@@ -194,31 +190,6 @@ def name(self, name):
 
         self._name = name
 
-    @property
-    def permissions(self):
-        """Gets the permissions of this UserGroupWrite.  # noqa: E501
-
-        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
-
-        :return: The permissions of this UserGroupWrite.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._permissions
-
-    @permissions.setter
-    def permissions(self, permissions):
-        """Sets the permissions of this UserGroupWrite.
-
-        List of permissions the user group has been granted access to. Become obsolete. Use Roles parameter to setup group permission.  # noqa: E501
-
-        :param permissions: The permissions of this UserGroupWrite.  # noqa: E501
-        :type: list[str]
-        """
-        if self._configuration.client_side_validation and permissions is None:
-            raise ValueError("Invalid value for `permissions`, must not be `None`")  # noqa: E501
-
-        self._permissions = permissions
-
     @property
     def role_i_ds(self):
         """Gets the role_i_ds of this UserGroupWrite.  # noqa: E501

From 169cbe3f9e4c2927a3516cb418d702da942dc41d Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 4 Nov 2021 08:16:35 -0700
Subject: [PATCH 096/161] Autogenerated Update v2.110.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  8 +--
 docs/DashboardSection.md                      |  1 +
 docs/EventApi.md                              | 44 ++++++------
 setup.py                                      |  2 +-
 wavefront_api_client/api/event_api.py         | 68 +++++++++----------
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/dashboard_section.py               | 30 +++++++-
 10 files changed, 95 insertions(+), 66 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 44bdd29..d73e729 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.108.0"
+    "packageVersion": "2.110.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 601e10a..44bdd29 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.107.0"
+    "packageVersion": "2.108.0"
 }
diff --git a/README.md b/README.md
index 254d558..1bb6959 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.108.0
+- Package version: 2.110.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -179,9 +179,9 @@ Class | Method | HTTP request | Description
 *DerivedMetricApi* | [**update_derived_metric**](docs/DerivedMetricApi.md#update_derived_metric) | **PUT** /api/v2/derivedmetric/{id} | Update a specific derived metric definition
 *DirectIngestionApi* | [**report**](docs/DirectIngestionApi.md#report) | **POST** /report | Directly ingest data/data stream with specified format
 *EventApi* | [**add_event_tag**](docs/EventApi.md#add_event_tag) | **PUT** /api/v2/event/{id}/tag/{tagValue} | Add a tag to a specific event
-*EventApi* | [**close_event**](docs/EventApi.md#close_event) | **POST** /api/v2/event/{id}/close | Close a specific event
+*EventApi* | [**close_user_event**](docs/EventApi.md#close_user_event) | **POST** /api/v2/event/{id}/close | Close a specific event
 *EventApi* | [**create_event**](docs/EventApi.md#create_event) | **POST** /api/v2/event | Create a specific event
-*EventApi* | [**delete_event**](docs/EventApi.md#delete_event) | **DELETE** /api/v2/event/{id} | Delete a specific event
+*EventApi* | [**delete_user_event**](docs/EventApi.md#delete_user_event) | **DELETE** /api/v2/event/{id} | Delete a specific user event
 *EventApi* | [**get_alert_event_queries_slug**](docs/EventApi.md#get_alert_event_queries_slug) | **GET** /api/v2/event/{id}/alertQueriesSlug | If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution
 *EventApi* | [**get_alert_firing_details**](docs/EventApi.md#get_alert_firing_details) | **GET** /api/v2/event/{id}/alertFiringDetails | Return details of a particular alert firing, including all the series that fired during the referred alert firing
 *EventApi* | [**get_alert_firing_events**](docs/EventApi.md#get_alert_firing_events) | **GET** /api/v2/event/alertFirings | Get firings events of an alert within a time range
@@ -191,7 +191,7 @@ Class | Method | HTTP request | Description
 *EventApi* | [**get_related_events_with_time_span**](docs/EventApi.md#get_related_events_with_time_span) | **GET** /api/v2/event/{id}/events | List all related events for a specific firing event with a time span of one hour
 *EventApi* | [**remove_event_tag**](docs/EventApi.md#remove_event_tag) | **DELETE** /api/v2/event/{id}/tag/{tagValue} | Remove a tag from a specific event
 *EventApi* | [**set_event_tags**](docs/EventApi.md#set_event_tags) | **POST** /api/v2/event/{id}/tag | Set all tags associated with a specific event
-*EventApi* | [**update_event**](docs/EventApi.md#update_event) | **PUT** /api/v2/event/{id} | Update a specific event
+*EventApi* | [**update_user_event**](docs/EventApi.md#update_user_event) | **PUT** /api/v2/event/{id} | Update a specific user event.
 *ExternalLinkApi* | [**create_external_link**](docs/ExternalLinkApi.md#create_external_link) | **POST** /api/v2/extlink | Create a specific external link
 *ExternalLinkApi* | [**delete_external_link**](docs/ExternalLinkApi.md#delete_external_link) | **DELETE** /api/v2/extlink/{id} | Delete a specific external link
 *ExternalLinkApi* | [**get_all_external_link**](docs/ExternalLinkApi.md#get_all_external_link) | **GET** /api/v2/extlink | Get all external links for a customer
diff --git a/docs/DashboardSection.md b/docs/DashboardSection.md
index 63fc605..9c449d6 100644
--- a/docs/DashboardSection.md
+++ b/docs/DashboardSection.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**id** | **str** | Id of this section | [optional] 
 **name** | **str** | Name of this section | 
 **rows** | [**list[DashboardSectionRow]**](DashboardSectionRow.md) | Rows of this section | 
 **section_filter** | [**JsonNode**](JsonNode.md) | Display filter for conditional dashboard section | [optional] 
diff --git a/docs/EventApi.md b/docs/EventApi.md
index ec14291..bbbe9e2 100644
--- a/docs/EventApi.md
+++ b/docs/EventApi.md
@@ -5,9 +5,9 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**add_event_tag**](EventApi.md#add_event_tag) | **PUT** /api/v2/event/{id}/tag/{tagValue} | Add a tag to a specific event
-[**close_event**](EventApi.md#close_event) | **POST** /api/v2/event/{id}/close | Close a specific event
+[**close_user_event**](EventApi.md#close_user_event) | **POST** /api/v2/event/{id}/close | Close a specific event
 [**create_event**](EventApi.md#create_event) | **POST** /api/v2/event | Create a specific event
-[**delete_event**](EventApi.md#delete_event) | **DELETE** /api/v2/event/{id} | Delete a specific event
+[**delete_user_event**](EventApi.md#delete_user_event) | **DELETE** /api/v2/event/{id} | Delete a specific user event
 [**get_alert_event_queries_slug**](EventApi.md#get_alert_event_queries_slug) | **GET** /api/v2/event/{id}/alertQueriesSlug | If the specified event is associated with an alert, returns a slug encoding the queries having to do with that alert firing or resolution
 [**get_alert_firing_details**](EventApi.md#get_alert_firing_details) | **GET** /api/v2/event/{id}/alertFiringDetails | Return details of a particular alert firing, including all the series that fired during the referred alert firing
 [**get_alert_firing_events**](EventApi.md#get_alert_firing_events) | **GET** /api/v2/event/alertFirings | Get firings events of an alert within a time range
@@ -17,7 +17,7 @@ Method | HTTP request | Description
 [**get_related_events_with_time_span**](EventApi.md#get_related_events_with_time_span) | **GET** /api/v2/event/{id}/events | List all related events for a specific firing event with a time span of one hour
 [**remove_event_tag**](EventApi.md#remove_event_tag) | **DELETE** /api/v2/event/{id}/tag/{tagValue} | Remove a tag from a specific event
 [**set_event_tags**](EventApi.md#set_event_tags) | **POST** /api/v2/event/{id}/tag | Set all tags associated with a specific event
-[**update_event**](EventApi.md#update_event) | **PUT** /api/v2/event/{id} | Update a specific event
+[**update_user_event**](EventApi.md#update_user_event) | **PUT** /api/v2/event/{id} | Update a specific user event.
 
 
 # **add_event_tag**
@@ -76,12 +76,12 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **close_event**
-> ResponseContainerEvent close_event(id)
+# **close_user_event**
+> ResponseContainerEvent close_user_event(id)
 
 Close a specific event
 
-
+This API supports only user events. The API does <strong>not</strong> support close of system events (e.g. alert events).
 
 ### Example
 ```python
@@ -103,10 +103,10 @@ id = 'id_example' # str |
 
 try:
     # Close a specific event
-    api_response = api_instance.close_event(id)
+    api_response = api_instance.close_user_event(id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling EventApi->close_event: %s\n" % e)
+    print("Exception when calling EventApi->close_user_event: %s\n" % e)
 ```
 
 ### Parameters
@@ -184,12 +184,12 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **delete_event**
-> ResponseContainerEvent delete_event(id)
-
-Delete a specific event
+# **delete_user_event**
+> ResponseContainerEvent delete_user_event(id)
 
+Delete a specific user event
 
+This API supports only user events. The API does <strong>not</strong> support deletion of system events (e.g. alert events).
 
 ### Example
 ```python
@@ -210,11 +210,11 @@ api_instance = wavefront_api_client.EventApi(wavefront_api_client.ApiClient(conf
 id = 'id_example' # str | 
 
 try:
-    # Delete a specific event
-    api_response = api_instance.delete_event(id)
+    # Delete a specific user event
+    api_response = api_instance.delete_user_event(id)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling EventApi->delete_event: %s\n" % e)
+    print("Exception when calling EventApi->delete_user_event: %s\n" % e)
 ```
 
 ### Parameters
@@ -748,12 +748,12 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **update_event**
-> ResponseContainerEvent update_event(id, body=body)
+# **update_user_event**
+> ResponseContainerEvent update_user_event(id, body=body)
 
-Update a specific event
+Update a specific user event.
 
-The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>
+This API supports only user events. The API does <strong>not</strong> support update of system events (e.g. alert events). The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>
 
 ### Example
 ```python
@@ -775,11 +775,11 @@ id = 'id_example' # str |
 body = wavefront_api_client.Event() # Event | Example Body:  <pre>{   \"name\": \"Event API Example\",   \"annotations\": {     \"severity\": \"info\",     \"type\": \"event type\",     \"details\": \"description\"   },   \"tags\" : [     \"eventTag1\"   ],   \"startTime\": 1490000000000,   \"endTime\": 1490000000001 }</pre> (optional)
 
 try:
-    # Update a specific event
-    api_response = api_instance.update_event(id, body=body)
+    # Update a specific user event.
+    api_response = api_instance.update_user_event(id, body=body)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling EventApi->update_event: %s\n" % e)
+    print("Exception when calling EventApi->update_user_event: %s\n" % e)
 ```
 
 ### Parameters
diff --git a/setup.py b/setup.py
index b321821..cf925c7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.108.0"
+VERSION = "2.110.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index 0d91c29..ed4ddad 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -140,13 +140,13 @@ def add_event_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def close_event(self, id, **kwargs):  # noqa: E501
+    def close_user_event(self, id, **kwargs):  # noqa: E501
         """Close a specific event  # noqa: E501
 
-          # noqa: E501
+        This API supports only user events. The API does <strong>not</strong> support close of system events (e.g. alert events).  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.close_event(id, async_req=True)
+        >>> thread = api.close_user_event(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -157,18 +157,18 @@ def close_event(self, id, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.close_event_with_http_info(id, **kwargs)  # noqa: E501
+            return self.close_user_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.close_event_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.close_user_event_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def close_event_with_http_info(self, id, **kwargs):  # noqa: E501
+    def close_user_event_with_http_info(self, id, **kwargs):  # noqa: E501
         """Close a specific event  # noqa: E501
 
-          # noqa: E501
+        This API supports only user events. The API does <strong>not</strong> support close of system events (e.g. alert events).  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.close_event_with_http_info(id, async_req=True)
+        >>> thread = api.close_user_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -189,14 +189,14 @@ def close_event_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method close_event" % key
+                    " to method close_user_event" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `close_event`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `close_user_event`")  # noqa: E501
 
         collection_formats = {}
 
@@ -330,13 +330,13 @@ def create_event_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def delete_event(self, id, **kwargs):  # noqa: E501
-        """Delete a specific event  # noqa: E501
+    def delete_user_event(self, id, **kwargs):  # noqa: E501
+        """Delete a specific user event  # noqa: E501
 
-          # noqa: E501
+        This API supports only user events. The API does <strong>not</strong> support deletion of system events (e.g. alert events).  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.delete_event(id, async_req=True)
+        >>> thread = api.delete_user_event(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -347,18 +347,18 @@ def delete_event(self, id, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.delete_event_with_http_info(id, **kwargs)  # noqa: E501
+            return self.delete_user_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.delete_event_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.delete_user_event_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Delete a specific event  # noqa: E501
+    def delete_user_event_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific user event  # noqa: E501
 
-          # noqa: E501
+        This API supports only user events. The API does <strong>not</strong> support deletion of system events (e.g. alert events).  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.delete_event_with_http_info(id, async_req=True)
+        >>> thread = api.delete_user_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -379,14 +379,14 @@ def delete_event_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method delete_event" % key
+                    " to method delete_user_event" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `delete_event`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_user_event`")  # noqa: E501
 
         collection_formats = {}
 
@@ -1336,13 +1336,13 @@ def set_event_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def update_event(self, id, **kwargs):  # noqa: E501
-        """Update a specific event  # noqa: E501
+    def update_user_event(self, id, **kwargs):  # noqa: E501
+        """Update a specific user event.  # noqa: E501
 
-        The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
+        This API supports only user events. The API does <strong>not</strong> support update of system events (e.g. alert events). The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_event(id, async_req=True)
+        >>> thread = api.update_user_event(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1354,18 +1354,18 @@ def update_event(self, id, **kwargs):  # noqa: E501
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.update_event_with_http_info(id, **kwargs)  # noqa: E501
+            return self.update_user_event_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.update_event_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.update_user_event_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def update_event_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Update a specific event  # noqa: E501
+    def update_user_event_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific user event.  # noqa: E501
 
-        The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
+        This API supports only user events. The API does <strong>not</strong> support update of system events (e.g. alert events). The following fields are readonly and will be ignored when passed in the request: <code>id</code>, <code>isEphemeral</code>, <code>isUserEvent</code>, <code>runningState</code>, <code>canDelete</code>, <code>canClose</code>, <code>creatorType</code>, <code>createdAt</code>, <code>updatedAt</code>, <code>createdEpochMillis</code>, <code>updatedEpochMillis</code>, <code>updaterId</code>, <code>creatorId</code>, and <code>summarizedEvents</code>  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_event_with_http_info(id, async_req=True)
+        >>> thread = api.update_user_event_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -1387,14 +1387,14 @@ def update_event_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method update_event" % key
+                    " to method update_user_event" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `update_event`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_user_event`")  # noqa: E501
 
         collection_formats = {}
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3d142a9..e522c72 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.108.0/python'
+        self.user_agent = 'Swagger-Codegen/2.110.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index d8179b8..4a6b1d4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.108.0".\
+               "SDK Package Version: 2.110.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index c5a2b30..94d2cea 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -33,33 +33,61 @@ class DashboardSection(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'id': 'str',
         'name': 'str',
         'rows': 'list[DashboardSectionRow]',
         'section_filter': 'JsonNode'
     }
 
     attribute_map = {
+        'id': 'id',
         'name': 'name',
         'rows': 'rows',
         'section_filter': 'sectionFilter'
     }
 
-    def __init__(self, name=None, rows=None, section_filter=None, _configuration=None):  # noqa: E501
+    def __init__(self, id=None, name=None, rows=None, section_filter=None, _configuration=None):  # noqa: E501
         """DashboardSection - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._id = None
         self._name = None
         self._rows = None
         self._section_filter = None
         self.discriminator = None
 
+        if id is not None:
+            self.id = id
         self.name = name
         self.rows = rows
         if section_filter is not None:
             self.section_filter = section_filter
 
+    @property
+    def id(self):
+        """Gets the id of this DashboardSection.  # noqa: E501
+
+        Id of this section  # noqa: E501
+
+        :return: The id of this DashboardSection.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DashboardSection.
+
+        Id of this section  # noqa: E501
+
+        :param id: The id of this DashboardSection.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def name(self):
         """Gets the name of this DashboardSection.  # noqa: E501

From 957b9d9ad6d4c6c11cbda620e446e5788348f3f1 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 11 Nov 2021 08:16:38 -0800
Subject: [PATCH 097/161] Autogenerated Update v2.111.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/CloudIntegration.md                      |   1 +
 docs/VropsConfiguration.md                    |  15 +
 setup.py                                      |   2 +-
 test/test_vrops_configuration.py              |  40 +++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 .../models/cloud_integration.py               |  34 ++-
 .../models/vrops_configuration.py             | 274 ++++++++++++++++++
 13 files changed, 369 insertions(+), 10 deletions(-)
 create mode 100644 docs/VropsConfiguration.md
 create mode 100644 test/test_vrops_configuration.py
 create mode 100644 wavefront_api_client/models/vrops_configuration.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index d73e729..bc84ca2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.110.1"
+    "packageVersion": "2.111.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 44bdd29..d73e729 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.108.0"
+    "packageVersion": "2.110.1"
 }
diff --git a/README.md b/README.md
index 1bb6959..e44a365 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.110.1
+- Package version: 2.111.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -621,6 +621,7 @@ Class | Method | HTTP request | Description
  - [UserRequestDTO](docs/UserRequestDTO.md)
  - [UserToCreate](docs/UserToCreate.md)
  - [ValidatedUsersDTO](docs/ValidatedUsersDTO.md)
+ - [VropsConfiguration](docs/VropsConfiguration.md)
  - [WFTags](docs/WFTags.md)
 
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 2b796ea..7cccb9f 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -34,6 +34,7 @@ Name | Type | Description | Notes
 **tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
+**vrops** | [**VropsConfiguration**](VropsConfiguration.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VropsConfiguration.md b/docs/VropsConfiguration.md
new file mode 100644
index 0000000..b4fdb3d
--- /dev/null
+++ b/docs/VropsConfiguration.md
@@ -0,0 +1,15 @@
+# VropsConfiguration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**adapter_names** | **dict(str, list[str])** | Adapter names: Metrics will be fetched of only these adapter if given | [optional] 
+**base_url** | **str** | The base url for vrops api, Default : https://www.mgmt.cloud.vmware.com/vrops-cloud | [optional] 
+**categories_to_fetch** | **list[str]** | A list of vRops Adpater and Resource kind to fetch metrics.  Allowable values are VMWARE_DATASTORE, VMWARE_DATASTORE) | [optional] 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**organization_id** | **str** | OrganizationID will be derived from api token | [optional] 
+**vrops_api_token** | **str** | The vRops API Token | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index cf925c7..8499c0a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.110.1"
+VERSION = "2.111.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_vrops_configuration.py b/test/test_vrops_configuration.py
new file mode 100644
index 0000000..4d10ca7
--- /dev/null
+++ b/test/test_vrops_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.vrops_configuration import VropsConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestVropsConfiguration(unittest.TestCase):
+    """VropsConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testVropsConfiguration(self):
+        """Test VropsConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.vrops_configuration.VropsConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index e15e509..cc0dbda 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -279,4 +279,5 @@
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
+from wavefront_api_client.models.vrops_configuration import VropsConfiguration
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e522c72..b701101 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.110.1/python'
+        self.user_agent = 'Swagger-Codegen/2.111.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 4a6b1d4..5b73746 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.110.1".\
+               "SDK Package Version: 2.111.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 351dc61..5df703b 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -244,4 +244,5 @@
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
+from wavefront_api_client.models.vrops_configuration import VropsConfiguration
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 1314933..e11ce0a 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -63,7 +63,8 @@ class CloudIntegration(object):
         'service_refresh_rate_in_mins': 'int',
         'tesla': 'TeslaConfiguration',
         'updated_epoch_millis': 'int',
-        'updater_id': 'str'
+        'updater_id': 'str',
+        'vrops': 'VropsConfiguration'
     }
 
     attribute_map = {
@@ -97,10 +98,11 @@ class CloudIntegration(object):
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'tesla': 'tesla',
         'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId'
+        'updater_id': 'updaterId',
+        'vrops': 'vrops'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -137,6 +139,7 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._tesla = None
         self._updated_epoch_millis = None
         self._updater_id = None
+        self._vrops = None
         self.discriminator = None
 
         if additional_tags is not None:
@@ -199,6 +202,8 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
             self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
             self.updater_id = updater_id
+        if vrops is not None:
+            self.vrops = vrops
 
     @property
     def additional_tags(self):
@@ -788,7 +793,7 @@ def service(self, service):
         """
         if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 service not in allowed_values):
             raise ValueError(
@@ -884,6 +889,27 @@ def updater_id(self, updater_id):
 
         self._updater_id = updater_id
 
+    @property
+    def vrops(self):
+        """Gets the vrops of this CloudIntegration.  # noqa: E501
+
+
+        :return: The vrops of this CloudIntegration.  # noqa: E501
+        :rtype: VropsConfiguration
+        """
+        return self._vrops
+
+    @vrops.setter
+    def vrops(self, vrops):
+        """Sets the vrops of this CloudIntegration.
+
+
+        :param vrops: The vrops of this CloudIntegration.  # noqa: E501
+        :type: VropsConfiguration
+        """
+
+        self._vrops = vrops
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/vrops_configuration.py b/wavefront_api_client/models/vrops_configuration.py
new file mode 100644
index 0000000..78d328d
--- /dev/null
+++ b/wavefront_api_client/models/vrops_configuration.py
@@ -0,0 +1,274 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class VropsConfiguration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'adapter_names': 'dict(str, list[str])',
+        'base_url': 'str',
+        'categories_to_fetch': 'list[str]',
+        'metric_filter_regex': 'str',
+        'organization_id': 'str',
+        'vrops_api_token': 'str'
+    }
+
+    attribute_map = {
+        'adapter_names': 'adapterNames',
+        'base_url': 'baseURL',
+        'categories_to_fetch': 'categoriesToFetch',
+        'metric_filter_regex': 'metricFilterRegex',
+        'organization_id': 'organizationID',
+        'vrops_api_token': 'vropsAPIToken'
+    }
+
+    def __init__(self, adapter_names=None, base_url=None, categories_to_fetch=None, metric_filter_regex=None, organization_id=None, vrops_api_token=None, _configuration=None):  # noqa: E501
+        """VropsConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._adapter_names = None
+        self._base_url = None
+        self._categories_to_fetch = None
+        self._metric_filter_regex = None
+        self._organization_id = None
+        self._vrops_api_token = None
+        self.discriminator = None
+
+        if adapter_names is not None:
+            self.adapter_names = adapter_names
+        if base_url is not None:
+            self.base_url = base_url
+        if categories_to_fetch is not None:
+            self.categories_to_fetch = categories_to_fetch
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
+        if organization_id is not None:
+            self.organization_id = organization_id
+        self.vrops_api_token = vrops_api_token
+
+    @property
+    def adapter_names(self):
+        """Gets the adapter_names of this VropsConfiguration.  # noqa: E501
+
+        Adapter names: Metrics will be fetched of only these adapter if given  # noqa: E501
+
+        :return: The adapter_names of this VropsConfiguration.  # noqa: E501
+        :rtype: dict(str, list[str])
+        """
+        return self._adapter_names
+
+    @adapter_names.setter
+    def adapter_names(self, adapter_names):
+        """Sets the adapter_names of this VropsConfiguration.
+
+        Adapter names: Metrics will be fetched of only these adapter if given  # noqa: E501
+
+        :param adapter_names: The adapter_names of this VropsConfiguration.  # noqa: E501
+        :type: dict(str, list[str])
+        """
+
+        self._adapter_names = adapter_names
+
+    @property
+    def base_url(self):
+        """Gets the base_url of this VropsConfiguration.  # noqa: E501
+
+        The base url for vrops api, Default : https://www.mgmt.cloud.vmware.com/vrops-cloud  # noqa: E501
+
+        :return: The base_url of this VropsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._base_url
+
+    @base_url.setter
+    def base_url(self, base_url):
+        """Sets the base_url of this VropsConfiguration.
+
+        The base url for vrops api, Default : https://www.mgmt.cloud.vmware.com/vrops-cloud  # noqa: E501
+
+        :param base_url: The base_url of this VropsConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._base_url = base_url
+
+    @property
+    def categories_to_fetch(self):
+        """Gets the categories_to_fetch of this VropsConfiguration.  # noqa: E501
+
+        A list of vRops Adpater and Resource kind to fetch metrics.  Allowable values are VMWARE_DATASTORE, VMWARE_DATASTORE)  # noqa: E501
+
+        :return: The categories_to_fetch of this VropsConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._categories_to_fetch
+
+    @categories_to_fetch.setter
+    def categories_to_fetch(self, categories_to_fetch):
+        """Sets the categories_to_fetch of this VropsConfiguration.
+
+        A list of vRops Adpater and Resource kind to fetch metrics.  Allowable values are VMWARE_DATASTORE, VMWARE_DATASTORE)  # noqa: E501
+
+        :param categories_to_fetch: The categories_to_fetch of this VropsConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["VMWARE_CLUSTERCOMPUTERESOURCE", "VMWARE_DATASTORE"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                not set(categories_to_fetch).issubset(set(allowed_values))):  # noqa: E501
+            raise ValueError(
+                "Invalid values for `categories_to_fetch` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(categories_to_fetch) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._categories_to_fetch = categories_to_fetch
+
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this VropsConfiguration.  # noqa: E501
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The metric_filter_regex of this VropsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this VropsConfiguration.
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param metric_filter_regex: The metric_filter_regex of this VropsConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
+    @property
+    def organization_id(self):
+        """Gets the organization_id of this VropsConfiguration.  # noqa: E501
+
+        OrganizationID will be derived from api token  # noqa: E501
+
+        :return: The organization_id of this VropsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._organization_id
+
+    @organization_id.setter
+    def organization_id(self, organization_id):
+        """Sets the organization_id of this VropsConfiguration.
+
+        OrganizationID will be derived from api token  # noqa: E501
+
+        :param organization_id: The organization_id of this VropsConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._organization_id = organization_id
+
+    @property
+    def vrops_api_token(self):
+        """Gets the vrops_api_token of this VropsConfiguration.  # noqa: E501
+
+        The vRops API Token  # noqa: E501
+
+        :return: The vrops_api_token of this VropsConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._vrops_api_token
+
+    @vrops_api_token.setter
+    def vrops_api_token(self, vrops_api_token):
+        """Sets the vrops_api_token of this VropsConfiguration.
+
+        The vRops API Token  # noqa: E501
+
+        :param vrops_api_token: The vrops_api_token of this VropsConfiguration.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and vrops_api_token is None:
+            raise ValueError("Invalid value for `vrops_api_token`, must not be `None`")  # noqa: E501
+
+        self._vrops_api_token = vrops_api_token
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(VropsConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, VropsConfiguration):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, VropsConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()

From eebda67381fcf893914c309103878236b609a70b Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Sat, 18 Dec 2021 08:16:30 -0800
Subject: [PATCH 098/161] Autogenerated Update v2.116.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  19 +-
 docs/Alert.md                                 |   6 +-
 docs/AlertApi.md                              |  95 +-
 docs/AlertDashboard.md                        |  12 +
 docs/AlertSource.md                           |  18 +
 docs/NotificationMessages.md                  |  20 +
 ...sponseContainerListNotificationMessages.md |  11 +
 docs/ResponseContainerSpanSamplingPolicy.md   |  11 +
 docs/ResponseContainerVoid.md                 |  11 +
 docs/SpanSamplingPolicyApi.md                 | 515 ++++++++++
 docs/Void.md                                  |   9 +
 setup.py                                      |   2 +-
 test/test_alert_dashboard.py                  |  40 +
 test/test_alert_source.py                     |  40 +
 test/test_notification_messages.py            |  40 +
 ...se_container_list_notification_messages.py |  40 +
 ...response_container_span_sampling_policy.py |  40 +
 test/test_response_container_void.py          |  40 +
 test/test_span_sampling_policy_api.py         |  97 ++
 test/test_void.py                             |  40 +
 wavefront_api_client/__init__.py              |   8 +
 wavefront_api_client/api/__init__.py          |   1 +
 wavefront_api_client/api/alert_api.py         | 137 ++-
 .../api/span_sampling_policy_api.py           | 913 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   7 +
 wavefront_api_client/models/alert.py          | 118 ++-
 .../models/alert_dashboard.py                 | 175 ++++
 wavefront_api_client/models/alert_source.py   | 364 +++++++
 wavefront_api_client/models/notificant.py     |   2 +-
 .../models/notification_messages.py           | 394 ++++++++
 ...se_container_list_notification_messages.py | 150 +++
 ...response_container_span_sampling_policy.py | 150 +++
 .../models/response_container_void.py         | 150 +++
 wavefront_api_client/models/void.py           |  95 ++
 38 files changed, 3730 insertions(+), 48 deletions(-)
 create mode 100644 docs/AlertDashboard.md
 create mode 100644 docs/AlertSource.md
 create mode 100644 docs/NotificationMessages.md
 create mode 100644 docs/ResponseContainerListNotificationMessages.md
 create mode 100644 docs/ResponseContainerSpanSamplingPolicy.md
 create mode 100644 docs/ResponseContainerVoid.md
 create mode 100644 docs/SpanSamplingPolicyApi.md
 create mode 100644 docs/Void.md
 create mode 100644 test/test_alert_dashboard.py
 create mode 100644 test/test_alert_source.py
 create mode 100644 test/test_notification_messages.py
 create mode 100644 test/test_response_container_list_notification_messages.py
 create mode 100644 test/test_response_container_span_sampling_policy.py
 create mode 100644 test/test_response_container_void.py
 create mode 100644 test/test_span_sampling_policy_api.py
 create mode 100644 test/test_void.py
 create mode 100644 wavefront_api_client/api/span_sampling_policy_api.py
 create mode 100644 wavefront_api_client/models/alert_dashboard.py
 create mode 100644 wavefront_api_client/models/alert_source.py
 create mode 100644 wavefront_api_client/models/notification_messages.py
 create mode 100644 wavefront_api_client/models/response_container_list_notification_messages.py
 create mode 100644 wavefront_api_client/models/response_container_span_sampling_policy.py
 create mode 100644 wavefront_api_client/models/response_container_void.py
 create mode 100644 wavefront_api_client/models/void.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index bc84ca2..f95d87d 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.111.0"
+    "packageVersion": "2.116.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index d73e729..bc84ca2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.110.1"
+    "packageVersion": "2.111.0"
 }
diff --git a/README.md b/README.md
index e44a365..70c6132 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.111.0
+- Package version: 2.116.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -119,6 +119,7 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**get_alerts_summary**](docs/AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 *AlertApi* | [**get_all_alert**](docs/AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 *AlertApi* | [**hide_alert**](docs/AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
+*AlertApi* | [**preview_alert_notification**](docs/AlertApi.md#preview_alert_notification) | **POST** /api/v2/alert/preview | Get all the notification preview for a specific alert
 *AlertApi* | [**remove_alert_access**](docs/AlertApi.md#remove_alert_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
 *AlertApi* | [**remove_alert_tag**](docs/AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
 *AlertApi* | [**set_alert_acl**](docs/AlertApi.md#set_alert_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
@@ -353,6 +354,15 @@ Class | Method | HTTP request | Description
 *SourceApi* | [**set_description**](docs/SourceApi.md#set_description) | **POST** /api/v2/source/{id}/description | Set description associated with a specific source
 *SourceApi* | [**set_source_tags**](docs/SourceApi.md#set_source_tags) | **POST** /api/v2/source/{id}/tag | Set all tags associated with a specific source
 *SourceApi* | [**update_source**](docs/SourceApi.md#update_source) | **PUT** /api/v2/source/{id} | Update metadata (description or tags) for a specific source.
+*SpanSamplingPolicyApi* | [**create_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#create_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy | Create a span sampling policy
+*SpanSamplingPolicyApi* | [**delete_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#delete_span_sampling_policy) | **DELETE** /api/v2/spansamplingpolicy/{id} | Delete a specific span sampling policy
+*SpanSamplingPolicyApi* | [**get_all_deleted_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#get_all_deleted_span_sampling_policy) | **GET** /api/v2/spansamplingpolicy/deleted | Get all deleted sampling policies for a customer
+*SpanSamplingPolicyApi* | [**get_all_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#get_all_span_sampling_policy) | **GET** /api/v2/spansamplingpolicy | Get all sampling policies for a customer
+*SpanSamplingPolicyApi* | [**get_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy) | **GET** /api/v2/spansamplingpolicy/{id} | Get a specific span sampling policy
+*SpanSamplingPolicyApi* | [**get_span_sampling_policy_history**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy_history) | **GET** /api/v2/spansamplingpolicy/{id}/history | Get the version history of a specific sampling policy
+*SpanSamplingPolicyApi* | [**get_span_sampling_policy_version**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy_version) | **GET** /api/v2/spansamplingpolicy/{id}/history/{version} | Get a specific historical version of a specific sampling policy
+*SpanSamplingPolicyApi* | [**undelete_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#undelete_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy/{id}/undelete | Restore a deleted span sampling policy
+*SpanSamplingPolicyApi* | [**update_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#update_span_sampling_policy) | **PUT** /api/v2/spansamplingpolicy/{id} | Update a specific span sampling policy
 *UsageApi* | [**create_ingestion_policy**](docs/UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 *UsageApi* | [**delete_ingestion_policy**](docs/UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
@@ -401,8 +411,10 @@ Class | Method | HTTP request | Description
  - [AccessPolicyRuleDTO](docs/AccessPolicyRuleDTO.md)
  - [Account](docs/Account.md)
  - [Alert](docs/Alert.md)
+ - [AlertDashboard](docs/AlertDashboard.md)
  - [AlertMin](docs/AlertMin.md)
  - [AlertRoute](docs/AlertRoute.md)
+ - [AlertSource](docs/AlertSource.md)
  - [Annotation](docs/Annotation.md)
  - [Anomaly](docs/Anomaly.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
@@ -470,6 +482,7 @@ Class | Method | HTTP request | Description
  - [NewRelicConfiguration](docs/NewRelicConfiguration.md)
  - [NewRelicMetricFilters](docs/NewRelicMetricFilters.md)
  - [Notificant](docs/Notificant.md)
+ - [NotificationMessages](docs/NotificationMessages.md)
  - [Package](docs/Package.md)
  - [Paged](docs/Paged.md)
  - [PagedAccount](docs/PagedAccount.md)
@@ -532,6 +545,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
  - [ResponseContainerListIntegration](docs/ResponseContainerListIntegration.md)
  - [ResponseContainerListIntegrationManifestGroup](docs/ResponseContainerListIntegrationManifestGroup.md)
+ - [ResponseContainerListNotificationMessages](docs/ResponseContainerListNotificationMessages.md)
  - [ResponseContainerListServiceAccount](docs/ResponseContainerListServiceAccount.md)
  - [ResponseContainerListString](docs/ResponseContainerListString.md)
  - [ResponseContainerListUserApiToken](docs/ResponseContainerListUserApiToken.md)
@@ -580,11 +594,13 @@ Class | Method | HTTP request | Description
  - [ResponseContainerSetBusinessFunction](docs/ResponseContainerSetBusinessFunction.md)
  - [ResponseContainerSetSourceLabelPair](docs/ResponseContainerSetSourceLabelPair.md)
  - [ResponseContainerSource](docs/ResponseContainerSource.md)
+ - [ResponseContainerSpanSamplingPolicy](docs/ResponseContainerSpanSamplingPolicy.md)
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
+ - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [RoleDTO](docs/RoleDTO.md)
  - [SavedSearch](docs/SavedSearch.md)
@@ -621,6 +637,7 @@ Class | Method | HTTP request | Description
  - [UserRequestDTO](docs/UserRequestDTO.md)
  - [UserToCreate](docs/UserToCreate.md)
  - [ValidatedUsersDTO](docs/ValidatedUsersDTO.md)
+ - [Void](docs/Void.md)
  - [VropsConfiguration](docs/VropsConfiguration.md)
  - [WFTags](docs/WFTags.md)
 
diff --git a/docs/Alert.md b/docs/Alert.md
index 1b43cde..833f31b 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -6,11 +6,15 @@ Name | Type | Description | Notes
 **acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
 **active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
 **additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
+**alert_sources** | [**list[AlertSource]**](AlertSource.md) | A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION. | [optional] 
+**alert_triage_dashboards** | [**list[AlertDashboard]**](AlertDashboard.md) | User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported | [optional] 
 **alert_type** | **str** | Alert type. | [optional] 
 **alerts_last_day** | **int** |  | [optional] 
 **alerts_last_month** | **int** |  | [optional] 
 **alerts_last_week** | **int** |  | [optional] 
 **application** | **list[str]** | Lists the applications from the failingHostLabelPair of the alert. | [optional] 
+**chart_attributes** | [**JsonNode**](JsonNode.md) | Additional chart settings for the alert (e.g. pie chart has its chart settings in this section). | [optional] 
+**chart_settings** | [**ChartSettings**](ChartSettings.md) | The old chart settings for the alert (e.g. chart type, chart range etc.). | [optional] 
 **condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
 **condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
 **condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
@@ -73,7 +77,7 @@ Name | Type | Description | Notes
 **target_endpoints** | **list[str]** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **targets** | **dict(str, str)** | Targets for severity. | [optional] 
-**triage_dashboards** | [**list[TriageDashboard]**](TriageDashboard.md) | User-supplied dashboard and parameters to create dashboard links | [optional] 
+**triage_dashboards** | [**list[TriageDashboard]**](TriageDashboard.md) | Deprecated for alertTriageDashboards | [optional] 
 **update_user_id** | **str** | The user that last updated this alert | [optional] 
 **updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index 1d27a3f..bdca394 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -18,6 +18,7 @@ Method | HTTP request | Description
 [**get_alerts_summary**](AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
 [**get_all_alert**](AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 [**hide_alert**](AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
+[**preview_alert_notification**](AlertApi.md#preview_alert_notification) | **POST** /api/v2/alert/preview | Get all the notification preview for a specific alert
 [**remove_alert_access**](AlertApi.md#remove_alert_access) | **POST** /api/v2/alert/acl/remove | Removes the specified ids from the given alerts&#39; ACL
 [**remove_alert_tag**](AlertApi.md#remove_alert_tag) | **DELETE** /api/v2/alert/{id}/tag/{tagValue} | Remove a tag from a specific alert
 [**set_alert_acl**](AlertApi.md#set_alert_acl) | **PUT** /api/v2/alert/acl/set | Set ACL for the specified alerts
@@ -83,7 +84,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **add_alert_tag**
-> ResponseContainer add_alert_tag(id, tag_value)
+> ResponseContainerVoid add_alert_tag(id, tag_value)
 
 Add a tag to a specific alert
 
@@ -125,7 +126,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainer**](ResponseContainer.md)
+[**ResponseContainerVoid**](ResponseContainerVoid.md)
 
 ### Authorization
 
@@ -251,7 +252,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_alert**
-> ResponseContainerAlert create_alert(body=body)
+> ResponseContainerAlert create_alert(use_multi_query=use_multi_query, body=body)
 
 Create a specific alert
 
@@ -273,11 +274,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+use_multi_query = false # bool | A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources  (optional) (default to false)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Create a specific alert
-    api_response = api_instance.create_alert(body=body)
+    api_response = api_instance.create_alert(use_multi_query=use_multi_query, body=body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling AlertApi->create_alert: %s\n" % e)
@@ -287,7 +289,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **use_multi_query** | **bool**| A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.&lt;br/&gt; When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.&lt;br/&gt; When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources  | [optional] [default to false]
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;alertTriageDashboards\&quot;: [{     \&quot;dashboardId\&quot;: \&quot;dashboard-name\&quot;,     \&quot;parameters\&quot;: {       \&quot;constants\&quot;: {         \&quot;key\&quot;: \&quot;value\&quot;         }       },    \&quot;description\&quot;: \&quot;dashboard description\&quot;     }   ],   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Classic Body with multi queries:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;CLASSIC\&quot;,     \&quot;alertSources\&quot;: [        {             \&quot;name\&quot;: \&quot;A\&quot;,             \&quot;query\&quot;: \&quot;${B} &gt; 2\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]         },         {             \&quot;name\&quot;: \&quot;B\&quot;,             \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]         }     ],     \&quot;severity\&quot;: \&quot;WARN\&quot;,     \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Example Threshold Body with multi queries:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,   \&quot;alertSources\&quot;: [     {       \&quot;name\&quot;: \&quot;A\&quot;,       \&quot;query\&quot;: \&quot;${B}\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]     },     {       \&quot;name\&quot;: \&quot;B\&quot;,       \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]     }   ],   \&quot;conditions\&quot;: {     \&quot;info\&quot;: \&quot;${B} &gt; bool 0\&quot;,     \&quot;warn\&quot;: \&quot;${B} &gt; bool 2\&quot;   },   \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
@@ -796,6 +799,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **preview_alert_notification**
+> ResponseContainerListNotificationMessages preview_alert_notification(body=body)
+
+Get all the notification preview for a specific alert
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.Alert() # Alert |  (optional)
+
+try:
+    # Get all the notification preview for a specific alert
+    api_response = api_instance.preview_alert_notification(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->preview_alert_notification: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Alert**](Alert.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerListNotificationMessages**](ResponseContainerListNotificationMessages.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **remove_alert_access**
 > remove_alert_access(body=body)
 
@@ -850,7 +907,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_alert_tag**
-> ResponseContainer remove_alert_tag(id, tag_value)
+> ResponseContainerVoid remove_alert_tag(id, tag_value)
 
 Remove a tag from a specific alert
 
@@ -892,7 +949,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainer**](ResponseContainer.md)
+[**ResponseContainerVoid**](ResponseContainerVoid.md)
 
 ### Authorization
 
@@ -959,7 +1016,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **set_alert_tags**
-> ResponseContainer set_alert_tags(id, body=body)
+> ResponseContainerVoid set_alert_tags(id, body=body)
 
 Set all tags associated with a specific alert
 
@@ -1001,7 +1058,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainer**](ResponseContainer.md)
+[**ResponseContainerVoid**](ResponseContainerVoid.md)
 
 ### Authorization
 
@@ -1093,7 +1150,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+id = 789 # int | 
 
 try:
     # Undelete a specific alert
@@ -1107,7 +1164,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
+ **id** | **int**|  | 
 
 ### Return type
 
@@ -1201,7 +1258,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+id = 789 # int | 
 
 try:
     # Unsnooze a specific alert
@@ -1215,7 +1272,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
+ **id** | **int**|  | 
 
 ### Return type
 
@@ -1233,7 +1290,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_alert**
-> ResponseContainerAlert update_alert(id, body=body)
+> ResponseContainerAlert update_alert(id, use_multi_query=use_multi_query, body=body)
 
 Update a specific alert
 
@@ -1256,11 +1313,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+use_multi_query = false # bool | A flag indicates whether to use the new multi-query alert structures when the feature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources  (optional) (default to false)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
 
 try:
     # Update a specific alert
-    api_response = api_instance.update_alert(id, body=body)
+    api_response = api_instance.update_alert(id, use_multi_query=use_multi_query, body=body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling AlertApi->update_alert: %s\n" % e)
@@ -1271,7 +1329,8 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;id\&quot;: \&quot;1459375928550\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 5\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;resolveAfterMinutes\&quot;: 2,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **use_multi_query** | **bool**| A flag indicates whether to use the new multi-query alert structures when the feature is enabled.&lt;br/&gt; When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.&lt;br/&gt; When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources  | [optional] [default to false]
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Classic Body with multi queries:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;CLASSIC\&quot;,     \&quot;alertSources\&quot;: [        {             \&quot;name\&quot;: \&quot;A\&quot;,             \&quot;query\&quot;: \&quot;${B} &gt; 2\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]         },         {             \&quot;name\&quot;: \&quot;B\&quot;,             \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]         }     ],     \&quot;severity\&quot;: \&quot;WARN\&quot;,     \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;id\&quot;: \&quot;1459375928550\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 5\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;resolveAfterMinutes\&quot;: 2,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Example Threshold Body with multi queries:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,   \&quot;alertSources\&quot;: [     {       \&quot;name\&quot;: \&quot;A\&quot;,       \&quot;query\&quot;: \&quot;${B}\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]     },     {       \&quot;name\&quot;: \&quot;B\&quot;,       \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]     }   ],   \&quot;conditions\&quot;: {     \&quot;info\&quot;: \&quot;${B} &gt; bool 0\&quot;,     \&quot;warn\&quot;: \&quot;${B} &gt; bool 2\&quot;   },   \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
diff --git a/docs/AlertDashboard.md b/docs/AlertDashboard.md
new file mode 100644
index 0000000..4bb6ce0
--- /dev/null
+++ b/docs/AlertDashboard.md
@@ -0,0 +1,12 @@
+# AlertDashboard
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**dashboard_id** | **str** |  | [optional] 
+**description** | **str** |  | [optional] 
+**parameters** | **dict(str, dict(str, str))** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AlertSource.md b/docs/AlertSource.md
new file mode 100644
index 0000000..3b92e30
--- /dev/null
+++ b/docs/AlertSource.md
@@ -0,0 +1,18 @@
+# AlertSource
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**alert_source_type** | **list[str]** | The types of the alert source (an array of CONDITION, AUDIT, VARIABLE) and the default one is [VARIABLE]. CONDITION alert source is the condition query in the alert. AUDIT alert source is the query to get more details when the alert changes state. VARIABLE alert source is a variable used in the other queries. | [optional] 
+**color** | **str** | The color of the alert source. | [optional] 
+**description** | **str** | The additional long description of the alert source. | [optional] 
+**hidden** | **bool** | A flag to indicate whether the alert source is hidden or not. | [optional] 
+**name** | **str** | The alert source query name. Used as the variable name in the other query. | [optional] 
+**query** | **str** | The alert query. Support both Wavefront Query and Prometheus Query. | [optional] 
+**query_builder_enabled** | **bool** | A flag indicate whether the alert source query builder enabled or not. | [optional] 
+**query_builder_serialization** | **str** | The string serialization of the alert source query builder, mostly used by Wavefront UI. | [optional] 
+**query_type** | **str** | The type of the alert query. Supported types are [PROMQL, WQL]. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/NotificationMessages.md b/docs/NotificationMessages.md
new file mode 100644
index 0000000..c1fe39e
--- /dev/null
+++ b/docs/NotificationMessages.md
@@ -0,0 +1,20 @@
+# NotificationMessages
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additional_info** | **dict(str, str)** |  | [optional] 
+**content** | **str** |  | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**id** | **str** |  | [optional] 
+**method** | **str** | The notification method, can either be WEBHOOK, EMAIL or PAGERDUTY | [optional] 
+**name** | **str** | The alert target name, easier to read than ID | [optional] 
+**subject** | **str** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListNotificationMessages.md b/docs/ResponseContainerListNotificationMessages.md
new file mode 100644
index 0000000..ccc71c3
--- /dev/null
+++ b/docs/ResponseContainerListNotificationMessages.md
@@ -0,0 +1,11 @@
+# ResponseContainerListNotificationMessages
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[NotificationMessages]**](NotificationMessages.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSpanSamplingPolicy.md b/docs/ResponseContainerSpanSamplingPolicy.md
new file mode 100644
index 0000000..0a55529
--- /dev/null
+++ b/docs/ResponseContainerSpanSamplingPolicy.md
@@ -0,0 +1,11 @@
+# ResponseContainerSpanSamplingPolicy
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**SpanSamplingPolicy**](SpanSamplingPolicy.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerVoid.md b/docs/ResponseContainerVoid.md
new file mode 100644
index 0000000..ebbbc35
--- /dev/null
+++ b/docs/ResponseContainerVoid.md
@@ -0,0 +1,11 @@
+# ResponseContainerVoid
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**Void**](Void.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SpanSamplingPolicyApi.md b/docs/SpanSamplingPolicyApi.md
new file mode 100644
index 0000000..0d2be76
--- /dev/null
+++ b/docs/SpanSamplingPolicyApi.md
@@ -0,0 +1,515 @@
+# wavefront_api_client.SpanSamplingPolicyApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_span_sampling_policy**](SpanSamplingPolicyApi.md#create_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy | Create a span sampling policy
+[**delete_span_sampling_policy**](SpanSamplingPolicyApi.md#delete_span_sampling_policy) | **DELETE** /api/v2/spansamplingpolicy/{id} | Delete a specific span sampling policy
+[**get_all_deleted_span_sampling_policy**](SpanSamplingPolicyApi.md#get_all_deleted_span_sampling_policy) | **GET** /api/v2/spansamplingpolicy/deleted | Get all deleted sampling policies for a customer
+[**get_all_span_sampling_policy**](SpanSamplingPolicyApi.md#get_all_span_sampling_policy) | **GET** /api/v2/spansamplingpolicy | Get all sampling policies for a customer
+[**get_span_sampling_policy**](SpanSamplingPolicyApi.md#get_span_sampling_policy) | **GET** /api/v2/spansamplingpolicy/{id} | Get a specific span sampling policy
+[**get_span_sampling_policy_history**](SpanSamplingPolicyApi.md#get_span_sampling_policy_history) | **GET** /api/v2/spansamplingpolicy/{id}/history | Get the version history of a specific sampling policy
+[**get_span_sampling_policy_version**](SpanSamplingPolicyApi.md#get_span_sampling_policy_version) | **GET** /api/v2/spansamplingpolicy/{id}/history/{version} | Get a specific historical version of a specific sampling policy
+[**undelete_span_sampling_policy**](SpanSamplingPolicyApi.md#undelete_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy/{id}/undelete | Restore a deleted span sampling policy
+[**update_span_sampling_policy**](SpanSamplingPolicyApi.md#update_span_sampling_policy) | **PUT** /api/v2/spansamplingpolicy/{id} | Update a specific span sampling policy
+
+
+# **create_span_sampling_policy**
+> ResponseContainerSpanSamplingPolicy create_span_sampling_policy(body=body)
+
+Create a span sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SpanSamplingPolicy() # SpanSamplingPolicy | Example Body:  <pre>{   \"name\": \"Test\",   \"id\": \"test\",   \"active\": false,   \"expression\": \"{{sourceName}}='localhost'\",   \"description\": \"test description\",   \"samplingPercent\": 100 }</pre> (optional)
+
+try:
+    # Create a span sampling policy
+    api_response = api_instance.create_span_sampling_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->create_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SpanSamplingPolicy**](SpanSamplingPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Test\&quot;,   \&quot;id\&quot;: \&quot;test\&quot;,   \&quot;active\&quot;: false,   \&quot;expression\&quot;: \&quot;{{sourceName}}&#x3D;&#39;localhost&#39;\&quot;,   \&quot;description\&quot;: \&quot;test description\&quot;,   \&quot;samplingPercent\&quot;: 100 }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSpanSamplingPolicy**](ResponseContainerSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_span_sampling_policy**
+> ResponseContainerSpanSamplingPolicy delete_span_sampling_policy(id)
+
+Delete a specific span sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a specific span sampling policy
+    api_response = api_instance.delete_span_sampling_policy(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->delete_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSpanSamplingPolicy**](ResponseContainerSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_deleted_span_sampling_policy**
+> ResponseContainerPagedSpanSamplingPolicy get_all_deleted_span_sampling_policy(offset=offset, limit=limit)
+
+Get all deleted sampling policies for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all deleted sampling policies for a customer
+    api_response = api_instance.get_all_deleted_span_sampling_policy(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->get_all_deleted_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSpanSamplingPolicy**](ResponseContainerPagedSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_span_sampling_policy**
+> ResponseContainerPagedSpanSamplingPolicy get_all_span_sampling_policy(offset=offset, limit=limit)
+
+Get all sampling policies for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all sampling policies for a customer
+    api_response = api_instance.get_all_span_sampling_policy(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->get_all_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSpanSamplingPolicy**](ResponseContainerPagedSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_span_sampling_policy**
+> ResponseContainerSpanSamplingPolicy get_span_sampling_policy(id)
+
+Get a specific span sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific span sampling policy
+    api_response = api_instance.get_span_sampling_policy(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->get_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSpanSamplingPolicy**](ResponseContainerSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_span_sampling_policy_history**
+> ResponseContainerHistoryResponse get_span_sampling_policy_history(id, offset=offset, limit=limit)
+
+Get the version history of a specific sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of a specific sampling policy
+    api_response = api_instance.get_span_sampling_policy_history(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->get_span_sampling_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_span_sampling_policy_version**
+> ResponseContainerSpanSamplingPolicy get_span_sampling_policy_version(id, version)
+
+Get a specific historical version of a specific sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+version = 789 # int | 
+
+try:
+    # Get a specific historical version of a specific sampling policy
+    api_response = api_instance.get_span_sampling_policy_version(id, version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->get_span_sampling_policy_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerSpanSamplingPolicy**](ResponseContainerSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **undelete_span_sampling_policy**
+> ResponseContainerSpanSamplingPolicy undelete_span_sampling_policy(id)
+
+Restore a deleted span sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Restore a deleted span sampling policy
+    api_response = api_instance.undelete_span_sampling_policy(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->undelete_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSpanSamplingPolicy**](ResponseContainerSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_span_sampling_policy**
+> ResponseContainerSpanSamplingPolicy update_span_sampling_policy(id, body=body)
+
+Update a specific span sampling policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SpanSamplingPolicyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SpanSamplingPolicy() # SpanSamplingPolicy | Example Body:  <pre>{   \"name\": \"Test\",   \"id\": \"test\",   \"active\": false,   \"expression\": \"{{sourceName}}='localhost'\",   \"description\": \"test description\",   \"samplingPercent\": 100 }</pre> (optional)
+
+try:
+    # Update a specific span sampling policy
+    api_response = api_instance.update_span_sampling_policy(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SpanSamplingPolicyApi->update_span_sampling_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SpanSamplingPolicy**](SpanSamplingPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Test\&quot;,   \&quot;id\&quot;: \&quot;test\&quot;,   \&quot;active\&quot;: false,   \&quot;expression\&quot;: \&quot;{{sourceName}}&#x3D;&#39;localhost&#39;\&quot;,   \&quot;description\&quot;: \&quot;test description\&quot;,   \&quot;samplingPercent\&quot;: 100 }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSpanSamplingPolicy**](ResponseContainerSpanSamplingPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/Void.md b/docs/Void.md
new file mode 100644
index 0000000..d167d3a
--- /dev/null
+++ b/docs/Void.md
@@ -0,0 +1,9 @@
+# Void
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 8499c0a..3dbcf2d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.111.0"
+VERSION = "2.116.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_alert_dashboard.py b/test/test_alert_dashboard.py
new file mode 100644
index 0000000..49ef3b2
--- /dev/null
+++ b/test/test_alert_dashboard.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_dashboard import AlertDashboard  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertDashboard(unittest.TestCase):
+    """AlertDashboard unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertDashboard(self):
+        """Test AlertDashboard"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_dashboard.AlertDashboard()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_source.py b/test/test_alert_source.py
new file mode 100644
index 0000000..0ddd7e2
--- /dev/null
+++ b/test/test_alert_source.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_source import AlertSource  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertSource(unittest.TestCase):
+    """AlertSource unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertSource(self):
+        """Test AlertSource"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_source.AlertSource()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_notification_messages.py b/test/test_notification_messages.py
new file mode 100644
index 0000000..bf0ad4f
--- /dev/null
+++ b/test/test_notification_messages.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.notification_messages import NotificationMessages  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestNotificationMessages(unittest.TestCase):
+    """NotificationMessages unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testNotificationMessages(self):
+        """Test NotificationMessages"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.notification_messages.NotificationMessages()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_notification_messages.py b/test/test_response_container_list_notification_messages.py
new file mode 100644
index 0000000..baa473f
--- /dev/null
+++ b/test/test_response_container_list_notification_messages.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_notification_messages import ResponseContainerListNotificationMessages  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListNotificationMessages(unittest.TestCase):
+    """ResponseContainerListNotificationMessages unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListNotificationMessages(self):
+        """Test ResponseContainerListNotificationMessages"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_notification_messages.ResponseContainerListNotificationMessages()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_span_sampling_policy.py b/test/test_response_container_span_sampling_policy.py
new file mode 100644
index 0000000..ebe08ed
--- /dev/null
+++ b/test/test_response_container_span_sampling_policy.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_span_sampling_policy import ResponseContainerSpanSamplingPolicy  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSpanSamplingPolicy(unittest.TestCase):
+    """ResponseContainerSpanSamplingPolicy unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSpanSamplingPolicy(self):
+        """Test ResponseContainerSpanSamplingPolicy"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_span_sampling_policy.ResponseContainerSpanSamplingPolicy()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_void.py b/test/test_response_container_void.py
new file mode 100644
index 0000000..f56f6a4
--- /dev/null
+++ b/test/test_response_container_void.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_void import ResponseContainerVoid  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerVoid(unittest.TestCase):
+    """ResponseContainerVoid unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerVoid(self):
+        """Test ResponseContainerVoid"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_void.ResponseContainerVoid()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_span_sampling_policy_api.py b/test/test_span_sampling_policy_api.py
new file mode 100644
index 0000000..e7d5843
--- /dev/null
+++ b/test/test_span_sampling_policy_api.py
@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSpanSamplingPolicyApi(unittest.TestCase):
+    """SpanSamplingPolicyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.span_sampling_policy_api.SpanSamplingPolicyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_span_sampling_policy(self):
+        """Test case for create_span_sampling_policy
+
+        Create a span sampling policy  # noqa: E501
+        """
+        pass
+
+    def test_delete_span_sampling_policy(self):
+        """Test case for delete_span_sampling_policy
+
+        Delete a specific span sampling policy  # noqa: E501
+        """
+        pass
+
+    def test_get_all_deleted_span_sampling_policy(self):
+        """Test case for get_all_deleted_span_sampling_policy
+
+        Get all deleted sampling policies for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_all_span_sampling_policy(self):
+        """Test case for get_all_span_sampling_policy
+
+        Get all sampling policies for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_span_sampling_policy(self):
+        """Test case for get_span_sampling_policy
+
+        Get a specific span sampling policy  # noqa: E501
+        """
+        pass
+
+    def test_get_span_sampling_policy_history(self):
+        """Test case for get_span_sampling_policy_history
+
+        Get the version history of a specific sampling policy  # noqa: E501
+        """
+        pass
+
+    def test_get_span_sampling_policy_version(self):
+        """Test case for get_span_sampling_policy_version
+
+        Get a specific historical version of a specific sampling policy  # noqa: E501
+        """
+        pass
+
+    def test_undelete_span_sampling_policy(self):
+        """Test case for undelete_span_sampling_policy
+
+        Restore a deleted span sampling policy  # noqa: E501
+        """
+        pass
+
+    def test_update_span_sampling_policy(self):
+        """Test case for update_span_sampling_policy
+
+        Update a specific span sampling policy  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_void.py b/test/test_void.py
new file mode 100644
index 0000000..faa54e8
--- /dev/null
+++ b/test/test_void.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.void import Void  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestVoid(unittest.TestCase):
+    """Void unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testVoid(self):
+        """Test Void"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.void.Void()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index cc0dbda..71899e6 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -41,6 +41,7 @@
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.source_api import SourceApi
+from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi
 from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
 from wavefront_api_client.api.user_group_api import UserGroupApi
@@ -59,8 +60,10 @@
 from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_dashboard import AlertDashboard
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
+from wavefront_api_client.models.alert_source import AlertSource
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
@@ -128,6 +131,7 @@
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
+from wavefront_api_client.models.notification_messages import NotificationMessages
 from wavefront_api_client.models.package import Package
 from wavefront_api_client.models.paged import Paged
 from wavefront_api_client.models.paged_account import PagedAccount
@@ -190,6 +194,7 @@
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
+from wavefront_api_client.models.response_container_list_notification_messages import ResponseContainerListNotificationMessages
 from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
@@ -238,11 +243,13 @@
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
 from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
+from wavefront_api_client.models.response_container_span_sampling_policy import ResponseContainerSpanSamplingPolicy
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
+from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -279,5 +286,6 @@
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
+from wavefront_api_client.models.void import Void
 from wavefront_api_client.models.vrops_configuration import VropsConfiguration
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index a01b0bd..d104647 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -28,6 +28,7 @@
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.source_api import SourceApi
+from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi
 from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
 from wavefront_api_client.api.user_group_api import UserGroupApi
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 7a1bbdd..de9ea7e 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -140,7 +140,7 @@ def add_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
-        :return: ResponseContainer
+        :return: ResponseContainerVoid
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -163,7 +163,7 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
-        :return: ResponseContainer
+        :return: ResponseContainerVoid
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -227,7 +227,7 @@ def add_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
+            response_type='ResponseContainerVoid',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -447,7 +447,8 @@ def create_alert(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -469,13 +470,14 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['body']  # noqa: E501
+        all_params = ['use_multi_query', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -496,6 +498,8 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
         path_params = {}
 
         query_params = []
+        if 'use_multi_query' in params:
+            query_params.append(('useMultiQuery', params['use_multi_query']))  # noqa: E501
 
         header_params = {}
 
@@ -1396,6 +1400,97 @@ def hide_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def preview_alert_notification(self, **kwargs):  # noqa: E501
+        """Get all the notification preview for a specific alert  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.preview_alert_notification(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param Alert body:
+        :return: ResponseContainerListNotificationMessages
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.preview_alert_notification_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.preview_alert_notification_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def preview_alert_notification_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all the notification preview for a specific alert  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.preview_alert_notification_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param Alert body:
+        :return: ResponseContainerListNotificationMessages
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method preview_alert_notification" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/preview', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListNotificationMessages',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_alert_access(self, **kwargs):  # noqa: E501
         """Removes the specified ids from the given alerts' ACL  # noqa: E501
 
@@ -1503,7 +1598,7 @@ def remove_alert_tag(self, id, tag_value, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
-        :return: ResponseContainer
+        :return: ResponseContainerVoid
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1526,7 +1621,7 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
         :param async_req bool
         :param str id: (required)
         :param str tag_value: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (required)
-        :return: ResponseContainer
+        :return: ResponseContainerVoid
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1586,7 +1681,7 @@ def remove_alert_tag_with_http_info(self, id, tag_value, **kwargs):  # noqa: E50
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
+            response_type='ResponseContainerVoid',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1701,7 +1796,7 @@ def set_alert_tags(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
-        :return: ResponseContainer
+        :return: ResponseContainerVoid
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1724,7 +1819,7 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
-        :return: ResponseContainer
+        :return: ResponseContainerVoid
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1784,7 +1879,7 @@ def set_alert_tags_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
+            response_type='ResponseContainerVoid',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1901,7 +1996,7 @@ def undelete_alert(self, id, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param int id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1923,7 +2018,7 @@ def undelete_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param int id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2091,7 +2186,7 @@ def unsnooze_alert(self, id, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param int id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2113,7 +2208,7 @@ def unsnooze_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param int id: (required)
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2187,7 +2282,8 @@ def update_alert(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when the feature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources 
+        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2210,13 +2306,14 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when the feature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources 
+        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id', 'body']  # noqa: E501
+        all_params = ['id', 'use_multi_query', 'body']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -2243,6 +2340,8 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'use_multi_query' in params:
+            query_params.append(('useMultiQuery', params['use_multi_query']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api/span_sampling_policy_api.py b/wavefront_api_client/api/span_sampling_policy_api.py
new file mode 100644
index 0000000..113f902
--- /dev/null
+++ b/wavefront_api_client/api/span_sampling_policy_api.py
@@ -0,0 +1,913 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SpanSamplingPolicyApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_span_sampling_policy(self, **kwargs):  # noqa: E501
+        """Create a span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_span_sampling_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SpanSamplingPolicy body: Example Body:  <pre>{   \"name\": \"Test\",   \"id\": \"test\",   \"active\": false,   \"expression\": \"{{sourceName}}='localhost'\",   \"description\": \"test description\",   \"samplingPercent\": 100 }</pre>
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_span_sampling_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_span_sampling_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_span_sampling_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_span_sampling_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SpanSamplingPolicy body: Example Body:  <pre>{   \"name\": \"Test\",   \"id\": \"test\",   \"active\": false,   \"expression\": \"{{sourceName}}='localhost'\",   \"description\": \"test description\",   \"samplingPercent\": 100 }</pre>
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_span_sampling_policy(self, id, **kwargs):  # noqa: E501
+        """Delete a specific span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_span_sampling_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_span_sampling_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a specific span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_span_sampling_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_span_sampling_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_deleted_span_sampling_policy(self, **kwargs):  # noqa: E501
+        """Get all deleted sampling policies for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_deleted_span_sampling_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_deleted_span_sampling_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_deleted_span_sampling_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_deleted_span_sampling_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all deleted sampling policies for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_deleted_span_sampling_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_deleted_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/deleted', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_span_sampling_policy(self, **kwargs):  # noqa: E501
+        """Get all sampling policies for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_span_sampling_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_span_sampling_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_span_sampling_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_span_sampling_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all sampling policies for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_span_sampling_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_span_sampling_policy(self, id, **kwargs):  # noqa: E501
+        """Get a specific span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_span_sampling_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_span_sampling_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_span_sampling_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_span_sampling_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_span_sampling_policy_history(self, id, **kwargs):  # noqa: E501
+        """Get the version history of a specific sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_span_sampling_policy_history(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_span_sampling_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_span_sampling_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_span_sampling_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the version history of a specific sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_span_sampling_policy_history_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_span_sampling_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_span_sampling_policy_history`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/{id}/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_span_sampling_policy_version(self, id, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a specific sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_span_sampling_policy_version(id, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int version: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_span_sampling_policy_version_with_http_info(id, version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_span_sampling_policy_version_with_http_info(id, version, **kwargs)  # noqa: E501
+            return data
+
+    def get_span_sampling_policy_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a specific sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_span_sampling_policy_version_with_http_info(id, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int version: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_span_sampling_policy_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_span_sampling_policy_version`")  # noqa: E501
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `get_span_sampling_policy_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/{id}/history/{version}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def undelete_span_sampling_policy(self, id, **kwargs):  # noqa: E501
+        """Restore a deleted span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_span_sampling_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.undelete_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.undelete_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def undelete_span_sampling_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Restore a deleted span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.undelete_span_sampling_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method undelete_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `undelete_span_sampling_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/{id}/undelete', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_span_sampling_policy(self, id, **kwargs):  # noqa: E501
+        """Update a specific span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_span_sampling_policy(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SpanSamplingPolicy body: Example Body:  <pre>{   \"name\": \"Test\",   \"id\": \"test\",   \"active\": false,   \"expression\": \"{{sourceName}}='localhost'\",   \"description\": \"test description\",   \"samplingPercent\": 100 }</pre>
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_span_sampling_policy_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_span_sampling_policy_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a specific span sampling policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_span_sampling_policy_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SpanSamplingPolicy body: Example Body:  <pre>{   \"name\": \"Test\",   \"id\": \"test\",   \"active\": false,   \"expression\": \"{{sourceName}}='localhost'\",   \"description\": \"test description\",   \"samplingPercent\": 100 }</pre>
+        :return: ResponseContainerSpanSamplingPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_span_sampling_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_span_sampling_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/spansamplingpolicy/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSpanSamplingPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b701101..fa8cd51 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.111.0/python'
+        self.user_agent = 'Swagger-Codegen/2.116.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 5b73746..63ce424 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.111.0".\
+               "SDK Package Version: 2.116.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 5df703b..1a73a7a 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -24,8 +24,10 @@
 from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_dashboard import AlertDashboard
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
+from wavefront_api_client.models.alert_source import AlertSource
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
@@ -93,6 +95,7 @@
 from wavefront_api_client.models.new_relic_configuration import NewRelicConfiguration
 from wavefront_api_client.models.new_relic_metric_filters import NewRelicMetricFilters
 from wavefront_api_client.models.notificant import Notificant
+from wavefront_api_client.models.notification_messages import NotificationMessages
 from wavefront_api_client.models.package import Package
 from wavefront_api_client.models.paged import Paged
 from wavefront_api_client.models.paged_account import PagedAccount
@@ -155,6 +158,7 @@
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
+from wavefront_api_client.models.response_container_list_notification_messages import ResponseContainerListNotificationMessages
 from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
@@ -203,11 +207,13 @@
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
 from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair
 from wavefront_api_client.models.response_container_source import ResponseContainerSource
+from wavefront_api_client.models.response_container_span_sampling_policy import ResponseContainerSpanSamplingPolicy
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
+from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.saved_search import SavedSearch
@@ -244,5 +250,6 @@
 from wavefront_api_client.models.user_request_dto import UserRequestDTO
 from wavefront_api_client.models.user_to_create import UserToCreate
 from wavefront_api_client.models.validated_users_dto import ValidatedUsersDTO
+from wavefront_api_client.models.void import Void
 from wavefront_api_client.models.vrops_configuration import VropsConfiguration
 from wavefront_api_client.models.wf_tags import WFTags
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index c4399de..9326cb2 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -36,11 +36,15 @@ class Alert(object):
         'acl': 'AccessControlListSimple',
         'active_maintenance_windows': 'list[str]',
         'additional_information': 'str',
+        'alert_sources': 'list[AlertSource]',
+        'alert_triage_dashboards': 'list[AlertDashboard]',
         'alert_type': 'str',
         'alerts_last_day': 'int',
         'alerts_last_month': 'int',
         'alerts_last_week': 'int',
         'application': 'list[str]',
+        'chart_attributes': 'JsonNode',
+        'chart_settings': 'ChartSettings',
         'condition': 'str',
         'condition_qb_enabled': 'bool',
         'condition_qb_serialization': 'str',
@@ -114,11 +118,15 @@ class Alert(object):
         'acl': 'acl',
         'active_maintenance_windows': 'activeMaintenanceWindows',
         'additional_information': 'additionalInformation',
+        'alert_sources': 'alertSources',
+        'alert_triage_dashboards': 'alertTriageDashboards',
         'alert_type': 'alertType',
         'alerts_last_day': 'alertsLastDay',
         'alerts_last_month': 'alertsLastMonth',
         'alerts_last_week': 'alertsLastWeek',
         'application': 'application',
+        'chart_attributes': 'chartAttributes',
+        'chart_settings': 'chartSettings',
         'condition': 'condition',
         'condition_qb_enabled': 'conditionQBEnabled',
         'condition_qb_serialization': 'conditionQBSerialization',
@@ -188,7 +196,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_sources=None, alert_triage_dashboards=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, chart_attributes=None, chart_settings=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -197,11 +205,15 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._acl = None
         self._active_maintenance_windows = None
         self._additional_information = None
+        self._alert_sources = None
+        self._alert_triage_dashboards = None
         self._alert_type = None
         self._alerts_last_day = None
         self._alerts_last_month = None
         self._alerts_last_week = None
         self._application = None
+        self._chart_attributes = None
+        self._chart_settings = None
         self._condition = None
         self._condition_qb_enabled = None
         self._condition_qb_serialization = None
@@ -277,6 +289,10 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.active_maintenance_windows = active_maintenance_windows
         if additional_information is not None:
             self.additional_information = additional_information
+        if alert_sources is not None:
+            self.alert_sources = alert_sources
+        if alert_triage_dashboards is not None:
+            self.alert_triage_dashboards = alert_triage_dashboards
         if alert_type is not None:
             self.alert_type = alert_type
         if alerts_last_day is not None:
@@ -287,6 +303,10 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.alerts_last_week = alerts_last_week
         if application is not None:
             self.application = application
+        if chart_attributes is not None:
+            self.chart_attributes = chart_attributes
+        if chart_settings is not None:
+            self.chart_settings = chart_settings
         self.condition = condition
         if condition_qb_enabled is not None:
             self.condition_qb_enabled = condition_qb_enabled
@@ -486,6 +506,52 @@ def additional_information(self, additional_information):
 
         self._additional_information = additional_information
 
+    @property
+    def alert_sources(self):
+        """Gets the alert_sources of this Alert.  # noqa: E501
+
+        A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION.  # noqa: E501
+
+        :return: The alert_sources of this Alert.  # noqa: E501
+        :rtype: list[AlertSource]
+        """
+        return self._alert_sources
+
+    @alert_sources.setter
+    def alert_sources(self, alert_sources):
+        """Sets the alert_sources of this Alert.
+
+        A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION.  # noqa: E501
+
+        :param alert_sources: The alert_sources of this Alert.  # noqa: E501
+        :type: list[AlertSource]
+        """
+
+        self._alert_sources = alert_sources
+
+    @property
+    def alert_triage_dashboards(self):
+        """Gets the alert_triage_dashboards of this Alert.  # noqa: E501
+
+        User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported  # noqa: E501
+
+        :return: The alert_triage_dashboards of this Alert.  # noqa: E501
+        :rtype: list[AlertDashboard]
+        """
+        return self._alert_triage_dashboards
+
+    @alert_triage_dashboards.setter
+    def alert_triage_dashboards(self, alert_triage_dashboards):
+        """Sets the alert_triage_dashboards of this Alert.
+
+        User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported  # noqa: E501
+
+        :param alert_triage_dashboards: The alert_triage_dashboards of this Alert.  # noqa: E501
+        :type: list[AlertDashboard]
+        """
+
+        self._alert_triage_dashboards = alert_triage_dashboards
+
     @property
     def alert_type(self):
         """Gets the alert_type of this Alert.  # noqa: E501
@@ -602,6 +668,52 @@ def application(self, application):
 
         self._application = application
 
+    @property
+    def chart_attributes(self):
+        """Gets the chart_attributes of this Alert.  # noqa: E501
+
+        Additional chart settings for the alert (e.g. pie chart has its chart settings in this section).  # noqa: E501
+
+        :return: The chart_attributes of this Alert.  # noqa: E501
+        :rtype: JsonNode
+        """
+        return self._chart_attributes
+
+    @chart_attributes.setter
+    def chart_attributes(self, chart_attributes):
+        """Sets the chart_attributes of this Alert.
+
+        Additional chart settings for the alert (e.g. pie chart has its chart settings in this section).  # noqa: E501
+
+        :param chart_attributes: The chart_attributes of this Alert.  # noqa: E501
+        :type: JsonNode
+        """
+
+        self._chart_attributes = chart_attributes
+
+    @property
+    def chart_settings(self):
+        """Gets the chart_settings of this Alert.  # noqa: E501
+
+        The old chart settings for the alert (e.g. chart type, chart range etc.).  # noqa: E501
+
+        :return: The chart_settings of this Alert.  # noqa: E501
+        :rtype: ChartSettings
+        """
+        return self._chart_settings
+
+    @chart_settings.setter
+    def chart_settings(self, chart_settings):
+        """Sets the chart_settings of this Alert.
+
+        The old chart settings for the alert (e.g. chart type, chart range etc.).  # noqa: E501
+
+        :param chart_settings: The chart_settings of this Alert.  # noqa: E501
+        :type: ChartSettings
+        """
+
+        self._chart_settings = chart_settings
+
     @property
     def condition(self):
         """Gets the condition of this Alert.  # noqa: E501
@@ -2035,7 +2147,7 @@ def targets(self, targets):
     def triage_dashboards(self):
         """Gets the triage_dashboards of this Alert.  # noqa: E501
 
-        User-supplied dashboard and parameters to create dashboard links  # noqa: E501
+        Deprecated for alertTriageDashboards  # noqa: E501
 
         :return: The triage_dashboards of this Alert.  # noqa: E501
         :rtype: list[TriageDashboard]
@@ -2046,7 +2158,7 @@ def triage_dashboards(self):
     def triage_dashboards(self, triage_dashboards):
         """Sets the triage_dashboards of this Alert.
 
-        User-supplied dashboard and parameters to create dashboard links  # noqa: E501
+        Deprecated for alertTriageDashboards  # noqa: E501
 
         :param triage_dashboards: The triage_dashboards of this Alert.  # noqa: E501
         :type: list[TriageDashboard]
diff --git a/wavefront_api_client/models/alert_dashboard.py b/wavefront_api_client/models/alert_dashboard.py
new file mode 100644
index 0000000..489c802
--- /dev/null
+++ b/wavefront_api_client/models/alert_dashboard.py
@@ -0,0 +1,175 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertDashboard(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'dashboard_id': 'str',
+        'description': 'str',
+        'parameters': 'dict(str, dict(str, str))'
+    }
+
+    attribute_map = {
+        'dashboard_id': 'dashboardId',
+        'description': 'description',
+        'parameters': 'parameters'
+    }
+
+    def __init__(self, dashboard_id=None, description=None, parameters=None, _configuration=None):  # noqa: E501
+        """AlertDashboard - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._dashboard_id = None
+        self._description = None
+        self._parameters = None
+        self.discriminator = None
+
+        if dashboard_id is not None:
+            self.dashboard_id = dashboard_id
+        if description is not None:
+            self.description = description
+        if parameters is not None:
+            self.parameters = parameters
+
+    @property
+    def dashboard_id(self):
+        """Gets the dashboard_id of this AlertDashboard.  # noqa: E501
+
+
+        :return: The dashboard_id of this AlertDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._dashboard_id
+
+    @dashboard_id.setter
+    def dashboard_id(self, dashboard_id):
+        """Sets the dashboard_id of this AlertDashboard.
+
+
+        :param dashboard_id: The dashboard_id of this AlertDashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._dashboard_id = dashboard_id
+
+    @property
+    def description(self):
+        """Gets the description of this AlertDashboard.  # noqa: E501
+
+
+        :return: The description of this AlertDashboard.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this AlertDashboard.
+
+
+        :param description: The description of this AlertDashboard.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def parameters(self):
+        """Gets the parameters of this AlertDashboard.  # noqa: E501
+
+
+        :return: The parameters of this AlertDashboard.  # noqa: E501
+        :rtype: dict(str, dict(str, str))
+        """
+        return self._parameters
+
+    @parameters.setter
+    def parameters(self, parameters):
+        """Sets the parameters of this AlertDashboard.
+
+
+        :param parameters: The parameters of this AlertDashboard.  # noqa: E501
+        :type: dict(str, dict(str, str))
+        """
+
+        self._parameters = parameters
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertDashboard, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertDashboard):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertDashboard):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_source.py b/wavefront_api_client/models/alert_source.py
new file mode 100644
index 0000000..b03b7ae
--- /dev/null
+++ b/wavefront_api_client/models/alert_source.py
@@ -0,0 +1,364 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertSource(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'alert_source_type': 'list[str]',
+        'color': 'str',
+        'description': 'str',
+        'hidden': 'bool',
+        'name': 'str',
+        'query': 'str',
+        'query_builder_enabled': 'bool',
+        'query_builder_serialization': 'str',
+        'query_type': 'str'
+    }
+
+    attribute_map = {
+        'alert_source_type': 'alertSourceType',
+        'color': 'color',
+        'description': 'description',
+        'hidden': 'hidden',
+        'name': 'name',
+        'query': 'query',
+        'query_builder_enabled': 'queryBuilderEnabled',
+        'query_builder_serialization': 'queryBuilderSerialization',
+        'query_type': 'queryType'
+    }
+
+    def __init__(self, alert_source_type=None, color=None, description=None, hidden=None, name=None, query=None, query_builder_enabled=None, query_builder_serialization=None, query_type=None, _configuration=None):  # noqa: E501
+        """AlertSource - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._alert_source_type = None
+        self._color = None
+        self._description = None
+        self._hidden = None
+        self._name = None
+        self._query = None
+        self._query_builder_enabled = None
+        self._query_builder_serialization = None
+        self._query_type = None
+        self.discriminator = None
+
+        if alert_source_type is not None:
+            self.alert_source_type = alert_source_type
+        if color is not None:
+            self.color = color
+        if description is not None:
+            self.description = description
+        if hidden is not None:
+            self.hidden = hidden
+        if name is not None:
+            self.name = name
+        if query is not None:
+            self.query = query
+        if query_builder_enabled is not None:
+            self.query_builder_enabled = query_builder_enabled
+        if query_builder_serialization is not None:
+            self.query_builder_serialization = query_builder_serialization
+        if query_type is not None:
+            self.query_type = query_type
+
+    @property
+    def alert_source_type(self):
+        """Gets the alert_source_type of this AlertSource.  # noqa: E501
+
+        The types of the alert source (an array of CONDITION, AUDIT, VARIABLE) and the default one is [VARIABLE]. CONDITION alert source is the condition query in the alert. AUDIT alert source is the query to get more details when the alert changes state. VARIABLE alert source is a variable used in the other queries.  # noqa: E501
+
+        :return: The alert_source_type of this AlertSource.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._alert_source_type
+
+    @alert_source_type.setter
+    def alert_source_type(self, alert_source_type):
+        """Sets the alert_source_type of this AlertSource.
+
+        The types of the alert source (an array of CONDITION, AUDIT, VARIABLE) and the default one is [VARIABLE]. CONDITION alert source is the condition query in the alert. AUDIT alert source is the query to get more details when the alert changes state. VARIABLE alert source is a variable used in the other queries.  # noqa: E501
+
+        :param alert_source_type: The alert_source_type of this AlertSource.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["VARIABLE", "CONDITION", "AUDIT"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                not set(alert_source_type).issubset(set(allowed_values))):  # noqa: E501
+            raise ValueError(
+                "Invalid values for `alert_source_type` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(alert_source_type) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._alert_source_type = alert_source_type
+
+    @property
+    def color(self):
+        """Gets the color of this AlertSource.  # noqa: E501
+
+        The color of the alert source.  # noqa: E501
+
+        :return: The color of this AlertSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._color
+
+    @color.setter
+    def color(self, color):
+        """Sets the color of this AlertSource.
+
+        The color of the alert source.  # noqa: E501
+
+        :param color: The color of this AlertSource.  # noqa: E501
+        :type: str
+        """
+
+        self._color = color
+
+    @property
+    def description(self):
+        """Gets the description of this AlertSource.  # noqa: E501
+
+        The additional long description of the alert source.  # noqa: E501
+
+        :return: The description of this AlertSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this AlertSource.
+
+        The additional long description of the alert source.  # noqa: E501
+
+        :param description: The description of this AlertSource.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def hidden(self):
+        """Gets the hidden of this AlertSource.  # noqa: E501
+
+        A flag to indicate whether the alert source is hidden or not.  # noqa: E501
+
+        :return: The hidden of this AlertSource.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this AlertSource.
+
+        A flag to indicate whether the alert source is hidden or not.  # noqa: E501
+
+        :param hidden: The hidden of this AlertSource.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def name(self):
+        """Gets the name of this AlertSource.  # noqa: E501
+
+        The alert source query name. Used as the variable name in the other query.  # noqa: E501
+
+        :return: The name of this AlertSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this AlertSource.
+
+        The alert source query name. Used as the variable name in the other query.  # noqa: E501
+
+        :param name: The name of this AlertSource.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def query(self):
+        """Gets the query of this AlertSource.  # noqa: E501
+
+        The alert query. Support both Wavefront Query and Prometheus Query.  # noqa: E501
+
+        :return: The query of this AlertSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._query
+
+    @query.setter
+    def query(self, query):
+        """Sets the query of this AlertSource.
+
+        The alert query. Support both Wavefront Query and Prometheus Query.  # noqa: E501
+
+        :param query: The query of this AlertSource.  # noqa: E501
+        :type: str
+        """
+
+        self._query = query
+
+    @property
+    def query_builder_enabled(self):
+        """Gets the query_builder_enabled of this AlertSource.  # noqa: E501
+
+        A flag indicate whether the alert source query builder enabled or not.  # noqa: E501
+
+        :return: The query_builder_enabled of this AlertSource.  # noqa: E501
+        :rtype: bool
+        """
+        return self._query_builder_enabled
+
+    @query_builder_enabled.setter
+    def query_builder_enabled(self, query_builder_enabled):
+        """Sets the query_builder_enabled of this AlertSource.
+
+        A flag indicate whether the alert source query builder enabled or not.  # noqa: E501
+
+        :param query_builder_enabled: The query_builder_enabled of this AlertSource.  # noqa: E501
+        :type: bool
+        """
+
+        self._query_builder_enabled = query_builder_enabled
+
+    @property
+    def query_builder_serialization(self):
+        """Gets the query_builder_serialization of this AlertSource.  # noqa: E501
+
+        The string serialization of the alert source query builder, mostly used by Wavefront UI.  # noqa: E501
+
+        :return: The query_builder_serialization of this AlertSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._query_builder_serialization
+
+    @query_builder_serialization.setter
+    def query_builder_serialization(self, query_builder_serialization):
+        """Sets the query_builder_serialization of this AlertSource.
+
+        The string serialization of the alert source query builder, mostly used by Wavefront UI.  # noqa: E501
+
+        :param query_builder_serialization: The query_builder_serialization of this AlertSource.  # noqa: E501
+        :type: str
+        """
+
+        self._query_builder_serialization = query_builder_serialization
+
+    @property
+    def query_type(self):
+        """Gets the query_type of this AlertSource.  # noqa: E501
+
+        The type of the alert query. Supported types are [PROMQL, WQL].  # noqa: E501
+
+        :return: The query_type of this AlertSource.  # noqa: E501
+        :rtype: str
+        """
+        return self._query_type
+
+    @query_type.setter
+    def query_type(self, query_type):
+        """Sets the query_type of this AlertSource.
+
+        The type of the alert query. Supported types are [PROMQL, WQL].  # noqa: E501
+
+        :param query_type: The query_type of this AlertSource.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                query_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(query_type, allowed_values)
+            )
+
+        self._query_type = query_type
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertSource, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertSource):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertSource):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index 71fecb6..851a000 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -486,7 +486,7 @@ def triggers(self, triggers):
         """
         if self._configuration.client_side_validation and triggers is None:
             raise ValueError("Invalid value for `triggers`, must not be `None`")  # noqa: E501
-        allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE", "ALERT_SEVERITY_UPDATE"]  # noqa: E501
+        allowed_values = ["ALERT_OPENED", "ALERT_UPDATED", "ALERT_RESOLVED", "ALERT_MAINTENANCE", "ALERT_SNOOZED", "ALERT_INVALID", "ALERT_NO_LONGER_INVALID", "ALERT_TESTING", "ALERT_RETRIGGERED", "ALERT_NO_DATA", "ALERT_NO_DATA_RESOLVED", "ALERT_NO_DATA_MAINTENANCE", "ALERT_SEVERITY_UPDATE", "ALERT_NOTIFICATION_PREVIEW"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(triggers).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/notification_messages.py b/wavefront_api_client/models/notification_messages.py
new file mode 100644
index 0000000..69531ca
--- /dev/null
+++ b/wavefront_api_client/models/notification_messages.py
@@ -0,0 +1,394 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class NotificationMessages(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'additional_info': 'dict(str, str)',
+        'content': 'str',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'id': 'str',
+        'method': 'str',
+        'name': 'str',
+        'subject': 'str',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'additional_info': 'additionalInfo',
+        'content': 'content',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'id': 'id',
+        'method': 'method',
+        'name': 'name',
+        'subject': 'subject',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, additional_info=None, content=None, created_epoch_millis=None, creator_id=None, deleted=None, id=None, method=None, name=None, subject=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """NotificationMessages - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._additional_info = None
+        self._content = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._id = None
+        self._method = None
+        self._name = None
+        self._subject = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if additional_info is not None:
+            self.additional_info = additional_info
+        if content is not None:
+            self.content = content
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if id is not None:
+            self.id = id
+        if method is not None:
+            self.method = method
+        if name is not None:
+            self.name = name
+        if subject is not None:
+            self.subject = subject
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def additional_info(self):
+        """Gets the additional_info of this NotificationMessages.  # noqa: E501
+
+
+        :return: The additional_info of this NotificationMessages.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._additional_info
+
+    @additional_info.setter
+    def additional_info(self, additional_info):
+        """Sets the additional_info of this NotificationMessages.
+
+
+        :param additional_info: The additional_info of this NotificationMessages.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._additional_info = additional_info
+
+    @property
+    def content(self):
+        """Gets the content of this NotificationMessages.  # noqa: E501
+
+
+        :return: The content of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._content
+
+    @content.setter
+    def content(self, content):
+        """Sets the content of this NotificationMessages.
+
+
+        :param content: The content of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+
+        self._content = content
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this NotificationMessages.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this NotificationMessages.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this NotificationMessages.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this NotificationMessages.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this NotificationMessages.  # noqa: E501
+
+
+        :return: The creator_id of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this NotificationMessages.
+
+
+        :param creator_id: The creator_id of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this NotificationMessages.  # noqa: E501
+
+
+        :return: The deleted of this NotificationMessages.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this NotificationMessages.
+
+
+        :param deleted: The deleted of this NotificationMessages.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def id(self):
+        """Gets the id of this NotificationMessages.  # noqa: E501
+
+
+        :return: The id of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this NotificationMessages.
+
+
+        :param id: The id of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def method(self):
+        """Gets the method of this NotificationMessages.  # noqa: E501
+
+        The notification method, can either be WEBHOOK, EMAIL or PAGERDUTY  # noqa: E501
+
+        :return: The method of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._method
+
+    @method.setter
+    def method(self, method):
+        """Sets the method of this NotificationMessages.
+
+        The notification method, can either be WEBHOOK, EMAIL or PAGERDUTY  # noqa: E501
+
+        :param method: The method of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WEBHOOK", "PAGERDUTY", "EMAIL"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                method not in allowed_values):
+            raise ValueError(
+                "Invalid value for `method` ({0}), must be one of {1}"  # noqa: E501
+                .format(method, allowed_values)
+            )
+
+        self._method = method
+
+    @property
+    def name(self):
+        """Gets the name of this NotificationMessages.  # noqa: E501
+
+        The alert target name, easier to read than ID  # noqa: E501
+
+        :return: The name of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this NotificationMessages.
+
+        The alert target name, easier to read than ID  # noqa: E501
+
+        :param name: The name of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def subject(self):
+        """Gets the subject of this NotificationMessages.  # noqa: E501
+
+
+        :return: The subject of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._subject
+
+    @subject.setter
+    def subject(self, subject):
+        """Sets the subject of this NotificationMessages.
+
+
+        :param subject: The subject of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+
+        self._subject = subject
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this NotificationMessages.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this NotificationMessages.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this NotificationMessages.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this NotificationMessages.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this NotificationMessages.  # noqa: E501
+
+
+        :return: The updater_id of this NotificationMessages.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this NotificationMessages.
+
+
+        :param updater_id: The updater_id of this NotificationMessages.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(NotificationMessages, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, NotificationMessages):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, NotificationMessages):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_notification_messages.py b/wavefront_api_client/models/response_container_list_notification_messages.py
new file mode 100644
index 0000000..de5ee98
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_notification_messages.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerListNotificationMessages(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[NotificationMessages]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerListNotificationMessages - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListNotificationMessages.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListNotificationMessages.  # noqa: E501
+        :rtype: list[NotificationMessages]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListNotificationMessages.
+
+
+        :param response: The response of this ResponseContainerListNotificationMessages.  # noqa: E501
+        :type: list[NotificationMessages]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListNotificationMessages.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListNotificationMessages.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListNotificationMessages.
+
+
+        :param status: The status of this ResponseContainerListNotificationMessages.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListNotificationMessages, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListNotificationMessages):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerListNotificationMessages):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_span_sampling_policy.py b/wavefront_api_client/models/response_container_span_sampling_policy.py
new file mode 100644
index 0000000..1de7621
--- /dev/null
+++ b/wavefront_api_client/models/response_container_span_sampling_policy.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerSpanSamplingPolicy(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'SpanSamplingPolicy',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerSpanSamplingPolicy - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+        :rtype: SpanSamplingPolicy
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSpanSamplingPolicy.
+
+
+        :param response: The response of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+        :type: SpanSamplingPolicy
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSpanSamplingPolicy.
+
+
+        :param status: The status of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSpanSamplingPolicy, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSpanSamplingPolicy):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerSpanSamplingPolicy):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_void.py b/wavefront_api_client/models/response_container_void.py
new file mode 100644
index 0000000..a777144
--- /dev/null
+++ b/wavefront_api_client/models/response_container_void.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerVoid(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'Void',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerVoid - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerVoid.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerVoid.  # noqa: E501
+        :rtype: Void
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerVoid.
+
+
+        :param response: The response of this ResponseContainerVoid.  # noqa: E501
+        :type: Void
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerVoid.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerVoid.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerVoid.
+
+
+        :param status: The status of this ResponseContainerVoid.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerVoid, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerVoid):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerVoid):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/void.py b/wavefront_api_client/models/void.py
new file mode 100644
index 0000000..d914cea
--- /dev/null
+++ b/wavefront_api_client/models/void.py
@@ -0,0 +1,95 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class Void(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+    }
+
+    attribute_map = {
+    }
+
+    def __init__(self, _configuration=None):  # noqa: E501
+        """Void - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+        self.discriminator = None
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Void, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Void):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, Void):
+            return True
+
+        return self.to_dict() != other.to_dict()

From 45a9a04372f89af905e0c276f9a88da81ce9a8f1 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 14 Jan 2022 08:16:29 -0800
Subject: [PATCH 099/161] Autogenerated Update v2.117.1.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  11 +-
 docs/Account.md                               |   1 +
 docs/AccountUserAndServiceAccountApi.md       | 126 +++++-
 docs/IngestionPolicy.md                       |   7 +
 docs/IngestionPolicyMapping.md                |   3 +-
 docs/Integration.md                           |   2 +
 docs/Proxy.md                                 |   1 +
 docs/ResponseContainerUserDTO.md              |  11 +
 docs/ServiceAccount.md                        |   1 +
 docs/ServiceAccountWrite.md                   |   1 +
 docs/UsageApi.md                              | 236 +++++++++-
 docs/UserApi.md                               |  12 +-
 docs/UserApiToken.md                          |   3 +
 docs/UserDTO.md                               |   1 +
 docs/UserGroupApi.md                          | 110 +++++
 docs/UserGroupModel.md                        |   1 +
 docs/UserModel.md                             |   1 +
 docs/UserRequestDTO.md                        |   1 +
 docs/UserToCreate.md                          |   3 +-
 setup.py                                      |   2 +-
 test/test_response_container_user_dto.py      |  40 ++
 wavefront_api_client/__init__.py              |   1 +
 .../account__user_and_service_account_api.py  | 206 ++++++++-
 wavefront_api_client/api/usage_api.py         | 404 +++++++++++++++++-
 wavefront_api_client/api/user_api.py          |  12 +-
 wavefront_api_client/api/user_group_api.py    | 190 ++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 wavefront_api_client/models/account.py        |  30 +-
 .../models/ingestion_policy.py                | 205 ++++++++-
 .../models/ingestion_policy_mapping.py        |  39 +-
 wavefront_api_client/models/integration.py    |  59 ++-
 wavefront_api_client/models/proxy.py          |  30 +-
 .../models/response_container_user_dto.py     | 150 +++++++
 .../models/service_account.py                 |  30 +-
 .../models/service_account_write.py           |  30 +-
 wavefront_api_client/models/user_api_token.py |  93 +++-
 wavefront_api_client/models/user_dto.py       |  28 +-
 .../models/user_group_model.py                |  30 +-
 wavefront_api_client/models/user_model.py     |  28 +-
 .../models/user_request_dto.py                |  28 +-
 wavefront_api_client/models/user_to_create.py |  34 +-
 45 files changed, 2146 insertions(+), 64 deletions(-)
 create mode 100644 docs/ResponseContainerUserDTO.md
 create mode 100644 test/test_response_container_user_dto.py
 create mode 100644 wavefront_api_client/models/response_container_user_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f95d87d..4c41f0a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.116.3"
+    "packageVersion": "2.117.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index bc84ca2..f95d87d 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.111.0"
+    "packageVersion": "2.116.3"
 }
diff --git a/README.md b/README.md
index 70c6132..ab6c0b7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.116.3
+- Package version: 2.117.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -82,6 +82,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
+*AccountUserAndServiceAccountApi* | [**add_single_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_single_ingestion_policy) | **POST** /api/v2/account/addIngestionPolicy | Add single ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -100,6 +101,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
+*AccountUserAndServiceAccountApi* | [**remove_single_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#remove_single_ingestion_policy) | **POST** /api/v2/account/removeIngestionPolicy | Removes single ingestion policy from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -363,11 +365,15 @@ Class | Method | HTTP request | Description
 *SpanSamplingPolicyApi* | [**get_span_sampling_policy_version**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy_version) | **GET** /api/v2/spansamplingpolicy/{id}/history/{version} | Get a specific historical version of a specific sampling policy
 *SpanSamplingPolicyApi* | [**undelete_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#undelete_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy/{id}/undelete | Restore a deleted span sampling policy
 *SpanSamplingPolicyApi* | [**update_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#update_span_sampling_policy) | **PUT** /api/v2/spansamplingpolicy/{id} | Update a specific span sampling policy
+*UsageApi* | [**add_accounts**](docs/UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
+*UsageApi* | [**add_groups**](docs/UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 *UsageApi* | [**create_ingestion_policy**](docs/UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 *UsageApi* | [**delete_ingestion_policy**](docs/UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
+*UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 *UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific groups to the user or service account
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
@@ -384,12 +390,14 @@ Class | Method | HTTP request | Description
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 *UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
 *UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
+*UserGroupApi* | [**add_ingestion_policy**](docs/UserGroupApi.md#add_ingestion_policy) | **POST** /api/v2/usergroup/addIngestionPolicy | Add single ingestion policy to multiple groups
 *UserGroupApi* | [**add_roles_to_user_group**](docs/UserGroupApi.md#add_roles_to_user_group) | **POST** /api/v2/usergroup/{id}/addRoles | Add multiple roles to a specific user group
 *UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 *UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 *UserGroupApi* | [**delete_user_group**](docs/UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
 *UserGroupApi* | [**get_all_user_groups**](docs/UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
 *UserGroupApi* | [**get_user_group**](docs/UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
+*UserGroupApi* | [**remove_ingestion_policy**](docs/UserGroupApi.md#remove_ingestion_policy) | **POST** /api/v2/usergroup/removeIngestionPolicy | Removes single ingestion policy from multiple groups
 *UserGroupApi* | [**remove_roles_from_user_group**](docs/UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 *UserGroupApi* | [**remove_users_from_user_group**](docs/UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
 *UserGroupApi* | [**update_user_group**](docs/UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
@@ -598,6 +606,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
+ - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
diff --git a/docs/Account.md b/docs/Account.md
index cbe1c65..abca3c0 100644
--- a/docs/Account.md
+++ b/docs/Account.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **groups** | **list[str]** | The list of account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of an account. | 
+**ingestion_policies** | **list[str]** | The list of ingestion policies associated with the account. | [optional] 
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with account. | [optional] 
 **roles** | **list[str]** | The list of account&#39;s roles. | [optional] 
 **united_permissions** | **list[str]** | The list of account&#39;s permissions assigned directly or through united roles assigned to it | [optional] 
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index 005c671..dd8cf0a 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -8,6 +8,7 @@ Method | HTTP request | Description
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
 [**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
+[**add_single_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_single_ingestion_policy) | **POST** /api/v2/account/addIngestionPolicy | Add single ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -26,6 +27,7 @@ Method | HTTP request | Description
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 [**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
+[**remove_single_ingestion_policy**](AccountUserAndServiceAccountApi.md#remove_single_ingestion_policy) | **POST** /api/v2/account/removeIngestionPolicy | Removes single ingestion policy from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -222,7 +224,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ], }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
 
 try:
     # Add a specific ingestion policy to multiple accounts
@@ -236,7 +238,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ], }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -253,6 +255,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **add_single_ingestion_policy**
+> ResponseContainerUserDTO add_single_ingestion_policy(body=body)
+
+Add single ingestion policy to multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
+
+try:
+    # Add single ingestion policy to multiple accounts
+    api_response = api_instance.add_single_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->add_single_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserDTO**](ResponseContainerUserDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -277,7 +333,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre> (optional)
 
 try:
     # Creates or updates a user account
@@ -292,7 +348,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -1032,7 +1088,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre> (optional)
 
 try:
     # Invite user accounts with given user groups and permissions.
@@ -1046,7 +1102,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] } ]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -1229,6 +1285,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_single_ingestion_policy**
+> ResponseContainerUserDTO remove_single_ingestion_policy(body=body)
+
+Removes single ingestion policy from multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
+
+try:
+    # Removes single ingestion policy from multiple accounts
+    api_response = api_instance.remove_single_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->remove_single_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserDTO**](ResponseContainerUserDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
@@ -1421,7 +1531,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Update user with given user groups, permissions and ingestion policy.
@@ -1436,7 +1546,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policy_id\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/IngestionPolicy.md b/docs/IngestionPolicy.md
index 3cf9002..6864241 100644
--- a/docs/IngestionPolicy.md
+++ b/docs/IngestionPolicy.md
@@ -3,14 +3,21 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**account_count** | **int** | Total number of accounts that are linked to the ingestion policy | [optional] 
 **customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
 **description** | **str** | The description of the ingestion policy | [optional] 
+**group_count** | **int** | Total number of groups that are linked to the ingestion policy | [optional] 
 **id** | **str** | The unique ID for the ingestion policy | [optional] 
+**is_limited** | **bool** | Whether the ingestion policy is limited | [optional] 
 **last_updated_account_id** | **str** | The account that updated this ingestion policy last time | [optional] 
 **last_updated_ms** | **int** | The last time when the ingestion policy is updated, in epoch milliseconds | [optional] 
+**limit_pps** | **int** | The PPS limit of the ingestion policy | [optional] 
 **name** | **str** | The name of the ingestion policy | [optional] 
+**sampled_accounts** | **list[str]** | A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy | [optional] 
+**sampled_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy | [optional] 
 **sampled_service_accounts** | **list[str]** | A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy | [optional] 
 **sampled_user_accounts** | **list[str]** | A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy | [optional] 
+**scope** | **str** | The scope of the ingestion policy | [optional] 
 **service_account_count** | **int** | Total number of service accounts that are linked to the ingestion policy | [optional] 
 **user_account_count** | **int** | Total number of user accounts that are linked to the ingestion policy | [optional] 
 
diff --git a/docs/IngestionPolicyMapping.md b/docs/IngestionPolicyMapping.md
index 5be111e..24f5aff 100644
--- a/docs/IngestionPolicyMapping.md
+++ b/docs/IngestionPolicyMapping.md
@@ -3,7 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**accounts** | **list[str]** | The list of accounts that should be linked to the ingestion policy | 
+**accounts** | **list[str]** | The list of accounts that should be linked/unlinked to/from the ingestion policy | [optional] 
+**groups** | **list[str]** | The list of groups that should be linked/unlinked to/from the ingestion policy | [optional] 
 **ingestion_policy_id** | **str** | The unique identifier of the ingestion policy | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/Integration.md b/docs/Integration.md
index b2b792a..59f19f6 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -12,10 +12,12 @@ Name | Type | Description | Notes
 **dashboards** | [**list[IntegrationDashboard]**](IntegrationDashboard.md) | A list of dashboards belonging to this integration | [optional] 
 **deleted** | **bool** |  | [optional] 
 **description** | **str** | Integration description | 
+**have_metric_dropdown** | **bool** | Integration have metric dropdown or not | 
 **hidden** | **bool** | Integration is hidden or not | 
 **icon** | **str** | URI path to the integration icon | 
 **id** | **str** |  | [optional] 
 **metrics** | [**IntegrationMetrics**](IntegrationMetrics.md) |  | [optional] 
+**metrics_docs** | **str** | Metric Preview File Name | [optional] 
 **name** | **str** | Integration name | 
 **overview** | **str** | Descriptive text giving an overview of integration functionality | [optional] 
 **setup** | **str** | How the integration will be set-up | [optional] 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 8f90726..e2a52a9 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -15,6 +15,7 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
diff --git a/docs/ResponseContainerUserDTO.md b/docs/ResponseContainerUserDTO.md
new file mode 100644
index 0000000..aa42ad5
--- /dev/null
+++ b/docs/ResponseContainerUserDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerUserDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**UserDTO**](UserDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index 36fe554..a38980f 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | The list of service account&#39;s ingestion policies. | [optional] 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
diff --git a/docs/ServiceAccountWrite.md b/docs/ServiceAccountWrite.md
index fe657a4..c316703 100644
--- a/docs/ServiceAccountWrite.md
+++ b/docs/ServiceAccountWrite.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account to be created. | [optional] 
 **groups** | **list[str]** | The list of permissions, the service account will be granted. | [optional] 
 **identifier** | **str** | The unique identifier for a service account. | 
+**ingestion_policies** | **list[str]** | The list of ingestion policy ids, the service account will be added to.\&quot; | [optional] 
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with service account. | [optional] 
 **roles** | **list[str]** | The list of role ids, the service account will be added to.\&quot; | [optional] 
 **tokens** | **list[str]** | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 16270f1..42a07fb 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -4,14 +4,130 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_accounts**](UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
+[**add_groups**](UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 [**create_ingestion_policy**](UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 [**delete_ingestion_policy**](UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
+[**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
+# **add_accounts**
+> ResponseContainerIngestionPolicy add_accounts(id, body=body)
+
+Add accounts to ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
+
+try:
+    # Add accounts to ingestion policy
+    api_response = api_instance.add_accounts(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->add_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **add_groups**
+> ResponseContainerIngestionPolicy add_groups(id, body=body)
+
+Add groups to the ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be added to the ingestion policy (optional)
+
+try:
+    # Add groups to the ingestion policy
+    api_response = api_instance.add_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->add_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of groups to be added to the ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_ingestion_policy**
 > ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
 
@@ -35,7 +151,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -49,7 +165,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -285,6 +401,118 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_accounts**
+> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
+
+Remove accounts from ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
+
+try:
+    # Remove accounts from ingestion policy
+    api_response = api_instance.remove_accounts(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->remove_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_groups**
+> ResponseContainerIngestionPolicy remove_groups(id, body=body)
+
+Remove groups from the ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be removed from the ingestion policy (optional)
+
+try:
+    # Remove groups from the ingestion policy
+    api_response = api_instance.remove_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->remove_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of groups to be removed from the ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **update_ingestion_policy**
 > ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
 
@@ -309,7 +537,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -324,7 +552,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 6986b7a..0841885 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -101,7 +101,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre> (optional)
 
 try:
     # Creates an user if the user doesn't already exist.
@@ -116,7 +116,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -533,7 +533,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre> (optional)
 
 try:
     # Invite users with given user groups and permissions.
@@ -547,7 +547,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] } ]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -756,7 +756,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Update user with given user groups, permissions and ingestion policy.
@@ -771,7 +771,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicyId\&quot;: \&quot;ingestionPolicyId\&quot;,   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policy_id\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserApiToken.md b/docs/UserApiToken.md
index 1ca7be9..1c55cd3 100644
--- a/docs/UserApiToken.md
+++ b/docs/UserApiToken.md
@@ -3,6 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**account** | **str** | The account who generated this token. | [optional] 
+**account_type** | **str** | The user or service account generated this token. | [optional] 
+**date_generated** | **int** | The generation date of the token. | [optional] 
 **last_used** | **int** | The last time this token was used | [optional] 
 **token_id** | **str** | The identifier of the user API token | 
 **token_name** | **str** | The name of the user API token | [optional] 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index dddfbcd..d4ceba2 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 2c73a32..945cd0f 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -4,17 +4,73 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_ingestion_policy**](UserGroupApi.md#add_ingestion_policy) | **POST** /api/v2/usergroup/addIngestionPolicy | Add single ingestion policy to multiple groups
 [**add_roles_to_user_group**](UserGroupApi.md#add_roles_to_user_group) | **POST** /api/v2/usergroup/{id}/addRoles | Add multiple roles to a specific user group
 [**add_users_to_user_group**](UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 [**create_user_group**](UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 [**delete_user_group**](UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
 [**get_all_user_groups**](UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
 [**get_user_group**](UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
+[**remove_ingestion_policy**](UserGroupApi.md#remove_ingestion_policy) | **POST** /api/v2/usergroup/removeIngestionPolicy | Removes single ingestion policy from multiple groups
 [**remove_roles_from_user_group**](UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 [**remove_users_from_user_group**](UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
 [**update_user_group**](UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
 
 
+# **add_ingestion_policy**
+> ResponseContainerUserGroupModel add_ingestion_policy(body=body)
+
+Add single ingestion policy to multiple groups
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
+
+try:
+    # Add single ingestion policy to multiple groups
+    api_response = api_instance.add_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->add_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **add_roles_to_user_group**
 > ResponseContainerUserGroupModel add_roles_to_user_group(id, body=body)
 
@@ -345,6 +401,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_ingestion_policy**
+> ResponseContainerUserGroupModel remove_ingestion_policy(body=body)
+
+Removes single ingestion policy from multiple groups
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
+
+try:
+    # Removes single ingestion policy from multiple groups
+    api_response = api_instance.remove_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UserGroupApi->remove_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **remove_roles_from_user_group**
 > ResponseContainerUserGroupModel remove_roles_from_user_group(id, body=body)
 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index b8cfca6..2c61529 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 2357d00..657200c 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
 **ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
index 5fafe13..c10a83e 100644
--- a/docs/UserRequestDTO.md
+++ b/docs/UserRequestDTO.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
+**ingestion_policies** | **list[str]** |  | [optional] 
 **ingestion_policy_id** | **str** |  | [optional] 
 **roles** | **list[str]** |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserToCreate.md b/docs/UserToCreate.md
index 6befc0e..7f3069c 100644
--- a/docs/UserToCreate.md
+++ b/docs/UserToCreate.md
@@ -5,8 +5,9 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **email_address** | **str** | The (unique) identifier of the user to create. Must be a valid email address | 
 **groups** | **list[str]** | List of permission groups to grant to this user. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management | 
+**ingestion_policies** | **list[str]** | The list of ingestion policy ids, the user will be added to. | [optional] 
 **ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
-**roles** | **list[str]** | The list of role ids, the user will be added to.\&quot; | [optional] 
+**roles** | **list[str]** | The list of role ids, the user will be added to. | [optional] 
 **user_groups** | **list[str]** | List of user groups to this user.  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/setup.py b/setup.py
index 3dbcf2d..b512922 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.116.3"
+VERSION = "2.117.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_response_container_user_dto.py b/test/test_response_container_user_dto.py
new file mode 100644
index 0000000..f40e58a
--- /dev/null
+++ b/test/test_response_container_user_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerUserDTO(unittest.TestCase):
+    """ResponseContainerUserDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerUserDTO(self):
+        """Test ResponseContainerUserDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_user_dto.ResponseContainerUserDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 71899e6..459bca5 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -247,6 +247,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index e285a15..2f78d7f 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -348,7 +348,7 @@ def add_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ], }</pre>
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -370,7 +370,7 @@ def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ], }</pre>
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -433,6 +433,101 @@ def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def add_single_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Add single ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_single_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_single_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Add single ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_single_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_single_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/addIngestionPolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -444,7 +539,7 @@ def create_or_update_user_account(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -467,7 +562,7 @@ def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1785,7 +1880,7 @@ def invite_user_accounts(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1807,7 +1902,7 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2171,6 +2266,101 @@ def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_single_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Removes single ingestion policy from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_single_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_single_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes single ingestion policy from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_single_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_single_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/removeIngestionPolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
@@ -2495,7 +2685,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2518,7 +2708,7 @@ def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 81790ac..c6b67e8 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -33,6 +33,204 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_accounts(self, id, **kwargs):  # noqa: E501
+        """Add accounts to ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_accounts(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add accounts to ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_accounts_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `add_accounts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/addAccounts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def add_groups(self, id, **kwargs):  # noqa: E501
+        """Add groups to the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be added to the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add groups to the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be added to the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `add_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/addGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_ingestion_policy(self, **kwargs):  # noqa: E501
         """Create a specific ingestion policy  # noqa: E501
 
@@ -43,7 +241,7 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
         :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
@@ -65,7 +263,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
         :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
@@ -512,6 +710,204 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_accounts(self, id, **kwargs):  # noqa: E501
+        """Remove accounts from ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_accounts(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove accounts from ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_accounts_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `remove_accounts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/removeAccounts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_groups(self, id, **kwargs):  # noqa: E501
+        """Remove groups from the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be removed from the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove groups from the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be removed from the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `remove_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/removeGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
         """Update a specific ingestion policy  # noqa: E501
 
@@ -523,7 +919,7 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
         :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
@@ -546,7 +942,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\" }</pre>
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
         :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index d25d2e2..53a57ca 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -147,7 +147,7 @@ def create_user(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -170,7 +170,7 @@ def create_user_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -918,7 +918,7 @@ def invite_users(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -940,7 +940,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1323,7 +1323,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1346,7 +1346,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicyId\": \"ingestionPolicyId\",   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index 6106cee..f66cb7c 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -33,6 +33,101 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Add single ingestion policy to multiple groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserGroupModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Add single ingestion policy to multiple groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserGroupModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/addIngestionPolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
@@ -619,6 +714,101 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Removes single ingestion policy from multiple groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserGroupModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes single ingestion policy from multiple groups  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainerUserGroupModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usergroup/removeIngestionPolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserGroupModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index fa8cd51..f4a9a63 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.116.3/python'
+        self.user_agent = 'Swagger-Codegen/2.117.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 63ce424..d3273dc 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.116.3".\
+               "SDK Package Version: 2.117.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 1a73a7a..70245ad 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -211,6 +211,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index 0c82d06..d952793 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -35,6 +35,7 @@ class Account(object):
     swagger_types = {
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policies': 'list[str]',
         'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'united_permissions': 'list[str]',
@@ -45,6 +46,7 @@ class Account(object):
     attribute_map = {
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'united_permissions': 'unitedPermissions',
@@ -52,7 +54,7 @@ class Account(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, roles=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, groups=None, identifier=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """Account - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -60,6 +62,7 @@ def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, roles
 
         self._groups = None
         self._identifier = None
+        self._ingestion_policies = None
         self._ingestion_policy_id = None
         self._roles = None
         self._united_permissions = None
@@ -70,6 +73,8 @@ def __init__(self, groups=None, identifier=None, ingestion_policy_id=None, roles
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
@@ -129,6 +134,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this Account.  # noqa: E501
+
+        The list of ingestion policies associated with the account.  # noqa: E501
+
+        :return: The ingestion_policies of this Account.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this Account.
+
+        The list of ingestion policies associated with the account.  # noqa: E501
+
+        :param ingestion_policies: The ingestion_policies of this Account.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy_id(self):
         """Gets the ingestion_policy_id of this Account.  # noqa: E501
diff --git a/wavefront_api_client/models/ingestion_policy.py b/wavefront_api_client/models/ingestion_policy.py
index 8727239..6f62e0f 100644
--- a/wavefront_api_client/models/ingestion_policy.py
+++ b/wavefront_api_client/models/ingestion_policy.py
@@ -33,70 +33,128 @@ class IngestionPolicy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'account_count': 'int',
         'customer': 'str',
         'description': 'str',
+        'group_count': 'int',
         'id': 'str',
+        'is_limited': 'bool',
         'last_updated_account_id': 'str',
         'last_updated_ms': 'int',
+        'limit_pps': 'int',
         'name': 'str',
+        'sampled_accounts': 'list[str]',
+        'sampled_groups': 'list[UserGroup]',
         'sampled_service_accounts': 'list[str]',
         'sampled_user_accounts': 'list[str]',
+        'scope': 'str',
         'service_account_count': 'int',
         'user_account_count': 'int'
     }
 
     attribute_map = {
+        'account_count': 'accountCount',
         'customer': 'customer',
         'description': 'description',
+        'group_count': 'groupCount',
         'id': 'id',
+        'is_limited': 'isLimited',
         'last_updated_account_id': 'lastUpdatedAccountId',
         'last_updated_ms': 'lastUpdatedMs',
+        'limit_pps': 'limitPPS',
         'name': 'name',
+        'sampled_accounts': 'sampledAccounts',
+        'sampled_groups': 'sampledGroups',
         'sampled_service_accounts': 'sampledServiceAccounts',
         'sampled_user_accounts': 'sampledUserAccounts',
+        'scope': 'scope',
         'service_account_count': 'serviceAccountCount',
         'user_account_count': 'userAccountCount'
     }
 
-    def __init__(self, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, name=None, sampled_service_accounts=None, sampled_user_accounts=None, service_account_count=None, user_account_count=None, _configuration=None):  # noqa: E501
+    def __init__(self, account_count=None, customer=None, description=None, group_count=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, sampled_accounts=None, sampled_groups=None, sampled_service_accounts=None, sampled_user_accounts=None, scope=None, service_account_count=None, user_account_count=None, _configuration=None):  # noqa: E501
         """IngestionPolicy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._account_count = None
         self._customer = None
         self._description = None
+        self._group_count = None
         self._id = None
+        self._is_limited = None
         self._last_updated_account_id = None
         self._last_updated_ms = None
+        self._limit_pps = None
         self._name = None
+        self._sampled_accounts = None
+        self._sampled_groups = None
         self._sampled_service_accounts = None
         self._sampled_user_accounts = None
+        self._scope = None
         self._service_account_count = None
         self._user_account_count = None
         self.discriminator = None
 
+        if account_count is not None:
+            self.account_count = account_count
         if customer is not None:
             self.customer = customer
         if description is not None:
             self.description = description
+        if group_count is not None:
+            self.group_count = group_count
         if id is not None:
             self.id = id
+        if is_limited is not None:
+            self.is_limited = is_limited
         if last_updated_account_id is not None:
             self.last_updated_account_id = last_updated_account_id
         if last_updated_ms is not None:
             self.last_updated_ms = last_updated_ms
+        if limit_pps is not None:
+            self.limit_pps = limit_pps
         if name is not None:
             self.name = name
+        if sampled_accounts is not None:
+            self.sampled_accounts = sampled_accounts
+        if sampled_groups is not None:
+            self.sampled_groups = sampled_groups
         if sampled_service_accounts is not None:
             self.sampled_service_accounts = sampled_service_accounts
         if sampled_user_accounts is not None:
             self.sampled_user_accounts = sampled_user_accounts
+        if scope is not None:
+            self.scope = scope
         if service_account_count is not None:
             self.service_account_count = service_account_count
         if user_account_count is not None:
             self.user_account_count = user_account_count
 
+    @property
+    def account_count(self):
+        """Gets the account_count of this IngestionPolicy.  # noqa: E501
+
+        Total number of accounts that are linked to the ingestion policy  # noqa: E501
+
+        :return: The account_count of this IngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._account_count
+
+    @account_count.setter
+    def account_count(self, account_count):
+        """Sets the account_count of this IngestionPolicy.
+
+        Total number of accounts that are linked to the ingestion policy  # noqa: E501
+
+        :param account_count: The account_count of this IngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._account_count = account_count
+
     @property
     def customer(self):
         """Gets the customer of this IngestionPolicy.  # noqa: E501
@@ -143,6 +201,29 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def group_count(self):
+        """Gets the group_count of this IngestionPolicy.  # noqa: E501
+
+        Total number of groups that are linked to the ingestion policy  # noqa: E501
+
+        :return: The group_count of this IngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._group_count
+
+    @group_count.setter
+    def group_count(self, group_count):
+        """Sets the group_count of this IngestionPolicy.
+
+        Total number of groups that are linked to the ingestion policy  # noqa: E501
+
+        :param group_count: The group_count of this IngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._group_count = group_count
+
     @property
     def id(self):
         """Gets the id of this IngestionPolicy.  # noqa: E501
@@ -166,6 +247,29 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def is_limited(self):
+        """Gets the is_limited of this IngestionPolicy.  # noqa: E501
+
+        Whether the ingestion policy is limited  # noqa: E501
+
+        :return: The is_limited of this IngestionPolicy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_limited
+
+    @is_limited.setter
+    def is_limited(self, is_limited):
+        """Sets the is_limited of this IngestionPolicy.
+
+        Whether the ingestion policy is limited  # noqa: E501
+
+        :param is_limited: The is_limited of this IngestionPolicy.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_limited = is_limited
+
     @property
     def last_updated_account_id(self):
         """Gets the last_updated_account_id of this IngestionPolicy.  # noqa: E501
@@ -212,6 +316,29 @@ def last_updated_ms(self, last_updated_ms):
 
         self._last_updated_ms = last_updated_ms
 
+    @property
+    def limit_pps(self):
+        """Gets the limit_pps of this IngestionPolicy.  # noqa: E501
+
+        The PPS limit of the ingestion policy  # noqa: E501
+
+        :return: The limit_pps of this IngestionPolicy.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit_pps
+
+    @limit_pps.setter
+    def limit_pps(self, limit_pps):
+        """Sets the limit_pps of this IngestionPolicy.
+
+        The PPS limit of the ingestion policy  # noqa: E501
+
+        :param limit_pps: The limit_pps of this IngestionPolicy.  # noqa: E501
+        :type: int
+        """
+
+        self._limit_pps = limit_pps
+
     @property
     def name(self):
         """Gets the name of this IngestionPolicy.  # noqa: E501
@@ -235,6 +362,52 @@ def name(self, name):
 
         self._name = name
 
+    @property
+    def sampled_accounts(self):
+        """Gets the sampled_accounts of this IngestionPolicy.  # noqa: E501
+
+        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
+
+        :return: The sampled_accounts of this IngestionPolicy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sampled_accounts
+
+    @sampled_accounts.setter
+    def sampled_accounts(self, sampled_accounts):
+        """Sets the sampled_accounts of this IngestionPolicy.
+
+        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
+
+        :param sampled_accounts: The sampled_accounts of this IngestionPolicy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sampled_accounts = sampled_accounts
+
+    @property
+    def sampled_groups(self):
+        """Gets the sampled_groups of this IngestionPolicy.  # noqa: E501
+
+        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
+
+        :return: The sampled_groups of this IngestionPolicy.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._sampled_groups
+
+    @sampled_groups.setter
+    def sampled_groups(self, sampled_groups):
+        """Sets the sampled_groups of this IngestionPolicy.
+
+        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
+
+        :param sampled_groups: The sampled_groups of this IngestionPolicy.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._sampled_groups = sampled_groups
+
     @property
     def sampled_service_accounts(self):
         """Gets the sampled_service_accounts of this IngestionPolicy.  # noqa: E501
@@ -281,6 +454,36 @@ def sampled_user_accounts(self, sampled_user_accounts):
 
         self._sampled_user_accounts = sampled_user_accounts
 
+    @property
+    def scope(self):
+        """Gets the scope of this IngestionPolicy.  # noqa: E501
+
+        The scope of the ingestion policy  # noqa: E501
+
+        :return: The scope of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this IngestionPolicy.
+
+        The scope of the ingestion policy  # noqa: E501
+
+        :param scope: The scope of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ACCOUNT", "GROUP"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                scope not in allowed_values):
+            raise ValueError(
+                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
+                .format(scope, allowed_values)
+            )
+
+        self._scope = scope
+
     @property
     def service_account_count(self):
         """Gets the service_account_count of this IngestionPolicy.  # noqa: E501
diff --git a/wavefront_api_client/models/ingestion_policy_mapping.py b/wavefront_api_client/models/ingestion_policy_mapping.py
index e715594..1135fb5 100644
--- a/wavefront_api_client/models/ingestion_policy_mapping.py
+++ b/wavefront_api_client/models/ingestion_policy_mapping.py
@@ -34,32 +34,38 @@ class IngestionPolicyMapping(object):
     """
     swagger_types = {
         'accounts': 'list[str]',
+        'groups': 'list[str]',
         'ingestion_policy_id': 'str'
     }
 
     attribute_map = {
         'accounts': 'accounts',
+        'groups': 'groups',
         'ingestion_policy_id': 'ingestionPolicyId'
     }
 
-    def __init__(self, accounts=None, ingestion_policy_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, accounts=None, groups=None, ingestion_policy_id=None, _configuration=None):  # noqa: E501
         """IngestionPolicyMapping - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._accounts = None
+        self._groups = None
         self._ingestion_policy_id = None
         self.discriminator = None
 
-        self.accounts = accounts
+        if accounts is not None:
+            self.accounts = accounts
+        if groups is not None:
+            self.groups = groups
         self.ingestion_policy_id = ingestion_policy_id
 
     @property
     def accounts(self):
         """Gets the accounts of this IngestionPolicyMapping.  # noqa: E501
 
-        The list of accounts that should be linked to the ingestion policy  # noqa: E501
+        The list of accounts that should be linked/unlinked to/from the ingestion policy  # noqa: E501
 
         :return: The accounts of this IngestionPolicyMapping.  # noqa: E501
         :rtype: list[str]
@@ -70,16 +76,37 @@ def accounts(self):
     def accounts(self, accounts):
         """Sets the accounts of this IngestionPolicyMapping.
 
-        The list of accounts that should be linked to the ingestion policy  # noqa: E501
+        The list of accounts that should be linked/unlinked to/from the ingestion policy  # noqa: E501
 
         :param accounts: The accounts of this IngestionPolicyMapping.  # noqa: E501
         :type: list[str]
         """
-        if self._configuration.client_side_validation and accounts is None:
-            raise ValueError("Invalid value for `accounts`, must not be `None`")  # noqa: E501
 
         self._accounts = accounts
 
+    @property
+    def groups(self):
+        """Gets the groups of this IngestionPolicyMapping.  # noqa: E501
+
+        The list of groups that should be linked/unlinked to/from the ingestion policy  # noqa: E501
+
+        :return: The groups of this IngestionPolicyMapping.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this IngestionPolicyMapping.
+
+        The list of groups that should be linked/unlinked to/from the ingestion policy  # noqa: E501
+
+        :param groups: The groups of this IngestionPolicyMapping.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
     @property
     def ingestion_policy_id(self):
         """Gets the ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 8ddb96a..ef5d454 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -42,10 +42,12 @@ class Integration(object):
         'dashboards': 'list[IntegrationDashboard]',
         'deleted': 'bool',
         'description': 'str',
+        'have_metric_dropdown': 'bool',
         'hidden': 'bool',
         'icon': 'str',
         'id': 'str',
         'metrics': 'IntegrationMetrics',
+        'metrics_docs': 'str',
         'name': 'str',
         'overview': 'str',
         'setup': 'str',
@@ -65,10 +67,12 @@ class Integration(object):
         'dashboards': 'dashboards',
         'deleted': 'deleted',
         'description': 'description',
+        'have_metric_dropdown': 'haveMetricDropdown',
         'hidden': 'hidden',
         'icon': 'icon',
         'id': 'id',
         'metrics': 'metrics',
+        'metrics_docs': 'metricsDocs',
         'name': 'name',
         'overview': 'overview',
         'setup': 'setup',
@@ -78,7 +82,7 @@ class Integration(object):
         'version': 'version'
     }
 
-    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, hidden=None, icon=None, id=None, metrics=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, have_metric_dropdown=None, hidden=None, icon=None, id=None, metrics=None, metrics_docs=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None, _configuration=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -93,10 +97,12 @@ def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url
         self._dashboards = None
         self._deleted = None
         self._description = None
+        self._have_metric_dropdown = None
         self._hidden = None
         self._icon = None
         self._id = None
         self._metrics = None
+        self._metrics_docs = None
         self._name = None
         self._overview = None
         self._setup = None
@@ -123,12 +129,15 @@ def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url
         if deleted is not None:
             self.deleted = deleted
         self.description = description
+        self.have_metric_dropdown = have_metric_dropdown
         self.hidden = hidden
         self.icon = icon
         if id is not None:
             self.id = id
         if metrics is not None:
             self.metrics = metrics
+        if metrics_docs is not None:
+            self.metrics_docs = metrics_docs
         self.name = name
         if overview is not None:
             self.overview = overview
@@ -345,6 +354,31 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def have_metric_dropdown(self):
+        """Gets the have_metric_dropdown of this Integration.  # noqa: E501
+
+        Integration have metric dropdown or not  # noqa: E501
+
+        :return: The have_metric_dropdown of this Integration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._have_metric_dropdown
+
+    @have_metric_dropdown.setter
+    def have_metric_dropdown(self, have_metric_dropdown):
+        """Sets the have_metric_dropdown of this Integration.
+
+        Integration have metric dropdown or not  # noqa: E501
+
+        :param have_metric_dropdown: The have_metric_dropdown of this Integration.  # noqa: E501
+        :type: bool
+        """
+        if self._configuration.client_side_validation and have_metric_dropdown is None:
+            raise ValueError("Invalid value for `have_metric_dropdown`, must not be `None`")  # noqa: E501
+
+        self._have_metric_dropdown = have_metric_dropdown
+
     @property
     def hidden(self):
         """Gets the hidden of this Integration.  # noqa: E501
@@ -437,6 +471,29 @@ def metrics(self, metrics):
 
         self._metrics = metrics
 
+    @property
+    def metrics_docs(self):
+        """Gets the metrics_docs of this Integration.  # noqa: E501
+
+        Metric Preview File Name  # noqa: E501
+
+        :return: The metrics_docs of this Integration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metrics_docs
+
+    @metrics_docs.setter
+    def metrics_docs(self, metrics_docs):
+        """Sets the metrics_docs of this Integration.
+
+        Metric Preview File Name  # noqa: E501
+
+        :param metrics_docs: The metrics_docs of this Integration.  # noqa: E501
+        :type: str
+        """
+
+        self._metrics_docs = metrics_docs
+
     @property
     def name(self):
         """Gets the name of this Integration.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index e853862..9540eb9 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -45,6 +45,7 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'ingestion_policy': 'IngestionPolicy',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
@@ -78,6 +79,7 @@ class Proxy(object):
         'hostname': 'hostname',
         'id': 'id',
         'in_trash': 'inTrash',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy': 'ingestionPolicy',
         'last_check_in_time': 'lastCheckInTime',
         'last_error_event': 'lastErrorEvent',
@@ -98,7 +100,7 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None, _configuration=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -116,6 +118,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._hostname = None
         self._id = None
         self._in_trash = None
+        self._ingestion_policies = None
         self._ingestion_policy = None
         self._last_check_in_time = None
         self._last_error_event = None
@@ -160,6 +163,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.id = id
         if in_trash is not None:
             self.in_trash = in_trash
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy is not None:
             self.ingestion_policy = ingestion_policy
         if last_check_in_time is not None:
@@ -464,6 +469,29 @@ def in_trash(self, in_trash):
 
         self._in_trash = in_trash
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this Proxy.  # noqa: E501
+
+        Ingestion policies associated with the proxy through user and groups  # noqa: E501
+
+        :return: The ingestion_policies of this Proxy.  # noqa: E501
+        :rtype: list[IngestionPolicy]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this Proxy.
+
+        Ingestion policies associated with the proxy through user and groups  # noqa: E501
+
+        :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
+        :type: list[IngestionPolicy]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy(self):
         """Gets the ingestion_policy of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_user_dto.py b/wavefront_api_client/models/response_container_user_dto.py
new file mode 100644
index 0000000..b0429df
--- /dev/null
+++ b/wavefront_api_client/models/response_container_user_dto.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerUserDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'UserDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerUserDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerUserDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerUserDTO.  # noqa: E501
+        :rtype: UserDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerUserDTO.
+
+
+        :param response: The response of this ResponseContainerUserDTO.  # noqa: E501
+        :type: UserDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerUserDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerUserDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerUserDTO.
+
+
+        :param status: The status of this ResponseContainerUserDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerUserDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerUserDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerUserDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index 371e1c1..10c3027 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,6 +37,7 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'ingestion_policy': 'IngestionPolicy',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
@@ -51,6 +52,7 @@ class ServiceAccount(object):
         'description': 'description',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy': 'ingestionPolicy',
         'last_used': 'lastUsed',
         'roles': 'roles',
@@ -60,7 +62,7 @@ class ServiceAccount(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """ServiceAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -70,6 +72,7 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self._description = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policies = None
         self._ingestion_policy = None
         self._last_used = None
         self._roles = None
@@ -85,6 +88,8 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy is not None:
             self.ingestion_policy = ingestion_policy
         if last_used is not None:
@@ -196,6 +201,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this ServiceAccount.  # noqa: E501
+
+        The list of service account's ingestion policies.  # noqa: E501
+
+        :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
+        :rtype: list[IngestionPolicy]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this ServiceAccount.
+
+        The list of service account's ingestion policies.  # noqa: E501
+
+        :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
+        :type: list[IngestionPolicy]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy(self):
         """Gets the ingestion_policy of this ServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index f39e1ce..4d49253 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -37,6 +37,7 @@ class ServiceAccountWrite(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policies': 'list[str]',
         'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'tokens': 'list[str]',
@@ -48,13 +49,14 @@ class ServiceAccountWrite(object):
         'description': 'description',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'tokens': 'tokens',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, tokens=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, tokens=None, user_groups=None, _configuration=None):  # noqa: E501
         """ServiceAccountWrite - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -64,6 +66,7 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self._description = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policies = None
         self._ingestion_policy_id = None
         self._roles = None
         self._tokens = None
@@ -77,6 +80,8 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
@@ -180,6 +185,29 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this ServiceAccountWrite.  # noqa: E501
+
+        The list of ingestion policy ids, the service account will be added to.\"  # noqa: E501
+
+        :return: The ingestion_policies of this ServiceAccountWrite.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this ServiceAccountWrite.
+
+        The list of ingestion policy ids, the service account will be added to.\"  # noqa: E501
+
+        :param ingestion_policies: The ingestion_policies of this ServiceAccountWrite.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy_id(self):
         """Gets the ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index d9ea1b0..ff38752 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -33,34 +33,125 @@ class UserApiToken(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'account': 'str',
+        'account_type': 'str',
+        'date_generated': 'int',
         'last_used': 'int',
         'token_id': 'str',
         'token_name': 'str'
     }
 
     attribute_map = {
+        'account': 'account',
+        'account_type': 'accountType',
+        'date_generated': 'dateGenerated',
         'last_used': 'lastUsed',
         'token_id': 'tokenID',
         'token_name': 'tokenName'
     }
 
-    def __init__(self, last_used=None, token_id=None, token_name=None, _configuration=None):  # noqa: E501
+    def __init__(self, account=None, account_type=None, date_generated=None, last_used=None, token_id=None, token_name=None, _configuration=None):  # noqa: E501
         """UserApiToken - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._account = None
+        self._account_type = None
+        self._date_generated = None
         self._last_used = None
         self._token_id = None
         self._token_name = None
         self.discriminator = None
 
+        if account is not None:
+            self.account = account
+        if account_type is not None:
+            self.account_type = account_type
+        if date_generated is not None:
+            self.date_generated = date_generated
         if last_used is not None:
             self.last_used = last_used
         self.token_id = token_id
         if token_name is not None:
             self.token_name = token_name
 
+    @property
+    def account(self):
+        """Gets the account of this UserApiToken.  # noqa: E501
+
+        The account who generated this token.  # noqa: E501
+
+        :return: The account of this UserApiToken.  # noqa: E501
+        :rtype: str
+        """
+        return self._account
+
+    @account.setter
+    def account(self, account):
+        """Sets the account of this UserApiToken.
+
+        The account who generated this token.  # noqa: E501
+
+        :param account: The account of this UserApiToken.  # noqa: E501
+        :type: str
+        """
+
+        self._account = account
+
+    @property
+    def account_type(self):
+        """Gets the account_type of this UserApiToken.  # noqa: E501
+
+        The user or service account generated this token.  # noqa: E501
+
+        :return: The account_type of this UserApiToken.  # noqa: E501
+        :rtype: str
+        """
+        return self._account_type
+
+    @account_type.setter
+    def account_type(self, account_type):
+        """Sets the account_type of this UserApiToken.
+
+        The user or service account generated this token.  # noqa: E501
+
+        :param account_type: The account_type of this UserApiToken.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                account_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `account_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(account_type, allowed_values)
+            )
+
+        self._account_type = account_type
+
+    @property
+    def date_generated(self):
+        """Gets the date_generated of this UserApiToken.  # noqa: E501
+
+        The generation date of the token.  # noqa: E501
+
+        :return: The date_generated of this UserApiToken.  # noqa: E501
+        :rtype: int
+        """
+        return self._date_generated
+
+    @date_generated.setter
+    def date_generated(self, date_generated):
+        """Sets the date_generated of this UserApiToken.
+
+        The generation date of the token.  # noqa: E501
+
+        :param date_generated: The date_generated of this UserApiToken.  # noqa: E501
+        :type: int
+        """
+
+        self._date_generated = date_generated
+
     @property
     def last_used(self):
         """Gets the last_used of this UserApiToken.  # noqa: E501
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 47eaa9b..86035d4 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,6 +36,7 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
@@ -47,6 +48,7 @@ class UserDTO(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
         'roles': 'roles',
@@ -54,7 +56,7 @@ class UserDTO(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -63,6 +65,7 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
         self._customer = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policies = None
         self._ingestion_policy = None
         self._last_successful_login = None
         self._roles = None
@@ -76,6 +79,8 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy is not None:
             self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
@@ -150,6 +155,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this UserDTO.  # noqa: E501
+
+
+        :return: The ingestion_policies of this UserDTO.  # noqa: E501
+        :rtype: list[IngestionPolicy]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this UserDTO.
+
+
+        :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
+        :type: list[IngestionPolicy]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy(self):
         """Gets the ingestion_policy of this UserDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 26601e7..00ecf80 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,6 +37,7 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -50,6 +51,7 @@ class UserGroupModel(object):
         'customer': 'customer',
         'description': 'description',
         'id': 'id',
+        'ingestion_policies': 'ingestionPolicies',
         'name': 'name',
         'properties': 'properties',
         'role_count': 'roleCount',
@@ -58,7 +60,7 @@ class UserGroupModel(object):
         'users': 'users'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, ingestion_policies=None, name=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
         """UserGroupModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -68,6 +70,7 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._customer = None
         self._description = None
         self._id = None
+        self._ingestion_policies = None
         self._name = None
         self._properties = None
         self._role_count = None
@@ -84,6 +87,8 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
             self.description = description
         if id is not None:
             self.id = id
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         self.name = name
         if properties is not None:
             self.properties = properties
@@ -186,6 +191,29 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this UserGroupModel.  # noqa: E501
+
+        Ingestion policies linked with the user group  # noqa: E501
+
+        :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
+        :rtype: list[IngestionPolicy]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this UserGroupModel.
+
+        Ingestion policies linked with the user group  # noqa: E501
+
+        :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
+        :type: list[IngestionPolicy]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def name(self):
         """Gets the name of this UserGroupModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 08e07bc..3502332 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,6 +36,7 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
@@ -47,6 +48,7 @@ class UserModel(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
         'roles': 'roles',
@@ -54,7 +56,7 @@ class UserModel(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -63,6 +65,7 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
         self._customer = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policies = None
         self._ingestion_policy = None
         self._last_successful_login = None
         self._roles = None
@@ -73,6 +76,8 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_policy
         self.customer = customer
         self.groups = groups
         self.identifier = identifier
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy is not None:
             self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
@@ -158,6 +163,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this UserModel.  # noqa: E501
+
+
+        :return: The ingestion_policies of this UserModel.  # noqa: E501
+        :rtype: list[IngestionPolicy]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this UserModel.
+
+
+        :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
+        :type: list[IngestionPolicy]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy(self):
         """Gets the ingestion_policy of this UserModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 258312b..a153295 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -37,6 +37,7 @@ class UserRequestDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
+        'ingestion_policies': 'list[str]',
         'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'sso_id': 'str',
@@ -48,13 +49,14 @@ class UserRequestDTO(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policy_id=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -64,6 +66,7 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
         self._customer = None
         self._groups = None
         self._identifier = None
+        self._ingestion_policies = None
         self._ingestion_policy_id = None
         self._roles = None
         self._sso_id = None
@@ -78,6 +81,8 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
@@ -171,6 +176,27 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this UserRequestDTO.  # noqa: E501
+
+
+        :return: The ingestion_policies of this UserRequestDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this UserRequestDTO.
+
+
+        :param ingestion_policies: The ingestion_policies of this UserRequestDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy_id(self):
         """Gets the ingestion_policy_id of this UserRequestDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index f25dc2e..f56ba4c 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -35,6 +35,7 @@ class UserToCreate(object):
     swagger_types = {
         'email_address': 'str',
         'groups': 'list[str]',
+        'ingestion_policies': 'list[str]',
         'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'user_groups': 'list[str]'
@@ -43,12 +44,13 @@ class UserToCreate(object):
     attribute_map = {
         'email_address': 'emailAddress',
         'groups': 'groups',
+        'ingestion_policies': 'ingestionPolicies',
         'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, email_address=None, groups=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserToCreate - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -56,6 +58,7 @@ def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, ro
 
         self._email_address = None
         self._groups = None
+        self._ingestion_policies = None
         self._ingestion_policy_id = None
         self._roles = None
         self._user_groups = None
@@ -63,6 +66,8 @@ def __init__(self, email_address=None, groups=None, ingestion_policy_id=None, ro
 
         self.email_address = email_address
         self.groups = groups
+        if ingestion_policies is not None:
+            self.ingestion_policies = ingestion_policies
         if ingestion_policy_id is not None:
             self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
@@ -119,6 +124,29 @@ def groups(self, groups):
 
         self._groups = groups
 
+    @property
+    def ingestion_policies(self):
+        """Gets the ingestion_policies of this UserToCreate.  # noqa: E501
+
+        The list of ingestion policy ids, the user will be added to.  # noqa: E501
+
+        :return: The ingestion_policies of this UserToCreate.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._ingestion_policies
+
+    @ingestion_policies.setter
+    def ingestion_policies(self, ingestion_policies):
+        """Sets the ingestion_policies of this UserToCreate.
+
+        The list of ingestion policy ids, the user will be added to.  # noqa: E501
+
+        :param ingestion_policies: The ingestion_policies of this UserToCreate.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._ingestion_policies = ingestion_policies
+
     @property
     def ingestion_policy_id(self):
         """Gets the ingestion_policy_id of this UserToCreate.  # noqa: E501
@@ -146,7 +174,7 @@ def ingestion_policy_id(self, ingestion_policy_id):
     def roles(self):
         """Gets the roles of this UserToCreate.  # noqa: E501
 
-        The list of role ids, the user will be added to.\"  # noqa: E501
+        The list of role ids, the user will be added to.  # noqa: E501
 
         :return: The roles of this UserToCreate.  # noqa: E501
         :rtype: list[str]
@@ -157,7 +185,7 @@ def roles(self):
     def roles(self, roles):
         """Sets the roles of this UserToCreate.
 
-        The list of role ids, the user will be added to.\"  # noqa: E501
+        The list of role ids, the user will be added to.  # noqa: E501
 
         :param roles: The roles of this UserToCreate.  # noqa: E501
         :type: list[str]

From cbb2b23aa2af89f469275f2c55321c062aad598e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 20 Jan 2022 08:16:31 -0800
Subject: [PATCH 100/161] Autogenerated Update v2.118.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/Alert.md                                 |   3 +
 docs/CloudIntegration.md                      |   1 +
 docs/Proxy.md                                 |   1 +
 docs/SnowflakeConfiguration.md                |  15 +
 setup.py                                      |   2 +-
 test/test_snowflake_configuration.py          |  40 +++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 wavefront_api_client/models/alert.py          |  86 +++++-
 .../models/cloud_integration.py               |  30 +-
 wavefront_api_client/models/proxy.py          |  30 +-
 .../models/snowflake_configuration.py         | 268 ++++++++++++++++++
 17 files changed, 479 insertions(+), 10 deletions(-)
 create mode 100644 docs/SnowflakeConfiguration.md
 create mode 100644 test/test_snowflake_configuration.py
 create mode 100644 wavefront_api_client/models/snowflake_configuration.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 4c41f0a..886df50 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.117.1"
+    "packageVersion": "2.118.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f95d87d..4c41f0a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.116.3"
+    "packageVersion": "2.117.1"
 }
diff --git a/README.md b/README.md
index ab6c0b7..45447ee 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.117.1
+- Package version: 2.118.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -617,6 +617,7 @@ Class | Method | HTTP request | Description
  - [SearchQuery](docs/SearchQuery.md)
  - [ServiceAccount](docs/ServiceAccount.md)
  - [ServiceAccountWrite](docs/ServiceAccountWrite.md)
+ - [SnowflakeConfiguration](docs/SnowflakeConfiguration.md)
  - [SortableSearchRequest](docs/SortableSearchRequest.md)
  - [Sorting](docs/Sorting.md)
  - [Source](docs/Source.md)
diff --git a/docs/Alert.md b/docs/Alert.md
index 833f31b..fe6c28c 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -6,6 +6,9 @@ Name | Type | Description | Notes
 **acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
 **active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
 **additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
+**alert_chart_base** | **int** | The base of alert chart. A linear chart will have base as 1, while a logarithmic chart will have the other base value. | [optional] 
+**alert_chart_description** | **str** | The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart. | [optional] 
+**alert_chart_units** | **str** | The y-axis unit of Alert chart. | [optional] 
 **alert_sources** | [**list[AlertSource]**](AlertSource.md) | A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION. | [optional] 
 **alert_triage_dashboards** | [**list[AlertDashboard]**](AlertDashboard.md) | User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported | [optional] 
 **alert_type** | **str** | Alert type. | [optional] 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 7cccb9f..f7a9ff1 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -31,6 +31,7 @@ Name | Type | Description | Notes
 **reuse_external_id_credential** | **str** |  | [optional] 
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
 **service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
+**snowflake** | [**SnowflakeConfiguration**](SnowflakeConfiguration.md) |  | [optional] 
 **tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index e2a52a9..0f57bd3 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -32,6 +32,7 @@ Name | Type | Description | Notes
 **status** | **str** | the proxy&#39;s status | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
 **time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
+**truncate** | **bool** | When true, attempt to truncate down this proxy backlog remotely | [optional] 
 **user_id** | **str** | The user associated with this proxy | [optional] 
 **version** | **str** |  | [optional] 
 
diff --git a/docs/SnowflakeConfiguration.md b/docs/SnowflakeConfiguration.md
new file mode 100644
index 0000000..db5c305
--- /dev/null
+++ b/docs/SnowflakeConfiguration.md
@@ -0,0 +1,15 @@
+# SnowflakeConfiguration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**account_id** | **str** | Snowflake AccountID | 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+**password** | **str** | Snowflake Password | 
+**role** | **str** | Role to be used while querying snowflake database | [optional] 
+**user_name** | **str** | Snowflake Username | 
+**warehouse** | **str** | Warehouse to be used while querying snowflake database | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index b512922..ef16a8d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.117.1"
+VERSION = "2.118.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_snowflake_configuration.py b/test/test_snowflake_configuration.py
new file mode 100644
index 0000000..526f5af
--- /dev/null
+++ b/test/test_snowflake_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.snowflake_configuration import SnowflakeConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSnowflakeConfiguration(unittest.TestCase):
+    """SnowflakeConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSnowflakeConfiguration(self):
+        """Test SnowflakeConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.snowflake_configuration.SnowflakeConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 459bca5..54b657f 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -258,6 +258,7 @@
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
 from wavefront_api_client.models.service_account_write import ServiceAccountWrite
+from wavefront_api_client.models.snowflake_configuration import SnowflakeConfiguration
 from wavefront_api_client.models.sortable_search_request import SortableSearchRequest
 from wavefront_api_client.models.sorting import Sorting
 from wavefront_api_client.models.source import Source
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index f4a9a63..c24f0b3 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.117.1/python'
+        self.user_agent = 'Swagger-Codegen/2.118.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index d3273dc..270e8f2 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.117.1".\
+               "SDK Package Version: 2.118.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 70245ad..2ee3ffa 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -222,6 +222,7 @@
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
 from wavefront_api_client.models.service_account_write import ServiceAccountWrite
+from wavefront_api_client.models.snowflake_configuration import SnowflakeConfiguration
 from wavefront_api_client.models.sortable_search_request import SortableSearchRequest
 from wavefront_api_client.models.sorting import Sorting
 from wavefront_api_client.models.source import Source
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 9326cb2..53929e3 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -36,6 +36,9 @@ class Alert(object):
         'acl': 'AccessControlListSimple',
         'active_maintenance_windows': 'list[str]',
         'additional_information': 'str',
+        'alert_chart_base': 'int',
+        'alert_chart_description': 'str',
+        'alert_chart_units': 'str',
         'alert_sources': 'list[AlertSource]',
         'alert_triage_dashboards': 'list[AlertDashboard]',
         'alert_type': 'str',
@@ -118,6 +121,9 @@ class Alert(object):
         'acl': 'acl',
         'active_maintenance_windows': 'activeMaintenanceWindows',
         'additional_information': 'additionalInformation',
+        'alert_chart_base': 'alertChartBase',
+        'alert_chart_description': 'alertChartDescription',
+        'alert_chart_units': 'alertChartUnits',
         'alert_sources': 'alertSources',
         'alert_triage_dashboards': 'alertTriageDashboards',
         'alert_type': 'alertType',
@@ -196,7 +202,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_sources=None, alert_triage_dashboards=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, chart_attributes=None, chart_settings=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_chart_base=None, alert_chart_description=None, alert_chart_units=None, alert_sources=None, alert_triage_dashboards=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, chart_attributes=None, chart_settings=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -205,6 +211,9 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._acl = None
         self._active_maintenance_windows = None
         self._additional_information = None
+        self._alert_chart_base = None
+        self._alert_chart_description = None
+        self._alert_chart_units = None
         self._alert_sources = None
         self._alert_triage_dashboards = None
         self._alert_type = None
@@ -289,6 +298,12 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.active_maintenance_windows = active_maintenance_windows
         if additional_information is not None:
             self.additional_information = additional_information
+        if alert_chart_base is not None:
+            self.alert_chart_base = alert_chart_base
+        if alert_chart_description is not None:
+            self.alert_chart_description = alert_chart_description
+        if alert_chart_units is not None:
+            self.alert_chart_units = alert_chart_units
         if alert_sources is not None:
             self.alert_sources = alert_sources
         if alert_triage_dashboards is not None:
@@ -506,6 +521,75 @@ def additional_information(self, additional_information):
 
         self._additional_information = additional_information
 
+    @property
+    def alert_chart_base(self):
+        """Gets the alert_chart_base of this Alert.  # noqa: E501
+
+        The base of alert chart. A linear chart will have base as 1, while a logarithmic chart will have the other base value.  # noqa: E501
+
+        :return: The alert_chart_base of this Alert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alert_chart_base
+
+    @alert_chart_base.setter
+    def alert_chart_base(self, alert_chart_base):
+        """Sets the alert_chart_base of this Alert.
+
+        The base of alert chart. A linear chart will have base as 1, while a logarithmic chart will have the other base value.  # noqa: E501
+
+        :param alert_chart_base: The alert_chart_base of this Alert.  # noqa: E501
+        :type: int
+        """
+
+        self._alert_chart_base = alert_chart_base
+
+    @property
+    def alert_chart_description(self):
+        """Gets the alert_chart_description of this Alert.  # noqa: E501
+
+        The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart.  # noqa: E501
+
+        :return: The alert_chart_description of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_chart_description
+
+    @alert_chart_description.setter
+    def alert_chart_description(self, alert_chart_description):
+        """Sets the alert_chart_description of this Alert.
+
+        The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart.  # noqa: E501
+
+        :param alert_chart_description: The alert_chart_description of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_chart_description = alert_chart_description
+
+    @property
+    def alert_chart_units(self):
+        """Gets the alert_chart_units of this Alert.  # noqa: E501
+
+        The y-axis unit of Alert chart.  # noqa: E501
+
+        :return: The alert_chart_units of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_chart_units
+
+    @alert_chart_units.setter
+    def alert_chart_units(self, alert_chart_units):
+        """Sets the alert_chart_units of this Alert.
+
+        The y-axis unit of Alert chart.  # noqa: E501
+
+        :param alert_chart_units: The alert_chart_units of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_chart_units = alert_chart_units
+
     @property
     def alert_sources(self):
         """Gets the alert_sources of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index e11ce0a..b1e1474 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -61,6 +61,7 @@ class CloudIntegration(object):
         'reuse_external_id_credential': 'str',
         'service': 'str',
         'service_refresh_rate_in_mins': 'int',
+        'snowflake': 'SnowflakeConfiguration',
         'tesla': 'TeslaConfiguration',
         'updated_epoch_millis': 'int',
         'updater_id': 'str',
@@ -96,13 +97,14 @@ class CloudIntegration(object):
         'reuse_external_id_credential': 'reuseExternalIdCredential',
         'service': 'service',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
+        'snowflake': 'snowflake',
         'tesla': 'tesla',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId',
         'vrops': 'vrops'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -136,6 +138,7 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._reuse_external_id_credential = None
         self._service = None
         self._service_refresh_rate_in_mins = None
+        self._snowflake = None
         self._tesla = None
         self._updated_epoch_millis = None
         self._updater_id = None
@@ -196,6 +199,8 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self.service = service
         if service_refresh_rate_in_mins is not None:
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
+        if snowflake is not None:
+            self.snowflake = snowflake
         if tesla is not None:
             self.tesla = tesla
         if updated_epoch_millis is not None:
@@ -793,7 +798,7 @@ def service(self, service):
         """
         if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 service not in allowed_values):
             raise ValueError(
@@ -826,6 +831,27 @@ def service_refresh_rate_in_mins(self, service_refresh_rate_in_mins):
 
         self._service_refresh_rate_in_mins = service_refresh_rate_in_mins
 
+    @property
+    def snowflake(self):
+        """Gets the snowflake of this CloudIntegration.  # noqa: E501
+
+
+        :return: The snowflake of this CloudIntegration.  # noqa: E501
+        :rtype: SnowflakeConfiguration
+        """
+        return self._snowflake
+
+    @snowflake.setter
+    def snowflake(self, snowflake):
+        """Sets the snowflake of this CloudIntegration.
+
+
+        :param snowflake: The snowflake of this CloudIntegration.  # noqa: E501
+        :type: SnowflakeConfiguration
+        """
+
+        self._snowflake = snowflake
+
     @property
     def tesla(self):
         """Gets the tesla of this CloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 9540eb9..762e3a9 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -62,6 +62,7 @@ class Proxy(object):
         'status': 'str',
         'status_cause': 'str',
         'time_drift': 'int',
+        'truncate': 'bool',
         'user_id': 'str',
         'version': 'str'
     }
@@ -96,11 +97,12 @@ class Proxy(object):
         'status': 'status',
         'status_cause': 'statusCause',
         'time_drift': 'timeDrift',
+        'truncate': 'truncate',
         'user_id': 'userId',
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, user_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -135,6 +137,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._status = None
         self._status_cause = None
         self._time_drift = None
+        self._truncate = None
         self._user_id = None
         self._version = None
         self.discriminator = None
@@ -196,6 +199,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.status_cause = status_cause
         if time_drift is not None:
             self.time_drift = time_drift
+        if truncate is not None:
+            self.truncate = truncate
         if user_id is not None:
             self.user_id = user_id
         if version is not None:
@@ -867,6 +872,29 @@ def time_drift(self, time_drift):
 
         self._time_drift = time_drift
 
+    @property
+    def truncate(self):
+        """Gets the truncate of this Proxy.  # noqa: E501
+
+        When true, attempt to truncate down this proxy backlog remotely  # noqa: E501
+
+        :return: The truncate of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._truncate
+
+    @truncate.setter
+    def truncate(self, truncate):
+        """Sets the truncate of this Proxy.
+
+        When true, attempt to truncate down this proxy backlog remotely  # noqa: E501
+
+        :param truncate: The truncate of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._truncate = truncate
+
     @property
     def user_id(self):
         """Gets the user_id of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/snowflake_configuration.py b/wavefront_api_client/models/snowflake_configuration.py
new file mode 100644
index 0000000..980e919
--- /dev/null
+++ b/wavefront_api_client/models/snowflake_configuration.py
@@ -0,0 +1,268 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class SnowflakeConfiguration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'account_id': 'str',
+        'metric_filter_regex': 'str',
+        'password': 'str',
+        'role': 'str',
+        'user_name': 'str',
+        'warehouse': 'str'
+    }
+
+    attribute_map = {
+        'account_id': 'accountID',
+        'metric_filter_regex': 'metricFilterRegex',
+        'password': 'password',
+        'role': 'role',
+        'user_name': 'userName',
+        'warehouse': 'warehouse'
+    }
+
+    def __init__(self, account_id=None, metric_filter_regex=None, password=None, role=None, user_name=None, warehouse=None, _configuration=None):  # noqa: E501
+        """SnowflakeConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._account_id = None
+        self._metric_filter_regex = None
+        self._password = None
+        self._role = None
+        self._user_name = None
+        self._warehouse = None
+        self.discriminator = None
+
+        self.account_id = account_id
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
+        self.password = password
+        if role is not None:
+            self.role = role
+        self.user_name = user_name
+        if warehouse is not None:
+            self.warehouse = warehouse
+
+    @property
+    def account_id(self):
+        """Gets the account_id of this SnowflakeConfiguration.  # noqa: E501
+
+        Snowflake AccountID  # noqa: E501
+
+        :return: The account_id of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._account_id
+
+    @account_id.setter
+    def account_id(self, account_id):
+        """Sets the account_id of this SnowflakeConfiguration.
+
+        Snowflake AccountID  # noqa: E501
+
+        :param account_id: The account_id of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and account_id is None:
+            raise ValueError("Invalid value for `account_id`, must not be `None`")  # noqa: E501
+
+        self._account_id = account_id
+
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this SnowflakeConfiguration.  # noqa: E501
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The metric_filter_regex of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this SnowflakeConfiguration.
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param metric_filter_regex: The metric_filter_regex of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
+    @property
+    def password(self):
+        """Gets the password of this SnowflakeConfiguration.  # noqa: E501
+
+        Snowflake Password  # noqa: E501
+
+        :return: The password of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._password
+
+    @password.setter
+    def password(self, password):
+        """Sets the password of this SnowflakeConfiguration.
+
+        Snowflake Password  # noqa: E501
+
+        :param password: The password of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and password is None:
+            raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
+
+        self._password = password
+
+    @property
+    def role(self):
+        """Gets the role of this SnowflakeConfiguration.  # noqa: E501
+
+        Role to be used while querying snowflake database  # noqa: E501
+
+        :return: The role of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._role
+
+    @role.setter
+    def role(self, role):
+        """Sets the role of this SnowflakeConfiguration.
+
+        Role to be used while querying snowflake database  # noqa: E501
+
+        :param role: The role of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._role = role
+
+    @property
+    def user_name(self):
+        """Gets the user_name of this SnowflakeConfiguration.  # noqa: E501
+
+        Snowflake Username  # noqa: E501
+
+        :return: The user_name of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._user_name
+
+    @user_name.setter
+    def user_name(self, user_name):
+        """Sets the user_name of this SnowflakeConfiguration.
+
+        Snowflake Username  # noqa: E501
+
+        :param user_name: The user_name of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and user_name is None:
+            raise ValueError("Invalid value for `user_name`, must not be `None`")  # noqa: E501
+
+        self._user_name = user_name
+
+    @property
+    def warehouse(self):
+        """Gets the warehouse of this SnowflakeConfiguration.  # noqa: E501
+
+        Warehouse to be used while querying snowflake database  # noqa: E501
+
+        :return: The warehouse of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._warehouse
+
+    @warehouse.setter
+    def warehouse(self, warehouse):
+        """Sets the warehouse of this SnowflakeConfiguration.
+
+        Warehouse to be used while querying snowflake database  # noqa: E501
+
+        :param warehouse: The warehouse of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._warehouse = warehouse
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SnowflakeConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SnowflakeConfiguration):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, SnowflakeConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()

From 574cf12669e7ad2738c8b667033754b87f21aa85 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 28 Jan 2022 08:16:30 -0800
Subject: [PATCH 101/161] Autogenerated Update v2.119.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/CloudIntegration.md                      |   1 +
 docs/DynatraceConfiguration.md                |  12 ++
 setup.py                                      |   2 +-
 test/test_dynatrace_configuration.py          |  40 ++++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 .../models/cloud_integration.py               |  30 ++-
 .../models/dynatrace_configuration.py         | 182 ++++++++++++++++++
 .../models/gcp_configuration.py               |   2 +-
 14 files changed, 273 insertions(+), 9 deletions(-)
 create mode 100644 docs/DynatraceConfiguration.md
 create mode 100644 test/test_dynatrace_configuration.py
 create mode 100644 wavefront_api_client/models/dynatrace_configuration.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 886df50..16e50b2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.118.3"
+    "packageVersion": "2.119.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 4c41f0a..886df50 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.117.1"
+    "packageVersion": "2.118.3"
 }
diff --git a/README.md b/README.md
index 45447ee..2d5825c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.118.3
+- Package version: 2.119.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -445,6 +445,7 @@ Class | Method | HTTP request | Description
  - [DashboardSection](docs/DashboardSection.md)
  - [DashboardSectionRow](docs/DashboardSectionRow.md)
  - [DerivedMetricDefinition](docs/DerivedMetricDefinition.md)
+ - [DynatraceConfiguration](docs/DynatraceConfiguration.md)
  - [EC2Configuration](docs/EC2Configuration.md)
  - [Event](docs/Event.md)
  - [EventSearchRequest](docs/EventSearchRequest.md)
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index f7a9ff1..60041e8 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **creator_id** | **str** |  | [optional] 
 **deleted** | **bool** |  | [optional] 
 **disabled** | **bool** | True when an aws credential failed to authenticate. | [optional] 
+**dynatrace** | [**DynatraceConfiguration**](DynatraceConfiguration.md) |  | [optional] 
 **ec2** | [**EC2Configuration**](EC2Configuration.md) |  | [optional] 
 **force_save** | **bool** |  | [optional] 
 **gcp** | [**GCPConfiguration**](GCPConfiguration.md) |  | [optional] 
diff --git a/docs/DynatraceConfiguration.md b/docs/DynatraceConfiguration.md
new file mode 100644
index 0000000..cef7d1f
--- /dev/null
+++ b/docs/DynatraceConfiguration.md
@@ -0,0 +1,12 @@
+# DynatraceConfiguration
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**dynatrace_api_token** | **str** | The Dynatrace API Token | 
+**environment_id** | **str** | The ID of Dynatrace Environment | [optional] 
+**metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index ef16a8d..f8ce8fb 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.118.3"
+VERSION = "2.119.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_dynatrace_configuration.py b/test/test_dynatrace_configuration.py
new file mode 100644
index 0000000..7802ebc
--- /dev/null
+++ b/test/test_dynatrace_configuration.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.dynatrace_configuration import DynatraceConfiguration  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDynatraceConfiguration(unittest.TestCase):
+    """DynatraceConfiguration unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDynatraceConfiguration(self):
+        """Test DynatraceConfiguration"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.dynatrace_configuration.DynatraceConfiguration()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 54b657f..f7559ab 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -86,6 +86,7 @@
 from wavefront_api_client.models.dashboard_section import DashboardSection
 from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow
 from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition
+from wavefront_api_client.models.dynatrace_configuration import DynatraceConfiguration
 from wavefront_api_client.models.ec2_configuration import EC2Configuration
 from wavefront_api_client.models.event import Event
 from wavefront_api_client.models.event_search_request import EventSearchRequest
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index c24f0b3..ac1fb39 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.118.3/python'
+        self.user_agent = 'Swagger-Codegen/2.119.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 270e8f2..57ef89b 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.118.3".\
+               "SDK Package Version: 2.119.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 2ee3ffa..c6e4560 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -50,6 +50,7 @@
 from wavefront_api_client.models.dashboard_section import DashboardSection
 from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow
 from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition
+from wavefront_api_client.models.dynatrace_configuration import DynatraceConfiguration
 from wavefront_api_client.models.ec2_configuration import EC2Configuration
 from wavefront_api_client.models.event import Event
 from wavefront_api_client.models.event_search_request import EventSearchRequest
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index b1e1474..15a3392 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -43,6 +43,7 @@ class CloudIntegration(object):
         'creator_id': 'str',
         'deleted': 'bool',
         'disabled': 'bool',
+        'dynatrace': 'DynatraceConfiguration',
         'ec2': 'EC2Configuration',
         'force_save': 'bool',
         'gcp': 'GCPConfiguration',
@@ -79,6 +80,7 @@ class CloudIntegration(object):
         'creator_id': 'creatorId',
         'deleted': 'deleted',
         'disabled': 'disabled',
+        'dynatrace': 'dynatrace',
         'ec2': 'ec2',
         'force_save': 'forceSave',
         'gcp': 'gcp',
@@ -104,7 +106,7 @@ class CloudIntegration(object):
         'vrops': 'vrops'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -120,6 +122,7 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._creator_id = None
         self._deleted = None
         self._disabled = None
+        self._dynatrace = None
         self._ec2 = None
         self._force_save = None
         self._gcp = None
@@ -165,6 +168,8 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
             self.deleted = deleted
         if disabled is not None:
             self.disabled = disabled
+        if dynatrace is not None:
+            self.dynatrace = dynatrace
         if ec2 is not None:
             self.ec2 = ec2
         if force_save is not None:
@@ -424,6 +429,27 @@ def disabled(self, disabled):
 
         self._disabled = disabled
 
+    @property
+    def dynatrace(self):
+        """Gets the dynatrace of this CloudIntegration.  # noqa: E501
+
+
+        :return: The dynatrace of this CloudIntegration.  # noqa: E501
+        :rtype: DynatraceConfiguration
+        """
+        return self._dynatrace
+
+    @dynatrace.setter
+    def dynatrace(self, dynatrace):
+        """Sets the dynatrace of this CloudIntegration.
+
+
+        :param dynatrace: The dynatrace of this CloudIntegration.  # noqa: E501
+        :type: DynatraceConfiguration
+        """
+
+        self._dynatrace = dynatrace
+
     @property
     def ec2(self):
         """Gets the ec2 of this CloudIntegration.  # noqa: E501
@@ -798,7 +824,7 @@ def service(self, service):
         """
         if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 service not in allowed_values):
             raise ValueError(
diff --git a/wavefront_api_client/models/dynatrace_configuration.py b/wavefront_api_client/models/dynatrace_configuration.py
new file mode 100644
index 0000000..f3965a3
--- /dev/null
+++ b/wavefront_api_client/models/dynatrace_configuration.py
@@ -0,0 +1,182 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class DynatraceConfiguration(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'dynatrace_api_token': 'str',
+        'environment_id': 'str',
+        'metric_filter_regex': 'str'
+    }
+
+    attribute_map = {
+        'dynatrace_api_token': 'dynatraceAPIToken',
+        'environment_id': 'environmentID',
+        'metric_filter_regex': 'metricFilterRegex'
+    }
+
+    def __init__(self, dynatrace_api_token=None, environment_id=None, metric_filter_regex=None, _configuration=None):  # noqa: E501
+        """DynatraceConfiguration - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._dynatrace_api_token = None
+        self._environment_id = None
+        self._metric_filter_regex = None
+        self.discriminator = None
+
+        self.dynatrace_api_token = dynatrace_api_token
+        if environment_id is not None:
+            self.environment_id = environment_id
+        if metric_filter_regex is not None:
+            self.metric_filter_regex = metric_filter_regex
+
+    @property
+    def dynatrace_api_token(self):
+        """Gets the dynatrace_api_token of this DynatraceConfiguration.  # noqa: E501
+
+        The Dynatrace API Token  # noqa: E501
+
+        :return: The dynatrace_api_token of this DynatraceConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._dynatrace_api_token
+
+    @dynatrace_api_token.setter
+    def dynatrace_api_token(self, dynatrace_api_token):
+        """Sets the dynatrace_api_token of this DynatraceConfiguration.
+
+        The Dynatrace API Token  # noqa: E501
+
+        :param dynatrace_api_token: The dynatrace_api_token of this DynatraceConfiguration.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and dynatrace_api_token is None:
+            raise ValueError("Invalid value for `dynatrace_api_token`, must not be `None`")  # noqa: E501
+
+        self._dynatrace_api_token = dynatrace_api_token
+
+    @property
+    def environment_id(self):
+        """Gets the environment_id of this DynatraceConfiguration.  # noqa: E501
+
+        The ID of Dynatrace Environment  # noqa: E501
+
+        :return: The environment_id of this DynatraceConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._environment_id
+
+    @environment_id.setter
+    def environment_id(self, environment_id):
+        """Sets the environment_id of this DynatraceConfiguration.
+
+        The ID of Dynatrace Environment  # noqa: E501
+
+        :param environment_id: The environment_id of this DynatraceConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._environment_id = environment_id
+
+    @property
+    def metric_filter_regex(self):
+        """Gets the metric_filter_regex of this DynatraceConfiguration.  # noqa: E501
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The metric_filter_regex of this DynatraceConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._metric_filter_regex
+
+    @metric_filter_regex.setter
+    def metric_filter_regex(self, metric_filter_regex):
+        """Sets the metric_filter_regex of this DynatraceConfiguration.
+
+        A regular expression that a metric name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param metric_filter_regex: The metric_filter_regex of this DynatraceConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._metric_filter_regex = metric_filter_regex
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(DynatraceConfiguration, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, DynatraceConfiguration):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, DynatraceConfiguration):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 6103371..1d226da 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -100,7 +100,7 @@ def categories_to_fetch(self, categories_to_fetch):
         :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "KUBERNETES", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN"]  # noqa: E501
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "KUBERNETES", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN", "APIGEE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(categories_to_fetch).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From 904acd9d747fe5c40abe7a35629238c3864c4347 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 3 Feb 2022 08:16:19 -0800
Subject: [PATCH 102/161] Autogenerated Update v2.120.1.

---
 .swagger-codegen/config.json             |   2 +-
 .swagger-codegen/config.jsone            |   2 +-
 README.md                                |   6 +-
 docs/Dashboard.md                        |   1 +
 docs/UsageApi.md                         | 228 -------------
 setup.py                                 |   2 +-
 wavefront_api_client/api/usage_api.py    | 396 -----------------------
 wavefront_api_client/api_client.py       |   2 +-
 wavefront_api_client/configuration.py    |   2 +-
 wavefront_api_client/models/dashboard.py |  30 +-
 10 files changed, 36 insertions(+), 635 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 16e50b2..2c9c807 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.119.2"
+    "packageVersion": "2.120.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 886df50..16e50b2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.118.3"
+    "packageVersion": "2.119.2"
 }
diff --git a/README.md b/README.md
index 2d5825c..d0fa14c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.119.2
+- Package version: 2.120.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -365,15 +365,11 @@ Class | Method | HTTP request | Description
 *SpanSamplingPolicyApi* | [**get_span_sampling_policy_version**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy_version) | **GET** /api/v2/spansamplingpolicy/{id}/history/{version} | Get a specific historical version of a specific sampling policy
 *SpanSamplingPolicyApi* | [**undelete_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#undelete_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy/{id}/undelete | Restore a deleted span sampling policy
 *SpanSamplingPolicyApi* | [**update_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#update_span_sampling_policy) | **PUT** /api/v2/spansamplingpolicy/{id} | Update a specific span sampling policy
-*UsageApi* | [**add_accounts**](docs/UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
-*UsageApi* | [**add_groups**](docs/UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 *UsageApi* | [**create_ingestion_policy**](docs/UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 *UsageApi* | [**delete_ingestion_policy**](docs/UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
-*UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
-*UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 *UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific groups to the user or service account
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index 9d3e93b..bee9c03 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -25,6 +25,7 @@ Name | Type | Description | Notes
 **force_v2_ui** | **bool** | Whether to force this dashboard to use the V2 UI | [optional] 
 **hidden** | **bool** |  | [optional] 
 **id** | **str** | Unique identifier, also URL slug, of the dashboard | 
+**include_obsolete_metrics** | **bool** | Whether to include the obsolete metrics | [optional] 
 **modify_acl_access** | **bool** | Whether the user has modify ACL access to the dashboard. | [optional] 
 **name** | **str** | Name of the dashboard | 
 **num_charts** | **int** |  | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 42a07fb..560b6e2 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -4,130 +4,14 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_accounts**](UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
-[**add_groups**](UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 [**create_ingestion_policy**](UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 [**delete_ingestion_policy**](UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
-[**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
-[**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
-# **add_accounts**
-> ResponseContainerIngestionPolicy add_accounts(id, body=body)
-
-Add accounts to ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
-
-try:
-    # Add accounts to ingestion policy
-    api_response = api_instance.add_accounts(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->add_accounts: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
-
-### Return type
-
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **add_groups**
-> ResponseContainerIngestionPolicy add_groups(id, body=body)
-
-Add groups to the ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be added to the ingestion policy (optional)
-
-try:
-    # Add groups to the ingestion policy
-    api_response = api_instance.add_groups(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->add_groups: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of groups to be added to the ingestion policy | [optional] 
-
-### Return type
-
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **create_ingestion_policy**
 > ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
 
@@ -401,118 +285,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_accounts**
-> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
-
-Remove accounts from ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
-
-try:
-    # Remove accounts from ingestion policy
-    api_response = api_instance.remove_accounts(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->remove_accounts: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
-
-### Return type
-
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **remove_groups**
-> ResponseContainerIngestionPolicy remove_groups(id, body=body)
-
-Remove groups from the ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be removed from the ingestion policy (optional)
-
-try:
-    # Remove groups from the ingestion policy
-    api_response = api_instance.remove_groups(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->remove_groups: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of groups to be removed from the ingestion policy | [optional] 
-
-### Return type
-
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **update_ingestion_policy**
 > ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
 
diff --git a/setup.py b/setup.py
index f8ce8fb..2974c80 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.119.2"
+VERSION = "2.120.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index c6b67e8..e57387d 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -33,204 +33,6 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def add_accounts(self, id, **kwargs):  # noqa: E501
-        """Add accounts to ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_accounts(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Add accounts to ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_accounts_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_accounts" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `add_accounts`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/addAccounts', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def add_groups(self, id, **kwargs):  # noqa: E501
-        """Add groups to the ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_groups(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Add groups to the ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_groups_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_groups" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `add_groups`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/addGroups', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def create_ingestion_policy(self, **kwargs):  # noqa: E501
         """Create a specific ingestion policy  # noqa: E501
 
@@ -710,204 +512,6 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_accounts(self, id, **kwargs):  # noqa: E501
-        """Remove accounts from ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_accounts(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Remove accounts from ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_accounts_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_accounts" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `remove_accounts`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/removeAccounts', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def remove_groups(self, id, **kwargs):  # noqa: E501
-        """Remove groups from the ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_groups(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Remove groups from the ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_groups_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_groups" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `remove_groups`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/removeGroups', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
         """Update a specific ingestion policy  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index ac1fb39..4a7942a 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.119.2/python'
+        self.user_agent = 'Swagger-Codegen/2.120.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 57ef89b..97d8bb3 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.119.2".\
+               "SDK Package Version: 2.120.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index bf65fea..80cdbae 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -55,6 +55,7 @@ class Dashboard(object):
         'force_v2_ui': 'bool',
         'hidden': 'bool',
         'id': 'str',
+        'include_obsolete_metrics': 'bool',
         'modify_acl_access': 'bool',
         'name': 'str',
         'num_charts': 'int',
@@ -96,6 +97,7 @@ class Dashboard(object):
         'force_v2_ui': 'forceV2UI',
         'hidden': 'hidden',
         'id': 'id',
+        'include_obsolete_metrics': 'includeObsoleteMetrics',
         'modify_acl_access': 'modifyAclAccess',
         'name': 'name',
         'num_charts': 'numCharts',
@@ -114,7 +116,7 @@ class Dashboard(object):
         'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, include_obsolete_metrics=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -142,6 +144,7 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
         self._force_v2_ui = None
         self._hidden = None
         self._id = None
+        self._include_obsolete_metrics = None
         self._modify_acl_access = None
         self._name = None
         self._num_charts = None
@@ -203,6 +206,8 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
         if hidden is not None:
             self.hidden = hidden
         self.id = id
+        if include_obsolete_metrics is not None:
+            self.include_obsolete_metrics = include_obsolete_metrics
         if modify_acl_access is not None:
             self.modify_acl_access = modify_acl_access
         self.name = name
@@ -736,6 +741,29 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def include_obsolete_metrics(self):
+        """Gets the include_obsolete_metrics of this Dashboard.  # noqa: E501
+
+        Whether to include the obsolete metrics  # noqa: E501
+
+        :return: The include_obsolete_metrics of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._include_obsolete_metrics
+
+    @include_obsolete_metrics.setter
+    def include_obsolete_metrics(self, include_obsolete_metrics):
+        """Sets the include_obsolete_metrics of this Dashboard.
+
+        Whether to include the obsolete metrics  # noqa: E501
+
+        :param include_obsolete_metrics: The include_obsolete_metrics of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._include_obsolete_metrics = include_obsolete_metrics
+
     @property
     def modify_acl_access(self):
         """Gets the modify_acl_access of this Dashboard.  # noqa: E501

From 32d216e431c39cbd749a2aab83c1a41385bff280 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 10 Feb 2022 08:16:22 -0800
Subject: [PATCH 103/161] Autogenerated Update v2.121.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   4 +-
 docs/Dashboard.md                             |   1 +
 docs/MonitoredServiceApi.md                   | 130 ++++++++++-
 docs/MonitoredServiceDTO.md                   |   3 +
 docs/NotificantApi.md                         |   4 +-
 setup.py                                      |   2 +-
 .../api/monitored_service_api.py              | 220 +++++++++++++++++-
 wavefront_api_client/api/notificant_api.py    |   4 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/dashboard.py      |  30 ++-
 .../models/monitored_service_dto.py           |  89 ++++++-
 14 files changed, 472 insertions(+), 23 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 2c9c807..6847e88 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.120.1"
+    "packageVersion": "2.121.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 16e50b2..2c9c807 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.119.2"
+    "packageVersion": "2.120.1"
 }
diff --git a/README.md b/README.md
index d0fa14c..0acf8c1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.120.1
+- Package version: 2.121.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -233,7 +233,9 @@ Class | Method | HTTP request | Description
 *MonitoredApplicationApi* | [**get_application**](docs/MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
 *MonitoredApplicationApi* | [**update_service**](docs/MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
 *MonitoredServiceApi* | [**batch_update**](docs/MonitoredServiceApi.md#batch_update) | **PUT** /api/v2/monitoredservice/services | Update multiple applications and services in a batch. Batch size is limited to 100.
+*MonitoredServiceApi* | [**get_all_components**](docs/MonitoredServiceApi.md#get_all_components) | **GET** /api/v2/monitoredservice/components | Get all monitored services with components
 *MonitoredServiceApi* | [**get_all_services**](docs/MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
+*MonitoredServiceApi* | [**get_component**](docs/MonitoredServiceApi.md#get_component) | **GET** /api/v2/monitoredservice/{application}/{service}/{component} | Get a specific application
 *MonitoredServiceApi* | [**get_service**](docs/MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
 *MonitoredServiceApi* | [**get_services_of_application**](docs/MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
 *MonitoredServiceApi* | [**update_service**](docs/MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index bee9c03..66a69ba 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -16,6 +16,7 @@ Name | Type | Description | Notes
 **default_time_window** | **str** | Default time window to query charts | [optional] 
 **deleted** | **bool** |  | [optional] 
 **description** | **str** | Human-readable description of the dashboard | [optional] 
+**disable_refresh_in_live_mode** | **bool** | Refresh variables in Live Mode | [optional] 
 **display_description** | **bool** | Whether the dashboard description section is opened by default when the dashboard is shown | [optional] 
 **display_query_parameters** | **bool** | Whether the dashboard parameters section is opened by default when the dashboard is shown | [optional] 
 **display_section_table_of_contents** | **bool** | Whether the \&quot;pills\&quot; quick-linked the sections of the dashboard are displayed by default when the dashboard is shown | [optional] 
diff --git a/docs/MonitoredServiceApi.md b/docs/MonitoredServiceApi.md
index 127d6f9..b7b249e 100644
--- a/docs/MonitoredServiceApi.md
+++ b/docs/MonitoredServiceApi.md
@@ -5,7 +5,9 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**batch_update**](MonitoredServiceApi.md#batch_update) | **PUT** /api/v2/monitoredservice/services | Update multiple applications and services in a batch. Batch size is limited to 100.
+[**get_all_components**](MonitoredServiceApi.md#get_all_components) | **GET** /api/v2/monitoredservice/components | Get all monitored services with components
 [**get_all_services**](MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
+[**get_component**](MonitoredServiceApi.md#get_component) | **GET** /api/v2/monitoredservice/{application}/{service}/{component} | Get a specific application
 [**get_service**](MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
 [**get_services_of_application**](MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
 [**update_service**](MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
@@ -34,7 +36,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.MonitoredServiceDTO()] # list[MonitoredServiceDTO] | Example Body:  <pre>[{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"application\": \"beachshirts\",   \"service\": \"delivery\",   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre> (optional)
+body = [wavefront_api_client.MonitoredServiceDTO()] # list[MonitoredServiceDTO] | Example Body:  <pre>[{   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre> (optional)
 
 try:
     # Update multiple applications and services in a batch. Batch size is limited to 100.
@@ -48,7 +50,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[MonitoredServiceDTO]**](MonitoredServiceDTO.md)| Example Body:  &lt;pre&gt;[{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;service\&quot;: \&quot;shopping\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; },{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;service\&quot;: \&quot;delivery\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }]&lt;/pre&gt; | [optional] 
+ **body** | [**list[MonitoredServiceDTO]**](MonitoredServiceDTO.md)| Example Body:  &lt;pre&gt;[{   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; },{   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -65,6 +67,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_all_components**
+> ResponseContainerPagedMonitoredServiceDTO get_all_components(offset=offset, limit=limit)
+
+Get all monitored services with components
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all monitored services with components
+    api_response = api_instance.get_all_components(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->get_all_components: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedMonitoredServiceDTO**](ResponseContainerPagedMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_services**
 > ResponseContainerPagedMonitoredServiceDTO get_all_services(offset=offset, limit=limit)
 
@@ -121,6 +179,64 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_component**
+> ResponseContainerMonitoredServiceDTO get_component(application, service, component)
+
+Get a specific application
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
+application = 'application_example' # str | 
+service = 'service_example' # str | 
+component = 'component_example' # str | 
+
+try:
+    # Get a specific application
+    api_response = api_instance.get_component(application, service, component)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling MonitoredServiceApi->get_component: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **application** | **str**|  | 
+ **service** | **str**|  | 
+ **component** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMonitoredServiceDTO**](ResponseContainerMonitoredServiceDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_service**
 > ResponseContainerMonitoredServiceDTO get_service(application, service)
 
@@ -178,7 +294,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_services_of_application**
-> ResponseContainerPagedMonitoredServiceDTO get_services_of_application(application, offset=offset, limit=limit)
+> ResponseContainerPagedMonitoredServiceDTO get_services_of_application(application, include_component=include_component, offset=offset, limit=limit)
 
 Get a specific application
 
@@ -201,12 +317,13 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
 application = 'application_example' # str | 
+include_component = false # bool |  (optional) (default to false)
 offset = 0 # int |  (optional) (default to 0)
 limit = 100 # int |  (optional) (default to 100)
 
 try:
     # Get a specific application
-    api_response = api_instance.get_services_of_application(application, offset=offset, limit=limit)
+    api_response = api_instance.get_services_of_application(application, include_component=include_component, offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling MonitoredServiceApi->get_services_of_application: %s\n" % e)
@@ -217,6 +334,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **application** | **str**|  | 
+ **include_component** | **bool**|  | [optional] [default to false]
  **offset** | **int**|  | [optional] [default to 0]
  **limit** | **int**|  | [optional] [default to 100]
 
@@ -260,7 +378,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 api_instance = wavefront_api_client.MonitoredServiceApi(wavefront_api_client.ApiClient(configuration))
 application = 'application_example' # str | 
 service = 'service_example' # str | 
-body = wavefront_api_client.MonitoredServiceDTO() # MonitoredServiceDTO | Example Body:  <pre>{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre> (optional)
+body = wavefront_api_client.MonitoredServiceDTO() # MonitoredServiceDTO | Example Body:  <pre>{   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre> (optional)
 
 try:
     # Update a specific service
@@ -276,7 +394,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **application** | **str**|  | 
  **service** | **str**|  | 
- **body** | [**MonitoredServiceDTO**](MonitoredServiceDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;application\&quot;: \&quot;beachshirts\&quot;,   \&quot;service\&quot;: \&quot;shopping\&quot;,   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**MonitoredServiceDTO**](MonitoredServiceDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;satisfiedLatencyMillis\&quot;: \&quot;100000\&quot;,   \&quot;customDashboardLink\&quot;: \&quot;shopping-dashboard\&quot;,   \&quot;hidden\&quot;: \&quot;false\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/MonitoredServiceDTO.md b/docs/MonitoredServiceDTO.md
index d841423..748b07a 100644
--- a/docs/MonitoredServiceDTO.md
+++ b/docs/MonitoredServiceDTO.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **application** | **str** | Application Name of the monitored service | 
+**component** | **str** | Component Name of the monitored service | 
 **created** | **int** | Created epoch of monitored service | [optional] 
 **custom_dashboard_link** | **str** | Customer dashboard link | [optional] 
 **hidden** | **bool** | Monitored service is hidden or not | [optional] 
@@ -11,6 +12,8 @@ Name | Type | Description | Notes
 **last_updated** | **int** | Last update epoch of monitored service | [optional] 
 **satisfied_latency_millis** | **int** | Satisfied latency of monitored service | [optional] 
 **service** | **str** | Service Name of the monitored service | 
+**service_instance_count** | **int** | Service Instance count of the monitored service | 
+**source** | **str** | Source of the monitored service | 
 **status** | **str** | Status of monitored service | [optional] 
 **update_user_id** | **str** | Last update user id of monitored service | [optional] 
 
diff --git a/docs/NotificantApi.md b/docs/NotificantApi.md
index 44fe217..55fb082 100644
--- a/docs/NotificantApi.md
+++ b/docs/NotificantApi.md
@@ -90,7 +90,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.NotificantApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-unlink = false # bool |  (optional) (default to false)
+unlink = false # bool | If set to true, explicitly deletes a notification target even if it’s in use by alerts.<br/>Before deletion, the target is removed from the alert's target list.  (optional) (default to false)
 
 try:
     # Delete a specific notification target
@@ -105,7 +105,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **unlink** | **bool**|  | [optional] [default to false]
+ **unlink** | **bool**| If set to true, explicitly deletes a notification target even if it’s in use by alerts.&lt;br/&gt;Before deletion, the target is removed from the alert&#39;s target list.  | [optional] [default to false]
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index 2974c80..dfb5768 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.120.1"
+VERSION = "2.121.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index 66d280b..d783631 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -43,7 +43,7 @@ def batch_update(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[MonitoredServiceDTO] body: Example Body:  <pre>[{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"application\": \"beachshirts\",   \"service\": \"delivery\",   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre>
+        :param list[MonitoredServiceDTO] body: Example Body:  <pre>[{   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre>
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -65,7 +65,7 @@ def batch_update_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[MonitoredServiceDTO] body: Example Body:  <pre>[{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"application\": \"beachshirts\",   \"service\": \"delivery\",   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre>
+        :param list[MonitoredServiceDTO] body: Example Body:  <pre>[{   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" },{   \"satisfiedLatencyMillis\": \"100\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }]</pre>
         :return: ResponseContainer
                  If the method is called asynchronously,
                  returns the request thread.
@@ -128,6 +128,101 @@ def batch_update_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_all_components(self, **kwargs):  # noqa: E501
+        """Get all monitored services with components  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_components(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_components_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_components_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_components_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all monitored services with components  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_components_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_components" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice/components', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_services(self, **kwargs):  # noqa: E501
         """Get all monitored services  # noqa: E501
 
@@ -223,6 +318,117 @@ def get_all_services_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_component(self, application, service, component, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_component(application, service, component, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param str service: (required)
+        :param str component: (required)
+        :return: ResponseContainerMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_component_with_http_info(application, service, component, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_component_with_http_info(application, service, component, **kwargs)  # noqa: E501
+            return data
+
+    def get_component_with_http_info(self, application, service, component, **kwargs):  # noqa: E501
+        """Get a specific application  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_component_with_http_info(application, service, component, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str application: (required)
+        :param str service: (required)
+        :param str component: (required)
+        :return: ResponseContainerMonitoredServiceDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['application', 'service', 'component']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_component" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'application' is set
+        if self.api_client.client_side_validation and ('application' not in params or
+                                                       params['application'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `application` when calling `get_component`")  # noqa: E501
+        # verify the required parameter 'service' is set
+        if self.api_client.client_side_validation and ('service' not in params or
+                                                       params['service'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `service` when calling `get_component`")  # noqa: E501
+        # verify the required parameter 'component' is set
+        if self.api_client.client_side_validation and ('component' not in params or
+                                                       params['component'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `component` when calling `get_component`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'application' in params:
+            path_params['application'] = params['application']  # noqa: E501
+        if 'service' in params:
+            path_params['service'] = params['service']  # noqa: E501
+        if 'component' in params:
+            path_params['component'] = params['component']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/monitoredservice/{application}/{service}/{component}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMonitoredServiceDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_service(self, application, service, **kwargs):  # noqa: E501
         """Get a specific application  # noqa: E501
 
@@ -337,6 +543,7 @@ def get_services_of_application(self, application, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str application: (required)
+        :param bool include_component:
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedMonitoredServiceDTO
@@ -361,6 +568,7 @@ def get_services_of_application_with_http_info(self, application, **kwargs):  #
 
         :param async_req bool
         :param str application: (required)
+        :param bool include_component:
         :param int offset:
         :param int limit:
         :return: ResponseContainerPagedMonitoredServiceDTO
@@ -368,7 +576,7 @@ def get_services_of_application_with_http_info(self, application, **kwargs):  #
                  returns the request thread.
         """
 
-        all_params = ['application', 'offset', 'limit']  # noqa: E501
+        all_params = ['application', 'include_component', 'offset', 'limit']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -395,6 +603,8 @@ def get_services_of_application_with_http_info(self, application, **kwargs):  #
             path_params['application'] = params['application']  # noqa: E501
 
         query_params = []
+        if 'include_component' in params:
+            query_params.append(('includeComponent', params['include_component']))  # noqa: E501
         if 'offset' in params:
             query_params.append(('offset', params['offset']))  # noqa: E501
         if 'limit' in params:
@@ -441,7 +651,7 @@ def update_service(self, application, service, **kwargs):  # noqa: E501
         :param async_req bool
         :param str application: (required)
         :param str service: (required)
-        :param MonitoredServiceDTO body: Example Body:  <pre>{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre>
+        :param MonitoredServiceDTO body: Example Body:  <pre>{   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre>
         :return: ResponseContainerMonitoredServiceDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -465,7 +675,7 @@ def update_service_with_http_info(self, application, service, **kwargs):  # noqa
         :param async_req bool
         :param str application: (required)
         :param str service: (required)
-        :param MonitoredServiceDTO body: Example Body:  <pre>{   \"application\": \"beachshirts\",   \"service\": \"shopping\",   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre>
+        :param MonitoredServiceDTO body: Example Body:  <pre>{   \"satisfiedLatencyMillis\": \"100000\",   \"customDashboardLink\": \"shopping-dashboard\",   \"hidden\": \"false\" }</pre>
         :return: ResponseContainerMonitoredServiceDTO
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index d93fd6a..f5d8a60 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -139,7 +139,7 @@ def delete_notificant(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param bool unlink:
+        :param bool unlink: If set to true, explicitly deletes a notification target even if it’s in use by alerts.<br/>Before deletion, the target is removed from the alert's target list. 
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
@@ -162,7 +162,7 @@ def delete_notificant_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param bool unlink:
+        :param bool unlink: If set to true, explicitly deletes a notification target even if it’s in use by alerts.<br/>Before deletion, the target is removed from the alert's target list. 
         :return: ResponseContainerNotificant
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 4a7942a..9688d2a 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.120.1/python'
+        self.user_agent = 'Swagger-Codegen/2.121.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 97d8bb3..e18a981 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.120.1".\
+               "SDK Package Version: 2.121.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 80cdbae..7ec7f42 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -46,6 +46,7 @@ class Dashboard(object):
         'default_time_window': 'str',
         'deleted': 'bool',
         'description': 'str',
+        'disable_refresh_in_live_mode': 'bool',
         'display_description': 'bool',
         'display_query_parameters': 'bool',
         'display_section_table_of_contents': 'bool',
@@ -88,6 +89,7 @@ class Dashboard(object):
         'default_time_window': 'defaultTimeWindow',
         'deleted': 'deleted',
         'description': 'description',
+        'disable_refresh_in_live_mode': 'disableRefreshInLiveMode',
         'display_description': 'displayDescription',
         'display_query_parameters': 'displayQueryParameters',
         'display_section_table_of_contents': 'displaySectionTableOfContents',
@@ -116,7 +118,7 @@ class Dashboard(object):
         'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, include_obsolete_metrics=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, disable_refresh_in_live_mode=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, include_obsolete_metrics=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -135,6 +137,7 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
         self._default_time_window = None
         self._deleted = None
         self._description = None
+        self._disable_refresh_in_live_mode = None
         self._display_description = None
         self._display_query_parameters = None
         self._display_section_table_of_contents = None
@@ -189,6 +192,8 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
             self.deleted = deleted
         if description is not None:
             self.description = description
+        if disable_refresh_in_live_mode is not None:
+            self.disable_refresh_in_live_mode = disable_refresh_in_live_mode
         if display_description is not None:
             self.display_description = display_description
         if display_query_parameters is not None:
@@ -529,6 +534,29 @@ def description(self, description):
 
         self._description = description
 
+    @property
+    def disable_refresh_in_live_mode(self):
+        """Gets the disable_refresh_in_live_mode of this Dashboard.  # noqa: E501
+
+        Refresh variables in Live Mode  # noqa: E501
+
+        :return: The disable_refresh_in_live_mode of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._disable_refresh_in_live_mode
+
+    @disable_refresh_in_live_mode.setter
+    def disable_refresh_in_live_mode(self, disable_refresh_in_live_mode):
+        """Sets the disable_refresh_in_live_mode of this Dashboard.
+
+        Refresh variables in Live Mode  # noqa: E501
+
+        :param disable_refresh_in_live_mode: The disable_refresh_in_live_mode of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._disable_refresh_in_live_mode = disable_refresh_in_live_mode
+
     @property
     def display_description(self):
         """Gets the display_description of this Dashboard.  # noqa: E501
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
index 49faa93..df6a15c 100644
--- a/wavefront_api_client/models/monitored_service_dto.py
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -34,6 +34,7 @@ class MonitoredServiceDTO(object):
     """
     swagger_types = {
         'application': 'str',
+        'component': 'str',
         'created': 'int',
         'custom_dashboard_link': 'str',
         'hidden': 'bool',
@@ -41,12 +42,15 @@ class MonitoredServiceDTO(object):
         'last_updated': 'int',
         'satisfied_latency_millis': 'int',
         'service': 'str',
+        'service_instance_count': 'int',
+        'source': 'str',
         'status': 'str',
         'update_user_id': 'str'
     }
 
     attribute_map = {
         'application': 'application',
+        'component': 'component',
         'created': 'created',
         'custom_dashboard_link': 'customDashboardLink',
         'hidden': 'hidden',
@@ -54,17 +58,20 @@ class MonitoredServiceDTO(object):
         'last_updated': 'lastUpdated',
         'satisfied_latency_millis': 'satisfiedLatencyMillis',
         'service': 'service',
+        'service_instance_count': 'serviceInstanceCount',
+        'source': 'source',
         'status': 'status',
         'update_user_id': 'updateUserId'
     }
 
-    def __init__(self, application=None, created=None, custom_dashboard_link=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service=None, status=None, update_user_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, application=None, component=None, created=None, custom_dashboard_link=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service=None, service_instance_count=None, source=None, status=None, update_user_id=None, _configuration=None):  # noqa: E501
         """MonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._application = None
+        self._component = None
         self._created = None
         self._custom_dashboard_link = None
         self._hidden = None
@@ -72,11 +79,14 @@ def __init__(self, application=None, created=None, custom_dashboard_link=None, h
         self._last_updated = None
         self._satisfied_latency_millis = None
         self._service = None
+        self._service_instance_count = None
+        self._source = None
         self._status = None
         self._update_user_id = None
         self.discriminator = None
 
         self.application = application
+        self.component = component
         if created is not None:
             self.created = created
         if custom_dashboard_link is not None:
@@ -90,6 +100,8 @@ def __init__(self, application=None, created=None, custom_dashboard_link=None, h
         if satisfied_latency_millis is not None:
             self.satisfied_latency_millis = satisfied_latency_millis
         self.service = service
+        self.service_instance_count = service_instance_count
+        self.source = source
         if status is not None:
             self.status = status
         if update_user_id is not None:
@@ -120,6 +132,31 @@ def application(self, application):
 
         self._application = application
 
+    @property
+    def component(self):
+        """Gets the component of this MonitoredServiceDTO.  # noqa: E501
+
+        Component Name of the monitored service  # noqa: E501
+
+        :return: The component of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._component
+
+    @component.setter
+    def component(self, component):
+        """Sets the component of this MonitoredServiceDTO.
+
+        Component Name of the monitored service  # noqa: E501
+
+        :param component: The component of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and component is None:
+            raise ValueError("Invalid value for `component`, must not be `None`")  # noqa: E501
+
+        self._component = component
+
     @property
     def created(self):
         """Gets the created of this MonitoredServiceDTO.  # noqa: E501
@@ -283,6 +320,56 @@ def service(self, service):
 
         self._service = service
 
+    @property
+    def service_instance_count(self):
+        """Gets the service_instance_count of this MonitoredServiceDTO.  # noqa: E501
+
+        Service Instance count of the monitored service  # noqa: E501
+
+        :return: The service_instance_count of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: int
+        """
+        return self._service_instance_count
+
+    @service_instance_count.setter
+    def service_instance_count(self, service_instance_count):
+        """Sets the service_instance_count of this MonitoredServiceDTO.
+
+        Service Instance count of the monitored service  # noqa: E501
+
+        :param service_instance_count: The service_instance_count of this MonitoredServiceDTO.  # noqa: E501
+        :type: int
+        """
+        if self._configuration.client_side_validation and service_instance_count is None:
+            raise ValueError("Invalid value for `service_instance_count`, must not be `None`")  # noqa: E501
+
+        self._service_instance_count = service_instance_count
+
+    @property
+    def source(self):
+        """Gets the source of this MonitoredServiceDTO.  # noqa: E501
+
+        Source of the monitored service  # noqa: E501
+
+        :return: The source of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._source
+
+    @source.setter
+    def source(self, source):
+        """Sets the source of this MonitoredServiceDTO.
+
+        Source of the monitored service  # noqa: E501
+
+        :param source: The source of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and source is None:
+            raise ValueError("Invalid value for `source`, must not be `None`")  # noqa: E501
+
+        self._source = source
+
     @property
     def status(self):
         """Gets the status of this MonitoredServiceDTO.  # noqa: E501

From 8ddaf5d37ce1adbdbfaaeaa7a6dfc2444fc5c3fd Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Fri, 18 Feb 2022 08:16:16 -0800
Subject: [PATCH 104/161] Autogenerated Update v2.122.1.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  73 +-
 docs/AppSearchFilter.md                       |  11 +
 docs/AppSearchFilterValue.md                  |  12 +
 docs/AppSearchFilters.md                      |  11 +
 docs/MaintenanceWindow.md                     |   1 +
 docs/PagedRecentAppMapSearch.md               |  16 +
 docs/PagedRecentTracesSearch.md               |  16 +
 docs/PagedSavedAppMapSearch.md                |  16 +
 docs/PagedSavedAppMapSearchGroup.md           |  16 +
 docs/PagedSavedTracesSearch.md                |  16 +
 docs/PagedSavedTracesSearchGroup.md           |  16 +
 docs/RecentAppMapSearch.md                    |  15 +
 docs/RecentAppMapSearchApi.md                 | 175 ++++
 docs/RecentTracesSearch.md                    |  15 +
 docs/RecentTracesSearchApi.md                 | 175 ++++
 ...esponseContainerPagedRecentAppMapSearch.md |  11 +
 ...esponseContainerPagedRecentTracesSearch.md |  11 +
 ...ResponseContainerPagedSavedAppMapSearch.md |  11 +
 ...nseContainerPagedSavedAppMapSearchGroup.md |  11 +
 ...ResponseContainerPagedSavedTracesSearch.md |  11 +
 ...nseContainerPagedSavedTracesSearchGroup.md |  11 +
 docs/ResponseContainerRecentAppMapSearch.md   |  11 +
 docs/ResponseContainerRecentTracesSearch.md   |  11 +
 docs/ResponseContainerSavedAppMapSearch.md    |  11 +
 ...ResponseContainerSavedAppMapSearchGroup.md |  11 +
 docs/ResponseContainerSavedTracesSearch.md    |  11 +
 ...ResponseContainerSavedTracesSearchGroup.md |  11 +
 docs/SavedAppMapSearch.md                     |  17 +
 docs/SavedAppMapSearchApi.md                  | 456 ++++++++++
 docs/SavedAppMapSearchGroup.md                |  16 +
 docs/SavedAppMapSearchGroupApi.md             | 460 ++++++++++
 docs/SavedTracesSearch.md                     |  17 +
 docs/SavedTracesSearchApi.md                  | 456 ++++++++++
 docs/SavedTracesSearchGroup.md                |  16 +
 docs/SavedTracesSearchGroupApi.md             | 460 ++++++++++
 docs/SearchApi.md                             | 334 +++++++
 setup.py                                      |   8 +-
 test/test_app_search_filter.py                |  40 +
 test/test_app_search_filter_value.py          |  40 +
 test/test_app_search_filters.py               |  40 +
 test/test_paged_recent_app_map_search.py      |  40 +
 test/test_paged_recent_traces_search.py       |  40 +
 test/test_paged_saved_app_map_search.py       |  40 +
 test/test_paged_saved_app_map_search_group.py |  40 +
 test/test_paged_saved_traces_search.py        |  40 +
 test/test_paged_saved_traces_search_group.py  |  40 +
 test/test_recent_app_map_search.py            |  40 +
 test/test_recent_app_map_search_api.py        |  55 ++
 test/test_recent_traces_search.py             |  40 +
 test/test_recent_traces_search_api.py         |  55 ++
 ...e_container_paged_recent_app_map_search.py |  40 +
 ...se_container_paged_recent_traces_search.py |  40 +
 ...se_container_paged_saved_app_map_search.py |  40 +
 ...tainer_paged_saved_app_map_search_group.py |  40 +
 ...nse_container_paged_saved_traces_search.py |  40 +
 ...ntainer_paged_saved_traces_search_group.py |  40 +
 ...esponse_container_recent_app_map_search.py |  40 +
 ...response_container_recent_traces_search.py |  40 +
 ...response_container_saved_app_map_search.py |  40 +
 ...se_container_saved_app_map_search_group.py |  40 +
 ..._response_container_saved_traces_search.py |  40 +
 ...nse_container_saved_traces_search_group.py |  40 +
 test/test_saved_app_map_search.py             |  40 +
 test/test_saved_app_map_search_api.py         |  90 ++
 test/test_saved_app_map_search_group.py       |  40 +
 test/test_saved_app_map_search_group_api.py   |  90 ++
 test/test_saved_traces_search.py              |  40 +
 test/test_saved_traces_search_api.py          |  90 ++
 test/test_saved_traces_search_group.py        |  40 +
 test/test_saved_traces_search_group_api.py    |  90 ++
 wavefront_api_client/__init__.py              |  35 +-
 wavefront_api_client/api/__init__.py          |   6 +
 wavefront_api_client/api/access_policy_api.py |   2 +-
 .../account__user_and_service_account_api.py  |   2 +-
 wavefront_api_client/api/alert_api.py         |   2 +-
 wavefront_api_client/api/api_token_api.py     |   2 +-
 .../api/cloud_integration_api.py              |   2 +-
 wavefront_api_client/api/dashboard_api.py     |   2 +-
 .../api/derived_metric_api.py                 |   2 +-
 .../api/direct_ingestion_api.py               |   2 +-
 wavefront_api_client/api/event_api.py         |   2 +-
 wavefront_api_client/api/external_link_api.py |   2 +-
 wavefront_api_client/api/ingestion_spy_api.py |   2 +-
 wavefront_api_client/api/integration_api.py   |   2 +-
 .../api/maintenance_window_api.py             |   2 +-
 wavefront_api_client/api/message_api.py       |   2 +-
 wavefront_api_client/api/metric_api.py        |   2 +-
 .../api/metrics_policy_api.py                 |   2 +-
 .../api/monitored_application_api.py          |   2 +-
 .../api/monitored_service_api.py              |   2 +-
 wavefront_api_client/api/notificant_api.py    |   2 +-
 wavefront_api_client/api/proxy_api.py         |   2 +-
 wavefront_api_client/api/query_api.py         |   2 +-
 .../api/recent_app_map_search_api.py          | 319 +++++++
 .../api/recent_traces_search_api.py           | 319 +++++++
 wavefront_api_client/api/role_api.py          |   2 +-
 .../api/saved_app_map_search_api.py           | 818 +++++++++++++++++
 .../api/saved_app_map_search_group_api.py     | 830 ++++++++++++++++++
 wavefront_api_client/api/saved_search_api.py  |   2 +-
 .../api/saved_traces_search_api.py            | 818 +++++++++++++++++
 .../api/saved_traces_search_group_api.py      | 830 ++++++++++++++++++
 wavefront_api_client/api/search_api.py        | 588 ++++++++++++-
 wavefront_api_client/api/source_api.py        |   2 +-
 .../api/span_sampling_policy_api.py           |   2 +-
 wavefront_api_client/api/usage_api.py         |   2 +-
 wavefront_api_client/api/user_api.py          |   2 +-
 wavefront_api_client/api/user_group_api.py    |   2 +-
 wavefront_api_client/api/webhook_api.py       |   2 +-
 wavefront_api_client/api_client.py            |   4 +-
 wavefront_api_client/configuration.py         |   4 +-
 wavefront_api_client/models/__init__.py       |  29 +-
 .../models/access_control_element.py          |   2 +-
 .../models/access_control_list_read_dto.py    |   2 +-
 .../models/access_control_list_simple.py      |   2 +-
 .../models/access_control_list_write_dto.py   |   2 +-
 wavefront_api_client/models/access_policy.py  |   2 +-
 .../models/access_policy_rule_dto.py          |   2 +-
 wavefront_api_client/models/account.py        |   2 +-
 wavefront_api_client/models/alert.py          |   2 +-
 .../models/alert_dashboard.py                 |   2 +-
 wavefront_api_client/models/alert_min.py      |   2 +-
 wavefront_api_client/models/alert_route.py    |   2 +-
 wavefront_api_client/models/alert_source.py   |   2 +-
 wavefront_api_client/models/annotation.py     |   2 +-
 wavefront_api_client/models/anomaly.py        |   2 +-
 .../models/app_dynamics_configuration.py      |   2 +-
 .../models/app_search_filter.py               | 156 ++++
 .../models/app_search_filter_value.py         | 175 ++++
 .../models/app_search_filters.py              | 149 ++++
 .../models/aws_base_credentials.py            |   2 +-
 .../azure_activity_log_configuration.py       |   2 +-
 .../models/azure_base_credentials.py          |   2 +-
 .../models/azure_configuration.py             |   2 +-
 wavefront_api_client/models/chart.py          |   2 +-
 wavefront_api_client/models/chart_settings.py |   2 +-
 .../models/chart_source_query.py              |   2 +-
 wavefront_api_client/models/class_loader.py   |   2 +-
 .../models/cloud_integration.py               |   2 +-
 .../models/cloud_trail_configuration.py       |   2 +-
 .../models/cloud_watch_configuration.py       |   2 +-
 wavefront_api_client/models/conversion.py     |   2 +-
 .../models/conversion_object.py               |   2 +-
 .../models/customer_facing_user_object.py     |   2 +-
 wavefront_api_client/models/dashboard.py      |   2 +-
 wavefront_api_client/models/dashboard_min.py  |   2 +-
 .../models/dashboard_parameter_value.py       |   2 +-
 .../models/dashboard_section.py               |   2 +-
 .../models/dashboard_section_row.py           |   2 +-
 .../models/derived_metric_definition.py       |   2 +-
 .../models/dynatrace_configuration.py         |   2 +-
 .../models/ec2_configuration.py               |   2 +-
 wavefront_api_client/models/event.py          |   2 +-
 .../models/event_search_request.py            |   2 +-
 .../models/event_time_range.py                |   2 +-
 wavefront_api_client/models/external_link.py  |   2 +-
 wavefront_api_client/models/facet_response.py |   2 +-
 .../models/facet_search_request_container.py  |   2 +-
 .../models/facets_response_container.py       |   2 +-
 .../models/facets_search_request_container.py |   2 +-
 .../models/fast_reader_builder.py             |   2 +-
 wavefront_api_client/models/field.py          |   2 +-
 .../models/gcp_billing_configuration.py       |   2 +-
 .../models/gcp_configuration.py               |   2 +-
 wavefront_api_client/models/history_entry.py  |   2 +-
 .../models/history_response.py                |   2 +-
 .../models/ingestion_policy.py                |   2 +-
 .../models/ingestion_policy_mapping.py        |   2 +-
 wavefront_api_client/models/install_alerts.py |   2 +-
 wavefront_api_client/models/integration.py    |   2 +-
 .../models/integration_alert.py               |   2 +-
 .../models/integration_alias.py               |   2 +-
 .../models/integration_dashboard.py           |   2 +-
 .../models/integration_manifest_group.py      |   2 +-
 .../models/integration_metrics.py             |   2 +-
 .../models/integration_status.py              |   2 +-
 wavefront_api_client/models/json_node.py      |   2 +-
 .../models/kubernetes_component.py            |   2 +-
 .../models/kubernetes_component_status.py     |   2 +-
 wavefront_api_client/models/logical_type.py   |   2 +-
 .../models/maintenance_window.py              |  32 +-
 wavefront_api_client/models/message.py        |   2 +-
 wavefront_api_client/models/metric_details.py |   2 +-
 .../models/metric_details_response.py         |   2 +-
 wavefront_api_client/models/metric_status.py  |   2 +-
 .../models/metrics_policy_read_model.py       |   2 +-
 .../models/metrics_policy_write_model.py      |   2 +-
 wavefront_api_client/models/module.py         |   2 +-
 .../models/module_descriptor.py               |   2 +-
 wavefront_api_client/models/module_layer.py   |   2 +-
 .../models/monitored_application_dto.py       |   2 +-
 .../models/monitored_cluster.py               |   2 +-
 .../models/monitored_service_dto.py           |   2 +-
 .../models/new_relic_configuration.py         |   2 +-
 .../models/new_relic_metric_filters.py        |   2 +-
 wavefront_api_client/models/notificant.py     |   2 +-
 .../models/notification_messages.py           |   2 +-
 wavefront_api_client/models/package.py        |   2 +-
 wavefront_api_client/models/paged.py          |   2 +-
 wavefront_api_client/models/paged_account.py  |   2 +-
 wavefront_api_client/models/paged_alert.py    |   2 +-
 .../models/paged_alert_with_stats.py          |   2 +-
 wavefront_api_client/models/paged_anomaly.py  |   2 +-
 .../models/paged_cloud_integration.py         |   2 +-
 .../paged_customer_facing_user_object.py      |   2 +-
 .../models/paged_dashboard.py                 |   2 +-
 .../models/paged_derived_metric_definition.py |   2 +-
 ...ed_derived_metric_definition_with_stats.py |   2 +-
 wavefront_api_client/models/paged_event.py    |   2 +-
 .../models/paged_external_link.py             |   2 +-
 .../models/paged_ingestion_policy.py          |   2 +-
 .../models/paged_integration.py               |   2 +-
 .../models/paged_maintenance_window.py        |   2 +-
 wavefront_api_client/models/paged_message.py  |   2 +-
 .../models/paged_monitored_application_dto.py |   2 +-
 .../models/paged_monitored_cluster.py         |   2 +-
 .../models/paged_monitored_service_dto.py     |   2 +-
 .../models/paged_notificant.py                |   2 +-
 wavefront_api_client/models/paged_proxy.py    |   2 +-
 .../models/paged_recent_app_map_search.py     | 287 ++++++
 .../models/paged_recent_traces_search.py      | 287 ++++++
 .../models/paged_related_event.py             |   2 +-
 .../models/paged_report_event_anomaly_dto.py  |   2 +-
 wavefront_api_client/models/paged_role_dto.py |   2 +-
 .../models/paged_saved_app_map_search.py      | 287 ++++++
 .../paged_saved_app_map_search_group.py       | 287 ++++++
 .../models/paged_saved_search.py              |   2 +-
 .../models/paged_saved_traces_search.py       | 287 ++++++
 .../models/paged_saved_traces_search_group.py | 287 ++++++
 .../models/paged_service_account.py           |   2 +-
 wavefront_api_client/models/paged_source.py   |   2 +-
 .../models/paged_span_sampling_policy.py      |   2 +-
 .../models/paged_user_group_model.py          |   2 +-
 wavefront_api_client/models/point.py          |   2 +-
 .../models/policy_rule_read_model.py          |   2 +-
 .../models/policy_rule_write_model.py         |   2 +-
 wavefront_api_client/models/proxy.py          |   2 +-
 wavefront_api_client/models/query_event.py    |   2 +-
 wavefront_api_client/models/query_result.py   |   2 +-
 wavefront_api_client/models/query_type_dto.py |   2 +-
 wavefront_api_client/models/raw_timeseries.py |   2 +-
 .../models/recent_app_map_search.py           | 256 ++++++
 .../models/recent_traces_search.py            | 256 ++++++
 .../models/related_anomaly.py                 |   2 +-
 wavefront_api_client/models/related_data.py   |   2 +-
 wavefront_api_client/models/related_event.py  |   2 +-
 .../models/related_event_time_range.py        |   2 +-
 .../models/report_event_anomaly_dto.py        |   2 +-
 .../models/response_container.py              |   2 +-
 .../response_container_access_policy.py       |   2 +-
 ...response_container_access_policy_action.py |   2 +-
 .../models/response_container_account.py      |   2 +-
 .../models/response_container_alert.py        |   2 +-
 .../response_container_cloud_integration.py   |   2 +-
 .../models/response_container_dashboard.py    |   2 +-
 ...nse_container_derived_metric_definition.py |   2 +-
 .../models/response_container_event.py        |   2 +-
 .../response_container_external_link.py       |   2 +-
 .../response_container_facet_response.py      |   2 +-
 ...nse_container_facets_response_container.py |   2 +-
 .../response_container_history_response.py    |   2 +-
 .../response_container_ingestion_policy.py    |   2 +-
 .../models/response_container_integration.py  |   2 +-
 .../response_container_integration_status.py  |   2 +-
 ...ainer_list_access_control_list_read_dto.py |   2 +-
 .../response_container_list_integration.py    |   2 +-
 ...ntainer_list_integration_manifest_group.py |   2 +-
 ...se_container_list_notification_messages.py |   2 +-
 ...response_container_list_service_account.py |   2 +-
 .../models/response_container_list_string.py  |   2 +-
 .../response_container_list_user_api_token.py |   2 +-
 .../response_container_maintenance_window.py  |   2 +-
 .../response_container_map_string_integer.py  |   2 +-
 ...container_map_string_integration_status.py |   2 +-
 .../models/response_container_message.py      |   2 +-
 ...nse_container_metrics_policy_read_model.py |   2 +-
 ...nse_container_monitored_application_dto.py |   2 +-
 .../response_container_monitored_cluster.py   |   2 +-
 ...esponse_container_monitored_service_dto.py |   2 +-
 .../models/response_container_notificant.py   |   2 +-
 .../response_container_paged_account.py       |   2 +-
 .../models/response_container_paged_alert.py  |   2 +-
 ...sponse_container_paged_alert_with_stats.py |   2 +-
 .../response_container_paged_anomaly.py       |   2 +-
 ...ponse_container_paged_cloud_integration.py |   2 +-
 ...ainer_paged_customer_facing_user_object.py |   2 +-
 .../response_container_paged_dashboard.py     |   2 +-
 ...ntainer_paged_derived_metric_definition.py |   2 +-
 ...ed_derived_metric_definition_with_stats.py |   2 +-
 .../models/response_container_paged_event.py  |   2 +-
 .../response_container_paged_external_link.py |   2 +-
 ...sponse_container_paged_ingestion_policy.py |   2 +-
 .../response_container_paged_integration.py   |   2 +-
 ...onse_container_paged_maintenance_window.py |   2 +-
 .../response_container_paged_message.py       |   2 +-
 ...ntainer_paged_monitored_application_dto.py |   2 +-
 ...ponse_container_paged_monitored_cluster.py |   2 +-
 ...e_container_paged_monitored_service_dto.py |   2 +-
 .../response_container_paged_notificant.py    |   2 +-
 .../models/response_container_paged_proxy.py  |   2 +-
 ...e_container_paged_recent_app_map_search.py | 150 ++++
 ...se_container_paged_recent_traces_search.py | 150 ++++
 .../response_container_paged_related_event.py |   2 +-
 ...ontainer_paged_report_event_anomaly_dto.py |   2 +-
 .../response_container_paged_role_dto.py      |   2 +-
 ...se_container_paged_saved_app_map_search.py | 150 ++++
 ...tainer_paged_saved_app_map_search_group.py | 150 ++++
 .../response_container_paged_saved_search.py  |   2 +-
 ...nse_container_paged_saved_traces_search.py | 150 ++++
 ...ntainer_paged_saved_traces_search_group.py | 150 ++++
 ...esponse_container_paged_service_account.py |   2 +-
 .../models/response_container_paged_source.py |   2 +-
 ...se_container_paged_span_sampling_policy.py |   2 +-
 ...sponse_container_paged_user_group_model.py |   2 +-
 .../models/response_container_proxy.py        |   2 +-
 .../response_container_query_type_dto.py      |   2 +-
 ...esponse_container_recent_app_map_search.py | 150 ++++
 ...response_container_recent_traces_search.py | 150 ++++
 .../models/response_container_role_dto.py     |   2 +-
 ...response_container_saved_app_map_search.py | 150 ++++
 ...se_container_saved_app_map_search_group.py | 150 ++++
 .../models/response_container_saved_search.py |   2 +-
 .../response_container_saved_traces_search.py | 150 ++++
 ...nse_container_saved_traces_search_group.py | 150 ++++
 .../response_container_service_account.py     |   2 +-
 ...esponse_container_set_business_function.py |   2 +-
 ...esponse_container_set_source_label_pair.py |   2 +-
 .../models/response_container_source.py       |   2 +-
 ...response_container_span_sampling_policy.py |   2 +-
 .../models/response_container_string.py       |   2 +-
 .../response_container_tags_response.py       |   2 +-
 .../response_container_user_api_token.py      |   2 +-
 .../models/response_container_user_dto.py     |   2 +-
 .../response_container_user_group_model.py    |   2 +-
 .../response_container_validated_users_dto.py |   2 +-
 .../models/response_container_void.py         |   2 +-
 .../models/response_status.py                 |   2 +-
 wavefront_api_client/models/role_dto.py       |   2 +-
 .../models/saved_app_map_search.py            | 311 +++++++
 .../models/saved_app_map_search_group.py      | 282 ++++++
 wavefront_api_client/models/saved_search.py   |   2 +-
 .../models/saved_traces_search.py             | 310 +++++++
 .../models/saved_traces_search_group.py       | 282 ++++++
 wavefront_api_client/models/schema.py         |   2 +-
 wavefront_api_client/models/search_query.py   |   2 +-
 .../models/service_account.py                 |   2 +-
 .../models/service_account_write.py           |   2 +-
 .../models/snowflake_configuration.py         |   2 +-
 .../models/sortable_search_request.py         |   2 +-
 wavefront_api_client/models/sorting.py        |   2 +-
 wavefront_api_client/models/source.py         |   2 +-
 .../models/source_label_pair.py               |   2 +-
 .../models/source_search_request_container.py |   2 +-
 wavefront_api_client/models/span.py           |   2 +-
 .../models/span_sampling_policy.py            |   2 +-
 wavefront_api_client/models/specific_data.py  |   2 +-
 .../models/stats_model_internal_use.py        |   2 +-
 wavefront_api_client/models/stripe.py         |   2 +-
 wavefront_api_client/models/tags_response.py  |   2 +-
 wavefront_api_client/models/target_info.py    |   2 +-
 .../models/tesla_configuration.py             |   2 +-
 wavefront_api_client/models/timeseries.py     |   2 +-
 wavefront_api_client/models/trace.py          |   2 +-
 .../models/triage_dashboard.py                |   2 +-
 wavefront_api_client/models/tuple.py          |   2 +-
 wavefront_api_client/models/tuple_result.py   |   2 +-
 .../models/tuple_value_result.py              |   2 +-
 wavefront_api_client/models/user_api_token.py |   2 +-
 wavefront_api_client/models/user_dto.py       |   2 +-
 wavefront_api_client/models/user_group.py     |   2 +-
 .../models/user_group_model.py                |   2 +-
 .../models/user_group_properties_dto.py       |   2 +-
 .../models/user_group_write.py                |   2 +-
 wavefront_api_client/models/user_model.py     |   2 +-
 .../models/user_request_dto.py                |   2 +-
 wavefront_api_client/models/user_to_create.py |   2 +-
 .../models/validated_users_dto.py             |   2 +-
 wavefront_api_client/models/void.py           |   2 +-
 .../models/vrops_configuration.py             |   2 +-
 wavefront_api_client/models/wf_tags.py        |   2 +-
 wavefront_api_client/rest.py                  |   2 +-
 382 files changed, 15095 insertions(+), 286 deletions(-)
 create mode 100644 docs/AppSearchFilter.md
 create mode 100644 docs/AppSearchFilterValue.md
 create mode 100644 docs/AppSearchFilters.md
 create mode 100644 docs/PagedRecentAppMapSearch.md
 create mode 100644 docs/PagedRecentTracesSearch.md
 create mode 100644 docs/PagedSavedAppMapSearch.md
 create mode 100644 docs/PagedSavedAppMapSearchGroup.md
 create mode 100644 docs/PagedSavedTracesSearch.md
 create mode 100644 docs/PagedSavedTracesSearchGroup.md
 create mode 100644 docs/RecentAppMapSearch.md
 create mode 100644 docs/RecentAppMapSearchApi.md
 create mode 100644 docs/RecentTracesSearch.md
 create mode 100644 docs/RecentTracesSearchApi.md
 create mode 100644 docs/ResponseContainerPagedRecentAppMapSearch.md
 create mode 100644 docs/ResponseContainerPagedRecentTracesSearch.md
 create mode 100644 docs/ResponseContainerPagedSavedAppMapSearch.md
 create mode 100644 docs/ResponseContainerPagedSavedAppMapSearchGroup.md
 create mode 100644 docs/ResponseContainerPagedSavedTracesSearch.md
 create mode 100644 docs/ResponseContainerPagedSavedTracesSearchGroup.md
 create mode 100644 docs/ResponseContainerRecentAppMapSearch.md
 create mode 100644 docs/ResponseContainerRecentTracesSearch.md
 create mode 100644 docs/ResponseContainerSavedAppMapSearch.md
 create mode 100644 docs/ResponseContainerSavedAppMapSearchGroup.md
 create mode 100644 docs/ResponseContainerSavedTracesSearch.md
 create mode 100644 docs/ResponseContainerSavedTracesSearchGroup.md
 create mode 100644 docs/SavedAppMapSearch.md
 create mode 100644 docs/SavedAppMapSearchApi.md
 create mode 100644 docs/SavedAppMapSearchGroup.md
 create mode 100644 docs/SavedAppMapSearchGroupApi.md
 create mode 100644 docs/SavedTracesSearch.md
 create mode 100644 docs/SavedTracesSearchApi.md
 create mode 100644 docs/SavedTracesSearchGroup.md
 create mode 100644 docs/SavedTracesSearchGroupApi.md
 create mode 100644 test/test_app_search_filter.py
 create mode 100644 test/test_app_search_filter_value.py
 create mode 100644 test/test_app_search_filters.py
 create mode 100644 test/test_paged_recent_app_map_search.py
 create mode 100644 test/test_paged_recent_traces_search.py
 create mode 100644 test/test_paged_saved_app_map_search.py
 create mode 100644 test/test_paged_saved_app_map_search_group.py
 create mode 100644 test/test_paged_saved_traces_search.py
 create mode 100644 test/test_paged_saved_traces_search_group.py
 create mode 100644 test/test_recent_app_map_search.py
 create mode 100644 test/test_recent_app_map_search_api.py
 create mode 100644 test/test_recent_traces_search.py
 create mode 100644 test/test_recent_traces_search_api.py
 create mode 100644 test/test_response_container_paged_recent_app_map_search.py
 create mode 100644 test/test_response_container_paged_recent_traces_search.py
 create mode 100644 test/test_response_container_paged_saved_app_map_search.py
 create mode 100644 test/test_response_container_paged_saved_app_map_search_group.py
 create mode 100644 test/test_response_container_paged_saved_traces_search.py
 create mode 100644 test/test_response_container_paged_saved_traces_search_group.py
 create mode 100644 test/test_response_container_recent_app_map_search.py
 create mode 100644 test/test_response_container_recent_traces_search.py
 create mode 100644 test/test_response_container_saved_app_map_search.py
 create mode 100644 test/test_response_container_saved_app_map_search_group.py
 create mode 100644 test/test_response_container_saved_traces_search.py
 create mode 100644 test/test_response_container_saved_traces_search_group.py
 create mode 100644 test/test_saved_app_map_search.py
 create mode 100644 test/test_saved_app_map_search_api.py
 create mode 100644 test/test_saved_app_map_search_group.py
 create mode 100644 test/test_saved_app_map_search_group_api.py
 create mode 100644 test/test_saved_traces_search.py
 create mode 100644 test/test_saved_traces_search_api.py
 create mode 100644 test/test_saved_traces_search_group.py
 create mode 100644 test/test_saved_traces_search_group_api.py
 create mode 100644 wavefront_api_client/api/recent_app_map_search_api.py
 create mode 100644 wavefront_api_client/api/recent_traces_search_api.py
 create mode 100644 wavefront_api_client/api/saved_app_map_search_api.py
 create mode 100644 wavefront_api_client/api/saved_app_map_search_group_api.py
 create mode 100644 wavefront_api_client/api/saved_traces_search_api.py
 create mode 100644 wavefront_api_client/api/saved_traces_search_group_api.py
 create mode 100644 wavefront_api_client/models/app_search_filter.py
 create mode 100644 wavefront_api_client/models/app_search_filter_value.py
 create mode 100644 wavefront_api_client/models/app_search_filters.py
 create mode 100644 wavefront_api_client/models/paged_recent_app_map_search.py
 create mode 100644 wavefront_api_client/models/paged_recent_traces_search.py
 create mode 100644 wavefront_api_client/models/paged_saved_app_map_search.py
 create mode 100644 wavefront_api_client/models/paged_saved_app_map_search_group.py
 create mode 100644 wavefront_api_client/models/paged_saved_traces_search.py
 create mode 100644 wavefront_api_client/models/paged_saved_traces_search_group.py
 create mode 100644 wavefront_api_client/models/recent_app_map_search.py
 create mode 100644 wavefront_api_client/models/recent_traces_search.py
 create mode 100644 wavefront_api_client/models/response_container_paged_recent_app_map_search.py
 create mode 100644 wavefront_api_client/models/response_container_paged_recent_traces_search.py
 create mode 100644 wavefront_api_client/models/response_container_paged_saved_app_map_search.py
 create mode 100644 wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
 create mode 100644 wavefront_api_client/models/response_container_paged_saved_traces_search.py
 create mode 100644 wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
 create mode 100644 wavefront_api_client/models/response_container_recent_app_map_search.py
 create mode 100644 wavefront_api_client/models/response_container_recent_traces_search.py
 create mode 100644 wavefront_api_client/models/response_container_saved_app_map_search.py
 create mode 100644 wavefront_api_client/models/response_container_saved_app_map_search_group.py
 create mode 100644 wavefront_api_client/models/response_container_saved_traces_search.py
 create mode 100644 wavefront_api_client/models/response_container_saved_traces_search_group.py
 create mode 100644 wavefront_api_client/models/saved_app_map_search.py
 create mode 100644 wavefront_api_client/models/saved_app_map_search_group.py
 create mode 100644 wavefront_api_client/models/saved_traces_search.py
 create mode 100644 wavefront_api_client/models/saved_traces_search_group.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6847e88..fce21c3 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.121.0"
+    "packageVersion": "2.122.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 2c9c807..6847e88 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.120.1"
+    "packageVersion": "2.121.0"
 }
diff --git a/README.md b/README.md
index 0acf8c1..e5eefd8 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.121.0
+- Package version: 2.122.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -252,6 +252,12 @@ Class | Method | HTTP request | Description
 *ProxyApi* | [**update_proxy**](docs/ProxyApi.md#update_proxy) | **PUT** /api/v2/proxy/{id} | Update the name of a specific proxy
 *QueryApi* | [**query_api**](docs/QueryApi.md#query_api) | **GET** /api/v2/chart/api | Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
 *QueryApi* | [**query_raw**](docs/QueryApi.md#query_raw) | **GET** /api/v2/chart/raw | Perform a raw data query against Wavefront servers that returns second granularity points grouped by tags
+*RecentAppMapSearchApi* | [**create_recent_app_map_search**](docs/RecentAppMapSearchApi.md#create_recent_app_map_search) | **POST** /api/v2/recentappmapsearch | Create a search
+*RecentAppMapSearchApi* | [**get_all_recent_app_map_searches**](docs/RecentAppMapSearchApi.md#get_all_recent_app_map_searches) | **GET** /api/v2/recentappmapsearch | Get all searches for a user
+*RecentAppMapSearchApi* | [**get_recent_app_map_search**](docs/RecentAppMapSearchApi.md#get_recent_app_map_search) | **GET** /api/v2/recentappmapsearch/{id} | Get a specific search
+*RecentTracesSearchApi* | [**create_recent_traces_search**](docs/RecentTracesSearchApi.md#create_recent_traces_search) | **POST** /api/v2/recenttracessearch | Create a search
+*RecentTracesSearchApi* | [**get_all_recent_traces_searches**](docs/RecentTracesSearchApi.md#get_all_recent_traces_searches) | **GET** /api/v2/recenttracessearch | Get all searches for a user
+*RecentTracesSearchApi* | [**get_recent_traces_search**](docs/RecentTracesSearchApi.md#get_recent_traces_search) | **GET** /api/v2/recenttracessearch/{id} | Get a specific search
 *RoleApi* | [**add_assignees**](docs/RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add multiple users and user groups to a specific role
 *RoleApi* | [**create_role**](docs/RoleApi.md#create_role) | **POST** /api/v2/role | Create a specific role
 *RoleApi* | [**delete_role**](docs/RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a specific role
@@ -261,12 +267,44 @@ Class | Method | HTTP request | Description
 *RoleApi* | [**remove_assignees**](docs/RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove multiple users and user groups from a specific role
 *RoleApi* | [**revoke_permission_from_roles**](docs/RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revokes a single permission from role(s)
 *RoleApi* | [**update_role**](docs/RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a specific role
+*SavedAppMapSearchApi* | [**create_saved_app_map_search**](docs/SavedAppMapSearchApi.md#create_saved_app_map_search) | **POST** /api/v2/savedappmapsearch | Create a search
+*SavedAppMapSearchApi* | [**delete_saved_app_map_search**](docs/SavedAppMapSearchApi.md#delete_saved_app_map_search) | **DELETE** /api/v2/savedappmapsearch/{id} | Delete a search
+*SavedAppMapSearchApi* | [**delete_saved_app_map_search_for_user**](docs/SavedAppMapSearchApi.md#delete_saved_app_map_search_for_user) | **DELETE** /api/v2/savedappmapsearch/owned/{id} | Delete a search belonging to the user
+*SavedAppMapSearchApi* | [**get_all_saved_app_map_searches**](docs/SavedAppMapSearchApi.md#get_all_saved_app_map_searches) | **GET** /api/v2/savedappmapsearch | Get all searches for a customer
+*SavedAppMapSearchApi* | [**get_all_saved_app_map_searches_for_user**](docs/SavedAppMapSearchApi.md#get_all_saved_app_map_searches_for_user) | **GET** /api/v2/savedappmapsearch/owned | Get all searches for a user
+*SavedAppMapSearchApi* | [**get_saved_app_map_search**](docs/SavedAppMapSearchApi.md#get_saved_app_map_search) | **GET** /api/v2/savedappmapsearch/{id} | Get a specific search
+*SavedAppMapSearchApi* | [**update_saved_app_map_search**](docs/SavedAppMapSearchApi.md#update_saved_app_map_search) | **PUT** /api/v2/savedappmapsearch/{id} | Update a search
+*SavedAppMapSearchApi* | [**update_saved_app_map_search_for_user**](docs/SavedAppMapSearchApi.md#update_saved_app_map_search_for_user) | **PUT** /api/v2/savedappmapsearch/owned/{id} | Update a search belonging to the user
+*SavedAppMapSearchGroupApi* | [**add_saved_app_map_search_to_group**](docs/SavedAppMapSearchGroupApi.md#add_saved_app_map_search_to_group) | **POST** /api/v2/savedappmapsearchgroup/{id}/addSearch/{searchId} | Add a search to a search group
+*SavedAppMapSearchGroupApi* | [**create_saved_app_map_search_group**](docs/SavedAppMapSearchGroupApi.md#create_saved_app_map_search_group) | **POST** /api/v2/savedappmapsearchgroup | Create a search group
+*SavedAppMapSearchGroupApi* | [**delete_saved_app_map_search_group**](docs/SavedAppMapSearchGroupApi.md#delete_saved_app_map_search_group) | **DELETE** /api/v2/savedappmapsearchgroup/{id} | Delete a search group
+*SavedAppMapSearchGroupApi* | [**get_all_saved_app_map_search_group**](docs/SavedAppMapSearchGroupApi.md#get_all_saved_app_map_search_group) | **GET** /api/v2/savedappmapsearchgroup | Get all search groups for a user
+*SavedAppMapSearchGroupApi* | [**get_saved_app_map_search_group**](docs/SavedAppMapSearchGroupApi.md#get_saved_app_map_search_group) | **GET** /api/v2/savedappmapsearchgroup/{id} | Get a specific search group
+*SavedAppMapSearchGroupApi* | [**get_saved_app_map_searches_for_group**](docs/SavedAppMapSearchGroupApi.md#get_saved_app_map_searches_for_group) | **GET** /api/v2/savedappmapsearchgroup/{id}/searches | Get all searches for a search group
+*SavedAppMapSearchGroupApi* | [**remove_saved_app_map_search_from_group**](docs/SavedAppMapSearchGroupApi.md#remove_saved_app_map_search_from_group) | **POST** /api/v2/savedappmapsearchgroup/{id}/removeSearch/{searchId} | Remove a search from a search group
+*SavedAppMapSearchGroupApi* | [**update_saved_app_map_search_group**](docs/SavedAppMapSearchGroupApi.md#update_saved_app_map_search_group) | **PUT** /api/v2/savedappmapsearchgroup/{id} | Update a search group
 *SavedSearchApi* | [**create_saved_search**](docs/SavedSearchApi.md#create_saved_search) | **POST** /api/v2/savedsearch | Create a saved search
 *SavedSearchApi* | [**delete_saved_search**](docs/SavedSearchApi.md#delete_saved_search) | **DELETE** /api/v2/savedsearch/{id} | Delete a specific saved search
 *SavedSearchApi* | [**get_all_entity_type_saved_searches**](docs/SavedSearchApi.md#get_all_entity_type_saved_searches) | **GET** /api/v2/savedsearch/type/{entitytype} | Get all saved searches for a specific entity type for a user
 *SavedSearchApi* | [**get_all_saved_searches**](docs/SavedSearchApi.md#get_all_saved_searches) | **GET** /api/v2/savedsearch | Get all saved searches for a user
 *SavedSearchApi* | [**get_saved_search**](docs/SavedSearchApi.md#get_saved_search) | **GET** /api/v2/savedsearch/{id} | Get a specific saved search
 *SavedSearchApi* | [**update_saved_search**](docs/SavedSearchApi.md#update_saved_search) | **PUT** /api/v2/savedsearch/{id} | Update a specific saved search
+*SavedTracesSearchApi* | [**create_saved_traces_search**](docs/SavedTracesSearchApi.md#create_saved_traces_search) | **POST** /api/v2/savedtracessearch | Create a search
+*SavedTracesSearchApi* | [**delete_saved_traces_search**](docs/SavedTracesSearchApi.md#delete_saved_traces_search) | **DELETE** /api/v2/savedtracessearch/{id} | Delete a search
+*SavedTracesSearchApi* | [**delete_saved_traces_search_for_user**](docs/SavedTracesSearchApi.md#delete_saved_traces_search_for_user) | **DELETE** /api/v2/savedtracessearch/owned/{id} | Delete a search belonging to the user
+*SavedTracesSearchApi* | [**get_all_saved_traces_searches**](docs/SavedTracesSearchApi.md#get_all_saved_traces_searches) | **GET** /api/v2/savedtracessearch | Get all searches for a customer
+*SavedTracesSearchApi* | [**get_all_saved_traces_searches_for_user**](docs/SavedTracesSearchApi.md#get_all_saved_traces_searches_for_user) | **GET** /api/v2/savedtracessearch/owned | Get all searches for a user
+*SavedTracesSearchApi* | [**get_saved_traces_search**](docs/SavedTracesSearchApi.md#get_saved_traces_search) | **GET** /api/v2/savedtracessearch/{id} | Get a specific search
+*SavedTracesSearchApi* | [**update_saved_traces_search**](docs/SavedTracesSearchApi.md#update_saved_traces_search) | **PUT** /api/v2/savedtracessearch/{id} | Update a search
+*SavedTracesSearchApi* | [**update_saved_traces_search_for_user**](docs/SavedTracesSearchApi.md#update_saved_traces_search_for_user) | **PUT** /api/v2/savedtracessearch/owned/{id} | Update a search belonging to the user
+*SavedTracesSearchGroupApi* | [**add_saved_traces_search_to_group**](docs/SavedTracesSearchGroupApi.md#add_saved_traces_search_to_group) | **POST** /api/v2/savedtracessearchgroup/{id}/addSearch/{searchId} | Add a search to a search group
+*SavedTracesSearchGroupApi* | [**create_saved_traces_search_group**](docs/SavedTracesSearchGroupApi.md#create_saved_traces_search_group) | **POST** /api/v2/savedtracessearchgroup | Create a search group
+*SavedTracesSearchGroupApi* | [**delete_saved_traces_search_group**](docs/SavedTracesSearchGroupApi.md#delete_saved_traces_search_group) | **DELETE** /api/v2/savedtracessearchgroup/{id} | Delete a search group
+*SavedTracesSearchGroupApi* | [**get_all_saved_traces_search_group**](docs/SavedTracesSearchGroupApi.md#get_all_saved_traces_search_group) | **GET** /api/v2/savedtracessearchgroup | Get all search groups for a user
+*SavedTracesSearchGroupApi* | [**get_saved_traces_search_group**](docs/SavedTracesSearchGroupApi.md#get_saved_traces_search_group) | **GET** /api/v2/savedtracessearchgroup/{id} | Get a specific search group
+*SavedTracesSearchGroupApi* | [**get_saved_traces_searches_for_group**](docs/SavedTracesSearchGroupApi.md#get_saved_traces_searches_for_group) | **GET** /api/v2/savedtracessearchgroup/{id}/searches | Get all searches for a search group
+*SavedTracesSearchGroupApi* | [**remove_saved_traces_search_from_group**](docs/SavedTracesSearchGroupApi.md#remove_saved_traces_search_from_group) | **POST** /api/v2/savedtracessearchgroup/{id}/removeSearch/{searchId} | Remove a search from a search group
+*SavedTracesSearchGroupApi* | [**update_saved_traces_search_group**](docs/SavedTracesSearchGroupApi.md#update_saved_traces_search_group) | **PUT** /api/v2/savedtracessearchgroup/{id} | Update a search group
 *SearchApi* | [**search_account_entities**](docs/SearchApi.md#search_account_entities) | **POST** /api/v2/search/account | Search over a customer&#39;s accounts
 *SearchApi* | [**search_account_for_facet**](docs/SearchApi.md#search_account_for_facet) | **POST** /api/v2/search/account/{facet} | Lists the values of a specific facet over the customer&#39;s accounts
 *SearchApi* | [**search_account_for_facets**](docs/SearchApi.md#search_account_for_facets) | **POST** /api/v2/search/account/facets | Lists the values of one or more facets over the customer&#39;s accounts
@@ -326,6 +364,10 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_role_entities**](docs/SearchApi.md#search_role_entities) | **POST** /api/v2/search/role | Search over a customer&#39;s roles
 *SearchApi* | [**search_role_for_facet**](docs/SearchApi.md#search_role_for_facet) | **POST** /api/v2/search/role/{facet} | Lists the values of a specific facet over the customer&#39;s roles
 *SearchApi* | [**search_role_for_facets**](docs/SearchApi.md#search_role_for_facets) | **POST** /api/v2/search/role/facets | Lists the values of one or more facets over the customer&#39;s roles
+*SearchApi* | [**search_saved_app_map_entities**](docs/SearchApi.md#search_saved_app_map_entities) | **POST** /api/v2/search/savedappmapsearch | Search over all the customer&#39;s non-deleted saved app map searches
+*SearchApi* | [**search_saved_app_map_for_facet**](docs/SearchApi.md#search_saved_app_map_for_facet) | **POST** /api/v2/search/savedappmapsearch/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted app map searches
+*SearchApi* | [**search_saved_app_map_for_facets**](docs/SearchApi.md#search_saved_app_map_for_facets) | **POST** /api/v2/search/savedappmapsearch/facets | Lists the values of one or more facets over the customer&#39;s non-deleted app map searches
+*SearchApi* | [**search_saved_traces_entities**](docs/SearchApi.md#search_saved_traces_entities) | **POST** /api/v2/search/savedtracessearch | Search over all the customer&#39;s non-deleted saved traces searches
 *SearchApi* | [**search_service_account_entities**](docs/SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
 *SearchApi* | [**search_service_account_for_facet**](docs/SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
 *SearchApi* | [**search_service_account_for_facets**](docs/SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
@@ -338,6 +380,8 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_tagged_source_entities**](docs/SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facet**](docs/SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facets**](docs/SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
+*SearchApi* | [**search_traces_map_for_facet**](docs/SearchApi.md#search_traces_map_for_facet) | **POST** /api/v2/search/savedtracessearch/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted traces searches
+*SearchApi* | [**search_traces_map_for_facets**](docs/SearchApi.md#search_traces_map_for_facets) | **POST** /api/v2/search/savedtracessearch/facets | Lists the values of one or more facets over the customer&#39;s non-deleted traces searches
 *SearchApi* | [**search_user_entities**](docs/SearchApi.md#search_user_entities) | **POST** /api/v2/search/user | Search over a customer&#39;s users
 *SearchApi* | [**search_user_for_facet**](docs/SearchApi.md#search_user_for_facet) | **POST** /api/v2/search/user/{facet} | Lists the values of a specific facet over the customer&#39;s users
 *SearchApi* | [**search_user_for_facets**](docs/SearchApi.md#search_user_for_facets) | **POST** /api/v2/search/user/facets | Lists the values of one or more facets over the customer&#39;s users
@@ -424,6 +468,9 @@ Class | Method | HTTP request | Description
  - [Annotation](docs/Annotation.md)
  - [Anomaly](docs/Anomaly.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
+ - [AppSearchFilter](docs/AppSearchFilter.md)
+ - [AppSearchFilterValue](docs/AppSearchFilterValue.md)
+ - [AppSearchFilters](docs/AppSearchFilters.md)
  - [AzureActivityLogConfiguration](docs/AzureActivityLogConfiguration.md)
  - [AzureBaseCredentials](docs/AzureBaseCredentials.md)
  - [AzureConfiguration](docs/AzureConfiguration.md)
@@ -512,10 +559,16 @@ Class | Method | HTTP request | Description
  - [PagedMonitoredServiceDTO](docs/PagedMonitoredServiceDTO.md)
  - [PagedNotificant](docs/PagedNotificant.md)
  - [PagedProxy](docs/PagedProxy.md)
+ - [PagedRecentAppMapSearch](docs/PagedRecentAppMapSearch.md)
+ - [PagedRecentTracesSearch](docs/PagedRecentTracesSearch.md)
  - [PagedRelatedEvent](docs/PagedRelatedEvent.md)
  - [PagedReportEventAnomalyDTO](docs/PagedReportEventAnomalyDTO.md)
  - [PagedRoleDTO](docs/PagedRoleDTO.md)
+ - [PagedSavedAppMapSearch](docs/PagedSavedAppMapSearch.md)
+ - [PagedSavedAppMapSearchGroup](docs/PagedSavedAppMapSearchGroup.md)
  - [PagedSavedSearch](docs/PagedSavedSearch.md)
+ - [PagedSavedTracesSearch](docs/PagedSavedTracesSearch.md)
+ - [PagedSavedTracesSearchGroup](docs/PagedSavedTracesSearchGroup.md)
  - [PagedServiceAccount](docs/PagedServiceAccount.md)
  - [PagedSource](docs/PagedSource.md)
  - [PagedSpanSamplingPolicy](docs/PagedSpanSamplingPolicy.md)
@@ -528,6 +581,8 @@ Class | Method | HTTP request | Description
  - [QueryResult](docs/QueryResult.md)
  - [QueryTypeDTO](docs/QueryTypeDTO.md)
  - [RawTimeseries](docs/RawTimeseries.md)
+ - [RecentAppMapSearch](docs/RecentAppMapSearch.md)
+ - [RecentTracesSearch](docs/RecentTracesSearch.md)
  - [RelatedAnomaly](docs/RelatedAnomaly.md)
  - [RelatedData](docs/RelatedData.md)
  - [RelatedEvent](docs/RelatedEvent.md)
@@ -585,18 +640,30 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedMonitoredServiceDTO](docs/ResponseContainerPagedMonitoredServiceDTO.md)
  - [ResponseContainerPagedNotificant](docs/ResponseContainerPagedNotificant.md)
  - [ResponseContainerPagedProxy](docs/ResponseContainerPagedProxy.md)
+ - [ResponseContainerPagedRecentAppMapSearch](docs/ResponseContainerPagedRecentAppMapSearch.md)
+ - [ResponseContainerPagedRecentTracesSearch](docs/ResponseContainerPagedRecentTracesSearch.md)
  - [ResponseContainerPagedRelatedEvent](docs/ResponseContainerPagedRelatedEvent.md)
  - [ResponseContainerPagedReportEventAnomalyDTO](docs/ResponseContainerPagedReportEventAnomalyDTO.md)
  - [ResponseContainerPagedRoleDTO](docs/ResponseContainerPagedRoleDTO.md)
+ - [ResponseContainerPagedSavedAppMapSearch](docs/ResponseContainerPagedSavedAppMapSearch.md)
+ - [ResponseContainerPagedSavedAppMapSearchGroup](docs/ResponseContainerPagedSavedAppMapSearchGroup.md)
  - [ResponseContainerPagedSavedSearch](docs/ResponseContainerPagedSavedSearch.md)
+ - [ResponseContainerPagedSavedTracesSearch](docs/ResponseContainerPagedSavedTracesSearch.md)
+ - [ResponseContainerPagedSavedTracesSearchGroup](docs/ResponseContainerPagedSavedTracesSearchGroup.md)
  - [ResponseContainerPagedServiceAccount](docs/ResponseContainerPagedServiceAccount.md)
  - [ResponseContainerPagedSource](docs/ResponseContainerPagedSource.md)
  - [ResponseContainerPagedSpanSamplingPolicy](docs/ResponseContainerPagedSpanSamplingPolicy.md)
  - [ResponseContainerPagedUserGroupModel](docs/ResponseContainerPagedUserGroupModel.md)
  - [ResponseContainerProxy](docs/ResponseContainerProxy.md)
  - [ResponseContainerQueryTypeDTO](docs/ResponseContainerQueryTypeDTO.md)
+ - [ResponseContainerRecentAppMapSearch](docs/ResponseContainerRecentAppMapSearch.md)
+ - [ResponseContainerRecentTracesSearch](docs/ResponseContainerRecentTracesSearch.md)
  - [ResponseContainerRoleDTO](docs/ResponseContainerRoleDTO.md)
+ - [ResponseContainerSavedAppMapSearch](docs/ResponseContainerSavedAppMapSearch.md)
+ - [ResponseContainerSavedAppMapSearchGroup](docs/ResponseContainerSavedAppMapSearchGroup.md)
  - [ResponseContainerSavedSearch](docs/ResponseContainerSavedSearch.md)
+ - [ResponseContainerSavedTracesSearch](docs/ResponseContainerSavedTracesSearch.md)
+ - [ResponseContainerSavedTracesSearchGroup](docs/ResponseContainerSavedTracesSearchGroup.md)
  - [ResponseContainerServiceAccount](docs/ResponseContainerServiceAccount.md)
  - [ResponseContainerSetBusinessFunction](docs/ResponseContainerSetBusinessFunction.md)
  - [ResponseContainerSetSourceLabelPair](docs/ResponseContainerSetSourceLabelPair.md)
@@ -611,7 +678,11 @@ Class | Method | HTTP request | Description
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [RoleDTO](docs/RoleDTO.md)
+ - [SavedAppMapSearch](docs/SavedAppMapSearch.md)
+ - [SavedAppMapSearchGroup](docs/SavedAppMapSearchGroup.md)
  - [SavedSearch](docs/SavedSearch.md)
+ - [SavedTracesSearch](docs/SavedTracesSearch.md)
+ - [SavedTracesSearchGroup](docs/SavedTracesSearchGroup.md)
  - [Schema](docs/Schema.md)
  - [SearchQuery](docs/SearchQuery.md)
  - [ServiceAccount](docs/ServiceAccount.md)
diff --git a/docs/AppSearchFilter.md b/docs/AppSearchFilter.md
new file mode 100644
index 0000000..702dae7
--- /dev/null
+++ b/docs/AppSearchFilter.md
@@ -0,0 +1,11 @@
+# AppSearchFilter
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**filter_type** | **str** |  | [optional] 
+**values** | [**AppSearchFilterValue**](AppSearchFilterValue.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AppSearchFilterValue.md b/docs/AppSearchFilterValue.md
new file mode 100644
index 0000000..2c734e5
--- /dev/null
+++ b/docs/AppSearchFilterValue.md
@@ -0,0 +1,12 @@
+# AppSearchFilterValue
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**array_value** | **list[str]** |  | [optional] 
+**logical_value** | **list[list[str]]** |  | [optional] 
+**string_value** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AppSearchFilters.md b/docs/AppSearchFilters.md
new file mode 100644
index 0000000..da61099
--- /dev/null
+++ b/docs/AppSearchFilters.md
@@ -0,0 +1,11 @@
+# AppSearchFilters
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**filters** | [**list[AppSearchFilter]**](AppSearchFilter.md) |  | [optional] 
+**query** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/MaintenanceWindow.md b/docs/MaintenanceWindow.md
index e8b69e3..5c25e63 100644
--- a/docs/MaintenanceWindow.md
+++ b/docs/MaintenanceWindow.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **host_tag_group_host_names_group_anded** | **bool** | If true, a source/host must be in &#39;relevantHostNames&#39; and have tags matching the specification formed by &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39; in order for this maintenance window to apply. If false, a source/host must either be in &#39;relevantHostNames&#39; or match &#39;relevantHostTags&#39; and &#39;relevantHostTagsAnded&#39;. Default: false | [optional] 
 **id** | **str** |  | [optional] 
 **point_tag_filter** | **str** | Query that filters on point tags of timeseries scanned by alert. | [optional] 
+**point_tag_filter_anded** | **bool** | Whether to AND point tags filter listed in pointTagFilter. If true, a timeseries must contain the point tags along with other filters in order for the maintenance window to apply.If false, the tags are OR&#39;ed, the customer must contain one of the tags. Default: false | [optional] 
 **reason** | **str** | The purpose of this maintenance window | 
 **relevant_customer_tags** | **list[str]** | List of alert tags whose matching alerts will be put into maintenance because of this maintenance window | 
 **relevant_customer_tags_anded** | **bool** | Whether to AND customer tags listed in relevantCustomerTags. If true, a customer must contain all tags in order for the maintenance window to apply.  If false, the tags are OR&#39;ed, and a customer must contain one of the tags. Default: false | [optional] 
diff --git a/docs/PagedRecentAppMapSearch.md b/docs/PagedRecentAppMapSearch.md
new file mode 100644
index 0000000..cc2eaae
--- /dev/null
+++ b/docs/PagedRecentAppMapSearch.md
@@ -0,0 +1,16 @@
+# PagedRecentAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[RecentAppMapSearch]**](RecentAppMapSearch.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedRecentTracesSearch.md b/docs/PagedRecentTracesSearch.md
new file mode 100644
index 0000000..aa3ac82
--- /dev/null
+++ b/docs/PagedRecentTracesSearch.md
@@ -0,0 +1,16 @@
+# PagedRecentTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[RecentTracesSearch]**](RecentTracesSearch.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedSavedAppMapSearch.md b/docs/PagedSavedAppMapSearch.md
new file mode 100644
index 0000000..5f2e6e8
--- /dev/null
+++ b/docs/PagedSavedAppMapSearch.md
@@ -0,0 +1,16 @@
+# PagedSavedAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[SavedAppMapSearch]**](SavedAppMapSearch.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedSavedAppMapSearchGroup.md b/docs/PagedSavedAppMapSearchGroup.md
new file mode 100644
index 0000000..e652717
--- /dev/null
+++ b/docs/PagedSavedAppMapSearchGroup.md
@@ -0,0 +1,16 @@
+# PagedSavedAppMapSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[SavedAppMapSearchGroup]**](SavedAppMapSearchGroup.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedSavedTracesSearch.md b/docs/PagedSavedTracesSearch.md
new file mode 100644
index 0000000..46fadb1
--- /dev/null
+++ b/docs/PagedSavedTracesSearch.md
@@ -0,0 +1,16 @@
+# PagedSavedTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[SavedTracesSearch]**](SavedTracesSearch.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedSavedTracesSearchGroup.md b/docs/PagedSavedTracesSearchGroup.md
new file mode 100644
index 0000000..69b098f
--- /dev/null
+++ b/docs/PagedSavedTracesSearchGroup.md
@@ -0,0 +1,16 @@
+# PagedSavedTracesSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[SavedTracesSearchGroup]**](SavedTracesSearchGroup.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RecentAppMapSearch.md b/docs/RecentAppMapSearch.md
new file mode 100644
index 0000000..15f5b1e
--- /dev/null
+++ b/docs/RecentAppMapSearch.md
@@ -0,0 +1,15 @@
+# RecentAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**search_filters** | [**AppSearchFilters**](AppSearchFilters.md) | The search filters. | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RecentAppMapSearchApi.md b/docs/RecentAppMapSearchApi.md
new file mode 100644
index 0000000..3a468a3
--- /dev/null
+++ b/docs/RecentAppMapSearchApi.md
@@ -0,0 +1,175 @@
+# wavefront_api_client.RecentAppMapSearchApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_recent_app_map_search**](RecentAppMapSearchApi.md#create_recent_app_map_search) | **POST** /api/v2/recentappmapsearch | Create a search
+[**get_all_recent_app_map_searches**](RecentAppMapSearchApi.md#get_all_recent_app_map_searches) | **GET** /api/v2/recentappmapsearch | Get all searches for a user
+[**get_recent_app_map_search**](RecentAppMapSearchApi.md#get_recent_app_map_search) | **GET** /api/v2/recentappmapsearch/{id} | Get a specific search
+
+
+# **create_recent_app_map_search**
+> ResponseContainerRecentAppMapSearch create_recent_app_map_search(body=body)
+
+Create a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RecentAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.RecentAppMapSearch() # RecentAppMapSearch | Example Body:  <pre>{   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Create a search
+    api_response = api_instance.create_recent_app_map_search(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RecentAppMapSearchApi->create_recent_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**RecentAppMapSearch**](RecentAppMapSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerRecentAppMapSearch**](ResponseContainerRecentAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_recent_app_map_searches**
+> ResponseContainerPagedRecentAppMapSearch get_all_recent_app_map_searches(offset=offset, limit=limit)
+
+Get all searches for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RecentAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 10 # int |  (optional) (default to 10)
+
+try:
+    # Get all searches for a user
+    api_response = api_instance.get_all_recent_app_map_searches(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RecentAppMapSearchApi->get_all_recent_app_map_searches: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 10]
+
+### Return type
+
+[**ResponseContainerPagedRecentAppMapSearch**](ResponseContainerPagedRecentAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_recent_app_map_search**
+> ResponseContainerRecentAppMapSearch get_recent_app_map_search(id)
+
+Get a specific search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RecentAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific search
+    api_response = api_instance.get_recent_app_map_search(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RecentAppMapSearchApi->get_recent_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerRecentAppMapSearch**](ResponseContainerRecentAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/RecentTracesSearch.md b/docs/RecentTracesSearch.md
new file mode 100644
index 0000000..0e409d0
--- /dev/null
+++ b/docs/RecentTracesSearch.md
@@ -0,0 +1,15 @@
+# RecentTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**search_filters** | [**AppSearchFilters**](AppSearchFilters.md) | The search filters. | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RecentTracesSearchApi.md b/docs/RecentTracesSearchApi.md
new file mode 100644
index 0000000..86c78cc
--- /dev/null
+++ b/docs/RecentTracesSearchApi.md
@@ -0,0 +1,175 @@
+# wavefront_api_client.RecentTracesSearchApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_recent_traces_search**](RecentTracesSearchApi.md#create_recent_traces_search) | **POST** /api/v2/recenttracessearch | Create a search
+[**get_all_recent_traces_searches**](RecentTracesSearchApi.md#get_all_recent_traces_searches) | **GET** /api/v2/recenttracessearch | Get all searches for a user
+[**get_recent_traces_search**](RecentTracesSearchApi.md#get_recent_traces_search) | **GET** /api/v2/recenttracessearch/{id} | Get a specific search
+
+
+# **create_recent_traces_search**
+> ResponseContainerRecentTracesSearch create_recent_traces_search(body=body)
+
+Create a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RecentTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.RecentTracesSearch() # RecentTracesSearch | Example Body:  <pre>{   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Create a search
+    api_response = api_instance.create_recent_traces_search(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RecentTracesSearchApi->create_recent_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**RecentTracesSearch**](RecentTracesSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping.\&quot;, \&quot;&#39;*\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerRecentTracesSearch**](ResponseContainerRecentTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_recent_traces_searches**
+> ResponseContainerPagedRecentTracesSearch get_all_recent_traces_searches(offset=offset, limit=limit)
+
+Get all searches for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RecentTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a user
+    api_response = api_instance.get_all_recent_traces_searches(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RecentTracesSearchApi->get_all_recent_traces_searches: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedRecentTracesSearch**](ResponseContainerPagedRecentTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_recent_traces_search**
+> ResponseContainerRecentTracesSearch get_recent_traces_search(id)
+
+Get a specific search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.RecentTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific search
+    api_response = api_instance.get_recent_traces_search(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling RecentTracesSearchApi->get_recent_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerRecentTracesSearch**](ResponseContainerRecentTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/ResponseContainerPagedRecentAppMapSearch.md b/docs/ResponseContainerPagedRecentAppMapSearch.md
new file mode 100644
index 0000000..bd38d7d
--- /dev/null
+++ b/docs/ResponseContainerPagedRecentAppMapSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedRecentAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedRecentAppMapSearch**](PagedRecentAppMapSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedRecentTracesSearch.md b/docs/ResponseContainerPagedRecentTracesSearch.md
new file mode 100644
index 0000000..13c9afd
--- /dev/null
+++ b/docs/ResponseContainerPagedRecentTracesSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedRecentTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedRecentTracesSearch**](PagedRecentTracesSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedSavedAppMapSearch.md b/docs/ResponseContainerPagedSavedAppMapSearch.md
new file mode 100644
index 0000000..0f5c303
--- /dev/null
+++ b/docs/ResponseContainerPagedSavedAppMapSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedSavedAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedSavedAppMapSearch**](PagedSavedAppMapSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedSavedAppMapSearchGroup.md b/docs/ResponseContainerPagedSavedAppMapSearchGroup.md
new file mode 100644
index 0000000..3027237
--- /dev/null
+++ b/docs/ResponseContainerPagedSavedAppMapSearchGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedSavedAppMapSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedSavedAppMapSearchGroup**](PagedSavedAppMapSearchGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedSavedTracesSearch.md b/docs/ResponseContainerPagedSavedTracesSearch.md
new file mode 100644
index 0000000..7cca8e7
--- /dev/null
+++ b/docs/ResponseContainerPagedSavedTracesSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedSavedTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedSavedTracesSearch**](PagedSavedTracesSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedSavedTracesSearchGroup.md b/docs/ResponseContainerPagedSavedTracesSearchGroup.md
new file mode 100644
index 0000000..d480f57
--- /dev/null
+++ b/docs/ResponseContainerPagedSavedTracesSearchGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedSavedTracesSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedSavedTracesSearchGroup**](PagedSavedTracesSearchGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerRecentAppMapSearch.md b/docs/ResponseContainerRecentAppMapSearch.md
new file mode 100644
index 0000000..9be1cba
--- /dev/null
+++ b/docs/ResponseContainerRecentAppMapSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerRecentAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**RecentAppMapSearch**](RecentAppMapSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerRecentTracesSearch.md b/docs/ResponseContainerRecentTracesSearch.md
new file mode 100644
index 0000000..f9cee4b
--- /dev/null
+++ b/docs/ResponseContainerRecentTracesSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerRecentTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**RecentTracesSearch**](RecentTracesSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSavedAppMapSearch.md b/docs/ResponseContainerSavedAppMapSearch.md
new file mode 100644
index 0000000..f6fd70b
--- /dev/null
+++ b/docs/ResponseContainerSavedAppMapSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerSavedAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**SavedAppMapSearch**](SavedAppMapSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSavedAppMapSearchGroup.md b/docs/ResponseContainerSavedAppMapSearchGroup.md
new file mode 100644
index 0000000..9c3be98
--- /dev/null
+++ b/docs/ResponseContainerSavedAppMapSearchGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerSavedAppMapSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**SavedAppMapSearchGroup**](SavedAppMapSearchGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSavedTracesSearch.md b/docs/ResponseContainerSavedTracesSearch.md
new file mode 100644
index 0000000..e01889d
--- /dev/null
+++ b/docs/ResponseContainerSavedTracesSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerSavedTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**SavedTracesSearch**](SavedTracesSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerSavedTracesSearchGroup.md b/docs/ResponseContainerSavedTracesSearchGroup.md
new file mode 100644
index 0000000..55a7031
--- /dev/null
+++ b/docs/ResponseContainerSavedTracesSearchGroup.md
@@ -0,0 +1,11 @@
+# ResponseContainerSavedTracesSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**SavedTracesSearchGroup**](SavedTracesSearchGroup.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedAppMapSearch.md b/docs/SavedAppMapSearch.md
new file mode 100644
index 0000000..0bb69b9
--- /dev/null
+++ b/docs/SavedAppMapSearch.md
@@ -0,0 +1,17 @@
+# SavedAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** | Name of the search | 
+**search_filters** | [**AppSearchFilters**](AppSearchFilters.md) | The search filters. | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedAppMapSearchApi.md b/docs/SavedAppMapSearchApi.md
new file mode 100644
index 0000000..ddad53d
--- /dev/null
+++ b/docs/SavedAppMapSearchApi.md
@@ -0,0 +1,456 @@
+# wavefront_api_client.SavedAppMapSearchApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_saved_app_map_search**](SavedAppMapSearchApi.md#create_saved_app_map_search) | **POST** /api/v2/savedappmapsearch | Create a search
+[**delete_saved_app_map_search**](SavedAppMapSearchApi.md#delete_saved_app_map_search) | **DELETE** /api/v2/savedappmapsearch/{id} | Delete a search
+[**delete_saved_app_map_search_for_user**](SavedAppMapSearchApi.md#delete_saved_app_map_search_for_user) | **DELETE** /api/v2/savedappmapsearch/owned/{id} | Delete a search belonging to the user
+[**get_all_saved_app_map_searches**](SavedAppMapSearchApi.md#get_all_saved_app_map_searches) | **GET** /api/v2/savedappmapsearch | Get all searches for a customer
+[**get_all_saved_app_map_searches_for_user**](SavedAppMapSearchApi.md#get_all_saved_app_map_searches_for_user) | **GET** /api/v2/savedappmapsearch/owned | Get all searches for a user
+[**get_saved_app_map_search**](SavedAppMapSearchApi.md#get_saved_app_map_search) | **GET** /api/v2/savedappmapsearch/{id} | Get a specific search
+[**update_saved_app_map_search**](SavedAppMapSearchApi.md#update_saved_app_map_search) | **PUT** /api/v2/savedappmapsearch/{id} | Update a search
+[**update_saved_app_map_search_for_user**](SavedAppMapSearchApi.md#update_saved_app_map_search_for_user) | **PUT** /api/v2/savedappmapsearch/owned/{id} | Update a search belonging to the user
+
+
+# **create_saved_app_map_search**
+> ResponseContainerSavedAppMapSearch create_saved_app_map_search(body=body)
+
+Create a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SavedAppMapSearch() # SavedAppMapSearch | Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Create a search
+    api_response = api_instance.create_saved_app_map_search(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->create_saved_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SavedAppMapSearch**](SavedAppMapSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;beachshirts shopping\&quot;,   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearch**](ResponseContainerSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_saved_app_map_search**
+> ResponseContainerSavedAppMapSearch delete_saved_app_map_search(id)
+
+Delete a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a search
+    api_response = api_instance.delete_saved_app_map_search(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->delete_saved_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearch**](ResponseContainerSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_saved_app_map_search_for_user**
+> ResponseContainerSavedAppMapSearch delete_saved_app_map_search_for_user(id)
+
+Delete a search belonging to the user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a search belonging to the user
+    api_response = api_instance.delete_saved_app_map_search_for_user(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->delete_saved_app_map_search_for_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearch**](ResponseContainerSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_saved_app_map_searches**
+> ResponseContainerPagedSavedAppMapSearch get_all_saved_app_map_searches(offset=offset, limit=limit)
+
+Get all searches for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a customer
+    api_response = api_instance.get_all_saved_app_map_searches(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->get_all_saved_app_map_searches: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedAppMapSearch**](ResponseContainerPagedSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_saved_app_map_searches_for_user**
+> ResponseContainerPagedSavedAppMapSearch get_all_saved_app_map_searches_for_user(offset=offset, limit=limit)
+
+Get all searches for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a user
+    api_response = api_instance.get_all_saved_app_map_searches_for_user(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->get_all_saved_app_map_searches_for_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedAppMapSearch**](ResponseContainerPagedSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_saved_app_map_search**
+> ResponseContainerSavedAppMapSearch get_saved_app_map_search(id)
+
+Get a specific search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific search
+    api_response = api_instance.get_saved_app_map_search(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->get_saved_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearch**](ResponseContainerSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_saved_app_map_search**
+> ResponseContainerSavedAppMapSearch update_saved_app_map_search(id, body=body)
+
+Update a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SavedAppMapSearch() # SavedAppMapSearch | Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Update a search
+    api_response = api_instance.update_saved_app_map_search(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->update_saved_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SavedAppMapSearch**](SavedAppMapSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;beachshirts shopping\&quot;,   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearch**](ResponseContainerSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_saved_app_map_search_for_user**
+> ResponseContainerSavedAppMapSearch update_saved_app_map_search_for_user(id, body=body)
+
+Update a search belonging to the user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SavedAppMapSearch() # SavedAppMapSearch | Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Update a search belonging to the user
+    api_response = api_instance.update_saved_app_map_search_for_user(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->update_saved_app_map_search_for_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SavedAppMapSearch**](SavedAppMapSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;beachshirts shopping\&quot;,   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearch**](ResponseContainerSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SavedAppMapSearchGroup.md b/docs/SavedAppMapSearchGroup.md
new file mode 100644
index 0000000..c696b0b
--- /dev/null
+++ b/docs/SavedAppMapSearchGroup.md
@@ -0,0 +1,16 @@
+# SavedAppMapSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** | Name of the search group | 
+**search_filters** | **list[str]** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedAppMapSearchGroupApi.md b/docs/SavedAppMapSearchGroupApi.md
new file mode 100644
index 0000000..eeafb5b
--- /dev/null
+++ b/docs/SavedAppMapSearchGroupApi.md
@@ -0,0 +1,460 @@
+# wavefront_api_client.SavedAppMapSearchGroupApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_saved_app_map_search_to_group**](SavedAppMapSearchGroupApi.md#add_saved_app_map_search_to_group) | **POST** /api/v2/savedappmapsearchgroup/{id}/addSearch/{searchId} | Add a search to a search group
+[**create_saved_app_map_search_group**](SavedAppMapSearchGroupApi.md#create_saved_app_map_search_group) | **POST** /api/v2/savedappmapsearchgroup | Create a search group
+[**delete_saved_app_map_search_group**](SavedAppMapSearchGroupApi.md#delete_saved_app_map_search_group) | **DELETE** /api/v2/savedappmapsearchgroup/{id} | Delete a search group
+[**get_all_saved_app_map_search_group**](SavedAppMapSearchGroupApi.md#get_all_saved_app_map_search_group) | **GET** /api/v2/savedappmapsearchgroup | Get all search groups for a user
+[**get_saved_app_map_search_group**](SavedAppMapSearchGroupApi.md#get_saved_app_map_search_group) | **GET** /api/v2/savedappmapsearchgroup/{id} | Get a specific search group
+[**get_saved_app_map_searches_for_group**](SavedAppMapSearchGroupApi.md#get_saved_app_map_searches_for_group) | **GET** /api/v2/savedappmapsearchgroup/{id}/searches | Get all searches for a search group
+[**remove_saved_app_map_search_from_group**](SavedAppMapSearchGroupApi.md#remove_saved_app_map_search_from_group) | **POST** /api/v2/savedappmapsearchgroup/{id}/removeSearch/{searchId} | Remove a search from a search group
+[**update_saved_app_map_search_group**](SavedAppMapSearchGroupApi.md#update_saved_app_map_search_group) | **PUT** /api/v2/savedappmapsearchgroup/{id} | Update a search group
+
+
+# **add_saved_app_map_search_to_group**
+> ResponseContainer add_saved_app_map_search_to_group(id, search_id)
+
+Add a search to a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+search_id = 'search_id_example' # str | 
+
+try:
+    # Add a search to a search group
+    api_response = api_instance.add_saved_app_map_search_to_group(id, search_id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->add_saved_app_map_search_to_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **search_id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_saved_app_map_search_group**
+> ResponseContainerSavedAppMapSearchGroup create_saved_app_map_search_group(body=body)
+
+Create a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SavedAppMapSearchGroup() # SavedAppMapSearchGroup | Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre> (optional)
+
+try:
+    # Create a search group
+    api_response = api_instance.create_saved_app_map_search_group(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->create_saved_app_map_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SavedAppMapSearchGroup**](SavedAppMapSearchGroup.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Search Group 1\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearchGroup**](ResponseContainerSavedAppMapSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_saved_app_map_search_group**
+> ResponseContainerSavedAppMapSearchGroup delete_saved_app_map_search_group(id)
+
+Delete a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a search group
+    api_response = api_instance.delete_saved_app_map_search_group(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->delete_saved_app_map_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearchGroup**](ResponseContainerSavedAppMapSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_saved_app_map_search_group**
+> ResponseContainerPagedSavedAppMapSearchGroup get_all_saved_app_map_search_group(offset=offset, limit=limit)
+
+Get all search groups for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all search groups for a user
+    api_response = api_instance.get_all_saved_app_map_search_group(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->get_all_saved_app_map_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedAppMapSearchGroup**](ResponseContainerPagedSavedAppMapSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_saved_app_map_search_group**
+> ResponseContainerSavedAppMapSearchGroup get_saved_app_map_search_group(id)
+
+Get a specific search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific search group
+    api_response = api_instance.get_saved_app_map_search_group(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->get_saved_app_map_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearchGroup**](ResponseContainerSavedAppMapSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_saved_app_map_searches_for_group**
+> ResponseContainerPagedSavedAppMapSearch get_saved_app_map_searches_for_group(id, offset=offset, limit=limit)
+
+Get all searches for a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a search group
+    api_response = api_instance.get_saved_app_map_searches_for_group(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->get_saved_app_map_searches_for_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedAppMapSearch**](ResponseContainerPagedSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_saved_app_map_search_from_group**
+> ResponseContainer remove_saved_app_map_search_from_group(id, search_id)
+
+Remove a search from a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+search_id = 'search_id_example' # str | 
+
+try:
+    # Remove a search from a search group
+    api_response = api_instance.remove_saved_app_map_search_from_group(id, search_id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->remove_saved_app_map_search_from_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **search_id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_saved_app_map_search_group**
+> ResponseContainerSavedAppMapSearchGroup update_saved_app_map_search_group(id, body=body)
+
+Update a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SavedAppMapSearchGroup() # SavedAppMapSearchGroup | Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre> (optional)
+
+try:
+    # Update a search group
+    api_response = api_instance.update_saved_app_map_search_group(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchGroupApi->update_saved_app_map_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SavedAppMapSearchGroup**](SavedAppMapSearchGroup.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Search Group 1\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedAppMapSearchGroup**](ResponseContainerSavedAppMapSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SavedTracesSearch.md b/docs/SavedTracesSearch.md
new file mode 100644
index 0000000..ea5bfff
--- /dev/null
+++ b/docs/SavedTracesSearch.md
@@ -0,0 +1,17 @@
+# SavedTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** | Name of the search | [optional] 
+**search_filters** | [**AppSearchFilters**](AppSearchFilters.md) | The search filters. | 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedTracesSearchApi.md b/docs/SavedTracesSearchApi.md
new file mode 100644
index 0000000..a7bdc8e
--- /dev/null
+++ b/docs/SavedTracesSearchApi.md
@@ -0,0 +1,456 @@
+# wavefront_api_client.SavedTracesSearchApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_saved_traces_search**](SavedTracesSearchApi.md#create_saved_traces_search) | **POST** /api/v2/savedtracessearch | Create a search
+[**delete_saved_traces_search**](SavedTracesSearchApi.md#delete_saved_traces_search) | **DELETE** /api/v2/savedtracessearch/{id} | Delete a search
+[**delete_saved_traces_search_for_user**](SavedTracesSearchApi.md#delete_saved_traces_search_for_user) | **DELETE** /api/v2/savedtracessearch/owned/{id} | Delete a search belonging to the user
+[**get_all_saved_traces_searches**](SavedTracesSearchApi.md#get_all_saved_traces_searches) | **GET** /api/v2/savedtracessearch | Get all searches for a customer
+[**get_all_saved_traces_searches_for_user**](SavedTracesSearchApi.md#get_all_saved_traces_searches_for_user) | **GET** /api/v2/savedtracessearch/owned | Get all searches for a user
+[**get_saved_traces_search**](SavedTracesSearchApi.md#get_saved_traces_search) | **GET** /api/v2/savedtracessearch/{id} | Get a specific search
+[**update_saved_traces_search**](SavedTracesSearchApi.md#update_saved_traces_search) | **PUT** /api/v2/savedtracessearch/{id} | Update a search
+[**update_saved_traces_search_for_user**](SavedTracesSearchApi.md#update_saved_traces_search_for_user) | **PUT** /api/v2/savedtracessearch/owned/{id} | Update a search belonging to the user
+
+
+# **create_saved_traces_search**
+> ResponseContainerSavedTracesSearch create_saved_traces_search(body=body)
+
+Create a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SavedTracesSearch() # SavedTracesSearch | Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Create a search
+    api_response = api_instance.create_saved_traces_search(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->create_saved_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SavedTracesSearch**](SavedTracesSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;beachshirts shopping\&quot;,   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping.\&quot;, \&quot;&#39;*\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearch**](ResponseContainerSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_saved_traces_search**
+> ResponseContainerSavedTracesSearch delete_saved_traces_search(id)
+
+Delete a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a search
+    api_response = api_instance.delete_saved_traces_search(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->delete_saved_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearch**](ResponseContainerSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_saved_traces_search_for_user**
+> ResponseContainerSavedTracesSearch delete_saved_traces_search_for_user(id)
+
+Delete a search belonging to the user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a search belonging to the user
+    api_response = api_instance.delete_saved_traces_search_for_user(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->delete_saved_traces_search_for_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearch**](ResponseContainerSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_saved_traces_searches**
+> ResponseContainerPagedSavedTracesSearch get_all_saved_traces_searches(offset=offset, limit=limit)
+
+Get all searches for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a customer
+    api_response = api_instance.get_all_saved_traces_searches(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->get_all_saved_traces_searches: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedTracesSearch**](ResponseContainerPagedSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_saved_traces_searches_for_user**
+> ResponseContainerPagedSavedTracesSearch get_all_saved_traces_searches_for_user(offset=offset, limit=limit)
+
+Get all searches for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a user
+    api_response = api_instance.get_all_saved_traces_searches_for_user(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->get_all_saved_traces_searches_for_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedTracesSearch**](ResponseContainerPagedSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_saved_traces_search**
+> ResponseContainerSavedTracesSearch get_saved_traces_search(id)
+
+Get a specific search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific search
+    api_response = api_instance.get_saved_traces_search(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->get_saved_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearch**](ResponseContainerSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_saved_traces_search**
+> ResponseContainerSavedTracesSearch update_saved_traces_search(id, body=body)
+
+Update a search
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SavedTracesSearch() # SavedTracesSearch | Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Update a search
+    api_response = api_instance.update_saved_traces_search(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->update_saved_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SavedTracesSearch**](SavedTracesSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;beachshirts shopping\&quot;,   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping.\&quot;, \&quot;&#39;*\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearch**](ResponseContainerSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_saved_traces_search_for_user**
+> ResponseContainerSavedTracesSearch update_saved_traces_search_for_user(id, body=body)
+
+Update a search belonging to the user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SavedTracesSearch() # SavedTracesSearch | Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre> (optional)
+
+try:
+    # Update a search belonging to the user
+    api_response = api_instance.update_saved_traces_search_for_user(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->update_saved_traces_search_for_user: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SavedTracesSearch**](SavedTracesSearch.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;beachshirts shopping\&quot;,   \&quot;searchFilters\&quot;: {     \&quot;filters\&quot;: [       {         \&quot;filterType\&quot;: \&quot;OPERATION\&quot;,         \&quot;values\&quot;: {           \&quot;logicalValue\&quot;: [             [               \&quot;beachshirts.\&quot;, \&quot;shopping.\&quot;, \&quot;&#39;*\&quot;             ]           ]         }       }     ]   } }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearch**](ResponseContainerSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SavedTracesSearchGroup.md b/docs/SavedTracesSearchGroup.md
new file mode 100644
index 0000000..8d0afba
--- /dev/null
+++ b/docs/SavedTracesSearchGroup.md
@@ -0,0 +1,16 @@
+# SavedTracesSearchGroup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** | Name of the search group | 
+**search_filters** | **list[str]** |  | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedTracesSearchGroupApi.md b/docs/SavedTracesSearchGroupApi.md
new file mode 100644
index 0000000..e648c83
--- /dev/null
+++ b/docs/SavedTracesSearchGroupApi.md
@@ -0,0 +1,460 @@
+# wavefront_api_client.SavedTracesSearchGroupApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**add_saved_traces_search_to_group**](SavedTracesSearchGroupApi.md#add_saved_traces_search_to_group) | **POST** /api/v2/savedtracessearchgroup/{id}/addSearch/{searchId} | Add a search to a search group
+[**create_saved_traces_search_group**](SavedTracesSearchGroupApi.md#create_saved_traces_search_group) | **POST** /api/v2/savedtracessearchgroup | Create a search group
+[**delete_saved_traces_search_group**](SavedTracesSearchGroupApi.md#delete_saved_traces_search_group) | **DELETE** /api/v2/savedtracessearchgroup/{id} | Delete a search group
+[**get_all_saved_traces_search_group**](SavedTracesSearchGroupApi.md#get_all_saved_traces_search_group) | **GET** /api/v2/savedtracessearchgroup | Get all search groups for a user
+[**get_saved_traces_search_group**](SavedTracesSearchGroupApi.md#get_saved_traces_search_group) | **GET** /api/v2/savedtracessearchgroup/{id} | Get a specific search group
+[**get_saved_traces_searches_for_group**](SavedTracesSearchGroupApi.md#get_saved_traces_searches_for_group) | **GET** /api/v2/savedtracessearchgroup/{id}/searches | Get all searches for a search group
+[**remove_saved_traces_search_from_group**](SavedTracesSearchGroupApi.md#remove_saved_traces_search_from_group) | **POST** /api/v2/savedtracessearchgroup/{id}/removeSearch/{searchId} | Remove a search from a search group
+[**update_saved_traces_search_group**](SavedTracesSearchGroupApi.md#update_saved_traces_search_group) | **PUT** /api/v2/savedtracessearchgroup/{id} | Update a search group
+
+
+# **add_saved_traces_search_to_group**
+> ResponseContainer add_saved_traces_search_to_group(id, search_id)
+
+Add a search to a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+search_id = 'search_id_example' # str | 
+
+try:
+    # Add a search to a search group
+    api_response = api_instance.add_saved_traces_search_to_group(id, search_id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->add_saved_traces_search_to_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **search_id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **create_saved_traces_search_group**
+> ResponseContainerSavedTracesSearchGroup create_saved_traces_search_group(body=body)
+
+Create a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SavedTracesSearchGroup() # SavedTracesSearchGroup | Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre> (optional)
+
+try:
+    # Create a search group
+    api_response = api_instance.create_saved_traces_search_group(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->create_saved_traces_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SavedTracesSearchGroup**](SavedTracesSearchGroup.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Search Group 1\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearchGroup**](ResponseContainerSavedTracesSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_saved_traces_search_group**
+> ResponseContainerSavedTracesSearchGroup delete_saved_traces_search_group(id)
+
+Delete a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Delete a search group
+    api_response = api_instance.delete_saved_traces_search_group(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->delete_saved_traces_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearchGroup**](ResponseContainerSavedTracesSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_all_saved_traces_search_group**
+> ResponseContainerPagedSavedTracesSearchGroup get_all_saved_traces_search_group(offset=offset, limit=limit)
+
+Get all search groups for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all search groups for a user
+    api_response = api_instance.get_all_saved_traces_search_group(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->get_all_saved_traces_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedTracesSearchGroup**](ResponseContainerPagedSavedTracesSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_saved_traces_search_group**
+> ResponseContainerSavedTracesSearchGroup get_saved_traces_search_group(id)
+
+Get a specific search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific search group
+    api_response = api_instance.get_saved_traces_search_group(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->get_saved_traces_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearchGroup**](ResponseContainerSavedTracesSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_saved_traces_searches_for_group**
+> ResponseContainerPagedSavedTracesSearch get_saved_traces_searches_for_group(id, offset=offset, limit=limit)
+
+Get all searches for a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all searches for a search group
+    api_response = api_instance.get_saved_traces_searches_for_group(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->get_saved_traces_searches_for_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedSavedTracesSearch**](ResponseContainerPagedSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_saved_traces_search_from_group**
+> ResponseContainer remove_saved_traces_search_from_group(id, search_id)
+
+Remove a search from a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+search_id = 'search_id_example' # str | 
+
+try:
+    # Remove a search from a search group
+    api_response = api_instance.remove_saved_traces_search_from_group(id, search_id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->remove_saved_traces_search_from_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **search_id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_saved_traces_search_group**
+> ResponseContainerSavedTracesSearchGroup update_saved_traces_search_group(id, body=body)
+
+Update a search group
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchGroupApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = wavefront_api_client.SavedTracesSearchGroup() # SavedTracesSearchGroup | Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre> (optional)
+
+try:
+    # Update a search group
+    api_response = api_instance.update_saved_traces_search_group(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchGroupApi->update_saved_traces_search_group: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | [**SavedTracesSearchGroup**](SavedTracesSearchGroup.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Search Group 1\&quot; }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerSavedTracesSearchGroup**](ResponseContainerSavedTracesSearchGroup.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 614ee76..909b17a 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -63,6 +63,10 @@ Method | HTTP request | Description
 [**search_role_entities**](SearchApi.md#search_role_entities) | **POST** /api/v2/search/role | Search over a customer&#39;s roles
 [**search_role_for_facet**](SearchApi.md#search_role_for_facet) | **POST** /api/v2/search/role/{facet} | Lists the values of a specific facet over the customer&#39;s roles
 [**search_role_for_facets**](SearchApi.md#search_role_for_facets) | **POST** /api/v2/search/role/facets | Lists the values of one or more facets over the customer&#39;s roles
+[**search_saved_app_map_entities**](SearchApi.md#search_saved_app_map_entities) | **POST** /api/v2/search/savedappmapsearch | Search over all the customer&#39;s non-deleted saved app map searches
+[**search_saved_app_map_for_facet**](SearchApi.md#search_saved_app_map_for_facet) | **POST** /api/v2/search/savedappmapsearch/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted app map searches
+[**search_saved_app_map_for_facets**](SearchApi.md#search_saved_app_map_for_facets) | **POST** /api/v2/search/savedappmapsearch/facets | Lists the values of one or more facets over the customer&#39;s non-deleted app map searches
+[**search_saved_traces_entities**](SearchApi.md#search_saved_traces_entities) | **POST** /api/v2/search/savedtracessearch | Search over all the customer&#39;s non-deleted saved traces searches
 [**search_service_account_entities**](SearchApi.md#search_service_account_entities) | **POST** /api/v2/search/serviceaccount | Search over a customer&#39;s service accounts
 [**search_service_account_for_facet**](SearchApi.md#search_service_account_for_facet) | **POST** /api/v2/search/serviceaccount/{facet} | Lists the values of a specific facet over the customer&#39;s service accounts
 [**search_service_account_for_facets**](SearchApi.md#search_service_account_for_facets) | **POST** /api/v2/search/serviceaccount/facets | Lists the values of one or more facets over the customer&#39;s service accounts
@@ -75,6 +79,8 @@ Method | HTTP request | Description
 [**search_tagged_source_entities**](SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 [**search_tagged_source_for_facet**](SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 [**search_tagged_source_for_facets**](SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
+[**search_traces_map_for_facet**](SearchApi.md#search_traces_map_for_facet) | **POST** /api/v2/search/savedtracessearch/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted traces searches
+[**search_traces_map_for_facets**](SearchApi.md#search_traces_map_for_facets) | **POST** /api/v2/search/savedtracessearch/facets | Lists the values of one or more facets over the customer&#39;s non-deleted traces searches
 [**search_user_entities**](SearchApi.md#search_user_entities) | **POST** /api/v2/search/user | Search over a customer&#39;s users
 [**search_user_for_facet**](SearchApi.md#search_user_for_facet) | **POST** /api/v2/search/user/{facet} | Lists the values of a specific facet over the customer&#39;s users
 [**search_user_for_facets**](SearchApi.md#search_user_for_facets) | **POST** /api/v2/search/user/facets | Lists the values of one or more facets over the customer&#39;s users
@@ -3314,6 +3320,224 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_saved_app_map_entities**
+> ResponseContainerPagedSavedAppMapSearch search_saved_app_map_entities(body=body)
+
+Search over all the customer's non-deleted saved app map searches
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over all the customer's non-deleted saved app map searches
+    api_response = api_instance.search_saved_app_map_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_saved_app_map_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedSavedAppMapSearch**](ResponseContainerPagedSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_saved_app_map_for_facet**
+> ResponseContainerFacetResponse search_saved_app_map_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted app map searches
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted app map searches
+    api_response = api_instance.search_saved_app_map_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_saved_app_map_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_saved_app_map_for_facets**
+> ResponseContainerFacetsResponseContainer search_saved_app_map_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted app map searches
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted app map searches
+    api_response = api_instance.search_saved_app_map_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_saved_app_map_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_saved_traces_entities**
+> ResponseContainerPagedSavedTracesSearch search_saved_traces_entities(body=body)
+
+Search over all the customer's non-deleted saved traces searches
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over all the customer's non-deleted saved traces searches
+    api_response = api_instance.search_saved_traces_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_saved_traces_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedSavedTracesSearch**](ResponseContainerPagedSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_service_account_entities**
 > ResponseContainerPagedServiceAccount search_service_account_entities(body=body)
 
@@ -3970,6 +4194,116 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_traces_map_for_facet**
+> ResponseContainerFacetResponse search_traces_map_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's non-deleted traces searches
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's non-deleted traces searches
+    api_response = api_instance.search_traces_map_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_traces_map_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_traces_map_for_facets**
+> ResponseContainerFacetsResponseContainer search_traces_map_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's non-deleted traces searches
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's non-deleted traces searches
+    api_response = api_instance.search_traces_map_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_traces_map_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_user_entities**
 > ResponseContainerPagedCustomerFacingUserObject search_user_entities(body=body)
 
diff --git a/setup.py b/setup.py
index dfb5768..5a56196 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.121.0"
+VERSION = "2.122.1"
 # To install the library, run the following
 #
 # python setup.py install
@@ -33,10 +33,10 @@
 setup(
     name=NAME,
     version=VERSION,
-    description="Wavefront REST API",
+    description="Wavefront REST API Documentation",
     author_email="chitimba@wavefront.com",
     url="https://github.com/wavefrontHQ/python-client",
-    keywords=["Swagger", "Wavefront REST API"],
+    keywords=["Swagger", "Wavefront REST API Documentation"],
     install_requires=REQUIRES,
     packages=find_packages(),
     include_package_data=True,
diff --git a/test/test_app_search_filter.py b/test/test_app_search_filter.py
new file mode 100644
index 0000000..c37b136
--- /dev/null
+++ b/test/test_app_search_filter.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.app_search_filter import AppSearchFilter  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAppSearchFilter(unittest.TestCase):
+    """AppSearchFilter unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAppSearchFilter(self):
+        """Test AppSearchFilter"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.app_search_filter.AppSearchFilter()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_app_search_filter_value.py b/test/test_app_search_filter_value.py
new file mode 100644
index 0000000..00562b3
--- /dev/null
+++ b/test/test_app_search_filter_value.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.app_search_filter_value import AppSearchFilterValue  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAppSearchFilterValue(unittest.TestCase):
+    """AppSearchFilterValue unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAppSearchFilterValue(self):
+        """Test AppSearchFilterValue"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.app_search_filter_value.AppSearchFilterValue()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_app_search_filters.py b/test/test_app_search_filters.py
new file mode 100644
index 0000000..6d43409
--- /dev/null
+++ b/test/test_app_search_filters.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.app_search_filters import AppSearchFilters  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAppSearchFilters(unittest.TestCase):
+    """AppSearchFilters unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAppSearchFilters(self):
+        """Test AppSearchFilters"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.app_search_filters.AppSearchFilters()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_recent_app_map_search.py b/test/test_paged_recent_app_map_search.py
new file mode 100644
index 0000000..67e4d1f
--- /dev/null
+++ b/test/test_paged_recent_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_recent_app_map_search import PagedRecentAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedRecentAppMapSearch(unittest.TestCase):
+    """PagedRecentAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedRecentAppMapSearch(self):
+        """Test PagedRecentAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_recent_app_map_search.PagedRecentAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_recent_traces_search.py b/test/test_paged_recent_traces_search.py
new file mode 100644
index 0000000..c684234
--- /dev/null
+++ b/test/test_paged_recent_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_recent_traces_search import PagedRecentTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedRecentTracesSearch(unittest.TestCase):
+    """PagedRecentTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedRecentTracesSearch(self):
+        """Test PagedRecentTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_recent_traces_search.PagedRecentTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_saved_app_map_search.py b/test/test_paged_saved_app_map_search.py
new file mode 100644
index 0000000..44c357a
--- /dev/null
+++ b/test/test_paged_saved_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_saved_app_map_search import PagedSavedAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSavedAppMapSearch(unittest.TestCase):
+    """PagedSavedAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSavedAppMapSearch(self):
+        """Test PagedSavedAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_saved_app_map_search.PagedSavedAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_saved_app_map_search_group.py b/test/test_paged_saved_app_map_search_group.py
new file mode 100644
index 0000000..2a38104
--- /dev/null
+++ b/test/test_paged_saved_app_map_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_saved_app_map_search_group import PagedSavedAppMapSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSavedAppMapSearchGroup(unittest.TestCase):
+    """PagedSavedAppMapSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSavedAppMapSearchGroup(self):
+        """Test PagedSavedAppMapSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_saved_app_map_search_group.PagedSavedAppMapSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_saved_traces_search.py b/test/test_paged_saved_traces_search.py
new file mode 100644
index 0000000..346f9fc
--- /dev/null
+++ b/test/test_paged_saved_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_saved_traces_search import PagedSavedTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSavedTracesSearch(unittest.TestCase):
+    """PagedSavedTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSavedTracesSearch(self):
+        """Test PagedSavedTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_saved_traces_search.PagedSavedTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_saved_traces_search_group.py b/test/test_paged_saved_traces_search_group.py
new file mode 100644
index 0000000..1531c18
--- /dev/null
+++ b/test/test_paged_saved_traces_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_saved_traces_search_group import PagedSavedTracesSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedSavedTracesSearchGroup(unittest.TestCase):
+    """PagedSavedTracesSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedSavedTracesSearchGroup(self):
+        """Test PagedSavedTracesSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_saved_traces_search_group.PagedSavedTracesSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_recent_app_map_search.py b/test/test_recent_app_map_search.py
new file mode 100644
index 0000000..11c8ab9
--- /dev/null
+++ b/test/test_recent_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.recent_app_map_search import RecentAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRecentAppMapSearch(unittest.TestCase):
+    """RecentAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRecentAppMapSearch(self):
+        """Test RecentAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.recent_app_map_search.RecentAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_recent_app_map_search_api.py b/test/test_recent_app_map_search_api.py
new file mode 100644
index 0000000..259b70d
--- /dev/null
+++ b/test/test_recent_app_map_search_api.py
@@ -0,0 +1,55 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.recent_app_map_search_api import RecentAppMapSearchApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRecentAppMapSearchApi(unittest.TestCase):
+    """RecentAppMapSearchApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.recent_app_map_search_api.RecentAppMapSearchApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_recent_app_map_search(self):
+        """Test case for create_recent_app_map_search
+
+        Create a search  # noqa: E501
+        """
+        pass
+
+    def test_get_all_recent_app_map_searches(self):
+        """Test case for get_all_recent_app_map_searches
+
+        Get all searches for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_recent_app_map_search(self):
+        """Test case for get_recent_app_map_search
+
+        Get a specific search  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_recent_traces_search.py b/test/test_recent_traces_search.py
new file mode 100644
index 0000000..b226f17
--- /dev/null
+++ b/test/test_recent_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.recent_traces_search import RecentTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRecentTracesSearch(unittest.TestCase):
+    """RecentTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRecentTracesSearch(self):
+        """Test RecentTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.recent_traces_search.RecentTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_recent_traces_search_api.py b/test/test_recent_traces_search_api.py
new file mode 100644
index 0000000..546412a
--- /dev/null
+++ b/test/test_recent_traces_search_api.py
@@ -0,0 +1,55 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.recent_traces_search_api import RecentTracesSearchApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRecentTracesSearchApi(unittest.TestCase):
+    """RecentTracesSearchApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.recent_traces_search_api.RecentTracesSearchApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_recent_traces_search(self):
+        """Test case for create_recent_traces_search
+
+        Create a search  # noqa: E501
+        """
+        pass
+
+    def test_get_all_recent_traces_searches(self):
+        """Test case for get_all_recent_traces_searches
+
+        Get all searches for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_recent_traces_search(self):
+        """Test case for get_recent_traces_search
+
+        Get a specific search  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_recent_app_map_search.py b/test/test_response_container_paged_recent_app_map_search.py
new file mode 100644
index 0000000..caeb4f2
--- /dev/null
+++ b/test/test_response_container_paged_recent_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_recent_app_map_search import ResponseContainerPagedRecentAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedRecentAppMapSearch(unittest.TestCase):
+    """ResponseContainerPagedRecentAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedRecentAppMapSearch(self):
+        """Test ResponseContainerPagedRecentAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_recent_app_map_search.ResponseContainerPagedRecentAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_recent_traces_search.py b/test/test_response_container_paged_recent_traces_search.py
new file mode 100644
index 0000000..1ff0efc
--- /dev/null
+++ b/test/test_response_container_paged_recent_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_recent_traces_search import ResponseContainerPagedRecentTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedRecentTracesSearch(unittest.TestCase):
+    """ResponseContainerPagedRecentTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedRecentTracesSearch(self):
+        """Test ResponseContainerPagedRecentTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_recent_traces_search.ResponseContainerPagedRecentTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_saved_app_map_search.py b/test/test_response_container_paged_saved_app_map_search.py
new file mode 100644
index 0000000..12794b6
--- /dev/null
+++ b/test/test_response_container_paged_saved_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_saved_app_map_search import ResponseContainerPagedSavedAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSavedAppMapSearch(unittest.TestCase):
+    """ResponseContainerPagedSavedAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSavedAppMapSearch(self):
+        """Test ResponseContainerPagedSavedAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_saved_app_map_search.ResponseContainerPagedSavedAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_saved_app_map_search_group.py b/test/test_response_container_paged_saved_app_map_search_group.py
new file mode 100644
index 0000000..ae1e382
--- /dev/null
+++ b/test/test_response_container_paged_saved_app_map_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_saved_app_map_search_group import ResponseContainerPagedSavedAppMapSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSavedAppMapSearchGroup(unittest.TestCase):
+    """ResponseContainerPagedSavedAppMapSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSavedAppMapSearchGroup(self):
+        """Test ResponseContainerPagedSavedAppMapSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_saved_app_map_search_group.ResponseContainerPagedSavedAppMapSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_saved_traces_search.py b/test/test_response_container_paged_saved_traces_search.py
new file mode 100644
index 0000000..1901880
--- /dev/null
+++ b/test/test_response_container_paged_saved_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_saved_traces_search import ResponseContainerPagedSavedTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSavedTracesSearch(unittest.TestCase):
+    """ResponseContainerPagedSavedTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSavedTracesSearch(self):
+        """Test ResponseContainerPagedSavedTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_saved_traces_search.ResponseContainerPagedSavedTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_saved_traces_search_group.py b/test/test_response_container_paged_saved_traces_search_group.py
new file mode 100644
index 0000000..917c90c
--- /dev/null
+++ b/test/test_response_container_paged_saved_traces_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_saved_traces_search_group import ResponseContainerPagedSavedTracesSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedSavedTracesSearchGroup(unittest.TestCase):
+    """ResponseContainerPagedSavedTracesSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedSavedTracesSearchGroup(self):
+        """Test ResponseContainerPagedSavedTracesSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_saved_traces_search_group.ResponseContainerPagedSavedTracesSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_recent_app_map_search.py b/test/test_response_container_recent_app_map_search.py
new file mode 100644
index 0000000..c76f269
--- /dev/null
+++ b/test/test_response_container_recent_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_recent_app_map_search import ResponseContainerRecentAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerRecentAppMapSearch(unittest.TestCase):
+    """ResponseContainerRecentAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerRecentAppMapSearch(self):
+        """Test ResponseContainerRecentAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_recent_app_map_search.ResponseContainerRecentAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_recent_traces_search.py b/test/test_response_container_recent_traces_search.py
new file mode 100644
index 0000000..130e605
--- /dev/null
+++ b/test/test_response_container_recent_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_recent_traces_search import ResponseContainerRecentTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerRecentTracesSearch(unittest.TestCase):
+    """ResponseContainerRecentTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerRecentTracesSearch(self):
+        """Test ResponseContainerRecentTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_recent_traces_search.ResponseContainerRecentTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_saved_app_map_search.py b/test/test_response_container_saved_app_map_search.py
new file mode 100644
index 0000000..2e62f59
--- /dev/null
+++ b/test/test_response_container_saved_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_saved_app_map_search import ResponseContainerSavedAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSavedAppMapSearch(unittest.TestCase):
+    """ResponseContainerSavedAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSavedAppMapSearch(self):
+        """Test ResponseContainerSavedAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_saved_app_map_search.ResponseContainerSavedAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_saved_app_map_search_group.py b/test/test_response_container_saved_app_map_search_group.py
new file mode 100644
index 0000000..f05d58f
--- /dev/null
+++ b/test/test_response_container_saved_app_map_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_saved_app_map_search_group import ResponseContainerSavedAppMapSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSavedAppMapSearchGroup(unittest.TestCase):
+    """ResponseContainerSavedAppMapSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSavedAppMapSearchGroup(self):
+        """Test ResponseContainerSavedAppMapSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_saved_app_map_search_group.ResponseContainerSavedAppMapSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_saved_traces_search.py b/test/test_response_container_saved_traces_search.py
new file mode 100644
index 0000000..5195bd4
--- /dev/null
+++ b/test/test_response_container_saved_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_saved_traces_search import ResponseContainerSavedTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSavedTracesSearch(unittest.TestCase):
+    """ResponseContainerSavedTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSavedTracesSearch(self):
+        """Test ResponseContainerSavedTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_saved_traces_search.ResponseContainerSavedTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_saved_traces_search_group.py b/test/test_response_container_saved_traces_search_group.py
new file mode 100644
index 0000000..84f1a9a
--- /dev/null
+++ b/test/test_response_container_saved_traces_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_saved_traces_search_group import ResponseContainerSavedTracesSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerSavedTracesSearchGroup(unittest.TestCase):
+    """ResponseContainerSavedTracesSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerSavedTracesSearchGroup(self):
+        """Test ResponseContainerSavedTracesSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_saved_traces_search_group.ResponseContainerSavedTracesSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_app_map_search.py b/test/test_saved_app_map_search.py
new file mode 100644
index 0000000..923edd2
--- /dev/null
+++ b/test/test_saved_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedAppMapSearch(unittest.TestCase):
+    """SavedAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSavedAppMapSearch(self):
+        """Test SavedAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.saved_app_map_search.SavedAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_app_map_search_api.py b/test/test_saved_app_map_search_api.py
new file mode 100644
index 0000000..b2e0540
--- /dev/null
+++ b/test/test_saved_app_map_search_api.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.saved_app_map_search_api import SavedAppMapSearchApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedAppMapSearchApi(unittest.TestCase):
+    """SavedAppMapSearchApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.saved_app_map_search_api.SavedAppMapSearchApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_saved_app_map_search(self):
+        """Test case for create_saved_app_map_search
+
+        Create a search  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_app_map_search(self):
+        """Test case for delete_saved_app_map_search
+
+        Delete a search  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_app_map_search_for_user(self):
+        """Test case for delete_saved_app_map_search_for_user
+
+        Delete a search belonging to the user  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_app_map_searches(self):
+        """Test case for get_all_saved_app_map_searches
+
+        Get all searches for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_app_map_searches_for_user(self):
+        """Test case for get_all_saved_app_map_searches_for_user
+
+        Get all searches for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_app_map_search(self):
+        """Test case for get_saved_app_map_search
+
+        Get a specific search  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_app_map_search(self):
+        """Test case for update_saved_app_map_search
+
+        Update a search  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_app_map_search_for_user(self):
+        """Test case for update_saved_app_map_search_for_user
+
+        Update a search belonging to the user  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_app_map_search_group.py b/test/test_saved_app_map_search_group.py
new file mode 100644
index 0000000..8a7a882
--- /dev/null
+++ b/test/test_saved_app_map_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedAppMapSearchGroup(unittest.TestCase):
+    """SavedAppMapSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSavedAppMapSearchGroup(self):
+        """Test SavedAppMapSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.saved_app_map_search_group.SavedAppMapSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_app_map_search_group_api.py b/test/test_saved_app_map_search_group_api.py
new file mode 100644
index 0000000..b1a69c3
--- /dev/null
+++ b/test/test_saved_app_map_search_group_api.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.saved_app_map_search_group_api import SavedAppMapSearchGroupApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedAppMapSearchGroupApi(unittest.TestCase):
+    """SavedAppMapSearchGroupApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.saved_app_map_search_group_api.SavedAppMapSearchGroupApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_saved_app_map_search_to_group(self):
+        """Test case for add_saved_app_map_search_to_group
+
+        Add a search to a search group  # noqa: E501
+        """
+        pass
+
+    def test_create_saved_app_map_search_group(self):
+        """Test case for create_saved_app_map_search_group
+
+        Create a search group  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_app_map_search_group(self):
+        """Test case for delete_saved_app_map_search_group
+
+        Delete a search group  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_app_map_search_group(self):
+        """Test case for get_all_saved_app_map_search_group
+
+        Get all search groups for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_app_map_search_group(self):
+        """Test case for get_saved_app_map_search_group
+
+        Get a specific search group  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_app_map_searches_for_group(self):
+        """Test case for get_saved_app_map_searches_for_group
+
+        Get all searches for a search group  # noqa: E501
+        """
+        pass
+
+    def test_remove_saved_app_map_search_from_group(self):
+        """Test case for remove_saved_app_map_search_from_group
+
+        Remove a search from a search group  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_app_map_search_group(self):
+        """Test case for update_saved_app_map_search_group
+
+        Update a search group  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_traces_search.py b/test/test_saved_traces_search.py
new file mode 100644
index 0000000..12bb055
--- /dev/null
+++ b/test/test_saved_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.saved_traces_search import SavedTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedTracesSearch(unittest.TestCase):
+    """SavedTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSavedTracesSearch(self):
+        """Test SavedTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.saved_traces_search.SavedTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_traces_search_api.py b/test/test_saved_traces_search_api.py
new file mode 100644
index 0000000..a5589cd
--- /dev/null
+++ b/test/test_saved_traces_search_api.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.saved_traces_search_api import SavedTracesSearchApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedTracesSearchApi(unittest.TestCase):
+    """SavedTracesSearchApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.saved_traces_search_api.SavedTracesSearchApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_create_saved_traces_search(self):
+        """Test case for create_saved_traces_search
+
+        Create a search  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_traces_search(self):
+        """Test case for delete_saved_traces_search
+
+        Delete a search  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_traces_search_for_user(self):
+        """Test case for delete_saved_traces_search_for_user
+
+        Delete a search belonging to the user  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_traces_searches(self):
+        """Test case for get_all_saved_traces_searches
+
+        Get all searches for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_traces_searches_for_user(self):
+        """Test case for get_all_saved_traces_searches_for_user
+
+        Get all searches for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_traces_search(self):
+        """Test case for get_saved_traces_search
+
+        Get a specific search  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_traces_search(self):
+        """Test case for update_saved_traces_search
+
+        Update a search  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_traces_search_for_user(self):
+        """Test case for update_saved_traces_search_for_user
+
+        Update a search belonging to the user  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_traces_search_group.py b/test/test_saved_traces_search_group.py
new file mode 100644
index 0000000..d8c81b2
--- /dev/null
+++ b/test/test_saved_traces_search_group.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.saved_traces_search_group import SavedTracesSearchGroup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedTracesSearchGroup(unittest.TestCase):
+    """SavedTracesSearchGroup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSavedTracesSearchGroup(self):
+        """Test SavedTracesSearchGroup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.saved_traces_search_group.SavedTracesSearchGroup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_saved_traces_search_group_api.py b/test/test_saved_traces_search_group_api.py
new file mode 100644
index 0000000..99e1f30
--- /dev/null
+++ b/test/test_saved_traces_search_group_api.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.saved_traces_search_group_api import SavedTracesSearchGroupApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSavedTracesSearchGroupApi(unittest.TestCase):
+    """SavedTracesSearchGroupApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.saved_traces_search_group_api.SavedTracesSearchGroupApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_add_saved_traces_search_to_group(self):
+        """Test case for add_saved_traces_search_to_group
+
+        Add a search to a search group  # noqa: E501
+        """
+        pass
+
+    def test_create_saved_traces_search_group(self):
+        """Test case for create_saved_traces_search_group
+
+        Create a search group  # noqa: E501
+        """
+        pass
+
+    def test_delete_saved_traces_search_group(self):
+        """Test case for delete_saved_traces_search_group
+
+        Delete a search group  # noqa: E501
+        """
+        pass
+
+    def test_get_all_saved_traces_search_group(self):
+        """Test case for get_all_saved_traces_search_group
+
+        Get all search groups for a user  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_traces_search_group(self):
+        """Test case for get_saved_traces_search_group
+
+        Get a specific search group  # noqa: E501
+        """
+        pass
+
+    def test_get_saved_traces_searches_for_group(self):
+        """Test case for get_saved_traces_searches_for_group
+
+        Get all searches for a search group  # noqa: E501
+        """
+        pass
+
+    def test_remove_saved_traces_search_from_group(self):
+        """Test case for remove_saved_traces_search_from_group
+
+        Remove a search from a search group  # noqa: E501
+        """
+        pass
+
+    def test_update_saved_traces_search_group(self):
+        """Test case for update_saved_traces_search_group
+
+        Update a search group  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index f7559ab..80f3896 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -3,7 +3,7 @@
 # flake8: noqa
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -37,8 +37,14 @@
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
+from wavefront_api_client.api.recent_app_map_search_api import RecentAppMapSearchApi
+from wavefront_api_client.api.recent_traces_search_api import RecentTracesSearchApi
 from wavefront_api_client.api.role_api import RoleApi
+from wavefront_api_client.api.saved_app_map_search_api import SavedAppMapSearchApi
+from wavefront_api_client.api.saved_app_map_search_group_api import SavedAppMapSearchGroupApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
+from wavefront_api_client.api.saved_traces_search_api import SavedTracesSearchApi
+from wavefront_api_client.api.saved_traces_search_group_api import SavedTracesSearchGroupApi
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi
@@ -67,6 +73,9 @@
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
+from wavefront_api_client.models.app_search_filter import AppSearchFilter
+from wavefront_api_client.models.app_search_filter_value import AppSearchFilterValue
+from wavefront_api_client.models.app_search_filters import AppSearchFilters
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
@@ -155,10 +164,16 @@
 from wavefront_api_client.models.paged_monitored_service_dto import PagedMonitoredServiceDTO
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
+from wavefront_api_client.models.paged_recent_app_map_search import PagedRecentAppMapSearch
+from wavefront_api_client.models.paged_recent_traces_search import PagedRecentTracesSearch
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
 from wavefront_api_client.models.paged_report_event_anomaly_dto import PagedReportEventAnomalyDTO
 from wavefront_api_client.models.paged_role_dto import PagedRoleDTO
+from wavefront_api_client.models.paged_saved_app_map_search import PagedSavedAppMapSearch
+from wavefront_api_client.models.paged_saved_app_map_search_group import PagedSavedAppMapSearchGroup
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
+from wavefront_api_client.models.paged_saved_traces_search import PagedSavedTracesSearch
+from wavefront_api_client.models.paged_saved_traces_search_group import PagedSavedTracesSearchGroup
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
 from wavefront_api_client.models.paged_span_sampling_policy import PagedSpanSamplingPolicy
@@ -171,6 +186,8 @@
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.query_type_dto import QueryTypeDTO
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
+from wavefront_api_client.models.recent_app_map_search import RecentAppMapSearch
+from wavefront_api_client.models.recent_traces_search import RecentTracesSearch
 from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
 from wavefront_api_client.models.related_event import RelatedEvent
@@ -228,18 +245,30 @@
 from wavefront_api_client.models.response_container_paged_monitored_service_dto import ResponseContainerPagedMonitoredServiceDTO
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
+from wavefront_api_client.models.response_container_paged_recent_app_map_search import ResponseContainerPagedRecentAppMapSearch
+from wavefront_api_client.models.response_container_paged_recent_traces_search import ResponseContainerPagedRecentTracesSearch
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
 from wavefront_api_client.models.response_container_paged_report_event_anomaly_dto import ResponseContainerPagedReportEventAnomalyDTO
 from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO
+from wavefront_api_client.models.response_container_paged_saved_app_map_search import ResponseContainerPagedSavedAppMapSearch
+from wavefront_api_client.models.response_container_paged_saved_app_map_search_group import ResponseContainerPagedSavedAppMapSearchGroup
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
+from wavefront_api_client.models.response_container_paged_saved_traces_search import ResponseContainerPagedSavedTracesSearch
+from wavefront_api_client.models.response_container_paged_saved_traces_search_group import ResponseContainerPagedSavedTracesSearchGroup
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_span_sampling_policy import ResponseContainerPagedSpanSamplingPolicy
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO
+from wavefront_api_client.models.response_container_recent_app_map_search import ResponseContainerRecentAppMapSearch
+from wavefront_api_client.models.response_container_recent_traces_search import ResponseContainerRecentTracesSearch
 from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO
+from wavefront_api_client.models.response_container_saved_app_map_search import ResponseContainerSavedAppMapSearch
+from wavefront_api_client.models.response_container_saved_app_map_search_group import ResponseContainerSavedAppMapSearchGroup
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
+from wavefront_api_client.models.response_container_saved_traces_search import ResponseContainerSavedTracesSearch
+from wavefront_api_client.models.response_container_saved_traces_search_group import ResponseContainerSavedTracesSearchGroup
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
 from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair
@@ -254,7 +283,11 @@
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
+from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
+from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
 from wavefront_api_client.models.saved_search import SavedSearch
+from wavefront_api_client.models.saved_traces_search import SavedTracesSearch
+from wavefront_api_client.models.saved_traces_search_group import SavedTracesSearchGroup
 from wavefront_api_client.models.schema import Schema
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index d104647..3df3a49 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -24,8 +24,14 @@
 from wavefront_api_client.api.notificant_api import NotificantApi
 from wavefront_api_client.api.proxy_api import ProxyApi
 from wavefront_api_client.api.query_api import QueryApi
+from wavefront_api_client.api.recent_app_map_search_api import RecentAppMapSearchApi
+from wavefront_api_client.api.recent_traces_search_api import RecentTracesSearchApi
 from wavefront_api_client.api.role_api import RoleApi
+from wavefront_api_client.api.saved_app_map_search_api import SavedAppMapSearchApi
+from wavefront_api_client.api.saved_app_map_search_group_api import SavedAppMapSearchGroupApi
 from wavefront_api_client.api.saved_search_api import SavedSearchApi
+from wavefront_api_client.api.saved_traces_search_api import SavedTracesSearchApi
+from wavefront_api_client.api.saved_traces_search_group_api import SavedTracesSearchGroupApi
 from wavefront_api_client.api.search_api import SearchApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi
diff --git a/wavefront_api_client/api/access_policy_api.py b/wavefront_api_client/api/access_policy_api.py
index fe91ffd..4aeaf50 100644
--- a/wavefront_api_client/api/access_policy_api.py
+++ b/wavefront_api_client/api/access_policy_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 2f78d7f..a1d56ae 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index de9ea7e..86aaaa5 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index b6834ae..d97189e 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index dd26796..49d071f 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index 18a6938..4337c06 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index 07fd6fc..2016598 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/direct_ingestion_api.py b/wavefront_api_client/api/direct_ingestion_api.py
index 1adc466..6d18aa7 100644
--- a/wavefront_api_client/api/direct_ingestion_api.py
+++ b/wavefront_api_client/api/direct_ingestion_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index ed4ddad..aa9bd37 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index 3305b8f..6316cc7 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index cf8ea92..6c95f90 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index e7733a0..06098c7 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index 81a8eae..42318d4 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index 2999593..1be574c 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index 2c8d374..8f5d16e 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/metrics_policy_api.py b/wavefront_api_client/api/metrics_policy_api.py
index 2cac016..615f1ed 100644
--- a/wavefront_api_client/api/metrics_policy_api.py
+++ b/wavefront_api_client/api/metrics_policy_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/monitored_application_api.py b/wavefront_api_client/api/monitored_application_api.py
index d2565ec..c63c458 100644
--- a/wavefront_api_client/api/monitored_application_api.py
+++ b/wavefront_api_client/api/monitored_application_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index d783631..e2c3eb8 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index f5d8a60..87153ee 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index a5f2eb7..2675e0a 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index cc96f5e..e489299 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/recent_app_map_search_api.py b/wavefront_api_client/api/recent_app_map_search_api.py
new file mode 100644
index 0000000..5b84eff
--- /dev/null
+++ b/wavefront_api_client/api/recent_app_map_search_api.py
@@ -0,0 +1,319 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class RecentAppMapSearchApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_recent_app_map_search(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_recent_app_map_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RecentAppMapSearch body: Example Body:  <pre>{   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerRecentAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_recent_app_map_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_recent_app_map_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_recent_app_map_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_recent_app_map_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RecentAppMapSearch body: Example Body:  <pre>{   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerRecentAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_recent_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/recentappmapsearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRecentAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_recent_app_map_searches(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_recent_app_map_searches(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedRecentAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_recent_app_map_searches_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_recent_app_map_searches_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_recent_app_map_searches_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_recent_app_map_searches_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedRecentAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_recent_app_map_searches" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/recentappmapsearch', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedRecentAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_recent_app_map_search(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_recent_app_map_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRecentAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_recent_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_recent_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_recent_app_map_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_recent_app_map_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRecentAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_recent_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_recent_app_map_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/recentappmapsearch/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRecentAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/recent_traces_search_api.py b/wavefront_api_client/api/recent_traces_search_api.py
new file mode 100644
index 0000000..58ee4f2
--- /dev/null
+++ b/wavefront_api_client/api/recent_traces_search_api.py
@@ -0,0 +1,319 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class RecentTracesSearchApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_recent_traces_search(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_recent_traces_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RecentTracesSearch body: Example Body:  <pre>{   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerRecentTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_recent_traces_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_recent_traces_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_recent_traces_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_recent_traces_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RecentTracesSearch body: Example Body:  <pre>{   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerRecentTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_recent_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/recenttracessearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRecentTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_recent_traces_searches(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_recent_traces_searches(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedRecentTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_recent_traces_searches_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_recent_traces_searches_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_recent_traces_searches_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_recent_traces_searches_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedRecentTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_recent_traces_searches" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/recenttracessearch', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedRecentTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_recent_traces_search(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_recent_traces_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRecentTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_recent_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_recent_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_recent_traces_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_recent_traces_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerRecentTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_recent_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_recent_traces_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/recenttracessearch/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerRecentTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index 7485144..4573a97 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/saved_app_map_search_api.py b/wavefront_api_client/api/saved_app_map_search_api.py
new file mode 100644
index 0000000..f2fbc40
--- /dev/null
+++ b/wavefront_api_client/api/saved_app_map_search_api.py
@@ -0,0 +1,818 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SavedAppMapSearchApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_saved_app_map_search(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_app_map_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedAppMapSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_saved_app_map_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_saved_app_map_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_saved_app_map_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_app_map_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedAppMapSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_saved_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_saved_app_map_search(self, id, **kwargs):  # noqa: E501
+        """Delete a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_app_map_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_saved_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_saved_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_saved_app_map_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_app_map_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_saved_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_saved_app_map_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_saved_app_map_search_for_user(self, id, **kwargs):  # noqa: E501
+        """Delete a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_app_map_search_for_user(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_saved_app_map_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_saved_app_map_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_saved_app_map_search_for_user_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_app_map_search_for_user_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_saved_app_map_search_for_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_saved_app_map_search_for_user`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/owned/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_saved_app_map_searches(self, **kwargs):  # noqa: E501
+        """Get all searches for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_app_map_searches(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_saved_app_map_searches_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_saved_app_map_searches_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_saved_app_map_searches_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all searches for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_app_map_searches_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_saved_app_map_searches" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_saved_app_map_searches_for_user(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_app_map_searches_for_user(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_saved_app_map_searches_for_user_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_saved_app_map_searches_for_user_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_saved_app_map_searches_for_user_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_app_map_searches_for_user_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_saved_app_map_searches_for_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/owned', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_saved_app_map_search(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_app_map_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_saved_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_saved_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_saved_app_map_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_app_map_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_saved_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_saved_app_map_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_saved_app_map_search(self, id, **kwargs):  # noqa: E501
+        """Update a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_app_map_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedAppMapSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_saved_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_saved_app_map_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_saved_app_map_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_app_map_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedAppMapSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_saved_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_saved_app_map_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_saved_app_map_search_for_user(self, id, **kwargs):  # noqa: E501
+        """Update a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_app_map_search_for_user(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedAppMapSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_saved_app_map_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_saved_app_map_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_saved_app_map_search_for_user_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_app_map_search_for_user_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedAppMapSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_saved_app_map_search_for_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_saved_app_map_search_for_user`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/owned/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/saved_app_map_search_group_api.py b/wavefront_api_client/api/saved_app_map_search_group_api.py
new file mode 100644
index 0000000..873fad7
--- /dev/null
+++ b/wavefront_api_client/api/saved_app_map_search_group_api.py
@@ -0,0 +1,830 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SavedAppMapSearchGroupApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def add_saved_app_map_search_to_group(self, id, search_id, **kwargs):  # noqa: E501
+        """Add a search to a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_saved_app_map_search_to_group(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_saved_app_map_search_to_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_saved_app_map_search_to_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+            return data
+
+    def add_saved_app_map_search_to_group_with_http_info(self, id, search_id, **kwargs):  # noqa: E501
+        """Add a search to a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_saved_app_map_search_to_group_with_http_info(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'search_id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_saved_app_map_search_to_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `add_saved_app_map_search_to_group`")  # noqa: E501
+        # verify the required parameter 'search_id' is set
+        if self.api_client.client_side_validation and ('search_id' not in params or
+                                                       params['search_id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `search_id` when calling `add_saved_app_map_search_to_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'search_id' in params:
+            path_params['searchId'] = params['search_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup/{id}/addSearch/{searchId}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_saved_app_map_search_group(self, **kwargs):  # noqa: E501
+        """Create a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_app_map_search_group(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedAppMapSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_saved_app_map_search_group_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_saved_app_map_search_group_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_saved_app_map_search_group_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_app_map_search_group_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedAppMapSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_saved_app_map_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_saved_app_map_search_group(self, id, **kwargs):  # noqa: E501
+        """Delete a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_app_map_search_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_saved_app_map_search_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_saved_app_map_search_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_saved_app_map_search_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_app_map_search_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_saved_app_map_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_saved_app_map_search_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_saved_app_map_search_group(self, **kwargs):  # noqa: E501
+        """Get all search groups for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_app_map_search_group(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_saved_app_map_search_group_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_saved_app_map_search_group_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_saved_app_map_search_group_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all search groups for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_app_map_search_group_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_saved_app_map_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedAppMapSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_saved_app_map_search_group(self, id, **kwargs):  # noqa: E501
+        """Get a specific search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_app_map_search_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_saved_app_map_search_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_saved_app_map_search_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_saved_app_map_search_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_app_map_search_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_saved_app_map_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_saved_app_map_search_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_saved_app_map_searches_for_group(self, id, **kwargs):  # noqa: E501
+        """Get all searches for a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_app_map_searches_for_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_saved_app_map_searches_for_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_saved_app_map_searches_for_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_saved_app_map_searches_for_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get all searches for a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_app_map_searches_for_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_saved_app_map_searches_for_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_saved_app_map_searches_for_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup/{id}/searches', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_saved_app_map_search_from_group(self, id, search_id, **kwargs):  # noqa: E501
+        """Remove a search from a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_saved_app_map_search_from_group(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_saved_app_map_search_from_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_saved_app_map_search_from_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_saved_app_map_search_from_group_with_http_info(self, id, search_id, **kwargs):  # noqa: E501
+        """Remove a search from a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_saved_app_map_search_from_group_with_http_info(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'search_id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_saved_app_map_search_from_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `remove_saved_app_map_search_from_group`")  # noqa: E501
+        # verify the required parameter 'search_id' is set
+        if self.api_client.client_side_validation and ('search_id' not in params or
+                                                       params['search_id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `search_id` when calling `remove_saved_app_map_search_from_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'search_id' in params:
+            path_params['searchId'] = params['search_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup/{id}/removeSearch/{searchId}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_saved_app_map_search_group(self, id, **kwargs):  # noqa: E501
+        """Update a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_app_map_search_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedAppMapSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_saved_app_map_search_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_saved_app_map_search_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_saved_app_map_search_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_app_map_search_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedAppMapSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedAppMapSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_saved_app_map_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_saved_app_map_search_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearchgroup/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedAppMapSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index ca94819..8c3e60d 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/saved_traces_search_api.py b/wavefront_api_client/api/saved_traces_search_api.py
new file mode 100644
index 0000000..60c0805
--- /dev/null
+++ b/wavefront_api_client/api/saved_traces_search_api.py
@@ -0,0 +1,818 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SavedTracesSearchApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def create_saved_traces_search(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_traces_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedTracesSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_saved_traces_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_saved_traces_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_saved_traces_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_traces_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedTracesSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_saved_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_saved_traces_search(self, id, **kwargs):  # noqa: E501
+        """Delete a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_traces_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_saved_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_saved_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_saved_traces_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_traces_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_saved_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_saved_traces_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_saved_traces_search_for_user(self, id, **kwargs):  # noqa: E501
+        """Delete a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_traces_search_for_user(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_saved_traces_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_saved_traces_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_saved_traces_search_for_user_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_traces_search_for_user_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_saved_traces_search_for_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_saved_traces_search_for_user`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/owned/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_saved_traces_searches(self, **kwargs):  # noqa: E501
+        """Get all searches for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_traces_searches(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_saved_traces_searches_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_saved_traces_searches_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_saved_traces_searches_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all searches for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_traces_searches_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_saved_traces_searches" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_saved_traces_searches_for_user(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_traces_searches_for_user(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_saved_traces_searches_for_user_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_saved_traces_searches_for_user_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_saved_traces_searches_for_user_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all searches for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_traces_searches_for_user_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_saved_traces_searches_for_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/owned', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_saved_traces_search(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_traces_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_saved_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_saved_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_saved_traces_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_traces_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_saved_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_saved_traces_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_saved_traces_search(self, id, **kwargs):  # noqa: E501
+        """Update a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_traces_search(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedTracesSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_saved_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_saved_traces_search_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_saved_traces_search_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a search  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_traces_search_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedTracesSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_saved_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_saved_traces_search`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_saved_traces_search_for_user(self, id, **kwargs):  # noqa: E501
+        """Update a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_traces_search_for_user(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedTracesSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_saved_traces_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_saved_traces_search_for_user_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_saved_traces_search_for_user_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a search belonging to the user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_traces_search_for_user_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedTracesSearch body: Example Body:  <pre>{   \"name\": \"beachshirts shopping\",   \"searchFilters\": {     \"filters\": [       {         \"filterType\": \"OPERATION\",         \"values\": {           \"logicalValue\": [             [               \"beachshirts.\", \"shopping.\", \"'*\"             ]           ]         }       }     ]   } }</pre>
+        :return: ResponseContainerSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_saved_traces_search_for_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_saved_traces_search_for_user`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/owned/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/saved_traces_search_group_api.py b/wavefront_api_client/api/saved_traces_search_group_api.py
new file mode 100644
index 0000000..e40867f
--- /dev/null
+++ b/wavefront_api_client/api/saved_traces_search_group_api.py
@@ -0,0 +1,830 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SavedTracesSearchGroupApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def add_saved_traces_search_to_group(self, id, search_id, **kwargs):  # noqa: E501
+        """Add a search to a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_saved_traces_search_to_group(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_saved_traces_search_to_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_saved_traces_search_to_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+            return data
+
+    def add_saved_traces_search_to_group_with_http_info(self, id, search_id, **kwargs):  # noqa: E501
+        """Add a search to a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_saved_traces_search_to_group_with_http_info(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'search_id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_saved_traces_search_to_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `add_saved_traces_search_to_group`")  # noqa: E501
+        # verify the required parameter 'search_id' is set
+        if self.api_client.client_side_validation and ('search_id' not in params or
+                                                       params['search_id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `search_id` when calling `add_saved_traces_search_to_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'search_id' in params:
+            path_params['searchId'] = params['search_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup/{id}/addSearch/{searchId}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def create_saved_traces_search_group(self, **kwargs):  # noqa: E501
+        """Create a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_traces_search_group(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedTracesSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.create_saved_traces_search_group_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.create_saved_traces_search_group_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def create_saved_traces_search_group_with_http_info(self, **kwargs):  # noqa: E501
+        """Create a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.create_saved_traces_search_group_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SavedTracesSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method create_saved_traces_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def delete_saved_traces_search_group(self, id, **kwargs):  # noqa: E501
+        """Delete a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_traces_search_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_saved_traces_search_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_saved_traces_search_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def delete_saved_traces_search_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Delete a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_saved_traces_search_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_saved_traces_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `delete_saved_traces_search_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup/{id}', 'DELETE',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_all_saved_traces_search_group(self, **kwargs):  # noqa: E501
+        """Get all search groups for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_traces_search_group(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_all_saved_traces_search_group_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_all_saved_traces_search_group_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_all_saved_traces_search_group_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all search groups for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_all_saved_traces_search_group_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_all_saved_traces_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedTracesSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_saved_traces_search_group(self, id, **kwargs):  # noqa: E501
+        """Get a specific search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_traces_search_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_saved_traces_search_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_saved_traces_search_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_saved_traces_search_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_traces_search_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_saved_traces_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_saved_traces_search_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_saved_traces_searches_for_group(self, id, **kwargs):  # noqa: E501
+        """Get all searches for a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_traces_searches_for_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_saved_traces_searches_for_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_saved_traces_searches_for_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_saved_traces_searches_for_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get all searches for a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_saved_traces_searches_for_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_saved_traces_searches_for_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_saved_traces_searches_for_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup/{id}/searches', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_saved_traces_search_from_group(self, id, search_id, **kwargs):  # noqa: E501
+        """Remove a search from a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_saved_traces_search_from_group(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_saved_traces_search_from_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_saved_traces_search_from_group_with_http_info(id, search_id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_saved_traces_search_from_group_with_http_info(self, id, search_id, **kwargs):  # noqa: E501
+        """Remove a search from a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_saved_traces_search_from_group_with_http_info(id, search_id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param str search_id: (required)
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'search_id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_saved_traces_search_from_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `remove_saved_traces_search_from_group`")  # noqa: E501
+        # verify the required parameter 'search_id' is set
+        if self.api_client.client_side_validation and ('search_id' not in params or
+                                                       params['search_id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `search_id` when calling `remove_saved_traces_search_from_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+        if 'search_id' in params:
+            path_params['searchId'] = params['search_id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup/{id}/removeSearch/{searchId}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_saved_traces_search_group(self, id, **kwargs):  # noqa: E501
+        """Update a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_traces_search_group(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedTracesSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_saved_traces_search_group_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_saved_traces_search_group_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def update_saved_traces_search_group_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Update a search group  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_saved_traces_search_group_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param SavedTracesSearchGroup body: Example Body:  <pre>{   \"name\": \"Search Group 1\" }</pre>
+        :return: ResponseContainerSavedTracesSearchGroup
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_saved_traces_search_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `update_saved_traces_search_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearchgroup/{id}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerSavedTracesSearchGroup',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 9eacafc..6a9ff51 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -5806,6 +5806,394 @@ def search_role_for_facets_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_saved_app_map_entities(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted saved app map searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_app_map_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_saved_app_map_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_saved_app_map_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_saved_app_map_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted saved app map searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_app_map_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_saved_app_map_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/savedappmapsearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_saved_app_map_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted app map searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_app_map_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_saved_app_map_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_saved_app_map_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_saved_app_map_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted app map searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_app_map_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_saved_app_map_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_saved_app_map_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/savedappmapsearch/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_saved_app_map_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted app map searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_app_map_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_saved_app_map_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_saved_app_map_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_saved_app_map_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted app map searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_app_map_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_saved_app_map_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/savedappmapsearch/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_saved_traces_entities(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted saved traces searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_traces_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_saved_traces_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_saved_traces_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_saved_traces_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over all the customer's non-deleted saved traces searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_saved_traces_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_saved_traces_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/savedtracessearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_service_account_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's service accounts  # noqa: E501
 
@@ -6978,6 +7366,204 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_traces_map_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted traces searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_traces_map_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_traces_map_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_traces_map_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_traces_map_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's non-deleted traces searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_traces_map_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_traces_map_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_traces_map_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/savedtracessearch/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_traces_map_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted traces searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_traces_map_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_traces_map_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_traces_map_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_traces_map_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's non-deleted traces searches  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_traces_map_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_traces_map_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/savedtracessearch/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_user_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index abdcc39..7bd3720 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/span_sampling_policy_api.py b/wavefront_api_client/api/span_sampling_policy_api.py
index 113f902..0e2ede1 100644
--- a/wavefront_api_client/api/span_sampling_policy_api.py
+++ b/wavefront_api_client/api/span_sampling_policy_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index e57387d..b156013 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 53a57ca..5532db7 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index f66cb7c..3590572 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 7b16a7a..68a596f 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 9688d2a..e078b4b 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.121.0/python'
+        self.user_agent = 'Swagger-Codegen/2.122.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e18a981..6650ee7 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.121.0".\
+               "SDK Package Version: 2.122.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index c6e4560..b0b5a18 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -2,7 +2,7 @@
 
 # flake8: noqa
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -31,6 +31,9 @@
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
+from wavefront_api_client.models.app_search_filter import AppSearchFilter
+from wavefront_api_client.models.app_search_filter_value import AppSearchFilterValue
+from wavefront_api_client.models.app_search_filters import AppSearchFilters
 from wavefront_api_client.models.azure_activity_log_configuration import AzureActivityLogConfiguration
 from wavefront_api_client.models.azure_base_credentials import AzureBaseCredentials
 from wavefront_api_client.models.azure_configuration import AzureConfiguration
@@ -119,10 +122,16 @@
 from wavefront_api_client.models.paged_monitored_service_dto import PagedMonitoredServiceDTO
 from wavefront_api_client.models.paged_notificant import PagedNotificant
 from wavefront_api_client.models.paged_proxy import PagedProxy
+from wavefront_api_client.models.paged_recent_app_map_search import PagedRecentAppMapSearch
+from wavefront_api_client.models.paged_recent_traces_search import PagedRecentTracesSearch
 from wavefront_api_client.models.paged_related_event import PagedRelatedEvent
 from wavefront_api_client.models.paged_report_event_anomaly_dto import PagedReportEventAnomalyDTO
 from wavefront_api_client.models.paged_role_dto import PagedRoleDTO
+from wavefront_api_client.models.paged_saved_app_map_search import PagedSavedAppMapSearch
+from wavefront_api_client.models.paged_saved_app_map_search_group import PagedSavedAppMapSearchGroup
 from wavefront_api_client.models.paged_saved_search import PagedSavedSearch
+from wavefront_api_client.models.paged_saved_traces_search import PagedSavedTracesSearch
+from wavefront_api_client.models.paged_saved_traces_search_group import PagedSavedTracesSearchGroup
 from wavefront_api_client.models.paged_service_account import PagedServiceAccount
 from wavefront_api_client.models.paged_source import PagedSource
 from wavefront_api_client.models.paged_span_sampling_policy import PagedSpanSamplingPolicy
@@ -135,6 +144,8 @@
 from wavefront_api_client.models.query_result import QueryResult
 from wavefront_api_client.models.query_type_dto import QueryTypeDTO
 from wavefront_api_client.models.raw_timeseries import RawTimeseries
+from wavefront_api_client.models.recent_app_map_search import RecentAppMapSearch
+from wavefront_api_client.models.recent_traces_search import RecentTracesSearch
 from wavefront_api_client.models.related_anomaly import RelatedAnomaly
 from wavefront_api_client.models.related_data import RelatedData
 from wavefront_api_client.models.related_event import RelatedEvent
@@ -192,18 +203,30 @@
 from wavefront_api_client.models.response_container_paged_monitored_service_dto import ResponseContainerPagedMonitoredServiceDTO
 from wavefront_api_client.models.response_container_paged_notificant import ResponseContainerPagedNotificant
 from wavefront_api_client.models.response_container_paged_proxy import ResponseContainerPagedProxy
+from wavefront_api_client.models.response_container_paged_recent_app_map_search import ResponseContainerPagedRecentAppMapSearch
+from wavefront_api_client.models.response_container_paged_recent_traces_search import ResponseContainerPagedRecentTracesSearch
 from wavefront_api_client.models.response_container_paged_related_event import ResponseContainerPagedRelatedEvent
 from wavefront_api_client.models.response_container_paged_report_event_anomaly_dto import ResponseContainerPagedReportEventAnomalyDTO
 from wavefront_api_client.models.response_container_paged_role_dto import ResponseContainerPagedRoleDTO
+from wavefront_api_client.models.response_container_paged_saved_app_map_search import ResponseContainerPagedSavedAppMapSearch
+from wavefront_api_client.models.response_container_paged_saved_app_map_search_group import ResponseContainerPagedSavedAppMapSearchGroup
 from wavefront_api_client.models.response_container_paged_saved_search import ResponseContainerPagedSavedSearch
+from wavefront_api_client.models.response_container_paged_saved_traces_search import ResponseContainerPagedSavedTracesSearch
+from wavefront_api_client.models.response_container_paged_saved_traces_search_group import ResponseContainerPagedSavedTracesSearchGroup
 from wavefront_api_client.models.response_container_paged_service_account import ResponseContainerPagedServiceAccount
 from wavefront_api_client.models.response_container_paged_source import ResponseContainerPagedSource
 from wavefront_api_client.models.response_container_paged_span_sampling_policy import ResponseContainerPagedSpanSamplingPolicy
 from wavefront_api_client.models.response_container_paged_user_group_model import ResponseContainerPagedUserGroupModel
 from wavefront_api_client.models.response_container_proxy import ResponseContainerProxy
 from wavefront_api_client.models.response_container_query_type_dto import ResponseContainerQueryTypeDTO
+from wavefront_api_client.models.response_container_recent_app_map_search import ResponseContainerRecentAppMapSearch
+from wavefront_api_client.models.response_container_recent_traces_search import ResponseContainerRecentTracesSearch
 from wavefront_api_client.models.response_container_role_dto import ResponseContainerRoleDTO
+from wavefront_api_client.models.response_container_saved_app_map_search import ResponseContainerSavedAppMapSearch
+from wavefront_api_client.models.response_container_saved_app_map_search_group import ResponseContainerSavedAppMapSearchGroup
 from wavefront_api_client.models.response_container_saved_search import ResponseContainerSavedSearch
+from wavefront_api_client.models.response_container_saved_traces_search import ResponseContainerSavedTracesSearch
+from wavefront_api_client.models.response_container_saved_traces_search_group import ResponseContainerSavedTracesSearchGroup
 from wavefront_api_client.models.response_container_service_account import ResponseContainerServiceAccount
 from wavefront_api_client.models.response_container_set_business_function import ResponseContainerSetBusinessFunction
 from wavefront_api_client.models.response_container_set_source_label_pair import ResponseContainerSetSourceLabelPair
@@ -218,7 +241,11 @@
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
+from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
+from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
 from wavefront_api_client.models.saved_search import SavedSearch
+from wavefront_api_client.models.saved_traces_search import SavedTracesSearch
+from wavefront_api_client.models.saved_traces_search_group import SavedTracesSearchGroup
 from wavefront_api_client.models.schema import Schema
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index 498a7e4..fe2a935 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/access_control_list_read_dto.py b/wavefront_api_client/models/access_control_list_read_dto.py
index 3ad3ebf..6812e9b 100644
--- a/wavefront_api_client/models/access_control_list_read_dto.py
+++ b/wavefront_api_client/models/access_control_list_read_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
index 4afc7f3..04a6ef4 100644
--- a/wavefront_api_client/models/access_control_list_simple.py
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/access_control_list_write_dto.py b/wavefront_api_client/models/access_control_list_write_dto.py
index 2f38361..9bd47b2 100644
--- a/wavefront_api_client/models/access_control_list_write_dto.py
+++ b/wavefront_api_client/models/access_control_list_write_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/access_policy.py b/wavefront_api_client/models/access_policy.py
index 81a5f64..05a222c 100644
--- a/wavefront_api_client/models/access_policy.py
+++ b/wavefront_api_client/models/access_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/access_policy_rule_dto.py b/wavefront_api_client/models/access_policy_rule_dto.py
index 6da1bbb..9e60a17 100644
--- a/wavefront_api_client/models/access_policy_rule_dto.py
+++ b/wavefront_api_client/models/access_policy_rule_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index d952793..ffaf6b7 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 53929e3..86f4890 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/alert_dashboard.py b/wavefront_api_client/models/alert_dashboard.py
index 489c802..25ed658 100644
--- a/wavefront_api_client/models/alert_dashboard.py
+++ b/wavefront_api_client/models/alert_dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/alert_min.py b/wavefront_api_client/models/alert_min.py
index 2f6c414..50a52a5 100644
--- a/wavefront_api_client/models/alert_min.py
+++ b/wavefront_api_client/models/alert_min.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/alert_route.py b/wavefront_api_client/models/alert_route.py
index b79bbe2..8ecf192 100644
--- a/wavefront_api_client/models/alert_route.py
+++ b/wavefront_api_client/models/alert_route.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/alert_source.py b/wavefront_api_client/models/alert_source.py
index b03b7ae..606cb33 100644
--- a/wavefront_api_client/models/alert_source.py
+++ b/wavefront_api_client/models/alert_source.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 0e7a6ac..7d5867a 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/anomaly.py b/wavefront_api_client/models/anomaly.py
index 580a39e..f4947dc 100644
--- a/wavefront_api_client/models/anomaly.py
+++ b/wavefront_api_client/models/anomaly.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/app_dynamics_configuration.py b/wavefront_api_client/models/app_dynamics_configuration.py
index d5026e6..48e1996 100644
--- a/wavefront_api_client/models/app_dynamics_configuration.py
+++ b/wavefront_api_client/models/app_dynamics_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/app_search_filter.py b/wavefront_api_client/models/app_search_filter.py
new file mode 100644
index 0000000..261fe80
--- /dev/null
+++ b/wavefront_api_client/models/app_search_filter.py
@@ -0,0 +1,156 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AppSearchFilter(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'filter_type': 'str',
+        'values': 'AppSearchFilterValue'
+    }
+
+    attribute_map = {
+        'filter_type': 'filterType',
+        'values': 'values'
+    }
+
+    def __init__(self, filter_type=None, values=None, _configuration=None):  # noqa: E501
+        """AppSearchFilter - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._filter_type = None
+        self._values = None
+        self.discriminator = None
+
+        if filter_type is not None:
+            self.filter_type = filter_type
+        if values is not None:
+            self.values = values
+
+    @property
+    def filter_type(self):
+        """Gets the filter_type of this AppSearchFilter.  # noqa: E501
+
+
+        :return: The filter_type of this AppSearchFilter.  # noqa: E501
+        :rtype: str
+        """
+        return self._filter_type
+
+    @filter_type.setter
+    def filter_type(self, filter_type):
+        """Sets the filter_type of this AppSearchFilter.
+
+
+        :param filter_type: The filter_type of this AppSearchFilter.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["OPERATION", "TAG", "RAW_TAG", "SPAN_LOG", "DURATION", "SPAN_DURATION", "LIMIT", "ERROR", "TRACE_ID", "SOURCE"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                filter_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `filter_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(filter_type, allowed_values)
+            )
+
+        self._filter_type = filter_type
+
+    @property
+    def values(self):
+        """Gets the values of this AppSearchFilter.  # noqa: E501
+
+
+        :return: The values of this AppSearchFilter.  # noqa: E501
+        :rtype: AppSearchFilterValue
+        """
+        return self._values
+
+    @values.setter
+    def values(self, values):
+        """Sets the values of this AppSearchFilter.
+
+
+        :param values: The values of this AppSearchFilter.  # noqa: E501
+        :type: AppSearchFilterValue
+        """
+
+        self._values = values
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AppSearchFilter, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AppSearchFilter):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AppSearchFilter):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/app_search_filter_value.py b/wavefront_api_client/models/app_search_filter_value.py
new file mode 100644
index 0000000..98c6227
--- /dev/null
+++ b/wavefront_api_client/models/app_search_filter_value.py
@@ -0,0 +1,175 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AppSearchFilterValue(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'array_value': 'list[str]',
+        'logical_value': 'list[list[str]]',
+        'string_value': 'str'
+    }
+
+    attribute_map = {
+        'array_value': 'arrayValue',
+        'logical_value': 'logicalValue',
+        'string_value': 'stringValue'
+    }
+
+    def __init__(self, array_value=None, logical_value=None, string_value=None, _configuration=None):  # noqa: E501
+        """AppSearchFilterValue - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._array_value = None
+        self._logical_value = None
+        self._string_value = None
+        self.discriminator = None
+
+        if array_value is not None:
+            self.array_value = array_value
+        if logical_value is not None:
+            self.logical_value = logical_value
+        if string_value is not None:
+            self.string_value = string_value
+
+    @property
+    def array_value(self):
+        """Gets the array_value of this AppSearchFilterValue.  # noqa: E501
+
+
+        :return: The array_value of this AppSearchFilterValue.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._array_value
+
+    @array_value.setter
+    def array_value(self, array_value):
+        """Sets the array_value of this AppSearchFilterValue.
+
+
+        :param array_value: The array_value of this AppSearchFilterValue.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._array_value = array_value
+
+    @property
+    def logical_value(self):
+        """Gets the logical_value of this AppSearchFilterValue.  # noqa: E501
+
+
+        :return: The logical_value of this AppSearchFilterValue.  # noqa: E501
+        :rtype: list[list[str]]
+        """
+        return self._logical_value
+
+    @logical_value.setter
+    def logical_value(self, logical_value):
+        """Sets the logical_value of this AppSearchFilterValue.
+
+
+        :param logical_value: The logical_value of this AppSearchFilterValue.  # noqa: E501
+        :type: list[list[str]]
+        """
+
+        self._logical_value = logical_value
+
+    @property
+    def string_value(self):
+        """Gets the string_value of this AppSearchFilterValue.  # noqa: E501
+
+
+        :return: The string_value of this AppSearchFilterValue.  # noqa: E501
+        :rtype: str
+        """
+        return self._string_value
+
+    @string_value.setter
+    def string_value(self, string_value):
+        """Sets the string_value of this AppSearchFilterValue.
+
+
+        :param string_value: The string_value of this AppSearchFilterValue.  # noqa: E501
+        :type: str
+        """
+
+        self._string_value = string_value
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AppSearchFilterValue, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AppSearchFilterValue):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AppSearchFilterValue):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/app_search_filters.py b/wavefront_api_client/models/app_search_filters.py
new file mode 100644
index 0000000..650897b
--- /dev/null
+++ b/wavefront_api_client/models/app_search_filters.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AppSearchFilters(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'filters': 'list[AppSearchFilter]',
+        'query': 'str'
+    }
+
+    attribute_map = {
+        'filters': 'filters',
+        'query': 'query'
+    }
+
+    def __init__(self, filters=None, query=None, _configuration=None):  # noqa: E501
+        """AppSearchFilters - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._filters = None
+        self._query = None
+        self.discriminator = None
+
+        if filters is not None:
+            self.filters = filters
+        if query is not None:
+            self.query = query
+
+    @property
+    def filters(self):
+        """Gets the filters of this AppSearchFilters.  # noqa: E501
+
+
+        :return: The filters of this AppSearchFilters.  # noqa: E501
+        :rtype: list[AppSearchFilter]
+        """
+        return self._filters
+
+    @filters.setter
+    def filters(self, filters):
+        """Sets the filters of this AppSearchFilters.
+
+
+        :param filters: The filters of this AppSearchFilters.  # noqa: E501
+        :type: list[AppSearchFilter]
+        """
+
+        self._filters = filters
+
+    @property
+    def query(self):
+        """Gets the query of this AppSearchFilters.  # noqa: E501
+
+
+        :return: The query of this AppSearchFilters.  # noqa: E501
+        :rtype: str
+        """
+        return self._query
+
+    @query.setter
+    def query(self, query):
+        """Sets the query of this AppSearchFilters.
+
+
+        :param query: The query of this AppSearchFilters.  # noqa: E501
+        :type: str
+        """
+
+        self._query = query
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AppSearchFilters, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AppSearchFilters):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AppSearchFilters):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index 5bc5f06..159b459 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index ef4b8b7..44fc962 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 905c997..69eca36 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index 8cfde64..6d0507d 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index c206bc3..49df37a 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 09714fc..394f255 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index d2aa3af..282af34 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/class_loader.py b/wavefront_api_client/models/class_loader.py
index 374468f..1164e50 100644
--- a/wavefront_api_client/models/class_loader.py
+++ b/wavefront_api_client/models/class_loader.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 15a3392..6cc96c5 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index e5a1eaa..c8fed17 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index b694f54..0544753 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/conversion.py b/wavefront_api_client/models/conversion.py
index 5ba17e7..0361ce9 100644
--- a/wavefront_api_client/models/conversion.py
+++ b/wavefront_api_client/models/conversion.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/conversion_object.py b/wavefront_api_client/models/conversion_object.py
index adf5e9a..61a59b9 100644
--- a/wavefront_api_client/models/conversion_object.py
+++ b/wavefront_api_client/models/conversion_object.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index 7719530..37bf975 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 7ec7f42..a2c5613 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/dashboard_min.py b/wavefront_api_client/models/dashboard_min.py
index 1b46e8b..64797da 100644
--- a/wavefront_api_client/models/dashboard_min.py
+++ b/wavefront_api_client/models/dashboard_min.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index c71fe7a..0a81a28 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index 94d2cea..768b1ae 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index 10daeac..26ad8ab 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 73a67d5..a9990f5 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/dynatrace_configuration.py b/wavefront_api_client/models/dynatrace_configuration.py
index f3965a3..afa93a0 100644
--- a/wavefront_api_client/models/dynatrace_configuration.py
+++ b/wavefront_api_client/models/dynatrace_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 70a1f02..812f8b6 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 47d7215..1d89b98 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 56798c6..0546646 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/event_time_range.py b/wavefront_api_client/models/event_time_range.py
index ad0b37e..ce849e0 100644
--- a/wavefront_api_client/models/event_time_range.py
+++ b/wavefront_api_client/models/event_time_range.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index 36ca942..41b6a12 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index bbf0e48..47b9943 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 12be18b..e42bd7d 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index 9492f95..ffea04d 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index 366e467..e72818f 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/fast_reader_builder.py b/wavefront_api_client/models/fast_reader_builder.py
index 836bd15..3732415 100644
--- a/wavefront_api_client/models/fast_reader_builder.py
+++ b/wavefront_api_client/models/fast_reader_builder.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/field.py b/wavefront_api_client/models/field.py
index 58e4c6c..a1fc62e 100644
--- a/wavefront_api_client/models/field.py
+++ b/wavefront_api_client/models/field.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index 99f5807..80e982a 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 1d226da..2d05f1c 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index bab95da..644fde3 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index c3140ec..f00d5f0 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/ingestion_policy.py b/wavefront_api_client/models/ingestion_policy.py
index 6f62e0f..efea48e 100644
--- a/wavefront_api_client/models/ingestion_policy.py
+++ b/wavefront_api_client/models/ingestion_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/ingestion_policy_mapping.py b/wavefront_api_client/models/ingestion_policy_mapping.py
index 1135fb5..9d99ca4 100644
--- a/wavefront_api_client/models/ingestion_policy_mapping.py
+++ b/wavefront_api_client/models/ingestion_policy_mapping.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/install_alerts.py b/wavefront_api_client/models/install_alerts.py
index 7c72492..2272771 100644
--- a/wavefront_api_client/models/install_alerts.py
+++ b/wavefront_api_client/models/install_alerts.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index ef5d454..d42cc34 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index 3a38b13..caec4f1 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index 8f049c6..819d874 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index f1a6f45..9b7a0bf 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 26875e7..4285306 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index f447022..d0b328f 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index 05e1250..f0e358b 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/json_node.py b/wavefront_api_client/models/json_node.py
index b0b699d..9d94f53 100644
--- a/wavefront_api_client/models/json_node.py
+++ b/wavefront_api_client/models/json_node.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
index 823fea4..b88a543 100644
--- a/wavefront_api_client/models/kubernetes_component.py
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/kubernetes_component_status.py b/wavefront_api_client/models/kubernetes_component_status.py
index 4d2a866..86b22b3 100644
--- a/wavefront_api_client/models/kubernetes_component_status.py
+++ b/wavefront_api_client/models/kubernetes_component_status.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
index 255f011..0350271 100644
--- a/wavefront_api_client/models/logical_type.py
+++ b/wavefront_api_client/models/logical_type.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index ac921a9..8377447 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
@@ -41,6 +41,7 @@ class MaintenanceWindow(object):
         'host_tag_group_host_names_group_anded': 'bool',
         'id': 'str',
         'point_tag_filter': 'str',
+        'point_tag_filter_anded': 'bool',
         'reason': 'str',
         'relevant_customer_tags': 'list[str]',
         'relevant_customer_tags_anded': 'bool',
@@ -65,6 +66,7 @@ class MaintenanceWindow(object):
         'host_tag_group_host_names_group_anded': 'hostTagGroupHostNamesGroupAnded',
         'id': 'id',
         'point_tag_filter': 'pointTagFilter',
+        'point_tag_filter_anded': 'pointTagFilterAnded',
         'reason': 'reason',
         'relevant_customer_tags': 'relevantCustomerTags',
         'relevant_customer_tags_anded': 'relevantCustomerTagsAnded',
@@ -80,7 +82,7 @@ class MaintenanceWindow(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, point_tag_filter=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, targets=None, title=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None, end_time_in_seconds=None, event_name=None, host_tag_group_host_names_group_anded=None, id=None, point_tag_filter=None, point_tag_filter_anded=None, reason=None, relevant_customer_tags=None, relevant_customer_tags_anded=None, relevant_host_names=None, relevant_host_tags=None, relevant_host_tags_anded=None, running_state=None, sort_attr=None, start_time_in_seconds=None, targets=None, title=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MaintenanceWindow - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -94,6 +96,7 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
         self._host_tag_group_host_names_group_anded = None
         self._id = None
         self._point_tag_filter = None
+        self._point_tag_filter_anded = None
         self._reason = None
         self._relevant_customer_tags = None
         self._relevant_customer_tags_anded = None
@@ -124,6 +127,8 @@ def __init__(self, created_epoch_millis=None, creator_id=None, customer_id=None,
             self.id = id
         if point_tag_filter is not None:
             self.point_tag_filter = point_tag_filter
+        if point_tag_filter_anded is not None:
+            self.point_tag_filter_anded = point_tag_filter_anded
         self.reason = reason
         self.relevant_customer_tags = relevant_customer_tags
         if relevant_customer_tags_anded is not None:
@@ -325,6 +330,29 @@ def point_tag_filter(self, point_tag_filter):
 
         self._point_tag_filter = point_tag_filter
 
+    @property
+    def point_tag_filter_anded(self):
+        """Gets the point_tag_filter_anded of this MaintenanceWindow.  # noqa: E501
+
+        Whether to AND point tags filter listed in pointTagFilter. If true, a timeseries must contain the point tags along with other filters in order for the maintenance window to apply.If false, the tags are OR'ed, the customer must contain one of the tags. Default: false  # noqa: E501
+
+        :return: The point_tag_filter_anded of this MaintenanceWindow.  # noqa: E501
+        :rtype: bool
+        """
+        return self._point_tag_filter_anded
+
+    @point_tag_filter_anded.setter
+    def point_tag_filter_anded(self, point_tag_filter_anded):
+        """Sets the point_tag_filter_anded of this MaintenanceWindow.
+
+        Whether to AND point tags filter listed in pointTagFilter. If true, a timeseries must contain the point tags along with other filters in order for the maintenance window to apply.If false, the tags are OR'ed, the customer must contain one of the tags. Default: false  # noqa: E501
+
+        :param point_tag_filter_anded: The point_tag_filter_anded of this MaintenanceWindow.  # noqa: E501
+        :type: bool
+        """
+
+        self._point_tag_filter_anded = point_tag_filter_anded
+
     @property
     def reason(self):
         """Gets the reason of this MaintenanceWindow.  # noqa: E501
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index b434646..e477e13 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/metric_details.py b/wavefront_api_client/models/metric_details.py
index 639e319..7df55f4 100644
--- a/wavefront_api_client/models/metric_details.py
+++ b/wavefront_api_client/models/metric_details.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index 00ff880..0c30217 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index 52cc7f1..24a168a 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/metrics_policy_read_model.py b/wavefront_api_client/models/metrics_policy_read_model.py
index df178ec..de30781 100644
--- a/wavefront_api_client/models/metrics_policy_read_model.py
+++ b/wavefront_api_client/models/metrics_policy_read_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/metrics_policy_write_model.py b/wavefront_api_client/models/metrics_policy_write_model.py
index de9bc0d..d13bdb7 100644
--- a/wavefront_api_client/models/metrics_policy_write_model.py
+++ b/wavefront_api_client/models/metrics_policy_write_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/module.py b/wavefront_api_client/models/module.py
index 61813e2..358951a 100644
--- a/wavefront_api_client/models/module.py
+++ b/wavefront_api_client/models/module.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/module_descriptor.py b/wavefront_api_client/models/module_descriptor.py
index 722550b..0e93cf1 100644
--- a/wavefront_api_client/models/module_descriptor.py
+++ b/wavefront_api_client/models/module_descriptor.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/module_layer.py b/wavefront_api_client/models/module_layer.py
index 839fca0..944b4fb 100644
--- a/wavefront_api_client/models/module_layer.py
+++ b/wavefront_api_client/models/module_layer.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/monitored_application_dto.py b/wavefront_api_client/models/monitored_application_dto.py
index 80689f0..1013034 100644
--- a/wavefront_api_client/models/monitored_application_dto.py
+++ b/wavefront_api_client/models/monitored_application_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/monitored_cluster.py b/wavefront_api_client/models/monitored_cluster.py
index 6238dd0..ee69e8e 100644
--- a/wavefront_api_client/models/monitored_cluster.py
+++ b/wavefront_api_client/models/monitored_cluster.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
index df6a15c..f64ffdd 100644
--- a/wavefront_api_client/models/monitored_service_dto.py
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index dfcb698..edcfaa6 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/new_relic_metric_filters.py b/wavefront_api_client/models/new_relic_metric_filters.py
index b23e6b8..200f1c7 100644
--- a/wavefront_api_client/models/new_relic_metric_filters.py
+++ b/wavefront_api_client/models/new_relic_metric_filters.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index 851a000..ccb1160 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/notification_messages.py b/wavefront_api_client/models/notification_messages.py
index 69531ca..04ae911 100644
--- a/wavefront_api_client/models/notification_messages.py
+++ b/wavefront_api_client/models/notification_messages.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/package.py b/wavefront_api_client/models/package.py
index d94110f..8eab274 100644
--- a/wavefront_api_client/models/package.py
+++ b/wavefront_api_client/models/package.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged.py b/wavefront_api_client/models/paged.py
index 434f332..d867372 100644
--- a/wavefront_api_client/models/paged.py
+++ b/wavefront_api_client/models/paged.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_account.py b/wavefront_api_client/models/paged_account.py
index 0e09b5a..9c5723e 100644
--- a/wavefront_api_client/models/paged_account.py
+++ b/wavefront_api_client/models/paged_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index 0eafcca..c2d37aa 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index fed1a7f..c21375c 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_anomaly.py b/wavefront_api_client/models/paged_anomaly.py
index e4f385d..05e3ba3 100644
--- a/wavefront_api_client/models/paged_anomaly.py
+++ b/wavefront_api_client/models/paged_anomaly.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index 8a7d20b..69dafbc 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index edccc27..823c05e 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index 47c9799..6c905ef 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index e8df799..dfd95ce 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index e60dd22..d24316c 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index 5cd8c0d..38046ef 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index 9a8d7b7..473c474 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_ingestion_policy.py b/wavefront_api_client/models/paged_ingestion_policy.py
index dc13fdc..34581b2 100644
--- a/wavefront_api_client/models/paged_ingestion_policy.py
+++ b/wavefront_api_client/models/paged_ingestion_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index 108f56d..d0f8845 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index 76efada..fb07a68 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index 09f0c9d..2b667f0 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_monitored_application_dto.py b/wavefront_api_client/models/paged_monitored_application_dto.py
index 1eb9212..2207c1e 100644
--- a/wavefront_api_client/models/paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/paged_monitored_application_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_monitored_cluster.py b/wavefront_api_client/models/paged_monitored_cluster.py
index 150bde1..4bbe1a5 100644
--- a/wavefront_api_client/models/paged_monitored_cluster.py
+++ b/wavefront_api_client/models/paged_monitored_cluster.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_monitored_service_dto.py b/wavefront_api_client/models/paged_monitored_service_dto.py
index 4b395bc..d17ffbc 100644
--- a/wavefront_api_client/models/paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/paged_monitored_service_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index ff97f0b..9e9f65c 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index 3b78139..c920de5 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_recent_app_map_search.py b/wavefront_api_client/models/paged_recent_app_map_search.py
new file mode 100644
index 0000000..fa65ae7
--- /dev/null
+++ b/wavefront_api_client/models/paged_recent_app_map_search.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedRecentAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[RecentAppMapSearch]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedRecentAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedRecentAppMapSearch.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedRecentAppMapSearch.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedRecentAppMapSearch.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: list[RecentAppMapSearch]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedRecentAppMapSearch.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: list[RecentAppMapSearch]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The limit of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedRecentAppMapSearch.
+
+
+        :param limit: The limit of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedRecentAppMapSearch.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedRecentAppMapSearch.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The offset of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedRecentAppMapSearch.
+
+
+        :param offset: The offset of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The sort of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedRecentAppMapSearch.
+
+
+        :param sort: The sort of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedRecentAppMapSearch.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedRecentAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedRecentAppMapSearch.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedRecentAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedRecentAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedRecentAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedRecentAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_recent_traces_search.py b/wavefront_api_client/models/paged_recent_traces_search.py
new file mode 100644
index 0000000..84ee4ac
--- /dev/null
+++ b/wavefront_api_client/models/paged_recent_traces_search.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedRecentTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[RecentTracesSearch]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedRecentTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedRecentTracesSearch.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedRecentTracesSearch.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedRecentTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedRecentTracesSearch.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: list[RecentTracesSearch]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedRecentTracesSearch.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedRecentTracesSearch.  # noqa: E501
+        :type: list[RecentTracesSearch]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedRecentTracesSearch.  # noqa: E501
+
+
+        :return: The limit of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedRecentTracesSearch.
+
+
+        :param limit: The limit of this PagedRecentTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedRecentTracesSearch.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedRecentTracesSearch.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedRecentTracesSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedRecentTracesSearch.  # noqa: E501
+
+
+        :return: The offset of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedRecentTracesSearch.
+
+
+        :param offset: The offset of this PagedRecentTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedRecentTracesSearch.  # noqa: E501
+
+
+        :return: The sort of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedRecentTracesSearch.
+
+
+        :param sort: The sort of this PagedRecentTracesSearch.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedRecentTracesSearch.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedRecentTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedRecentTracesSearch.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedRecentTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedRecentTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedRecentTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedRecentTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_related_event.py b/wavefront_api_client/models/paged_related_event.py
index 88e1cf8..58126dc 100644
--- a/wavefront_api_client/models/paged_related_event.py
+++ b/wavefront_api_client/models/paged_related_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_report_event_anomaly_dto.py b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
index f819b58..ee0593b 100644
--- a/wavefront_api_client/models/paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_role_dto.py b/wavefront_api_client/models/paged_role_dto.py
index 2f761ee..00b76b2 100644
--- a/wavefront_api_client/models/paged_role_dto.py
+++ b/wavefront_api_client/models/paged_role_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_saved_app_map_search.py b/wavefront_api_client/models/paged_saved_app_map_search.py
new file mode 100644
index 0000000..d3d9594
--- /dev/null
+++ b/wavefront_api_client/models/paged_saved_app_map_search.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedSavedAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[SavedAppMapSearch]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSavedAppMapSearch.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSavedAppMapSearch.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedSavedAppMapSearch.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: list[SavedAppMapSearch]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedSavedAppMapSearch.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: list[SavedAppMapSearch]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The limit of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedSavedAppMapSearch.
+
+
+        :param limit: The limit of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedSavedAppMapSearch.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedSavedAppMapSearch.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The offset of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSavedAppMapSearch.
+
+
+        :param offset: The offset of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The sort of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedSavedAppMapSearch.
+
+
+        :param sort: The sort of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSavedAppMapSearch.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSavedAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSavedAppMapSearch.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSavedAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedSavedAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedSavedAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedSavedAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_saved_app_map_search_group.py b/wavefront_api_client/models/paged_saved_app_map_search_group.py
new file mode 100644
index 0000000..d3fc164
--- /dev/null
+++ b/wavefront_api_client/models/paged_saved_app_map_search_group.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedSavedAppMapSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[SavedAppMapSearchGroup]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedSavedAppMapSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSavedAppMapSearchGroup.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: list[SavedAppMapSearchGroup]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedSavedAppMapSearchGroup.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: list[SavedAppMapSearchGroup]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The limit of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedSavedAppMapSearchGroup.
+
+
+        :param limit: The limit of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedSavedAppMapSearchGroup.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The offset of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSavedAppMapSearchGroup.
+
+
+        :param offset: The offset of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The sort of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedSavedAppMapSearchGroup.
+
+
+        :param sort: The sort of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSavedAppMapSearchGroup.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedSavedAppMapSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedSavedAppMapSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedSavedAppMapSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index a088bed..8c96216 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_saved_traces_search.py b/wavefront_api_client/models/paged_saved_traces_search.py
new file mode 100644
index 0000000..e542675
--- /dev/null
+++ b/wavefront_api_client/models/paged_saved_traces_search.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedSavedTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[SavedTracesSearch]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSavedTracesSearch.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSavedTracesSearch.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSavedTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedSavedTracesSearch.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: list[SavedTracesSearch]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedSavedTracesSearch.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedSavedTracesSearch.  # noqa: E501
+        :type: list[SavedTracesSearch]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedSavedTracesSearch.  # noqa: E501
+
+
+        :return: The limit of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedSavedTracesSearch.
+
+
+        :param limit: The limit of this PagedSavedTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedSavedTracesSearch.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedSavedTracesSearch.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedSavedTracesSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSavedTracesSearch.  # noqa: E501
+
+
+        :return: The offset of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSavedTracesSearch.
+
+
+        :param offset: The offset of this PagedSavedTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedSavedTracesSearch.  # noqa: E501
+
+
+        :return: The sort of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedSavedTracesSearch.
+
+
+        :param sort: The sort of this PagedSavedTracesSearch.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSavedTracesSearch.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSavedTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSavedTracesSearch.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSavedTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedSavedTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedSavedTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedSavedTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_saved_traces_search_group.py b/wavefront_api_client/models/paged_saved_traces_search_group.py
new file mode 100644
index 0000000..890bab8
--- /dev/null
+++ b/wavefront_api_client/models/paged_saved_traces_search_group.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedSavedTracesSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[SavedTracesSearchGroup]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedSavedTracesSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedSavedTracesSearchGroup.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: list[SavedTracesSearchGroup]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedSavedTracesSearchGroup.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: list[SavedTracesSearchGroup]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The limit of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedSavedTracesSearchGroup.
+
+
+        :param limit: The limit of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedSavedTracesSearchGroup.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The offset of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedSavedTracesSearchGroup.
+
+
+        :param offset: The offset of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The sort of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedSavedTracesSearchGroup.
+
+
+        :param sort: The sort of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedSavedTracesSearchGroup.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedSavedTracesSearchGroup.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedSavedTracesSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedSavedTracesSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedSavedTracesSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedSavedTracesSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_service_account.py b/wavefront_api_client/models/paged_service_account.py
index c3cb709..16f27b3 100644
--- a/wavefront_api_client/models/paged_service_account.py
+++ b/wavefront_api_client/models/paged_service_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index 3fd15ac..a292046 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_span_sampling_policy.py b/wavefront_api_client/models/paged_span_sampling_policy.py
index b9df3df..ac2a805 100644
--- a/wavefront_api_client/models/paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/paged_span_sampling_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/paged_user_group_model.py b/wavefront_api_client/models/paged_user_group_model.py
index a4c445b..f632c81 100644
--- a/wavefront_api_client/models/paged_user_group_model.py
+++ b/wavefront_api_client/models/paged_user_group_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index 297bb8e..df8564f 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/policy_rule_read_model.py b/wavefront_api_client/models/policy_rule_read_model.py
index 0f3c17c..b5d1bca 100644
--- a/wavefront_api_client/models/policy_rule_read_model.py
+++ b/wavefront_api_client/models/policy_rule_read_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/policy_rule_write_model.py b/wavefront_api_client/models/policy_rule_write_model.py
index 8e11deb..23d3062 100644
--- a/wavefront_api_client/models/policy_rule_write_model.py
+++ b/wavefront_api_client/models/policy_rule_write_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 762e3a9..879168b 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index 8d718e3..c418133 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index 7249004..6c71f16 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/query_type_dto.py b/wavefront_api_client/models/query_type_dto.py
index 81015f4..1f7d963 100644
--- a/wavefront_api_client/models/query_type_dto.py
+++ b/wavefront_api_client/models/query_type_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index 9c2432d..e676c2e 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/recent_app_map_search.py b/wavefront_api_client/models/recent_app_map_search.py
new file mode 100644
index 0000000..e13cffe
--- /dev/null
+++ b/wavefront_api_client/models/recent_app_map_search.py
@@ -0,0 +1,256 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class RecentAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'id': 'str',
+        'search_filters': 'AppSearchFilters',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'id': 'id',
+        'search_filters': 'searchFilters',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, created_epoch_millis=None, creator_id=None, id=None, search_filters=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """RecentAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._id = None
+        self._search_filters = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if id is not None:
+            self.id = id
+        self.search_filters = search_filters
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this RecentAppMapSearch.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this RecentAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this RecentAppMapSearch.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this RecentAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this RecentAppMapSearch.  # noqa: E501
+
+
+        :return: The creator_id of this RecentAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this RecentAppMapSearch.
+
+
+        :param creator_id: The creator_id of this RecentAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def id(self):
+        """Gets the id of this RecentAppMapSearch.  # noqa: E501
+
+
+        :return: The id of this RecentAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this RecentAppMapSearch.
+
+
+        :param id: The id of this RecentAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def search_filters(self):
+        """Gets the search_filters of this RecentAppMapSearch.  # noqa: E501
+
+        The search filters.  # noqa: E501
+
+        :return: The search_filters of this RecentAppMapSearch.  # noqa: E501
+        :rtype: AppSearchFilters
+        """
+        return self._search_filters
+
+    @search_filters.setter
+    def search_filters(self, search_filters):
+        """Sets the search_filters of this RecentAppMapSearch.
+
+        The search filters.  # noqa: E501
+
+        :param search_filters: The search_filters of this RecentAppMapSearch.  # noqa: E501
+        :type: AppSearchFilters
+        """
+        if self._configuration.client_side_validation and search_filters is None:
+            raise ValueError("Invalid value for `search_filters`, must not be `None`")  # noqa: E501
+
+        self._search_filters = search_filters
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this RecentAppMapSearch.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this RecentAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this RecentAppMapSearch.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this RecentAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this RecentAppMapSearch.  # noqa: E501
+
+
+        :return: The updater_id of this RecentAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this RecentAppMapSearch.
+
+
+        :param updater_id: The updater_id of this RecentAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RecentAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RecentAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, RecentAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/recent_traces_search.py b/wavefront_api_client/models/recent_traces_search.py
new file mode 100644
index 0000000..8bf9c82
--- /dev/null
+++ b/wavefront_api_client/models/recent_traces_search.py
@@ -0,0 +1,256 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class RecentTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'id': 'str',
+        'search_filters': 'AppSearchFilters',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'id': 'id',
+        'search_filters': 'searchFilters',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, created_epoch_millis=None, creator_id=None, id=None, search_filters=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """RecentTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._id = None
+        self._search_filters = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if id is not None:
+            self.id = id
+        self.search_filters = search_filters
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this RecentTracesSearch.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this RecentTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this RecentTracesSearch.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this RecentTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this RecentTracesSearch.  # noqa: E501
+
+
+        :return: The creator_id of this RecentTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this RecentTracesSearch.
+
+
+        :param creator_id: The creator_id of this RecentTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def id(self):
+        """Gets the id of this RecentTracesSearch.  # noqa: E501
+
+
+        :return: The id of this RecentTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this RecentTracesSearch.
+
+
+        :param id: The id of this RecentTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def search_filters(self):
+        """Gets the search_filters of this RecentTracesSearch.  # noqa: E501
+
+        The search filters.  # noqa: E501
+
+        :return: The search_filters of this RecentTracesSearch.  # noqa: E501
+        :rtype: AppSearchFilters
+        """
+        return self._search_filters
+
+    @search_filters.setter
+    def search_filters(self, search_filters):
+        """Sets the search_filters of this RecentTracesSearch.
+
+        The search filters.  # noqa: E501
+
+        :param search_filters: The search_filters of this RecentTracesSearch.  # noqa: E501
+        :type: AppSearchFilters
+        """
+        if self._configuration.client_side_validation and search_filters is None:
+            raise ValueError("Invalid value for `search_filters`, must not be `None`")  # noqa: E501
+
+        self._search_filters = search_filters
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this RecentTracesSearch.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this RecentTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this RecentTracesSearch.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this RecentTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this RecentTracesSearch.  # noqa: E501
+
+
+        :return: The updater_id of this RecentTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this RecentTracesSearch.
+
+
+        :param updater_id: The updater_id of this RecentTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RecentTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RecentTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, RecentTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/related_anomaly.py b/wavefront_api_client/models/related_anomaly.py
index a3c44e2..8c5b02d 100644
--- a/wavefront_api_client/models/related_anomaly.py
+++ b/wavefront_api_client/models/related_anomaly.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/related_data.py b/wavefront_api_client/models/related_data.py
index acd3ee1..b2c107d 100644
--- a/wavefront_api_client/models/related_data.py
+++ b/wavefront_api_client/models/related_data.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index 5e75f45..c2ca6e7 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/related_event_time_range.py b/wavefront_api_client/models/related_event_time_range.py
index 53bb0a7..e061811 100644
--- a/wavefront_api_client/models/related_event_time_range.py
+++ b/wavefront_api_client/models/related_event_time_range.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/report_event_anomaly_dto.py b/wavefront_api_client/models/report_event_anomaly_dto.py
index 069bb9d..a6b10c1 100644
--- a/wavefront_api_client/models/report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/report_event_anomaly_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index 9f97c34..c769243 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_access_policy.py b/wavefront_api_client/models/response_container_access_policy.py
index ef434fd..707f501 100644
--- a/wavefront_api_client/models/response_container_access_policy.py
+++ b/wavefront_api_client/models/response_container_access_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_access_policy_action.py b/wavefront_api_client/models/response_container_access_policy_action.py
index 23adb70..30bed59 100644
--- a/wavefront_api_client/models/response_container_access_policy_action.py
+++ b/wavefront_api_client/models/response_container_access_policy_action.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_account.py b/wavefront_api_client/models/response_container_account.py
index 8fb0496..e535f0d 100644
--- a/wavefront_api_client/models/response_container_account.py
+++ b/wavefront_api_client/models/response_container_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index c2026d3..b3b759f 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 1566db1..23908c3 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index d97c765..932d7f6 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 5533e57..032c2c9 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 406af25..7c90423 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index ed6e04a..c618283 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 27abea9..6e5c318 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 7174a26..1c7741d 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 5ae5aac..11805d9 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_ingestion_policy.py b/wavefront_api_client/models/response_container_ingestion_policy.py
index 2531b0c..cffdc28 100644
--- a/wavefront_api_client/models/response_container_ingestion_policy.py
+++ b/wavefront_api_client/models/response_container_ingestion_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index e442f8a..81a6b9d 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 9e104c5..9cbb7a1 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
index 2626890..7284c4a 100644
--- a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index bd89cb6..2461cee 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index e2b4c2e..51c1954 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_notification_messages.py b/wavefront_api_client/models/response_container_list_notification_messages.py
index de5ee98..018c070 100644
--- a/wavefront_api_client/models/response_container_list_notification_messages.py
+++ b/wavefront_api_client/models/response_container_list_notification_messages.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
index a064e9b..1c2a06a 100644
--- a/wavefront_api_client/models/response_container_list_service_account.py
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index 176c9a4..0baf37b 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
index b029a43..b2c86df 100644
--- a/wavefront_api_client/models/response_container_list_user_api_token.py
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index 2a83318..d5b1161 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 687ed4d..4d9940c 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index 9ec7528..35f97b0 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index 9f72a0e..8422506 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_metrics_policy_read_model.py b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
index b00aba9..c90630f 100644
--- a/wavefront_api_client/models/response_container_metrics_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_monitored_application_dto.py b/wavefront_api_client/models/response_container_monitored_application_dto.py
index 2ed02c7..80753d6 100644
--- a/wavefront_api_client/models/response_container_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_application_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_monitored_cluster.py b/wavefront_api_client/models/response_container_monitored_cluster.py
index 530b25d..0ba7e68 100644
--- a/wavefront_api_client/models/response_container_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_monitored_cluster.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_monitored_service_dto.py b/wavefront_api_client/models/response_container_monitored_service_dto.py
index d7c1ba4..56019a1 100644
--- a/wavefront_api_client/models/response_container_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_service_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index 4b1499a..7519806 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
index 4b3300b..7662457 100644
--- a/wavefront_api_client/models/response_container_paged_account.py
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index f3891f3..0fc98d8 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index 3e3a59a..bc2a649 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_anomaly.py b/wavefront_api_client/models/response_container_paged_anomaly.py
index a8019da..77e8fd8 100644
--- a/wavefront_api_client/models/response_container_paged_anomaly.py
+++ b/wavefront_api_client/models/response_container_paged_anomaly.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index e6ce134..46ecb3d 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 776ba1f..7ff9cb3 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index 3ab650e..2b8c731 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index 6e1f9e7..9db2c1f 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 564fdd2..2ccc808 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index a93e58d..cb41a4c 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index 1aa7085..cdb7208 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy.py b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
index 7b80871..dae8549 100644
--- a/wavefront_api_client/models/response_container_paged_ingestion_policy.py
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 20417b7..5fba75a 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index 7555c9e..e2a9075 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index bd6f9e9..8a56992 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
index a257ba5..b514b83 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_monitored_cluster.py b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
index 0820c02..2c4855f 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
index 72d9642..2c302b4 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index bcb87db..a0a5c46 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index 7dbefd7..dbde508 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
new file mode 100644
index 0000000..01571fd
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedRecentAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedRecentAppMapSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedRecentAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+        :rtype: PagedRecentAppMapSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedRecentAppMapSearch.
+
+
+        :param response: The response of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+        :type: PagedRecentAppMapSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedRecentAppMapSearch.
+
+
+        :param status: The status of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedRecentAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedRecentAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedRecentAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_recent_traces_search.py b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
new file mode 100644
index 0000000..c5dde67
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedRecentTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedRecentTracesSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedRecentTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+        :rtype: PagedRecentTracesSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedRecentTracesSearch.
+
+
+        :param response: The response of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+        :type: PagedRecentTracesSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedRecentTracesSearch.
+
+
+        :param status: The status of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedRecentTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedRecentTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedRecentTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_related_event.py b/wavefront_api_client/models/response_container_paged_related_event.py
index cfe4de3..96cac58 100644
--- a/wavefront_api_client/models/response_container_paged_related_event.py
+++ b/wavefront_api_client/models/response_container_paged_related_event.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
index 51d587a..ac3366f 100644
--- a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_role_dto.py b/wavefront_api_client/models/response_container_paged_role_dto.py
index 59ee746..dc35581 100644
--- a/wavefront_api_client/models/response_container_paged_role_dto.py
+++ b/wavefront_api_client/models/response_container_paged_role_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
new file mode 100644
index 0000000..4f2e8fe
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedSavedAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedSavedAppMapSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+        :rtype: PagedSavedAppMapSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSavedAppMapSearch.
+
+
+        :param response: The response of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+        :type: PagedSavedAppMapSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedSavedAppMapSearch.
+
+
+        :param status: The status of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedSavedAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedSavedAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedSavedAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
new file mode 100644
index 0000000..812c457
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedSavedAppMapSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedSavedAppMapSearchGroup',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedSavedAppMapSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: PagedSavedAppMapSearchGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSavedAppMapSearchGroup.
+
+
+        :param response: The response of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: PagedSavedAppMapSearchGroup
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedSavedAppMapSearchGroup.
+
+
+        :param status: The status of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedSavedAppMapSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedSavedAppMapSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedSavedAppMapSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index bff6bd1..7772556 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search.py b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
new file mode 100644
index 0000000..fa4e09f
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedSavedTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedSavedTracesSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+        :rtype: PagedSavedTracesSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSavedTracesSearch.
+
+
+        :param response: The response of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+        :type: PagedSavedTracesSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedSavedTracesSearch.
+
+
+        :param status: The status of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedSavedTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedSavedTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedSavedTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
new file mode 100644
index 0000000..1887f6e
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedSavedTracesSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedSavedTracesSearchGroup',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedSavedTracesSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: PagedSavedTracesSearchGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedSavedTracesSearchGroup.
+
+
+        :param response: The response of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+        :type: PagedSavedTracesSearchGroup
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedSavedTracesSearchGroup.
+
+
+        :param status: The status of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedSavedTracesSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedSavedTracesSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedSavedTracesSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
index 6bb4cb4..aa9eb52 100644
--- a/wavefront_api_client/models/response_container_paged_service_account.py
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 5080536..1b6787d 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
index a9b285e..701b774 100644
--- a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
index bf510c9..2ea577a 100644
--- a/wavefront_api_client/models/response_container_paged_user_group_model.py
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index fbc150a..296a5f8 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_query_type_dto.py b/wavefront_api_client/models/response_container_query_type_dto.py
index 7033e63..d221a7b 100644
--- a/wavefront_api_client/models/response_container_query_type_dto.py
+++ b/wavefront_api_client/models/response_container_query_type_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_recent_app_map_search.py b/wavefront_api_client/models/response_container_recent_app_map_search.py
new file mode 100644
index 0000000..8002045
--- /dev/null
+++ b/wavefront_api_client/models/response_container_recent_app_map_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerRecentAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'RecentAppMapSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerRecentAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+        :rtype: RecentAppMapSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerRecentAppMapSearch.
+
+
+        :param response: The response of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+        :type: RecentAppMapSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerRecentAppMapSearch.
+
+
+        :param status: The status of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerRecentAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerRecentAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerRecentAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_recent_traces_search.py b/wavefront_api_client/models/response_container_recent_traces_search.py
new file mode 100644
index 0000000..72a7962
--- /dev/null
+++ b/wavefront_api_client/models/response_container_recent_traces_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerRecentTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'RecentTracesSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerRecentTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerRecentTracesSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerRecentTracesSearch.  # noqa: E501
+        :rtype: RecentTracesSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerRecentTracesSearch.
+
+
+        :param response: The response of this ResponseContainerRecentTracesSearch.  # noqa: E501
+        :type: RecentTracesSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerRecentTracesSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerRecentTracesSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerRecentTracesSearch.
+
+
+        :param status: The status of this ResponseContainerRecentTracesSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerRecentTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerRecentTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerRecentTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_role_dto.py b/wavefront_api_client/models/response_container_role_dto.py
index 0803841..50f307f 100644
--- a/wavefront_api_client/models/response_container_role_dto.py
+++ b/wavefront_api_client/models/response_container_role_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search.py b/wavefront_api_client/models/response_container_saved_app_map_search.py
new file mode 100644
index 0000000..544fe80
--- /dev/null
+++ b/wavefront_api_client/models/response_container_saved_app_map_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerSavedAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'SavedAppMapSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+        :rtype: SavedAppMapSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSavedAppMapSearch.
+
+
+        :param response: The response of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+        :type: SavedAppMapSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSavedAppMapSearch.
+
+
+        :param status: The status of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSavedAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSavedAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerSavedAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
new file mode 100644
index 0000000..dfc0736
--- /dev/null
+++ b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerSavedAppMapSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'SavedAppMapSearchGroup',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerSavedAppMapSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: SavedAppMapSearchGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSavedAppMapSearchGroup.
+
+
+        :param response: The response of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+        :type: SavedAppMapSearchGroup
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSavedAppMapSearchGroup.
+
+
+        :param status: The status of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSavedAppMapSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSavedAppMapSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerSavedAppMapSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index 41ce641..6b11d34 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_saved_traces_search.py b/wavefront_api_client/models/response_container_saved_traces_search.py
new file mode 100644
index 0000000..0aa3ee2
--- /dev/null
+++ b/wavefront_api_client/models/response_container_saved_traces_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerSavedTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'SavedTracesSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSavedTracesSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSavedTracesSearch.  # noqa: E501
+        :rtype: SavedTracesSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSavedTracesSearch.
+
+
+        :param response: The response of this ResponseContainerSavedTracesSearch.  # noqa: E501
+        :type: SavedTracesSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSavedTracesSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSavedTracesSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSavedTracesSearch.
+
+
+        :param status: The status of this ResponseContainerSavedTracesSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSavedTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSavedTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerSavedTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_saved_traces_search_group.py b/wavefront_api_client/models/response_container_saved_traces_search_group.py
new file mode 100644
index 0000000..ae91dd6
--- /dev/null
+++ b/wavefront_api_client/models/response_container_saved_traces_search_group.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerSavedTracesSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'SavedTracesSearchGroup',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerSavedTracesSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+        :rtype: SavedTracesSearchGroup
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerSavedTracesSearchGroup.
+
+
+        :param response: The response of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+        :type: SavedTracesSearchGroup
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerSavedTracesSearchGroup.
+
+
+        :param status: The status of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerSavedTracesSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerSavedTracesSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerSavedTracesSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
index 3408ef3..27b3d11 100644
--- a/wavefront_api_client/models/response_container_service_account.py
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 20205fd..e5e3316 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_set_source_label_pair.py b/wavefront_api_client/models/response_container_set_source_label_pair.py
index 6796dab..562419b 100644
--- a/wavefront_api_client/models/response_container_set_source_label_pair.py
+++ b/wavefront_api_client/models/response_container_set_source_label_pair.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 292d155..9fc56ee 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_span_sampling_policy.py b/wavefront_api_client/models/response_container_span_sampling_policy.py
index 1de7621..ef474fd 100644
--- a/wavefront_api_client/models/response_container_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_span_sampling_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_string.py b/wavefront_api_client/models/response_container_string.py
index d654cd0..c90d7de 100644
--- a/wavefront_api_client/models/response_container_string.py
+++ b/wavefront_api_client/models/response_container_string.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index 7c9e2a3..4f7e796 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
index 7aa5d39..3dd57d1 100644
--- a/wavefront_api_client/models/response_container_user_api_token.py
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_user_dto.py b/wavefront_api_client/models/response_container_user_dto.py
index b0429df..83d9e45 100644
--- a/wavefront_api_client/models/response_container_user_dto.py
+++ b/wavefront_api_client/models/response_container_user_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
index 3597853..f57262e 100644
--- a/wavefront_api_client/models/response_container_user_group_model.py
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index a706e58..2c7b026 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_container_void.py b/wavefront_api_client/models/response_container_void.py
index a777144..23ce1c7 100644
--- a/wavefront_api_client/models/response_container_void.py
+++ b/wavefront_api_client/models/response_container_void.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index 5209709..55ac162 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
index a8fb11c..5cf0239 100644
--- a/wavefront_api_client/models/role_dto.py
+++ b/wavefront_api_client/models/role_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/saved_app_map_search.py b/wavefront_api_client/models/saved_app_map_search.py
new file mode 100644
index 0000000..25de53c
--- /dev/null
+++ b/wavefront_api_client/models/saved_app_map_search.py
@@ -0,0 +1,311 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class SavedAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'id': 'str',
+        'name': 'str',
+        'search_filters': 'AppSearchFilters',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'id': 'id',
+        'name': 'name',
+        'search_filters': 'searchFilters',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, created_epoch_millis=None, creator_id=None, deleted=None, id=None, name=None, search_filters=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """SavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._id = None
+        self._name = None
+        self._search_filters = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if id is not None:
+            self.id = id
+        self.name = name
+        self.search_filters = search_filters
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this SavedAppMapSearch.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this SavedAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this SavedAppMapSearch.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this SavedAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this SavedAppMapSearch.  # noqa: E501
+
+
+        :return: The creator_id of this SavedAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this SavedAppMapSearch.
+
+
+        :param creator_id: The creator_id of this SavedAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this SavedAppMapSearch.  # noqa: E501
+
+
+        :return: The deleted of this SavedAppMapSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this SavedAppMapSearch.
+
+
+        :param deleted: The deleted of this SavedAppMapSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def id(self):
+        """Gets the id of this SavedAppMapSearch.  # noqa: E501
+
+
+        :return: The id of this SavedAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this SavedAppMapSearch.
+
+
+        :param id: The id of this SavedAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this SavedAppMapSearch.  # noqa: E501
+
+        Name of the search  # noqa: E501
+
+        :return: The name of this SavedAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this SavedAppMapSearch.
+
+        Name of the search  # noqa: E501
+
+        :param name: The name of this SavedAppMapSearch.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def search_filters(self):
+        """Gets the search_filters of this SavedAppMapSearch.  # noqa: E501
+
+        The search filters.  # noqa: E501
+
+        :return: The search_filters of this SavedAppMapSearch.  # noqa: E501
+        :rtype: AppSearchFilters
+        """
+        return self._search_filters
+
+    @search_filters.setter
+    def search_filters(self, search_filters):
+        """Sets the search_filters of this SavedAppMapSearch.
+
+        The search filters.  # noqa: E501
+
+        :param search_filters: The search_filters of this SavedAppMapSearch.  # noqa: E501
+        :type: AppSearchFilters
+        """
+        if self._configuration.client_side_validation and search_filters is None:
+            raise ValueError("Invalid value for `search_filters`, must not be `None`")  # noqa: E501
+
+        self._search_filters = search_filters
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this SavedAppMapSearch.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this SavedAppMapSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this SavedAppMapSearch.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this SavedAppMapSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SavedAppMapSearch.  # noqa: E501
+
+
+        :return: The updater_id of this SavedAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SavedAppMapSearch.
+
+
+        :param updater_id: The updater_id of this SavedAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SavedAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SavedAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, SavedAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/saved_app_map_search_group.py b/wavefront_api_client/models/saved_app_map_search_group.py
new file mode 100644
index 0000000..de2a5cd
--- /dev/null
+++ b/wavefront_api_client/models/saved_app_map_search_group.py
@@ -0,0 +1,282 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class SavedAppMapSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'id': 'str',
+        'name': 'str',
+        'search_filters': 'list[str]',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'id': 'id',
+        'name': 'name',
+        'search_filters': 'searchFilters',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, created_epoch_millis=None, creator_id=None, id=None, name=None, search_filters=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """SavedAppMapSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._id = None
+        self._name = None
+        self._search_filters = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if id is not None:
+            self.id = id
+        self.name = name
+        if search_filters is not None:
+            self.search_filters = search_filters
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this SavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this SavedAppMapSearchGroup.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this SavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The creator_id of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this SavedAppMapSearchGroup.
+
+
+        :param creator_id: The creator_id of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def id(self):
+        """Gets the id of this SavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The id of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this SavedAppMapSearchGroup.
+
+
+        :param id: The id of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this SavedAppMapSearchGroup.  # noqa: E501
+
+        Name of the search group  # noqa: E501
+
+        :return: The name of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this SavedAppMapSearchGroup.
+
+        Name of the search group  # noqa: E501
+
+        :param name: The name of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def search_filters(self):
+        """Gets the search_filters of this SavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The search_filters of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._search_filters
+
+    @search_filters.setter
+    def search_filters(self, search_filters):
+        """Sets the search_filters of this SavedAppMapSearchGroup.
+
+
+        :param search_filters: The search_filters of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._search_filters = search_filters
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this SavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this SavedAppMapSearchGroup.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The updater_id of this SavedAppMapSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SavedAppMapSearchGroup.
+
+
+        :param updater_id: The updater_id of this SavedAppMapSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SavedAppMapSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SavedAppMapSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, SavedAppMapSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 45ac300..48aa33c 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/saved_traces_search.py b/wavefront_api_client/models/saved_traces_search.py
new file mode 100644
index 0000000..87d6fc7
--- /dev/null
+++ b/wavefront_api_client/models/saved_traces_search.py
@@ -0,0 +1,310 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class SavedTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'id': 'str',
+        'name': 'str',
+        'search_filters': 'AppSearchFilters',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'id': 'id',
+        'name': 'name',
+        'search_filters': 'searchFilters',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, created_epoch_millis=None, creator_id=None, deleted=None, id=None, name=None, search_filters=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """SavedTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._id = None
+        self._name = None
+        self._search_filters = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if id is not None:
+            self.id = id
+        if name is not None:
+            self.name = name
+        self.search_filters = search_filters
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this SavedTracesSearch.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this SavedTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this SavedTracesSearch.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this SavedTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this SavedTracesSearch.  # noqa: E501
+
+
+        :return: The creator_id of this SavedTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this SavedTracesSearch.
+
+
+        :param creator_id: The creator_id of this SavedTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this SavedTracesSearch.  # noqa: E501
+
+
+        :return: The deleted of this SavedTracesSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this SavedTracesSearch.
+
+
+        :param deleted: The deleted of this SavedTracesSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def id(self):
+        """Gets the id of this SavedTracesSearch.  # noqa: E501
+
+
+        :return: The id of this SavedTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this SavedTracesSearch.
+
+
+        :param id: The id of this SavedTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this SavedTracesSearch.  # noqa: E501
+
+        Name of the search  # noqa: E501
+
+        :return: The name of this SavedTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this SavedTracesSearch.
+
+        Name of the search  # noqa: E501
+
+        :param name: The name of this SavedTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def search_filters(self):
+        """Gets the search_filters of this SavedTracesSearch.  # noqa: E501
+
+        The search filters.  # noqa: E501
+
+        :return: The search_filters of this SavedTracesSearch.  # noqa: E501
+        :rtype: AppSearchFilters
+        """
+        return self._search_filters
+
+    @search_filters.setter
+    def search_filters(self, search_filters):
+        """Sets the search_filters of this SavedTracesSearch.
+
+        The search filters.  # noqa: E501
+
+        :param search_filters: The search_filters of this SavedTracesSearch.  # noqa: E501
+        :type: AppSearchFilters
+        """
+        if self._configuration.client_side_validation and search_filters is None:
+            raise ValueError("Invalid value for `search_filters`, must not be `None`")  # noqa: E501
+
+        self._search_filters = search_filters
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this SavedTracesSearch.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this SavedTracesSearch.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this SavedTracesSearch.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this SavedTracesSearch.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SavedTracesSearch.  # noqa: E501
+
+
+        :return: The updater_id of this SavedTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SavedTracesSearch.
+
+
+        :param updater_id: The updater_id of this SavedTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SavedTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SavedTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, SavedTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/saved_traces_search_group.py b/wavefront_api_client/models/saved_traces_search_group.py
new file mode 100644
index 0000000..cc89d45
--- /dev/null
+++ b/wavefront_api_client/models/saved_traces_search_group.py
@@ -0,0 +1,282 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class SavedTracesSearchGroup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'id': 'str',
+        'name': 'str',
+        'search_filters': 'list[str]',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'id': 'id',
+        'name': 'name',
+        'search_filters': 'searchFilters',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, created_epoch_millis=None, creator_id=None, id=None, name=None, search_filters=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """SavedTracesSearchGroup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._id = None
+        self._name = None
+        self._search_filters = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if id is not None:
+            self.id = id
+        self.name = name
+        if search_filters is not None:
+            self.search_filters = search_filters
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this SavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this SavedTracesSearchGroup.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this SavedTracesSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this SavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The creator_id of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this SavedTracesSearchGroup.
+
+
+        :param creator_id: The creator_id of this SavedTracesSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def id(self):
+        """Gets the id of this SavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The id of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this SavedTracesSearchGroup.
+
+
+        :param id: The id of this SavedTracesSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this SavedTracesSearchGroup.  # noqa: E501
+
+        Name of the search group  # noqa: E501
+
+        :return: The name of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this SavedTracesSearchGroup.
+
+        Name of the search group  # noqa: E501
+
+        :param name: The name of this SavedTracesSearchGroup.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def search_filters(self):
+        """Gets the search_filters of this SavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The search_filters of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._search_filters
+
+    @search_filters.setter
+    def search_filters(self, search_filters):
+        """Sets the search_filters of this SavedTracesSearchGroup.
+
+
+        :param search_filters: The search_filters of this SavedTracesSearchGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._search_filters = search_filters
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this SavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this SavedTracesSearchGroup.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this SavedTracesSearchGroup.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this SavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The updater_id of this SavedTracesSearchGroup.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this SavedTracesSearchGroup.
+
+
+        :param updater_id: The updater_id of this SavedTracesSearchGroup.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(SavedTracesSearchGroup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, SavedTracesSearchGroup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, SavedTracesSearchGroup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/schema.py b/wavefront_api_client/models/schema.py
index 3882042..51c161e 100644
--- a/wavefront_api_client/models/schema.py
+++ b/wavefront_api_client/models/schema.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 38057c0..1c1313d 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index 10c3027..a891110 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index 4d49253..be7ecfe 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/snowflake_configuration.py b/wavefront_api_client/models/snowflake_configuration.py
index 980e919..dc354fe 100644
--- a/wavefront_api_client/models/snowflake_configuration.py
+++ b/wavefront_api_client/models/snowflake_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index f5e74a3..7ad92e2 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index 69987aa..516fc2d 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 52848f8..c583bcd 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index 478ab1c..b9bc19b 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index a2aa5a5..ba36362 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/span.py b/wavefront_api_client/models/span.py
index 16d115f..51a20f8 100644
--- a/wavefront_api_client/models/span.py
+++ b/wavefront_api_client/models/span.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/span_sampling_policy.py b/wavefront_api_client/models/span_sampling_policy.py
index 1d280a5..679f8fe 100644
--- a/wavefront_api_client/models/span_sampling_policy.py
+++ b/wavefront_api_client/models/span_sampling_policy.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/specific_data.py b/wavefront_api_client/models/specific_data.py
index 7e6922c..d4b08f5 100644
--- a/wavefront_api_client/models/specific_data.py
+++ b/wavefront_api_client/models/specific_data.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
index c57e2d5..79a046e 100644
--- a/wavefront_api_client/models/stats_model_internal_use.py
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/stripe.py b/wavefront_api_client/models/stripe.py
index f05d5a4..51863f5 100644
--- a/wavefront_api_client/models/stripe.py
+++ b/wavefront_api_client/models/stripe.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index bf922ae..66399e2 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index d6bad2b..9d52415 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/tesla_configuration.py b/wavefront_api_client/models/tesla_configuration.py
index 852be56..e023c89 100644
--- a/wavefront_api_client/models/tesla_configuration.py
+++ b/wavefront_api_client/models/tesla_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index 62c9e1c..dd74777 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/trace.py b/wavefront_api_client/models/trace.py
index 862e5d1..19fce7a 100644
--- a/wavefront_api_client/models/trace.py
+++ b/wavefront_api_client/models/trace.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/triage_dashboard.py b/wavefront_api_client/models/triage_dashboard.py
index 3df50c7..d17def2 100644
--- a/wavefront_api_client/models/triage_dashboard.py
+++ b/wavefront_api_client/models/triage_dashboard.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/tuple.py b/wavefront_api_client/models/tuple.py
index edfd579..4f097a4 100644
--- a/wavefront_api_client/models/tuple.py
+++ b/wavefront_api_client/models/tuple.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/tuple_result.py b/wavefront_api_client/models/tuple_result.py
index c8aaf49..c34a2f3 100644
--- a/wavefront_api_client/models/tuple_result.py
+++ b/wavefront_api_client/models/tuple_result.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/tuple_value_result.py b/wavefront_api_client/models/tuple_value_result.py
index f1ca6e0..b8bfc6b 100644
--- a/wavefront_api_client/models/tuple_value_result.py
+++ b/wavefront_api_client/models/tuple_value_result.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index ff38752..6b36a5f 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 86035d4..8d8b2a0 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index f997b82..e9919c7 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 00ecf80..d9fe7b4 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index 3eaae5d..06be906 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index 480bc0b..42616be 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 3502332..38f0017 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index a153295..ad257b0 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index f56ba4c..7d0f795 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
index 4b3a5a0..bfefab5 100644
--- a/wavefront_api_client/models/validated_users_dto.py
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/void.py b/wavefront_api_client/models/void.py
index d914cea..6b48302 100644
--- a/wavefront_api_client/models/void.py
+++ b/wavefront_api_client/models/void.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/vrops_configuration.py b/wavefront_api_client/models/vrops_configuration.py
index 78d328d..889691c 100644
--- a/wavefront_api_client/models/vrops_configuration.py
+++ b/wavefront_api_client/models/vrops_configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/models/wf_tags.py b/wavefront_api_client/models/wf_tags.py
index 6acae83..b079536 100644
--- a/wavefront_api_client/models/wf_tags.py
+++ b/wavefront_api_client/models/wf_tags.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 
diff --git a/wavefront_api_client/rest.py b/wavefront_api_client/rest.py
index 919963d..226f0e3 100644
--- a/wavefront_api_client/rest.py
+++ b/wavefront_api_client/rest.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
     <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
 

From f85a530367cdabe458a11919ad35609b9bc0606b Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 8 Mar 2022 08:16:23 -0800
Subject: [PATCH 105/161] Autogenerated Update v2.124.1.

---
 .swagger-codegen/config.json          |   2 +-
 .swagger-codegen/config.jsone         |   2 +-
 README.md                             |   6 +-
 docs/UsageApi.md                      | 228 +++++++++++++++
 setup.py                              |   2 +-
 wavefront_api_client/api/usage_api.py | 396 ++++++++++++++++++++++++++
 wavefront_api_client/api_client.py    |   2 +-
 wavefront_api_client/configuration.py |   2 +-
 8 files changed, 634 insertions(+), 6 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index fce21c3..5c589af 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.122.1"
+    "packageVersion": "2.124.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6847e88..fce21c3 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.121.0"
+    "packageVersion": "2.122.1"
 }
diff --git a/README.md b/README.md
index e5eefd8..b901330 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.122.1
+- Package version: 2.124.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -411,11 +411,15 @@ Class | Method | HTTP request | Description
 *SpanSamplingPolicyApi* | [**get_span_sampling_policy_version**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy_version) | **GET** /api/v2/spansamplingpolicy/{id}/history/{version} | Get a specific historical version of a specific sampling policy
 *SpanSamplingPolicyApi* | [**undelete_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#undelete_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy/{id}/undelete | Restore a deleted span sampling policy
 *SpanSamplingPolicyApi* | [**update_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#update_span_sampling_policy) | **PUT** /api/v2/spansamplingpolicy/{id} | Update a specific span sampling policy
+*UsageApi* | [**add_accounts**](docs/UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
+*UsageApi* | [**add_groups**](docs/UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 *UsageApi* | [**create_ingestion_policy**](docs/UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 *UsageApi* | [**delete_ingestion_policy**](docs/UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
+*UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 *UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific groups to the user or service account
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 560b6e2..42a07fb 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -4,14 +4,130 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**add_accounts**](UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
+[**add_groups**](UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 [**create_ingestion_policy**](UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 [**delete_ingestion_policy**](UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
+[**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
+# **add_accounts**
+> ResponseContainerIngestionPolicy add_accounts(id, body=body)
+
+Add accounts to ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
+
+try:
+    # Add accounts to ingestion policy
+    api_response = api_instance.add_accounts(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->add_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **add_groups**
+> ResponseContainerIngestionPolicy add_groups(id, body=body)
+
+Add groups to the ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be added to the ingestion policy (optional)
+
+try:
+    # Add groups to the ingestion policy
+    api_response = api_instance.add_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->add_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of groups to be added to the ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_ingestion_policy**
 > ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
 
@@ -285,6 +401,118 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_accounts**
+> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
+
+Remove accounts from ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
+
+try:
+    # Remove accounts from ingestion policy
+    api_response = api_instance.remove_accounts(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->remove_accounts: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **remove_groups**
+> ResponseContainerIngestionPolicy remove_groups(id, body=body)
+
+Remove groups from the ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be removed from the ingestion policy (optional)
+
+try:
+    # Remove groups from the ingestion policy
+    api_response = api_instance.remove_groups(id, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->remove_groups: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **body** | **list[str]**| List of groups to be removed from the ingestion policy | [optional] 
+
+### Return type
+
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **update_ingestion_policy**
 > ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
 
diff --git a/setup.py b/setup.py
index 5a56196..3b2de3a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.122.1"
+VERSION = "2.124.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index b156013..7c353f8 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -33,6 +33,204 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
+    def add_accounts(self, id, **kwargs):  # noqa: E501
+        """Add accounts to ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_accounts(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add accounts to ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_accounts_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `add_accounts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/addAccounts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def add_groups(self, id, **kwargs):  # noqa: E501
+        """Add groups to the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be added to the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Add groups to the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be added to the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `add_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/addGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_ingestion_policy(self, **kwargs):  # noqa: E501
         """Create a specific ingestion policy  # noqa: E501
 
@@ -512,6 +710,204 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_accounts(self, id, **kwargs):  # noqa: E501
+        """Remove accounts from ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_accounts(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove accounts from ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_accounts_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of accounts to be added to ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_accounts" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `remove_accounts`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/removeAccounts', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def remove_groups(self, id, **kwargs):  # noqa: E501
+        """Remove groups from the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_groups(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be removed from the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Remove groups from the ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_groups_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param list[str] body: List of groups to be removed from the ingestion policy
+        :return: ResponseContainerIngestionPolicy
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_groups" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `remove_groups`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/removeGroups', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
         """Update a specific ingestion policy  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e078b4b..e573078 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.122.1/python'
+        self.user_agent = 'Swagger-Codegen/2.124.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 6650ee7..02b1d7c 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.122.1".\
+               "SDK Package Version: 2.124.1".\
                format(env=sys.platform, pyversion=sys.version)

From 4b5c97bda1077e057c9f828b5ed0b269266664db Mon Sep 17 00:00:00 2001
From: Joshua Moravec <JMoravec@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:47:01 -0500
Subject: [PATCH 106/161] WFESO-4474 Move to Github Actions from TravisCI (#62)

* Move to Github Actions from TravisCI

* Update publish action

* Update Swagger Version and GH Actions.

* Autogenerated Update v2.126.1.

* Replace Nose Runner With Unittest.

Co-authored-by: Artem Ustinov <ustinov@users.noreply.github.com>
Co-authored-by: Artem Ustinov <austinov@austinov-a02.vmware.com>
---
 .github/workflows/python-build.yml    | 27 +++++++++++++++++++++
 .github/workflows/python-release.yml  | 35 +++++++++++++++++++++++++++
 .swagger-codegen/VERSION              |  2 +-
 .swagger-codegen/config.json          |  2 +-
 .swagger-codegen/config.jsone         |  2 +-
 .travis.yml                           | 25 -------------------
 README.md                             |  2 +-
 generate_client                       |  2 +-
 setup.py                              |  2 +-
 wavefront_api_client/api_client.py    |  2 +-
 wavefront_api_client/configuration.py |  2 +-
 11 files changed, 70 insertions(+), 33 deletions(-)
 create mode 100644 .github/workflows/python-build.yml
 create mode 100644 .github/workflows/python-release.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
new file mode 100644
index 0000000..2225746
--- /dev/null
+++ b/.github/workflows/python-build.yml
@@ -0,0 +1,27 @@
+name: Build and Run Unit Tests.
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install -r requirements.txt
+    - name: Test 
+      run: python -m unittest discover
\ No newline at end of file
diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml
new file mode 100644
index 0000000..2ab7a39
--- /dev/null
+++ b/.github/workflows/python-release.yml
@@ -0,0 +1,35 @@
+name: Build and Publish to PyPI
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.10'
+    - name: Install Dependencies
+      run: |
+        python -m pip install -U pip setuptools wheel
+        python -m pip install -U build
+    - name: Build Package
+      run: python -m build
+
+    - name: Publish Package to TestPypi
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        repository_url: https://test.pypi.org/legacy/
+
+    - name: Publish package
+      if: startsWith(github.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@mster
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 19244e8..21f40d9 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.21
\ No newline at end of file
+2.4.26
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5c589af..4e93611 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.124.1"
+    "packageVersion": "2.126.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index fce21c3..5c589af 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.122.1"
+    "packageVersion": "2.124.1"
 }
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2764adf..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-dist: focal
-language: python
-python:
-  - "2.7"
-  - "3.6"
-  - "3.7"
-  - "3.8"
-  - "3.9"
-install: "pip install -r requirements.txt"
-script: nosetests
-deploy:
-- provider: pypi
-  user: wavefront-cs
-  server: https://test.pypi.org/legacy/
-  password:
-    secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
-  on:
-    python: 3.9
-- provider: pypi
-  user: wavefront-cs
-  password:
-    secure: "FEWc+UJpnhMuTReVgAS2m1sTCUwkoc0zzVNsGOeYpuQ1OZHXBErA34DfkvIvB/5RRQwmR/9bbgNn1P17ThYVRioUZZ9+TiluwSHd/NT2PrAzxMYIXkyPXm6gPIXj4ZaGh5WH/dF6qQ1woc5/K4UoI+cjJW9eKB1WsNAvj/IqRzRL3zRorP/79/yLCBqdkHNv102MbslsjT5ZEhcsU7iOBah+wxFLVim6j6WuGWKLAyXudBHD3GjzK4BUbbPimzIY31VgQuPg47vukiPejmbJhuz/b/q8G7dASDBakTh+jqh4ESIwJOUxSw8EYFOFtKNoB3N+3rQeCj/1QoK+uH0jwSm8I+S3ILT11ulLMmdrJ+qs75XDZHuFBF1vkKLBCeCn6yQiXmL7smppDyArBSIHeT8g0zHyIvujeQXFDlA3zCzrFwCEi32QyksKpPLLpVTji41d9r6O4iD83HxRb+3OBoJefq8R+GRUWamIO4fm24HQNt3P7TJTUAwlBGquYvJE6LnLtZD1u9SyYPLmPZAoZfAVj4hRryRsNr1JwpcQkEOzhbayuEUSVMrcbYl/XIBxaQvmkUwNjPOJv6ztWRKL8aWxU5vCgKKOM0/YSFAkZXy85jZ/vHic7TuyfNPqLmFiVlG0kmrzm5znVGNxVa3eUaY2+yPcODeC8sHwPHhCey0="
-  on:
-    python: 3.9
-    tags: true
diff --git a/README.md b/README.md
index b901330..80f0c85 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.124.1
+- Package version: 2.126.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 6ba81c4..0426870 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.21"  # For 3.x use CGEN_VER="3.0.27"
+CGEN_VER="2.4.26"  # For 3.x use CGEN_VER="3.0.27"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 3b2de3a..af63bc9 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.124.1"
+VERSION = "2.126.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e573078..3b3c08f 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.124.1/python'
+        self.user_agent = 'Swagger-Codegen/2.126.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 02b1d7c..8aa5a8a 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.124.1".\
+               "SDK Package Version: 2.126.1".\
                format(env=sys.platform, pyversion=sys.version)

From 67d0ab8913326a0f7e81ca669f8a86779857c3f1 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 31 Mar 2022 08:16:20 -0700
Subject: [PATCH 107/161] Autogenerated Update v2.128.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  27 +-
 docs/AccountUserAndServiceAccountApi.md       | 110 ------
 docs/ApiTokenApi.md                           | 161 +++++++++
 docs/ApiTokenModel.md                         |  17 +
 docs/CloudWatchConfiguration.md               |   1 +
 docs/DefaultSavedAppMapSearch.md              |  11 +
 docs/DefaultSavedTracesSearch.md              |  11 +
 docs/PagedApiTokenModel.md                    |  16 +
 docs/ResponseContainerApiTokenModel.md        |  11 +
 ...sponseContainerDefaultSavedAppMapSearch.md |  11 +
 ...sponseContainerDefaultSavedTracesSearch.md |  11 +
 docs/ResponseContainerListApiTokenModel.md    |  11 +
 docs/ResponseContainerPagedApiTokenModel.md   |  11 +
 docs/SavedAppMapSearchApi.md                  | 161 +++++++++
 docs/SavedTracesSearchApi.md                  | 161 +++++++++
 docs/SearchApi.md                             | 167 +++++++++
 docs/SearchQuery.md                           |   2 +
 docs/UserGroupApi.md                          | 110 ------
 setup.py                                      |   2 +-
 test/test_api_token_model.py                  |  40 +++
 test/test_default_saved_app_map_search.py     |  40 +++
 test/test_default_saved_traces_search.py      |  40 +++
 test/test_paged_api_token_model.py            |  40 +++
 ...test_response_container_api_token_model.py |  40 +++
 ..._container_default_saved_app_map_search.py |  40 +++
 ...e_container_default_saved_traces_search.py |  40 +++
 ...response_container_list_api_token_model.py |  40 +++
 ...esponse_container_paged_api_token_model.py |  40 +++
 wavefront_api_client/__init__.py              |   9 +
 .../account__user_and_service_account_api.py  | 190 ----------
 wavefront_api_client/api/api_token_api.py     | 277 +++++++++++++++
 .../api/saved_app_map_search_api.py           | 277 +++++++++++++++
 .../api/saved_traces_search_api.py            | 277 +++++++++++++++
 wavefront_api_client/api/search_api.py        | 293 ++++++++++++++++
 wavefront_api_client/api/user_group_api.py    | 190 ----------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   9 +
 .../models/api_token_model.py                 | 326 ++++++++++++++++++
 .../models/cloud_watch_configuration.py       |  30 +-
 .../models/default_saved_app_map_search.py    | 149 ++++++++
 .../models/default_saved_traces_search.py     | 149 ++++++++
 .../models/paged_api_token_model.py           | 287 +++++++++++++++
 .../response_container_api_token_model.py     | 150 ++++++++
 ..._container_default_saved_app_map_search.py | 150 ++++++++
 ...e_container_default_saved_traces_search.py | 150 ++++++++
 ...response_container_list_api_token_model.py | 150 ++++++++
 ...esponse_container_paged_api_token_model.py | 150 ++++++++
 ...esponse_container_set_business_function.py |   2 +-
 wavefront_api_client/models/saved_search.py   |   2 +-
 wavefront_api_client/models/search_query.py   |  58 +++-
 53 files changed, 4041 insertions(+), 614 deletions(-)
 create mode 100644 docs/ApiTokenModel.md
 create mode 100644 docs/DefaultSavedAppMapSearch.md
 create mode 100644 docs/DefaultSavedTracesSearch.md
 create mode 100644 docs/PagedApiTokenModel.md
 create mode 100644 docs/ResponseContainerApiTokenModel.md
 create mode 100644 docs/ResponseContainerDefaultSavedAppMapSearch.md
 create mode 100644 docs/ResponseContainerDefaultSavedTracesSearch.md
 create mode 100644 docs/ResponseContainerListApiTokenModel.md
 create mode 100644 docs/ResponseContainerPagedApiTokenModel.md
 create mode 100644 test/test_api_token_model.py
 create mode 100644 test/test_default_saved_app_map_search.py
 create mode 100644 test/test_default_saved_traces_search.py
 create mode 100644 test/test_paged_api_token_model.py
 create mode 100644 test/test_response_container_api_token_model.py
 create mode 100644 test/test_response_container_default_saved_app_map_search.py
 create mode 100644 test/test_response_container_default_saved_traces_search.py
 create mode 100644 test/test_response_container_list_api_token_model.py
 create mode 100644 test/test_response_container_paged_api_token_model.py
 create mode 100644 wavefront_api_client/models/api_token_model.py
 create mode 100644 wavefront_api_client/models/default_saved_app_map_search.py
 create mode 100644 wavefront_api_client/models/default_saved_traces_search.py
 create mode 100644 wavefront_api_client/models/paged_api_token_model.py
 create mode 100644 wavefront_api_client/models/response_container_api_token_model.py
 create mode 100644 wavefront_api_client/models/response_container_default_saved_app_map_search.py
 create mode 100644 wavefront_api_client/models/response_container_default_saved_traces_search.py
 create mode 100644 wavefront_api_client/models/response_container_list_api_token_model.py
 create mode 100644 wavefront_api_client/models/response_container_paged_api_token_model.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 4e93611..b02a280 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.126.1"
+    "packageVersion": "2.128.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5c589af..4e93611 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.124.1"
+    "packageVersion": "2.126.1"
 }
diff --git a/README.md b/README.md
index 80f0c85..abb1b9e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.126.1
+- Package version: 2.128.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -82,7 +82,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
-*AccountUserAndServiceAccountApi* | [**add_single_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_single_ingestion_policy) | **POST** /api/v2/account/addIngestionPolicy | Add single ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -101,7 +100,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
-*AccountUserAndServiceAccountApi* | [**remove_single_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#remove_single_ingestion_policy) | **POST** /api/v2/account/removeIngestionPolicy | Removes single ingestion policy from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -132,10 +130,13 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
+*ApiTokenApi* | [**delete_customer_token**](docs/ApiTokenApi.md#delete_customer_token) | **PUT** /api/v2/apitoken/customertokens/revoke | Delete the specified api token for a customer
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
 *ApiTokenApi* | [**delete_token_service_account**](docs/ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
 *ApiTokenApi* | [**generate_token_service_account**](docs/ApiTokenApi.md#generate_token_service_account) | **POST** /api/v2/apitoken/serviceaccount/{id} | Create a new api token for the service account
 *ApiTokenApi* | [**get_all_tokens**](docs/ApiTokenApi.md#get_all_tokens) | **GET** /api/v2/apitoken | Get all api tokens for a user
+*ApiTokenApi* | [**get_customer_token**](docs/ApiTokenApi.md#get_customer_token) | **GET** /api/v2/apitoken/customertokens/{id} | Get the specified api token for a customer
+*ApiTokenApi* | [**get_customer_tokens**](docs/ApiTokenApi.md#get_customer_tokens) | **GET** /api/v2/apitoken/customertokens | Get all api tokens for a customer
 *ApiTokenApi* | [**get_tokens_service_account**](docs/ApiTokenApi.md#get_tokens_service_account) | **GET** /api/v2/apitoken/serviceaccount/{id} | Get all api tokens for the given service account
 *ApiTokenApi* | [**update_token_name**](docs/ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
 *ApiTokenApi* | [**update_token_name_service_account**](docs/ApiTokenApi.md#update_token_name_service_account) | **PUT** /api/v2/apitoken/serviceaccount/{id}/{token} | Update the name of the specified api token for the given service account
@@ -268,6 +269,9 @@ Class | Method | HTTP request | Description
 *RoleApi* | [**revoke_permission_from_roles**](docs/RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revokes a single permission from role(s)
 *RoleApi* | [**update_role**](docs/RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a specific role
 *SavedAppMapSearchApi* | [**create_saved_app_map_search**](docs/SavedAppMapSearchApi.md#create_saved_app_map_search) | **POST** /api/v2/savedappmapsearch | Create a search
+*SavedAppMapSearchApi* | [**default_app_map_search**](docs/SavedAppMapSearchApi.md#default_app_map_search) | **GET** /api/v2/savedappmapsearch/defaultAppMapSearch | Get default app map search for a user
+*SavedAppMapSearchApi* | [**default_app_map_search_0**](docs/SavedAppMapSearchApi.md#default_app_map_search_0) | **POST** /api/v2/savedappmapsearch/defaultAppMapSearch | Set default app map search at user level
+*SavedAppMapSearchApi* | [**default_customer_app_map_search**](docs/SavedAppMapSearchApi.md#default_customer_app_map_search) | **POST** /api/v2/savedappmapsearch/defaultCustomerAppMapSearch | Set default app map search at customer level
 *SavedAppMapSearchApi* | [**delete_saved_app_map_search**](docs/SavedAppMapSearchApi.md#delete_saved_app_map_search) | **DELETE** /api/v2/savedappmapsearch/{id} | Delete a search
 *SavedAppMapSearchApi* | [**delete_saved_app_map_search_for_user**](docs/SavedAppMapSearchApi.md#delete_saved_app_map_search_for_user) | **DELETE** /api/v2/savedappmapsearch/owned/{id} | Delete a search belonging to the user
 *SavedAppMapSearchApi* | [**get_all_saved_app_map_searches**](docs/SavedAppMapSearchApi.md#get_all_saved_app_map_searches) | **GET** /api/v2/savedappmapsearch | Get all searches for a customer
@@ -290,6 +294,9 @@ Class | Method | HTTP request | Description
 *SavedSearchApi* | [**get_saved_search**](docs/SavedSearchApi.md#get_saved_search) | **GET** /api/v2/savedsearch/{id} | Get a specific saved search
 *SavedSearchApi* | [**update_saved_search**](docs/SavedSearchApi.md#update_saved_search) | **PUT** /api/v2/savedsearch/{id} | Update a specific saved search
 *SavedTracesSearchApi* | [**create_saved_traces_search**](docs/SavedTracesSearchApi.md#create_saved_traces_search) | **POST** /api/v2/savedtracessearch | Create a search
+*SavedTracesSearchApi* | [**default_app_map_search**](docs/SavedTracesSearchApi.md#default_app_map_search) | **POST** /api/v2/savedtracessearch/defaultTracesSearch | Set default traces search at user level
+*SavedTracesSearchApi* | [**default_customer_traces_search**](docs/SavedTracesSearchApi.md#default_customer_traces_search) | **POST** /api/v2/savedtracessearch/defaultCustomerTracesSearch | Set default traces search at customer level
+*SavedTracesSearchApi* | [**default_traces_search**](docs/SavedTracesSearchApi.md#default_traces_search) | **GET** /api/v2/savedtracessearch/defaultTracesSearch | Get default traces search for a user
 *SavedTracesSearchApi* | [**delete_saved_traces_search**](docs/SavedTracesSearchApi.md#delete_saved_traces_search) | **DELETE** /api/v2/savedtracessearch/{id} | Delete a search
 *SavedTracesSearchApi* | [**delete_saved_traces_search_for_user**](docs/SavedTracesSearchApi.md#delete_saved_traces_search_for_user) | **DELETE** /api/v2/savedtracessearch/owned/{id} | Delete a search belonging to the user
 *SavedTracesSearchApi* | [**get_all_saved_traces_searches**](docs/SavedTracesSearchApi.md#get_all_saved_traces_searches) | **GET** /api/v2/savedtracessearch | Get all searches for a customer
@@ -380,6 +387,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_tagged_source_entities**](docs/SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facet**](docs/SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 *SearchApi* | [**search_tagged_source_for_facets**](docs/SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
+*SearchApi* | [**search_token_entities**](docs/SearchApi.md#search_token_entities) | **POST** /api/v2/search/token | Search over a customer&#39;s api tokens
+*SearchApi* | [**search_token_for_facet**](docs/SearchApi.md#search_token_for_facet) | **POST** /api/v2/search/token/{facet} | Lists the values of a specific facet over the customer&#39;s api tokens
+*SearchApi* | [**search_token_for_facets**](docs/SearchApi.md#search_token_for_facets) | **POST** /api/v2/search/token/facets | Lists the values of one or more facets over the customer&#39;s api tokens
 *SearchApi* | [**search_traces_map_for_facet**](docs/SearchApi.md#search_traces_map_for_facet) | **POST** /api/v2/search/savedtracessearch/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted traces searches
 *SearchApi* | [**search_traces_map_for_facets**](docs/SearchApi.md#search_traces_map_for_facets) | **POST** /api/v2/search/savedtracessearch/facets | Lists the values of one or more facets over the customer&#39;s non-deleted traces searches
 *SearchApi* | [**search_user_entities**](docs/SearchApi.md#search_user_entities) | **POST** /api/v2/search/user | Search over a customer&#39;s users
@@ -436,14 +446,12 @@ Class | Method | HTTP request | Description
 *UserApi* | [**revoke_user_permission**](docs/UserApi.md#revoke_user_permission) | **POST** /api/v2/user/{id}/revoke | Revokes a specific permission from user or service account
 *UserApi* | [**update_user**](docs/UserApi.md#update_user) | **PUT** /api/v2/user/{id} | Update user with given user groups, permissions and ingestion policy.
 *UserApi* | [**validate_users**](docs/UserApi.md#validate_users) | **POST** /api/v2/user/validateUsers | Returns valid users and service accounts, also invalid identifiers from the given list
-*UserGroupApi* | [**add_ingestion_policy**](docs/UserGroupApi.md#add_ingestion_policy) | **POST** /api/v2/usergroup/addIngestionPolicy | Add single ingestion policy to multiple groups
 *UserGroupApi* | [**add_roles_to_user_group**](docs/UserGroupApi.md#add_roles_to_user_group) | **POST** /api/v2/usergroup/{id}/addRoles | Add multiple roles to a specific user group
 *UserGroupApi* | [**add_users_to_user_group**](docs/UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 *UserGroupApi* | [**create_user_group**](docs/UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 *UserGroupApi* | [**delete_user_group**](docs/UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
 *UserGroupApi* | [**get_all_user_groups**](docs/UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
 *UserGroupApi* | [**get_user_group**](docs/UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
-*UserGroupApi* | [**remove_ingestion_policy**](docs/UserGroupApi.md#remove_ingestion_policy) | **POST** /api/v2/usergroup/removeIngestionPolicy | Removes single ingestion policy from multiple groups
 *UserGroupApi* | [**remove_roles_from_user_group**](docs/UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 *UserGroupApi* | [**remove_users_from_user_group**](docs/UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
 *UserGroupApi* | [**update_user_group**](docs/UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
@@ -471,6 +479,7 @@ Class | Method | HTTP request | Description
  - [AlertSource](docs/AlertSource.md)
  - [Annotation](docs/Annotation.md)
  - [Anomaly](docs/Anomaly.md)
+ - [ApiTokenModel](docs/ApiTokenModel.md)
  - [AppDynamicsConfiguration](docs/AppDynamicsConfiguration.md)
  - [AppSearchFilter](docs/AppSearchFilter.md)
  - [AppSearchFilterValue](docs/AppSearchFilterValue.md)
@@ -493,6 +502,8 @@ Class | Method | HTTP request | Description
  - [DashboardParameterValue](docs/DashboardParameterValue.md)
  - [DashboardSection](docs/DashboardSection.md)
  - [DashboardSectionRow](docs/DashboardSectionRow.md)
+ - [DefaultSavedAppMapSearch](docs/DefaultSavedAppMapSearch.md)
+ - [DefaultSavedTracesSearch](docs/DefaultSavedTracesSearch.md)
  - [DerivedMetricDefinition](docs/DerivedMetricDefinition.md)
  - [DynatraceConfiguration](docs/DynatraceConfiguration.md)
  - [EC2Configuration](docs/EC2Configuration.md)
@@ -547,6 +558,7 @@ Class | Method | HTTP request | Description
  - [PagedAlert](docs/PagedAlert.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
  - [PagedAnomaly](docs/PagedAnomaly.md)
+ - [PagedApiTokenModel](docs/PagedApiTokenModel.md)
  - [PagedCloudIntegration](docs/PagedCloudIntegration.md)
  - [PagedCustomerFacingUserObject](docs/PagedCustomerFacingUserObject.md)
  - [PagedDashboard](docs/PagedDashboard.md)
@@ -597,8 +609,11 @@ Class | Method | HTTP request | Description
  - [ResponseContainerAccessPolicyAction](docs/ResponseContainerAccessPolicyAction.md)
  - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
+ - [ResponseContainerApiTokenModel](docs/ResponseContainerApiTokenModel.md)
  - [ResponseContainerCloudIntegration](docs/ResponseContainerCloudIntegration.md)
  - [ResponseContainerDashboard](docs/ResponseContainerDashboard.md)
+ - [ResponseContainerDefaultSavedAppMapSearch](docs/ResponseContainerDefaultSavedAppMapSearch.md)
+ - [ResponseContainerDefaultSavedTracesSearch](docs/ResponseContainerDefaultSavedTracesSearch.md)
  - [ResponseContainerDerivedMetricDefinition](docs/ResponseContainerDerivedMetricDefinition.md)
  - [ResponseContainerEvent](docs/ResponseContainerEvent.md)
  - [ResponseContainerExternalLink](docs/ResponseContainerExternalLink.md)
@@ -609,6 +624,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
+ - [ResponseContainerListApiTokenModel](docs/ResponseContainerListApiTokenModel.md)
  - [ResponseContainerListIntegration](docs/ResponseContainerListIntegration.md)
  - [ResponseContainerListIntegrationManifestGroup](docs/ResponseContainerListIntegrationManifestGroup.md)
  - [ResponseContainerListNotificationMessages](docs/ResponseContainerListNotificationMessages.md)
@@ -628,6 +644,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedAlert](docs/ResponseContainerPagedAlert.md)
  - [ResponseContainerPagedAlertWithStats](docs/ResponseContainerPagedAlertWithStats.md)
  - [ResponseContainerPagedAnomaly](docs/ResponseContainerPagedAnomaly.md)
+ - [ResponseContainerPagedApiTokenModel](docs/ResponseContainerPagedApiTokenModel.md)
  - [ResponseContainerPagedCloudIntegration](docs/ResponseContainerPagedCloudIntegration.md)
  - [ResponseContainerPagedCustomerFacingUserObject](docs/ResponseContainerPagedCustomerFacingUserObject.md)
  - [ResponseContainerPagedDashboard](docs/ResponseContainerPagedDashboard.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index dd8cf0a..4de9bdf 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -8,7 +8,6 @@ Method | HTTP request | Description
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
 [**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
-[**add_single_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_single_ingestion_policy) | **POST** /api/v2/account/addIngestionPolicy | Add single ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -27,7 +26,6 @@ Method | HTTP request | Description
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 [**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
-[**remove_single_ingestion_policy**](AccountUserAndServiceAccountApi.md#remove_single_ingestion_policy) | **POST** /api/v2/account/removeIngestionPolicy | Removes single ingestion policy from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -255,60 +253,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **add_single_ingestion_policy**
-> ResponseContainerUserDTO add_single_ingestion_policy(body=body)
-
-Add single ingestion policy to multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Add single ingestion policy to multiple accounts
-    api_response = api_instance.add_single_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->add_single_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerUserDTO**](ResponseContainerUserDTO.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -1285,60 +1229,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_single_ingestion_policy**
-> ResponseContainerUserDTO remove_single_ingestion_policy(body=body)
-
-Removes single ingestion policy from multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Removes single ingestion policy from multiple accounts
-    api_response = api_instance.remove_single_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->remove_single_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerUserDTO**](ResponseContainerUserDTO.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
index 06bdb10..7be2189 100644
--- a/docs/ApiTokenApi.md
+++ b/docs/ApiTokenApi.md
@@ -5,10 +5,13 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**create_token**](ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
+[**delete_customer_token**](ApiTokenApi.md#delete_customer_token) | **PUT** /api/v2/apitoken/customertokens/revoke | Delete the specified api token for a customer
 [**delete_token**](ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
 [**delete_token_service_account**](ApiTokenApi.md#delete_token_service_account) | **DELETE** /api/v2/apitoken/serviceaccount/{id}/{token} | Delete the specified api token of the given service account
 [**generate_token_service_account**](ApiTokenApi.md#generate_token_service_account) | **POST** /api/v2/apitoken/serviceaccount/{id} | Create a new api token for the service account
 [**get_all_tokens**](ApiTokenApi.md#get_all_tokens) | **GET** /api/v2/apitoken | Get all api tokens for a user
+[**get_customer_token**](ApiTokenApi.md#get_customer_token) | **GET** /api/v2/apitoken/customertokens/{id} | Get the specified api token for a customer
+[**get_customer_tokens**](ApiTokenApi.md#get_customer_tokens) | **GET** /api/v2/apitoken/customertokens | Get all api tokens for a customer
 [**get_tokens_service_account**](ApiTokenApi.md#get_tokens_service_account) | **GET** /api/v2/apitoken/serviceaccount/{id} | Get all api tokens for the given service account
 [**update_token_name**](ApiTokenApi.md#update_token_name) | **PUT** /api/v2/apitoken/{id} | Update the name of the specified api token
 [**update_token_name_service_account**](ApiTokenApi.md#update_token_name_service_account) | **PUT** /api/v2/apitoken/serviceaccount/{id}/{token} | Update the name of the specified api token for the given service account
@@ -64,6 +67,60 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **delete_customer_token**
+> ResponseContainerUserApiToken delete_customer_token(body=body)
+
+Delete the specified api token for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.UserApiToken() # UserApiToken |  (optional)
+
+try:
+    # Delete the specified api token for a customer
+    api_response = api_instance.delete_customer_token(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->delete_customer_token: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**UserApiToken**](UserApiToken.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerUserApiToken**](ResponseContainerUserApiToken.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **delete_token**
 > ResponseContainerListUserApiToken delete_token(id)
 
@@ -280,6 +337,110 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_customer_token**
+> ResponseContainerApiTokenModel get_customer_token(id)
+
+Get the specified api token for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get the specified api token for a customer
+    api_response = api_instance.get_customer_token(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->get_customer_token: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerApiTokenModel**](ResponseContainerApiTokenModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_customer_tokens**
+> ResponseContainerListApiTokenModel get_customer_tokens()
+
+Get all api tokens for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ApiTokenApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all api tokens for a customer
+    api_response = api_instance.get_customer_tokens()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ApiTokenApi->get_customer_tokens: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListApiTokenModel**](ResponseContainerListApiTokenModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_tokens_service_account**
 > ResponseContainerListUserApiToken get_tokens_service_account(id)
 
diff --git a/docs/ApiTokenModel.md b/docs/ApiTokenModel.md
new file mode 100644
index 0000000..b355ecf
--- /dev/null
+++ b/docs/ApiTokenModel.md
@@ -0,0 +1,17 @@
+# ApiTokenModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**account** | **str** | The account who generated this token. | [optional] 
+**account_type** | **str** | The user or service account generated this token. | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**customer** | **str** | The id of the customer to which the token belongs. | [optional] 
+**date_generated** | **int** | The generation date of the token. | [optional] 
+**id** | **str** | The unique identifier of the token. | [optional] 
+**last_used** | **int** | The last time this token was used. | [optional] 
+**name** | **str** | The name of the token. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index 8a05631..06e071c 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
 **namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
+**thread_distribution_in_mins** | **int** | ThreadDistributionInMins | [optional] 
 **volume_selection_tags** | **dict(str, str)** | A string-&gt;string map of allow list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **volume_selection_tags_expr** | **str** | A string expressing the allow list of AWS volume tag-value pairs.  If the volume&#39;s AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed and also OR&#39;ed with entries from volumeSelectionTags.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
 
diff --git a/docs/DefaultSavedAppMapSearch.md b/docs/DefaultSavedAppMapSearch.md
new file mode 100644
index 0000000..c749d1b
--- /dev/null
+++ b/docs/DefaultSavedAppMapSearch.md
@@ -0,0 +1,11 @@
+# DefaultSavedAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**default_search_id** | **str** |  | [optional] 
+**user_setting** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/DefaultSavedTracesSearch.md b/docs/DefaultSavedTracesSearch.md
new file mode 100644
index 0000000..6e1f96d
--- /dev/null
+++ b/docs/DefaultSavedTracesSearch.md
@@ -0,0 +1,11 @@
+# DefaultSavedTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**default_search_id** | **str** |  | [optional] 
+**user_setting** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedApiTokenModel.md b/docs/PagedApiTokenModel.md
new file mode 100644
index 0000000..f5bfaa4
--- /dev/null
+++ b/docs/PagedApiTokenModel.md
@@ -0,0 +1,16 @@
+# PagedApiTokenModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[ApiTokenModel]**](ApiTokenModel.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerApiTokenModel.md b/docs/ResponseContainerApiTokenModel.md
new file mode 100644
index 0000000..31b0232
--- /dev/null
+++ b/docs/ResponseContainerApiTokenModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerApiTokenModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**ApiTokenModel**](ApiTokenModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerDefaultSavedAppMapSearch.md b/docs/ResponseContainerDefaultSavedAppMapSearch.md
new file mode 100644
index 0000000..60672c8
--- /dev/null
+++ b/docs/ResponseContainerDefaultSavedAppMapSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerDefaultSavedAppMapSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**DefaultSavedAppMapSearch**](DefaultSavedAppMapSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerDefaultSavedTracesSearch.md b/docs/ResponseContainerDefaultSavedTracesSearch.md
new file mode 100644
index 0000000..e3324ef
--- /dev/null
+++ b/docs/ResponseContainerDefaultSavedTracesSearch.md
@@ -0,0 +1,11 @@
+# ResponseContainerDefaultSavedTracesSearch
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**DefaultSavedTracesSearch**](DefaultSavedTracesSearch.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListApiTokenModel.md b/docs/ResponseContainerListApiTokenModel.md
new file mode 100644
index 0000000..952e859
--- /dev/null
+++ b/docs/ResponseContainerListApiTokenModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerListApiTokenModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[ApiTokenModel]**](ApiTokenModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedApiTokenModel.md b/docs/ResponseContainerPagedApiTokenModel.md
new file mode 100644
index 0000000..a391f54
--- /dev/null
+++ b/docs/ResponseContainerPagedApiTokenModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedApiTokenModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedApiTokenModel**](PagedApiTokenModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SavedAppMapSearchApi.md b/docs/SavedAppMapSearchApi.md
index ddad53d..57e6268 100644
--- a/docs/SavedAppMapSearchApi.md
+++ b/docs/SavedAppMapSearchApi.md
@@ -5,6 +5,9 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**create_saved_app_map_search**](SavedAppMapSearchApi.md#create_saved_app_map_search) | **POST** /api/v2/savedappmapsearch | Create a search
+[**default_app_map_search**](SavedAppMapSearchApi.md#default_app_map_search) | **GET** /api/v2/savedappmapsearch/defaultAppMapSearch | Get default app map search for a user
+[**default_app_map_search_0**](SavedAppMapSearchApi.md#default_app_map_search_0) | **POST** /api/v2/savedappmapsearch/defaultAppMapSearch | Set default app map search at user level
+[**default_customer_app_map_search**](SavedAppMapSearchApi.md#default_customer_app_map_search) | **POST** /api/v2/savedappmapsearch/defaultCustomerAppMapSearch | Set default app map search at customer level
 [**delete_saved_app_map_search**](SavedAppMapSearchApi.md#delete_saved_app_map_search) | **DELETE** /api/v2/savedappmapsearch/{id} | Delete a search
 [**delete_saved_app_map_search_for_user**](SavedAppMapSearchApi.md#delete_saved_app_map_search_for_user) | **DELETE** /api/v2/savedappmapsearch/owned/{id} | Delete a search belonging to the user
 [**get_all_saved_app_map_searches**](SavedAppMapSearchApi.md#get_all_saved_app_map_searches) | **GET** /api/v2/savedappmapsearch | Get all searches for a customer
@@ -68,6 +71,164 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **default_app_map_search**
+> ResponseContainerDefaultSavedAppMapSearch default_app_map_search()
+
+Get default app map search for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get default app map search for a user
+    api_response = api_instance.default_app_map_search()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->default_app_map_search: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerDefaultSavedAppMapSearch**](ResponseContainerDefaultSavedAppMapSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **default_app_map_search_0**
+> ResponseContainerString default_app_map_search_0(default_app_map_search=default_app_map_search)
+
+Set default app map search at user level
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+default_app_map_search = 'default_app_map_search_example' # str |  (optional)
+
+try:
+    # Set default app map search at user level
+    api_response = api_instance.default_app_map_search_0(default_app_map_search=default_app_map_search)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->default_app_map_search_0: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **default_app_map_search** | **str**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **default_customer_app_map_search**
+> ResponseContainerString default_customer_app_map_search(default_app_map_search=default_app_map_search)
+
+Set default app map search at customer level
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedAppMapSearchApi(wavefront_api_client.ApiClient(configuration))
+default_app_map_search = 'default_app_map_search_example' # str |  (optional)
+
+try:
+    # Set default app map search at customer level
+    api_response = api_instance.default_customer_app_map_search(default_app_map_search=default_app_map_search)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedAppMapSearchApi->default_customer_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **default_app_map_search** | **str**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **delete_saved_app_map_search**
 > ResponseContainerSavedAppMapSearch delete_saved_app_map_search(id)
 
diff --git a/docs/SavedTracesSearchApi.md b/docs/SavedTracesSearchApi.md
index a7bdc8e..e19105d 100644
--- a/docs/SavedTracesSearchApi.md
+++ b/docs/SavedTracesSearchApi.md
@@ -5,6 +5,9 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**create_saved_traces_search**](SavedTracesSearchApi.md#create_saved_traces_search) | **POST** /api/v2/savedtracessearch | Create a search
+[**default_app_map_search**](SavedTracesSearchApi.md#default_app_map_search) | **POST** /api/v2/savedtracessearch/defaultTracesSearch | Set default traces search at user level
+[**default_customer_traces_search**](SavedTracesSearchApi.md#default_customer_traces_search) | **POST** /api/v2/savedtracessearch/defaultCustomerTracesSearch | Set default traces search at customer level
+[**default_traces_search**](SavedTracesSearchApi.md#default_traces_search) | **GET** /api/v2/savedtracessearch/defaultTracesSearch | Get default traces search for a user
 [**delete_saved_traces_search**](SavedTracesSearchApi.md#delete_saved_traces_search) | **DELETE** /api/v2/savedtracessearch/{id} | Delete a search
 [**delete_saved_traces_search_for_user**](SavedTracesSearchApi.md#delete_saved_traces_search_for_user) | **DELETE** /api/v2/savedtracessearch/owned/{id} | Delete a search belonging to the user
 [**get_all_saved_traces_searches**](SavedTracesSearchApi.md#get_all_saved_traces_searches) | **GET** /api/v2/savedtracessearch | Get all searches for a customer
@@ -68,6 +71,164 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **default_app_map_search**
+> ResponseContainerString default_app_map_search(default_traces_search=default_traces_search)
+
+Set default traces search at user level
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+default_traces_search = 'default_traces_search_example' # str |  (optional)
+
+try:
+    # Set default traces search at user level
+    api_response = api_instance.default_app_map_search(default_traces_search=default_traces_search)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->default_app_map_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **default_traces_search** | **str**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **default_customer_traces_search**
+> ResponseContainerString default_customer_traces_search(default_traces_search=default_traces_search)
+
+Set default traces search at customer level
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+default_traces_search = 'default_traces_search_example' # str |  (optional)
+
+try:
+    # Set default traces search at customer level
+    api_response = api_instance.default_customer_traces_search(default_traces_search=default_traces_search)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->default_customer_traces_search: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **default_traces_search** | **str**|  | [optional] 
+
+### Return type
+
+[**ResponseContainerString**](ResponseContainerString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **default_traces_search**
+> ResponseContainerDefaultSavedTracesSearch default_traces_search()
+
+Get default traces search for a user
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SavedTracesSearchApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get default traces search for a user
+    api_response = api_instance.default_traces_search()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SavedTracesSearchApi->default_traces_search: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerDefaultSavedTracesSearch**](ResponseContainerDefaultSavedTracesSearch.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **delete_saved_traces_search**
 > ResponseContainerSavedTracesSearch delete_saved_traces_search(id)
 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 909b17a..02994b8 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -79,6 +79,9 @@ Method | HTTP request | Description
 [**search_tagged_source_entities**](SearchApi.md#search_tagged_source_entities) | **POST** /api/v2/search/source | Search over a customer&#39;s sources
 [**search_tagged_source_for_facet**](SearchApi.md#search_tagged_source_for_facet) | **POST** /api/v2/search/source/{facet} | Lists the values of a specific facet over the customer&#39;s sources
 [**search_tagged_source_for_facets**](SearchApi.md#search_tagged_source_for_facets) | **POST** /api/v2/search/source/facets | Lists the values of one or more facets over the customer&#39;s sources
+[**search_token_entities**](SearchApi.md#search_token_entities) | **POST** /api/v2/search/token | Search over a customer&#39;s api tokens
+[**search_token_for_facet**](SearchApi.md#search_token_for_facet) | **POST** /api/v2/search/token/{facet} | Lists the values of a specific facet over the customer&#39;s api tokens
+[**search_token_for_facets**](SearchApi.md#search_token_for_facets) | **POST** /api/v2/search/token/facets | Lists the values of one or more facets over the customer&#39;s api tokens
 [**search_traces_map_for_facet**](SearchApi.md#search_traces_map_for_facet) | **POST** /api/v2/search/savedtracessearch/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted traces searches
 [**search_traces_map_for_facets**](SearchApi.md#search_traces_map_for_facets) | **POST** /api/v2/search/savedtracessearch/facets | Lists the values of one or more facets over the customer&#39;s non-deleted traces searches
 [**search_user_entities**](SearchApi.md#search_user_entities) | **POST** /api/v2/search/user | Search over a customer&#39;s users
@@ -4194,6 +4197,170 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_token_entities**
+> ResponseContainerPagedApiTokenModel search_token_entities(body=body)
+
+Search over a customer's api tokens
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's api tokens
+    api_response = api_instance.search_token_entities(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_token_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedApiTokenModel**](ResponseContainerPagedApiTokenModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_token_for_facet**
+> ResponseContainerFacetResponse search_token_for_facet(facet, body=body)
+
+Lists the values of a specific facet over the customer's api tokens
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's api tokens
+    api_response = api_instance.search_token_for_facet(facet, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_token_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_token_for_facets**
+> ResponseContainerFacetsResponseContainer search_token_for_facets(body=body)
+
+Lists the values of one or more facets over the customer's api tokens
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's api tokens
+    api_response = api_instance.search_token_for_facets(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_token_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_traces_map_for_facet**
 > ResponseContainerFacetResponse search_traces_map_for_facet(facet, body=body)
 
diff --git a/docs/SearchQuery.md b/docs/SearchQuery.md
index 02c7943..66b9a30 100644
--- a/docs/SearchQuery.md
+++ b/docs/SearchQuery.md
@@ -3,9 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**end** | **int** | The end point of the range. At least one of start or end points should be available for range search. | [optional] 
 **key** | **str** | The entity facet (key) by which to search.  Valid keys are any property keys returned by the JSON representation of the entity.  Examples are &#39;creatorId&#39;, &#39;name&#39;, etc.  The following special key keywords are also valid:  &#39;tags&#39; performs a search on entity tags, &#39;tagpath&#39; performs a hierarchical search on tags, with  periods (.) as path level separators.  &#39;freetext&#39; performs a free text search across many fields of the entity | 
 **matching_method** | **str** | The method by which search matching is performed.  Default: CONTAINS | [optional] 
 **negated** | **bool** | The flag to create a NOT operation. Default: false | [optional] 
+**start** | **int** | The start point of the range. At least one of start or end points should be available for range search. | [optional] 
 **value** | **str** | The entity facet value for which to search. Either value or values field is required. If both are set, values takes precedence. | [optional] 
 **values** | **list[str]** | The entity facet values for which to search based on OR operation. Either value or values field is required. If both are set, values takes precedence. | [optional] 
 
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 945cd0f..2c73a32 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -4,73 +4,17 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_ingestion_policy**](UserGroupApi.md#add_ingestion_policy) | **POST** /api/v2/usergroup/addIngestionPolicy | Add single ingestion policy to multiple groups
 [**add_roles_to_user_group**](UserGroupApi.md#add_roles_to_user_group) | **POST** /api/v2/usergroup/{id}/addRoles | Add multiple roles to a specific user group
 [**add_users_to_user_group**](UserGroupApi.md#add_users_to_user_group) | **POST** /api/v2/usergroup/{id}/addUsers | Add multiple users to a specific user group
 [**create_user_group**](UserGroupApi.md#create_user_group) | **POST** /api/v2/usergroup | Create a specific user group
 [**delete_user_group**](UserGroupApi.md#delete_user_group) | **DELETE** /api/v2/usergroup/{id} | Delete a specific user group
 [**get_all_user_groups**](UserGroupApi.md#get_all_user_groups) | **GET** /api/v2/usergroup | Get all user groups for a customer
 [**get_user_group**](UserGroupApi.md#get_user_group) | **GET** /api/v2/usergroup/{id} | Get a specific user group
-[**remove_ingestion_policy**](UserGroupApi.md#remove_ingestion_policy) | **POST** /api/v2/usergroup/removeIngestionPolicy | Removes single ingestion policy from multiple groups
 [**remove_roles_from_user_group**](UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 [**remove_users_from_user_group**](UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
 [**update_user_group**](UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
 
 
-# **add_ingestion_policy**
-> ResponseContainerUserGroupModel add_ingestion_policy(body=body)
-
-Add single ingestion policy to multiple groups
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Add single ingestion policy to multiple groups
-    api_response = api_instance.add_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UserGroupApi->add_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **add_roles_to_user_group**
 > ResponseContainerUserGroupModel add_roles_to_user_group(id, body=body)
 
@@ -401,60 +345,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_ingestion_policy**
-> ResponseContainerUserGroupModel remove_ingestion_policy(body=body)
-
-Removes single ingestion policy from multiple groups
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UserGroupApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Removes single ingestion policy from multiple groups
-    api_response = api_instance.remove_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UserGroupApi->remove_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerUserGroupModel**](ResponseContainerUserGroupModel.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **remove_roles_from_user_group**
 > ResponseContainerUserGroupModel remove_roles_from_user_group(id, body=body)
 
diff --git a/setup.py b/setup.py
index af63bc9..0b8bb43 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.126.1"
+VERSION = "2.128.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_api_token_model.py b/test/test_api_token_model.py
new file mode 100644
index 0000000..0551214
--- /dev/null
+++ b/test/test_api_token_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.api_token_model import ApiTokenModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestApiTokenModel(unittest.TestCase):
+    """ApiTokenModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testApiTokenModel(self):
+        """Test ApiTokenModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.api_token_model.ApiTokenModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_default_saved_app_map_search.py b/test/test_default_saved_app_map_search.py
new file mode 100644
index 0000000..9683c29
--- /dev/null
+++ b/test/test_default_saved_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.default_saved_app_map_search import DefaultSavedAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDefaultSavedAppMapSearch(unittest.TestCase):
+    """DefaultSavedAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDefaultSavedAppMapSearch(self):
+        """Test DefaultSavedAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.default_saved_app_map_search.DefaultSavedAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_default_saved_traces_search.py b/test/test_default_saved_traces_search.py
new file mode 100644
index 0000000..879c8bf
--- /dev/null
+++ b/test/test_default_saved_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.default_saved_traces_search import DefaultSavedTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestDefaultSavedTracesSearch(unittest.TestCase):
+    """DefaultSavedTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testDefaultSavedTracesSearch(self):
+        """Test DefaultSavedTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.default_saved_traces_search.DefaultSavedTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_api_token_model.py b/test/test_paged_api_token_model.py
new file mode 100644
index 0000000..52ed536
--- /dev/null
+++ b/test/test_paged_api_token_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_api_token_model import PagedApiTokenModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedApiTokenModel(unittest.TestCase):
+    """PagedApiTokenModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedApiTokenModel(self):
+        """Test PagedApiTokenModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_api_token_model.PagedApiTokenModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_api_token_model.py b/test/test_response_container_api_token_model.py
new file mode 100644
index 0000000..7e405ea
--- /dev/null
+++ b/test/test_response_container_api_token_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerApiTokenModel(unittest.TestCase):
+    """ResponseContainerApiTokenModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerApiTokenModel(self):
+        """Test ResponseContainerApiTokenModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_api_token_model.ResponseContainerApiTokenModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_default_saved_app_map_search.py b/test/test_response_container_default_saved_app_map_search.py
new file mode 100644
index 0000000..c78960c
--- /dev/null
+++ b/test/test_response_container_default_saved_app_map_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_default_saved_app_map_search import ResponseContainerDefaultSavedAppMapSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerDefaultSavedAppMapSearch(unittest.TestCase):
+    """ResponseContainerDefaultSavedAppMapSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerDefaultSavedAppMapSearch(self):
+        """Test ResponseContainerDefaultSavedAppMapSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_default_saved_app_map_search.ResponseContainerDefaultSavedAppMapSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_default_saved_traces_search.py b/test/test_response_container_default_saved_traces_search.py
new file mode 100644
index 0000000..fe0690d
--- /dev/null
+++ b/test/test_response_container_default_saved_traces_search.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_default_saved_traces_search import ResponseContainerDefaultSavedTracesSearch  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerDefaultSavedTracesSearch(unittest.TestCase):
+    """ResponseContainerDefaultSavedTracesSearch unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerDefaultSavedTracesSearch(self):
+        """Test ResponseContainerDefaultSavedTracesSearch"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_default_saved_traces_search.ResponseContainerDefaultSavedTracesSearch()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_api_token_model.py b/test/test_response_container_list_api_token_model.py
new file mode 100644
index 0000000..5ea5170
--- /dev/null
+++ b/test/test_response_container_list_api_token_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_api_token_model import ResponseContainerListApiTokenModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListApiTokenModel(unittest.TestCase):
+    """ResponseContainerListApiTokenModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListApiTokenModel(self):
+        """Test ResponseContainerListApiTokenModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_api_token_model.ResponseContainerListApiTokenModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_api_token_model.py b/test/test_response_container_paged_api_token_model.py
new file mode 100644
index 0000000..5be0bfc
--- /dev/null
+++ b/test/test_response_container_paged_api_token_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_api_token_model import ResponseContainerPagedApiTokenModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedApiTokenModel(unittest.TestCase):
+    """ResponseContainerPagedApiTokenModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedApiTokenModel(self):
+        """Test ResponseContainerPagedApiTokenModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_api_token_model.ResponseContainerPagedApiTokenModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 80f3896..61f2faa 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -72,6 +72,7 @@
 from wavefront_api_client.models.alert_source import AlertSource
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
+from wavefront_api_client.models.api_token_model import ApiTokenModel
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.app_search_filter import AppSearchFilter
 from wavefront_api_client.models.app_search_filter_value import AppSearchFilterValue
@@ -94,6 +95,8 @@
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
 from wavefront_api_client.models.dashboard_section import DashboardSection
 from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow
+from wavefront_api_client.models.default_saved_app_map_search import DefaultSavedAppMapSearch
+from wavefront_api_client.models.default_saved_traces_search import DefaultSavedTracesSearch
 from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition
 from wavefront_api_client.models.dynatrace_configuration import DynatraceConfiguration
 from wavefront_api_client.models.ec2_configuration import EC2Configuration
@@ -148,6 +151,7 @@
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_anomaly import PagedAnomaly
+from wavefront_api_client.models.paged_api_token_model import PagedApiTokenModel
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
 from wavefront_api_client.models.paged_customer_facing_user_object import PagedCustomerFacingUserObject
 from wavefront_api_client.models.paged_dashboard import PagedDashboard
@@ -198,8 +202,11 @@
 from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
+from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
 from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard
+from wavefront_api_client.models.response_container_default_saved_app_map_search import ResponseContainerDefaultSavedAppMapSearch
+from wavefront_api_client.models.response_container_default_saved_traces_search import ResponseContainerDefaultSavedTracesSearch
 from wavefront_api_client.models.response_container_derived_metric_definition import ResponseContainerDerivedMetricDefinition
 from wavefront_api_client.models.response_container_event import ResponseContainerEvent
 from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink
@@ -210,6 +217,7 @@
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
+from wavefront_api_client.models.response_container_list_api_token_model import ResponseContainerListApiTokenModel
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
 from wavefront_api_client.models.response_container_list_notification_messages import ResponseContainerListNotificationMessages
@@ -229,6 +237,7 @@
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
 from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly
+from wavefront_api_client.models.response_container_paged_api_token_model import ResponseContainerPagedApiTokenModel
 from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration
 from wavefront_api_client.models.response_container_paged_customer_facing_user_object import ResponseContainerPagedCustomerFacingUserObject
 from wavefront_api_client.models.response_container_paged_dashboard import ResponseContainerPagedDashboard
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index a1d56ae..6f745a9 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -433,101 +433,6 @@ def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def add_single_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Add single ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_single_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserDTO
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.add_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def add_single_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Add single ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_single_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserDTO
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_single_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/addIngestionPolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerUserDTO',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -2266,101 +2171,6 @@ def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_single_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Removes single ingestion policy from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_single_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserDTO
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_single_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def remove_single_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Removes single ingestion policy from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_single_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserDTO
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_single_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/removeIngestionPolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerUserDTO',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index d97189e..25a262c 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -120,6 +120,101 @@ def create_token_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def delete_customer_token(self, **kwargs):  # noqa: E501
+        """Delete the specified api token for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_customer_token(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param UserApiToken body:
+        :return: ResponseContainerUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_customer_token_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_customer_token_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def delete_customer_token_with_http_info(self, **kwargs):  # noqa: E501
+        """Delete the specified api token for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_customer_token_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param UserApiToken body:
+        :return: ResponseContainerUserApiToken
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_customer_token" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/customertokens/revoke', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerUserApiToken',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_token(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
@@ -504,6 +599,188 @@ def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_customer_token(self, id, **kwargs):  # noqa: E501
+        """Get the specified api token for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_customer_token(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerApiTokenModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_customer_token_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_customer_token_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_customer_token_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the specified api token for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_customer_token_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerApiTokenModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_customer_token" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_customer_token`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/customertokens/{id}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerApiTokenModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_customer_tokens(self, **kwargs):  # noqa: E501
+        """Get all api tokens for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_customer_tokens(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListApiTokenModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_customer_tokens_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_customer_tokens_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_customer_tokens_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all api tokens for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_customer_tokens_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListApiTokenModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_customer_tokens" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/apitoken/customertokens', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListApiTokenModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_tokens_service_account(self, id, **kwargs):  # noqa: E501
         """Get all api tokens for the given service account  # noqa: E501
 
diff --git a/wavefront_api_client/api/saved_app_map_search_api.py b/wavefront_api_client/api/saved_app_map_search_api.py
index f2fbc40..90f5cf9 100644
--- a/wavefront_api_client/api/saved_app_map_search_api.py
+++ b/wavefront_api_client/api/saved_app_map_search_api.py
@@ -128,6 +128,283 @@ def create_saved_app_map_search_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def default_app_map_search(self, **kwargs):  # noqa: E501
+        """Get default app map search for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_app_map_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerDefaultSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.default_app_map_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.default_app_map_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def default_app_map_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Get default app map search for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_app_map_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerDefaultSavedAppMapSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method default_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/defaultAppMapSearch', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDefaultSavedAppMapSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def default_app_map_search_0(self, **kwargs):  # noqa: E501
+        """Set default app map search at user level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_app_map_search_0(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_app_map_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.default_app_map_search_0_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.default_app_map_search_0_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def default_app_map_search_0_with_http_info(self, **kwargs):  # noqa: E501
+        """Set default app map search at user level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_app_map_search_0_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_app_map_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['default_app_map_search']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method default_app_map_search_0" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'default_app_map_search' in params:
+            query_params.append(('defaultAppMapSearch', params['default_app_map_search']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/defaultAppMapSearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def default_customer_app_map_search(self, **kwargs):  # noqa: E501
+        """Set default app map search at customer level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_customer_app_map_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_app_map_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.default_customer_app_map_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.default_customer_app_map_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def default_customer_app_map_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Set default app map search at customer level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_customer_app_map_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_app_map_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['default_app_map_search']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method default_customer_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'default_app_map_search' in params:
+            query_params.append(('defaultAppMapSearch', params['default_app_map_search']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedappmapsearch/defaultCustomerAppMapSearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_saved_app_map_search(self, id, **kwargs):  # noqa: E501
         """Delete a search  # noqa: E501
 
diff --git a/wavefront_api_client/api/saved_traces_search_api.py b/wavefront_api_client/api/saved_traces_search_api.py
index 60c0805..5bfbc77 100644
--- a/wavefront_api_client/api/saved_traces_search_api.py
+++ b/wavefront_api_client/api/saved_traces_search_api.py
@@ -128,6 +128,283 @@ def create_saved_traces_search_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def default_app_map_search(self, **kwargs):  # noqa: E501
+        """Set default traces search at user level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_app_map_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_traces_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.default_app_map_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.default_app_map_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def default_app_map_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Set default traces search at user level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_app_map_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_traces_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['default_traces_search']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method default_app_map_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'default_traces_search' in params:
+            query_params.append(('defaultTracesSearch', params['default_traces_search']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/defaultTracesSearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def default_customer_traces_search(self, **kwargs):  # noqa: E501
+        """Set default traces search at customer level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_customer_traces_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_traces_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.default_customer_traces_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.default_customer_traces_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def default_customer_traces_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Set default traces search at customer level  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_customer_traces_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str default_traces_search:
+        :return: ResponseContainerString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['default_traces_search']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method default_customer_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'default_traces_search' in params:
+            query_params.append(('defaultTracesSearch', params['default_traces_search']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/defaultCustomerTracesSearch', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def default_traces_search(self, **kwargs):  # noqa: E501
+        """Get default traces search for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_traces_search(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerDefaultSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.default_traces_search_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.default_traces_search_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def default_traces_search_with_http_info(self, **kwargs):  # noqa: E501
+        """Get default traces search for a user  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.default_traces_search_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerDefaultSavedTracesSearch
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method default_traces_search" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/savedtracessearch/defaultTracesSearch', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerDefaultSavedTracesSearch',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_saved_traces_search(self, id, **kwargs):  # noqa: E501
         """Delete a search  # noqa: E501
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 6a9ff51..b29e022 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -7366,6 +7366,299 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_token_entities(self, **kwargs):  # noqa: E501
+        """Search over a customer's api tokens  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_token_entities(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedApiTokenModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_token_entities_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_token_entities_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_token_entities_with_http_info(self, **kwargs):  # noqa: E501
+        """Search over a customer's api tokens  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_token_entities_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedApiTokenModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_token_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/token', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedApiTokenModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_token_for_facet(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's api tokens  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_token_for_facet(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_token_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_token_for_facet_with_http_info(facet, **kwargs)  # noqa: E501
+            return data
+
+    def search_token_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's api tokens  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_token_for_facet_with_http_info(facet, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_token_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_token_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/token/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_token_for_facets(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's api tokens  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_token_for_facets(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_token_for_facets_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.search_token_for_facets_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def search_token_for_facets_with_http_info(self, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's api tokens  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_token_for_facets_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_token_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/token/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_traces_map_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's non-deleted traces searches  # noqa: E501
 
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index 3590572..eae86c1 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -33,101 +33,6 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def add_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Add single ingestion policy to multiple groups  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Add single ingestion policy to multiple groups  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usergroup/addIngestionPolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerUserGroupModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
@@ -714,101 +619,6 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Removes single ingestion policy from multiple groups  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def remove_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Removes single ingestion policy from multiple groups  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainerUserGroupModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usergroup/removeIngestionPolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerUserGroupModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3b3c08f..68c8c18 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.126.1/python'
+        self.user_agent = 'Swagger-Codegen/2.128.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 8aa5a8a..1e11ae7 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.126.1".\
+               "SDK Package Version: 2.128.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index b0b5a18..a40ee6e 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -30,6 +30,7 @@
 from wavefront_api_client.models.alert_source import AlertSource
 from wavefront_api_client.models.annotation import Annotation
 from wavefront_api_client.models.anomaly import Anomaly
+from wavefront_api_client.models.api_token_model import ApiTokenModel
 from wavefront_api_client.models.app_dynamics_configuration import AppDynamicsConfiguration
 from wavefront_api_client.models.app_search_filter import AppSearchFilter
 from wavefront_api_client.models.app_search_filter_value import AppSearchFilterValue
@@ -52,6 +53,8 @@
 from wavefront_api_client.models.dashboard_parameter_value import DashboardParameterValue
 from wavefront_api_client.models.dashboard_section import DashboardSection
 from wavefront_api_client.models.dashboard_section_row import DashboardSectionRow
+from wavefront_api_client.models.default_saved_app_map_search import DefaultSavedAppMapSearch
+from wavefront_api_client.models.default_saved_traces_search import DefaultSavedTracesSearch
 from wavefront_api_client.models.derived_metric_definition import DerivedMetricDefinition
 from wavefront_api_client.models.dynatrace_configuration import DynatraceConfiguration
 from wavefront_api_client.models.ec2_configuration import EC2Configuration
@@ -106,6 +109,7 @@
 from wavefront_api_client.models.paged_alert import PagedAlert
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_anomaly import PagedAnomaly
+from wavefront_api_client.models.paged_api_token_model import PagedApiTokenModel
 from wavefront_api_client.models.paged_cloud_integration import PagedCloudIntegration
 from wavefront_api_client.models.paged_customer_facing_user_object import PagedCustomerFacingUserObject
 from wavefront_api_client.models.paged_dashboard import PagedDashboard
@@ -156,8 +160,11 @@
 from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
+from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
 from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard
+from wavefront_api_client.models.response_container_default_saved_app_map_search import ResponseContainerDefaultSavedAppMapSearch
+from wavefront_api_client.models.response_container_default_saved_traces_search import ResponseContainerDefaultSavedTracesSearch
 from wavefront_api_client.models.response_container_derived_metric_definition import ResponseContainerDerivedMetricDefinition
 from wavefront_api_client.models.response_container_event import ResponseContainerEvent
 from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink
@@ -168,6 +175,7 @@
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
+from wavefront_api_client.models.response_container_list_api_token_model import ResponseContainerListApiTokenModel
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
 from wavefront_api_client.models.response_container_list_notification_messages import ResponseContainerListNotificationMessages
@@ -187,6 +195,7 @@
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
 from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly
+from wavefront_api_client.models.response_container_paged_api_token_model import ResponseContainerPagedApiTokenModel
 from wavefront_api_client.models.response_container_paged_cloud_integration import ResponseContainerPagedCloudIntegration
 from wavefront_api_client.models.response_container_paged_customer_facing_user_object import ResponseContainerPagedCustomerFacingUserObject
 from wavefront_api_client.models.response_container_paged_dashboard import ResponseContainerPagedDashboard
diff --git a/wavefront_api_client/models/api_token_model.py b/wavefront_api_client/models/api_token_model.py
new file mode 100644
index 0000000..a5d069b
--- /dev/null
+++ b/wavefront_api_client/models/api_token_model.py
@@ -0,0 +1,326 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ApiTokenModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'account': 'str',
+        'account_type': 'str',
+        'created_epoch_millis': 'int',
+        'customer': 'str',
+        'date_generated': 'int',
+        'id': 'str',
+        'last_used': 'int',
+        'name': 'str'
+    }
+
+    attribute_map = {
+        'account': 'account',
+        'account_type': 'accountType',
+        'created_epoch_millis': 'createdEpochMillis',
+        'customer': 'customer',
+        'date_generated': 'dateGenerated',
+        'id': 'id',
+        'last_used': 'lastUsed',
+        'name': 'name'
+    }
+
+    def __init__(self, account=None, account_type=None, created_epoch_millis=None, customer=None, date_generated=None, id=None, last_used=None, name=None, _configuration=None):  # noqa: E501
+        """ApiTokenModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._account = None
+        self._account_type = None
+        self._created_epoch_millis = None
+        self._customer = None
+        self._date_generated = None
+        self._id = None
+        self._last_used = None
+        self._name = None
+        self.discriminator = None
+
+        if account is not None:
+            self.account = account
+        if account_type is not None:
+            self.account_type = account_type
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if customer is not None:
+            self.customer = customer
+        if date_generated is not None:
+            self.date_generated = date_generated
+        if id is not None:
+            self.id = id
+        if last_used is not None:
+            self.last_used = last_used
+        if name is not None:
+            self.name = name
+
+    @property
+    def account(self):
+        """Gets the account of this ApiTokenModel.  # noqa: E501
+
+        The account who generated this token.  # noqa: E501
+
+        :return: The account of this ApiTokenModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._account
+
+    @account.setter
+    def account(self, account):
+        """Sets the account of this ApiTokenModel.
+
+        The account who generated this token.  # noqa: E501
+
+        :param account: The account of this ApiTokenModel.  # noqa: E501
+        :type: str
+        """
+
+        self._account = account
+
+    @property
+    def account_type(self):
+        """Gets the account_type of this ApiTokenModel.  # noqa: E501
+
+        The user or service account generated this token.  # noqa: E501
+
+        :return: The account_type of this ApiTokenModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._account_type
+
+    @account_type.setter
+    def account_type(self, account_type):
+        """Sets the account_type of this ApiTokenModel.
+
+        The user or service account generated this token.  # noqa: E501
+
+        :param account_type: The account_type of this ApiTokenModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                account_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `account_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(account_type, allowed_values)
+            )
+
+        self._account_type = account_type
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this ApiTokenModel.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this ApiTokenModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this ApiTokenModel.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this ApiTokenModel.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def customer(self):
+        """Gets the customer of this ApiTokenModel.  # noqa: E501
+
+        The id of the customer to which the token belongs.  # noqa: E501
+
+        :return: The customer of this ApiTokenModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this ApiTokenModel.
+
+        The id of the customer to which the token belongs.  # noqa: E501
+
+        :param customer: The customer of this ApiTokenModel.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def date_generated(self):
+        """Gets the date_generated of this ApiTokenModel.  # noqa: E501
+
+        The generation date of the token.  # noqa: E501
+
+        :return: The date_generated of this ApiTokenModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._date_generated
+
+    @date_generated.setter
+    def date_generated(self, date_generated):
+        """Sets the date_generated of this ApiTokenModel.
+
+        The generation date of the token.  # noqa: E501
+
+        :param date_generated: The date_generated of this ApiTokenModel.  # noqa: E501
+        :type: int
+        """
+
+        self._date_generated = date_generated
+
+    @property
+    def id(self):
+        """Gets the id of this ApiTokenModel.  # noqa: E501
+
+        The unique identifier of the token.  # noqa: E501
+
+        :return: The id of this ApiTokenModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this ApiTokenModel.
+
+        The unique identifier of the token.  # noqa: E501
+
+        :param id: The id of this ApiTokenModel.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def last_used(self):
+        """Gets the last_used of this ApiTokenModel.  # noqa: E501
+
+        The last time this token was used.  # noqa: E501
+
+        :return: The last_used of this ApiTokenModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_used
+
+    @last_used.setter
+    def last_used(self, last_used):
+        """Sets the last_used of this ApiTokenModel.
+
+        The last time this token was used.  # noqa: E501
+
+        :param last_used: The last_used of this ApiTokenModel.  # noqa: E501
+        :type: int
+        """
+
+        self._last_used = last_used
+
+    @property
+    def name(self):
+        """Gets the name of this ApiTokenModel.  # noqa: E501
+
+        The name of the token.  # noqa: E501
+
+        :return: The name of this ApiTokenModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this ApiTokenModel.
+
+        The name of the token.  # noqa: E501
+
+        :param name: The name of this ApiTokenModel.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ApiTokenModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ApiTokenModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ApiTokenModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 0544753..3731f90 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -39,6 +39,7 @@ class CloudWatchConfiguration(object):
         'metric_filter_regex': 'str',
         'namespaces': 'list[str]',
         'point_tag_filter_regex': 'str',
+        'thread_distribution_in_mins': 'int',
         'volume_selection_tags': 'dict(str, str)',
         'volume_selection_tags_expr': 'str'
     }
@@ -50,11 +51,12 @@ class CloudWatchConfiguration(object):
         'metric_filter_regex': 'metricFilterRegex',
         'namespaces': 'namespaces',
         'point_tag_filter_regex': 'pointTagFilterRegex',
+        'thread_distribution_in_mins': 'threadDistributionInMins',
         'volume_selection_tags': 'volumeSelectionTags',
         'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, volume_selection_tags=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
+    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, thread_distribution_in_mins=None, volume_selection_tags=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -66,6 +68,7 @@ def __init__(self, base_credentials=None, instance_selection_tags=None, instance
         self._metric_filter_regex = None
         self._namespaces = None
         self._point_tag_filter_regex = None
+        self._thread_distribution_in_mins = None
         self._volume_selection_tags = None
         self._volume_selection_tags_expr = None
         self.discriminator = None
@@ -82,6 +85,8 @@ def __init__(self, base_credentials=None, instance_selection_tags=None, instance
             self.namespaces = namespaces
         if point_tag_filter_regex is not None:
             self.point_tag_filter_regex = point_tag_filter_regex
+        if thread_distribution_in_mins is not None:
+            self.thread_distribution_in_mins = thread_distribution_in_mins
         if volume_selection_tags is not None:
             self.volume_selection_tags = volume_selection_tags
         if volume_selection_tags_expr is not None:
@@ -223,6 +228,29 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
 
         self._point_tag_filter_regex = point_tag_filter_regex
 
+    @property
+    def thread_distribution_in_mins(self):
+        """Gets the thread_distribution_in_mins of this CloudWatchConfiguration.  # noqa: E501
+
+        ThreadDistributionInMins  # noqa: E501
+
+        :return: The thread_distribution_in_mins of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: int
+        """
+        return self._thread_distribution_in_mins
+
+    @thread_distribution_in_mins.setter
+    def thread_distribution_in_mins(self, thread_distribution_in_mins):
+        """Sets the thread_distribution_in_mins of this CloudWatchConfiguration.
+
+        ThreadDistributionInMins  # noqa: E501
+
+        :param thread_distribution_in_mins: The thread_distribution_in_mins of this CloudWatchConfiguration.  # noqa: E501
+        :type: int
+        """
+
+        self._thread_distribution_in_mins = thread_distribution_in_mins
+
     @property
     def volume_selection_tags(self):
         """Gets the volume_selection_tags of this CloudWatchConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/default_saved_app_map_search.py b/wavefront_api_client/models/default_saved_app_map_search.py
new file mode 100644
index 0000000..a7cd19d
--- /dev/null
+++ b/wavefront_api_client/models/default_saved_app_map_search.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class DefaultSavedAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'default_search_id': 'str',
+        'user_setting': 'bool'
+    }
+
+    attribute_map = {
+        'default_search_id': 'defaultSearchId',
+        'user_setting': 'userSetting'
+    }
+
+    def __init__(self, default_search_id=None, user_setting=None, _configuration=None):  # noqa: E501
+        """DefaultSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._default_search_id = None
+        self._user_setting = None
+        self.discriminator = None
+
+        if default_search_id is not None:
+            self.default_search_id = default_search_id
+        if user_setting is not None:
+            self.user_setting = user_setting
+
+    @property
+    def default_search_id(self):
+        """Gets the default_search_id of this DefaultSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The default_search_id of this DefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._default_search_id
+
+    @default_search_id.setter
+    def default_search_id(self, default_search_id):
+        """Sets the default_search_id of this DefaultSavedAppMapSearch.
+
+
+        :param default_search_id: The default_search_id of this DefaultSavedAppMapSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._default_search_id = default_search_id
+
+    @property
+    def user_setting(self):
+        """Gets the user_setting of this DefaultSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The user_setting of this DefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._user_setting
+
+    @user_setting.setter
+    def user_setting(self, user_setting):
+        """Sets the user_setting of this DefaultSavedAppMapSearch.
+
+
+        :param user_setting: The user_setting of this DefaultSavedAppMapSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._user_setting = user_setting
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(DefaultSavedAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, DefaultSavedAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, DefaultSavedAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/default_saved_traces_search.py b/wavefront_api_client/models/default_saved_traces_search.py
new file mode 100644
index 0000000..43b41f6
--- /dev/null
+++ b/wavefront_api_client/models/default_saved_traces_search.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class DefaultSavedTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'default_search_id': 'str',
+        'user_setting': 'bool'
+    }
+
+    attribute_map = {
+        'default_search_id': 'defaultSearchId',
+        'user_setting': 'userSetting'
+    }
+
+    def __init__(self, default_search_id=None, user_setting=None, _configuration=None):  # noqa: E501
+        """DefaultSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._default_search_id = None
+        self._user_setting = None
+        self.discriminator = None
+
+        if default_search_id is not None:
+            self.default_search_id = default_search_id
+        if user_setting is not None:
+            self.user_setting = user_setting
+
+    @property
+    def default_search_id(self):
+        """Gets the default_search_id of this DefaultSavedTracesSearch.  # noqa: E501
+
+
+        :return: The default_search_id of this DefaultSavedTracesSearch.  # noqa: E501
+        :rtype: str
+        """
+        return self._default_search_id
+
+    @default_search_id.setter
+    def default_search_id(self, default_search_id):
+        """Sets the default_search_id of this DefaultSavedTracesSearch.
+
+
+        :param default_search_id: The default_search_id of this DefaultSavedTracesSearch.  # noqa: E501
+        :type: str
+        """
+
+        self._default_search_id = default_search_id
+
+    @property
+    def user_setting(self):
+        """Gets the user_setting of this DefaultSavedTracesSearch.  # noqa: E501
+
+
+        :return: The user_setting of this DefaultSavedTracesSearch.  # noqa: E501
+        :rtype: bool
+        """
+        return self._user_setting
+
+    @user_setting.setter
+    def user_setting(self, user_setting):
+        """Sets the user_setting of this DefaultSavedTracesSearch.
+
+
+        :param user_setting: The user_setting of this DefaultSavedTracesSearch.  # noqa: E501
+        :type: bool
+        """
+
+        self._user_setting = user_setting
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(DefaultSavedTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, DefaultSavedTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, DefaultSavedTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_api_token_model.py b/wavefront_api_client/models/paged_api_token_model.py
new file mode 100644
index 0000000..42572e8
--- /dev/null
+++ b/wavefront_api_client/models/paged_api_token_model.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedApiTokenModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[ApiTokenModel]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedApiTokenModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedApiTokenModel.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedApiTokenModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedApiTokenModel.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedApiTokenModel.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedApiTokenModel.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedApiTokenModel.  # noqa: E501
+        :rtype: list[ApiTokenModel]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedApiTokenModel.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedApiTokenModel.  # noqa: E501
+        :type: list[ApiTokenModel]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedApiTokenModel.  # noqa: E501
+
+
+        :return: The limit of this PagedApiTokenModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedApiTokenModel.
+
+
+        :param limit: The limit of this PagedApiTokenModel.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedApiTokenModel.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedApiTokenModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedApiTokenModel.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedApiTokenModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedApiTokenModel.  # noqa: E501
+
+
+        :return: The offset of this PagedApiTokenModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedApiTokenModel.
+
+
+        :param offset: The offset of this PagedApiTokenModel.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedApiTokenModel.  # noqa: E501
+
+
+        :return: The sort of this PagedApiTokenModel.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedApiTokenModel.
+
+
+        :param sort: The sort of this PagedApiTokenModel.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedApiTokenModel.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedApiTokenModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedApiTokenModel.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedApiTokenModel.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedApiTokenModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedApiTokenModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedApiTokenModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_api_token_model.py b/wavefront_api_client/models/response_container_api_token_model.py
new file mode 100644
index 0000000..93ebc25
--- /dev/null
+++ b/wavefront_api_client/models/response_container_api_token_model.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerApiTokenModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'ApiTokenModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerApiTokenModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerApiTokenModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerApiTokenModel.  # noqa: E501
+        :rtype: ApiTokenModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerApiTokenModel.
+
+
+        :param response: The response of this ResponseContainerApiTokenModel.  # noqa: E501
+        :type: ApiTokenModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerApiTokenModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerApiTokenModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerApiTokenModel.
+
+
+        :param status: The status of this ResponseContainerApiTokenModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerApiTokenModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerApiTokenModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerApiTokenModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_default_saved_app_map_search.py b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
new file mode 100644
index 0000000..2bd1a89
--- /dev/null
+++ b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerDefaultSavedAppMapSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'DefaultSavedAppMapSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerDefaultSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: DefaultSavedAppMapSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerDefaultSavedAppMapSearch.
+
+
+        :param response: The response of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+        :type: DefaultSavedAppMapSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerDefaultSavedAppMapSearch.
+
+
+        :param status: The status of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerDefaultSavedAppMapSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerDefaultSavedAppMapSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerDefaultSavedAppMapSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_default_saved_traces_search.py b/wavefront_api_client/models/response_container_default_saved_traces_search.py
new file mode 100644
index 0000000..ef4a97c
--- /dev/null
+++ b/wavefront_api_client/models/response_container_default_saved_traces_search.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerDefaultSavedTracesSearch(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'DefaultSavedTracesSearch',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerDefaultSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+        :rtype: DefaultSavedTracesSearch
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerDefaultSavedTracesSearch.
+
+
+        :param response: The response of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+        :type: DefaultSavedTracesSearch
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerDefaultSavedTracesSearch.
+
+
+        :param status: The status of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerDefaultSavedTracesSearch, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerDefaultSavedTracesSearch):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerDefaultSavedTracesSearch):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_api_token_model.py b/wavefront_api_client/models/response_container_list_api_token_model.py
new file mode 100644
index 0000000..000396a
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_api_token_model.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerListApiTokenModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[ApiTokenModel]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerListApiTokenModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListApiTokenModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListApiTokenModel.  # noqa: E501
+        :rtype: list[ApiTokenModel]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListApiTokenModel.
+
+
+        :param response: The response of this ResponseContainerListApiTokenModel.  # noqa: E501
+        :type: list[ApiTokenModel]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListApiTokenModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListApiTokenModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListApiTokenModel.
+
+
+        :param status: The status of this ResponseContainerListApiTokenModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListApiTokenModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListApiTokenModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerListApiTokenModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_api_token_model.py b/wavefront_api_client/models/response_container_paged_api_token_model.py
new file mode 100644
index 0000000..c91fa17
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_api_token_model.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedApiTokenModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedApiTokenModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedApiTokenModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+        :rtype: PagedApiTokenModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedApiTokenModel.
+
+
+        :param response: The response of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+        :type: PagedApiTokenModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedApiTokenModel.
+
+
+        :param status: The status of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedApiTokenModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedApiTokenModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedApiTokenModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index e5e3316..039afdf 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "GET_TOKEN_STATUS", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 48aa33c..7d2600d 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -149,7 +149,7 @@ def entity_type(self, entity_type):
         """
         if self._configuration.client_side_validation and entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 entity_type not in allowed_values):
             raise ValueError(
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 1c1313d..3d8bfed 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -33,44 +33,77 @@ class SearchQuery(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'end': 'int',
         'key': 'str',
         'matching_method': 'str',
         'negated': 'bool',
+        'start': 'int',
         'value': 'str',
         'values': 'list[str]'
     }
 
     attribute_map = {
+        'end': 'end',
         'key': 'key',
         'matching_method': 'matchingMethod',
         'negated': 'negated',
+        'start': 'start',
         'value': 'value',
         'values': 'values'
     }
 
-    def __init__(self, key=None, matching_method=None, negated=None, value=None, values=None, _configuration=None):  # noqa: E501
+    def __init__(self, end=None, key=None, matching_method=None, negated=None, start=None, value=None, values=None, _configuration=None):  # noqa: E501
         """SearchQuery - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._end = None
         self._key = None
         self._matching_method = None
         self._negated = None
+        self._start = None
         self._value = None
         self._values = None
         self.discriminator = None
 
+        if end is not None:
+            self.end = end
         self.key = key
         if matching_method is not None:
             self.matching_method = matching_method
         if negated is not None:
             self.negated = negated
+        if start is not None:
+            self.start = start
         if value is not None:
             self.value = value
         if values is not None:
             self.values = values
 
+    @property
+    def end(self):
+        """Gets the end of this SearchQuery.  # noqa: E501
+
+        The end point of the range. At least one of start or end points should be available for range search.  # noqa: E501
+
+        :return: The end of this SearchQuery.  # noqa: E501
+        :rtype: int
+        """
+        return self._end
+
+    @end.setter
+    def end(self, end):
+        """Sets the end of this SearchQuery.
+
+        The end point of the range. At least one of start or end points should be available for range search.  # noqa: E501
+
+        :param end: The end of this SearchQuery.  # noqa: E501
+        :type: int
+        """
+
+        self._end = end
+
     @property
     def key(self):
         """Gets the key of this SearchQuery.  # noqa: E501
@@ -149,6 +182,29 @@ def negated(self, negated):
 
         self._negated = negated
 
+    @property
+    def start(self):
+        """Gets the start of this SearchQuery.  # noqa: E501
+
+        The start point of the range. At least one of start or end points should be available for range search.  # noqa: E501
+
+        :return: The start of this SearchQuery.  # noqa: E501
+        :rtype: int
+        """
+        return self._start
+
+    @start.setter
+    def start(self, start):
+        """Sets the start of this SearchQuery.
+
+        The start point of the range. At least one of start or end points should be available for range search.  # noqa: E501
+
+        :param start: The start of this SearchQuery.  # noqa: E501
+        :type: int
+        """
+
+        self._start = start
+
     @property
     def value(self):
         """Gets the value of this SearchQuery.  # noqa: E501

From 516dd5c71224ab01abce1788f187046ec342a54f Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Wed, 13 Apr 2022 11:02:05 -0700
Subject: [PATCH 108/161] Update Build and Publish GH Actions. (#63)

* Fix Typo in Publish Action.
* Update Setup Python Version.
* Update Swagger CLI Version.
* Autogenerated Update v2.129.3.
---
 .github/workflows/python-build.yml    | 4 ++--
 .github/workflows/python-release.yml  | 5 ++---
 .swagger-codegen/VERSION              | 2 +-
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 generate_client                       | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
index 2225746..7f0a2e8 100644
--- a/.github/workflows/python-build.yml
+++ b/.github/workflows/python-build.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
@@ -24,4 +24,4 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         python -m pip install -r requirements.txt
     - name: Test 
-      run: python -m unittest discover
\ No newline at end of file
+      run: python -m unittest discover
diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml
index 2ab7a39..ed8f6f2 100644
--- a/.github/workflows/python-release.yml
+++ b/.github/workflows/python-release.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: '3.10'
     - name: Install Dependencies
@@ -24,12 +24,11 @@ jobs:
     - name: Publish Package to TestPypi
       uses: pypa/gh-action-pypi-publish@master
       with:
-        user: __token__
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
 
     - name: Publish package
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@mster
+      uses: pypa/gh-action-pypi-publish@master
       with:
         password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 21f40d9..d32233f 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.26
\ No newline at end of file
+2.4.27
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index b02a280..8007ab1 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.128.2"
+    "packageVersion": "2.129.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 4e93611..b02a280 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.126.1"
+    "packageVersion": "2.128.2"
 }
diff --git a/README.md b/README.md
index abb1b9e..04f8dcf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.128.2
+- Package version: 2.129.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/generate_client b/generate_client
index 0426870..37ad6c8 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.26"  # For 3.x use CGEN_VER="3.0.27"
+CGEN_VER="2.4.27"  # For 3.x use CGEN_VER="3.0.34"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/setup.py b/setup.py
index 0b8bb43..3fd2c2e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.128.2"
+VERSION = "2.129.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 68c8c18..6eee367 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.128.2/python'
+        self.user_agent = 'Swagger-Codegen/2.129.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 1e11ae7..1d276e0 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.128.2".\
+               "SDK Package Version: 2.129.3".\
                format(env=sys.platform, pyversion=sys.version)

From d3413c6f8928814d1610712ea2a2ed474624e79e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 4 May 2022 08:16:25 -0700
Subject: [PATCH 109/161] Autogenerated Update v2.132.4.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/Alert.md                                 |  2 +-
 docs/DefaultSavedAppMapSearch.md              |  4 +-
 docs/DefaultSavedTracesSearch.md              |  4 +-
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/alert.py          |  4 +-
 .../models/default_saved_app_map_search.py    | 66 +++++++++----------
 .../models/default_saved_traces_search.py     | 66 +++++++++----------
 12 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 8007ab1..0a6dfc3 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.129.3"
+    "packageVersion": "2.132.4"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index b02a280..8007ab1 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.128.2"
+    "packageVersion": "2.129.3"
 }
diff --git a/README.md b/README.md
index 04f8dcf..9f027fd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.129.3
+- Package version: 2.132.4
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index fe6c28c..9dddec9 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
 **active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
 **additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
-**alert_chart_base** | **int** | The base of alert chart. A linear chart will have base as 1, while a logarithmic chart will have the other base value. | [optional] 
+**alert_chart_base** | **int** | The base of alert chart. A linear chart will have base as 1. A logarithmic chart will have the other base value.The value should be an integer and should greater than or equal to 1. | [optional] 
 **alert_chart_description** | **str** | The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart. | [optional] 
 **alert_chart_units** | **str** | The y-axis unit of Alert chart. | [optional] 
 **alert_sources** | [**list[AlertSource]**](AlertSource.md) | A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION. | [optional] 
diff --git a/docs/DefaultSavedAppMapSearch.md b/docs/DefaultSavedAppMapSearch.md
index c749d1b..78516f4 100644
--- a/docs/DefaultSavedAppMapSearch.md
+++ b/docs/DefaultSavedAppMapSearch.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**default_search_id** | **str** |  | [optional] 
-**user_setting** | **bool** |  | [optional] 
+**default_customer_search** | [**SavedAppMapSearch**](SavedAppMapSearch.md) |  | [optional] 
+**default_user_search** | [**SavedAppMapSearch**](SavedAppMapSearch.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DefaultSavedTracesSearch.md b/docs/DefaultSavedTracesSearch.md
index 6e1f96d..1b72de8 100644
--- a/docs/DefaultSavedTracesSearch.md
+++ b/docs/DefaultSavedTracesSearch.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**default_search_id** | **str** |  | [optional] 
-**user_setting** | **bool** |  | [optional] 
+**default_customer_search** | [**SavedTracesSearch**](SavedTracesSearch.md) |  | [optional] 
+**default_user_search** | [**SavedTracesSearch**](SavedTracesSearch.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index 3fd2c2e..f5460bd 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.129.3"
+VERSION = "2.132.4"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6eee367..be0c615 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.129.3/python'
+        self.user_agent = 'Swagger-Codegen/2.132.4/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 1d276e0..1fe19f3 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.129.3".\
+               "SDK Package Version: 2.132.4".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 86f4890..b60eec7 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -525,7 +525,7 @@ def additional_information(self, additional_information):
     def alert_chart_base(self):
         """Gets the alert_chart_base of this Alert.  # noqa: E501
 
-        The base of alert chart. A linear chart will have base as 1, while a logarithmic chart will have the other base value.  # noqa: E501
+        The base of alert chart. A linear chart will have base as 1. A logarithmic chart will have the other base value.The value should be an integer and should greater than or equal to 1.  # noqa: E501
 
         :return: The alert_chart_base of this Alert.  # noqa: E501
         :rtype: int
@@ -536,7 +536,7 @@ def alert_chart_base(self):
     def alert_chart_base(self, alert_chart_base):
         """Sets the alert_chart_base of this Alert.
 
-        The base of alert chart. A linear chart will have base as 1, while a logarithmic chart will have the other base value.  # noqa: E501
+        The base of alert chart. A linear chart will have base as 1. A logarithmic chart will have the other base value.The value should be an integer and should greater than or equal to 1.  # noqa: E501
 
         :param alert_chart_base: The alert_chart_base of this Alert.  # noqa: E501
         :type: int
diff --git a/wavefront_api_client/models/default_saved_app_map_search.py b/wavefront_api_client/models/default_saved_app_map_search.py
index a7cd19d..c5cc0ce 100644
--- a/wavefront_api_client/models/default_saved_app_map_search.py
+++ b/wavefront_api_client/models/default_saved_app_map_search.py
@@ -33,71 +33,71 @@ class DefaultSavedAppMapSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'default_search_id': 'str',
-        'user_setting': 'bool'
+        'default_customer_search': 'SavedAppMapSearch',
+        'default_user_search': 'SavedAppMapSearch'
     }
 
     attribute_map = {
-        'default_search_id': 'defaultSearchId',
-        'user_setting': 'userSetting'
+        'default_customer_search': 'defaultCustomerSearch',
+        'default_user_search': 'defaultUserSearch'
     }
 
-    def __init__(self, default_search_id=None, user_setting=None, _configuration=None):  # noqa: E501
+    def __init__(self, default_customer_search=None, default_user_search=None, _configuration=None):  # noqa: E501
         """DefaultSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
-        self._default_search_id = None
-        self._user_setting = None
+        self._default_customer_search = None
+        self._default_user_search = None
         self.discriminator = None
 
-        if default_search_id is not None:
-            self.default_search_id = default_search_id
-        if user_setting is not None:
-            self.user_setting = user_setting
+        if default_customer_search is not None:
+            self.default_customer_search = default_customer_search
+        if default_user_search is not None:
+            self.default_user_search = default_user_search
 
     @property
-    def default_search_id(self):
-        """Gets the default_search_id of this DefaultSavedAppMapSearch.  # noqa: E501
+    def default_customer_search(self):
+        """Gets the default_customer_search of this DefaultSavedAppMapSearch.  # noqa: E501
 
 
-        :return: The default_search_id of this DefaultSavedAppMapSearch.  # noqa: E501
-        :rtype: str
+        :return: The default_customer_search of this DefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: SavedAppMapSearch
         """
-        return self._default_search_id
+        return self._default_customer_search
 
-    @default_search_id.setter
-    def default_search_id(self, default_search_id):
-        """Sets the default_search_id of this DefaultSavedAppMapSearch.
+    @default_customer_search.setter
+    def default_customer_search(self, default_customer_search):
+        """Sets the default_customer_search of this DefaultSavedAppMapSearch.
 
 
-        :param default_search_id: The default_search_id of this DefaultSavedAppMapSearch.  # noqa: E501
-        :type: str
+        :param default_customer_search: The default_customer_search of this DefaultSavedAppMapSearch.  # noqa: E501
+        :type: SavedAppMapSearch
         """
 
-        self._default_search_id = default_search_id
+        self._default_customer_search = default_customer_search
 
     @property
-    def user_setting(self):
-        """Gets the user_setting of this DefaultSavedAppMapSearch.  # noqa: E501
+    def default_user_search(self):
+        """Gets the default_user_search of this DefaultSavedAppMapSearch.  # noqa: E501
 
 
-        :return: The user_setting of this DefaultSavedAppMapSearch.  # noqa: E501
-        :rtype: bool
+        :return: The default_user_search of this DefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: SavedAppMapSearch
         """
-        return self._user_setting
+        return self._default_user_search
 
-    @user_setting.setter
-    def user_setting(self, user_setting):
-        """Sets the user_setting of this DefaultSavedAppMapSearch.
+    @default_user_search.setter
+    def default_user_search(self, default_user_search):
+        """Sets the default_user_search of this DefaultSavedAppMapSearch.
 
 
-        :param user_setting: The user_setting of this DefaultSavedAppMapSearch.  # noqa: E501
-        :type: bool
+        :param default_user_search: The default_user_search of this DefaultSavedAppMapSearch.  # noqa: E501
+        :type: SavedAppMapSearch
         """
 
-        self._user_setting = user_setting
+        self._default_user_search = default_user_search
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/wavefront_api_client/models/default_saved_traces_search.py b/wavefront_api_client/models/default_saved_traces_search.py
index 43b41f6..715d80f 100644
--- a/wavefront_api_client/models/default_saved_traces_search.py
+++ b/wavefront_api_client/models/default_saved_traces_search.py
@@ -33,71 +33,71 @@ class DefaultSavedTracesSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'default_search_id': 'str',
-        'user_setting': 'bool'
+        'default_customer_search': 'SavedTracesSearch',
+        'default_user_search': 'SavedTracesSearch'
     }
 
     attribute_map = {
-        'default_search_id': 'defaultSearchId',
-        'user_setting': 'userSetting'
+        'default_customer_search': 'defaultCustomerSearch',
+        'default_user_search': 'defaultUserSearch'
     }
 
-    def __init__(self, default_search_id=None, user_setting=None, _configuration=None):  # noqa: E501
+    def __init__(self, default_customer_search=None, default_user_search=None, _configuration=None):  # noqa: E501
         """DefaultSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
-        self._default_search_id = None
-        self._user_setting = None
+        self._default_customer_search = None
+        self._default_user_search = None
         self.discriminator = None
 
-        if default_search_id is not None:
-            self.default_search_id = default_search_id
-        if user_setting is not None:
-            self.user_setting = user_setting
+        if default_customer_search is not None:
+            self.default_customer_search = default_customer_search
+        if default_user_search is not None:
+            self.default_user_search = default_user_search
 
     @property
-    def default_search_id(self):
-        """Gets the default_search_id of this DefaultSavedTracesSearch.  # noqa: E501
+    def default_customer_search(self):
+        """Gets the default_customer_search of this DefaultSavedTracesSearch.  # noqa: E501
 
 
-        :return: The default_search_id of this DefaultSavedTracesSearch.  # noqa: E501
-        :rtype: str
+        :return: The default_customer_search of this DefaultSavedTracesSearch.  # noqa: E501
+        :rtype: SavedTracesSearch
         """
-        return self._default_search_id
+        return self._default_customer_search
 
-    @default_search_id.setter
-    def default_search_id(self, default_search_id):
-        """Sets the default_search_id of this DefaultSavedTracesSearch.
+    @default_customer_search.setter
+    def default_customer_search(self, default_customer_search):
+        """Sets the default_customer_search of this DefaultSavedTracesSearch.
 
 
-        :param default_search_id: The default_search_id of this DefaultSavedTracesSearch.  # noqa: E501
-        :type: str
+        :param default_customer_search: The default_customer_search of this DefaultSavedTracesSearch.  # noqa: E501
+        :type: SavedTracesSearch
         """
 
-        self._default_search_id = default_search_id
+        self._default_customer_search = default_customer_search
 
     @property
-    def user_setting(self):
-        """Gets the user_setting of this DefaultSavedTracesSearch.  # noqa: E501
+    def default_user_search(self):
+        """Gets the default_user_search of this DefaultSavedTracesSearch.  # noqa: E501
 
 
-        :return: The user_setting of this DefaultSavedTracesSearch.  # noqa: E501
-        :rtype: bool
+        :return: The default_user_search of this DefaultSavedTracesSearch.  # noqa: E501
+        :rtype: SavedTracesSearch
         """
-        return self._user_setting
+        return self._default_user_search
 
-    @user_setting.setter
-    def user_setting(self, user_setting):
-        """Sets the user_setting of this DefaultSavedTracesSearch.
+    @default_user_search.setter
+    def default_user_search(self, default_user_search):
+        """Sets the default_user_search of this DefaultSavedTracesSearch.
 
 
-        :param user_setting: The user_setting of this DefaultSavedTracesSearch.  # noqa: E501
-        :type: bool
+        :param default_user_search: The default_user_search of this DefaultSavedTracesSearch.  # noqa: E501
+        :type: SavedTracesSearch
         """
 
-        self._user_setting = user_setting
+        self._default_user_search = default_user_search
 
     def to_dict(self):
         """Returns the model properties as a dict"""

From b0720cc3b4f6a2a9c6a10625b482c3e7df7d5372 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 8 Jun 2022 08:16:18 -0700
Subject: [PATCH 110/161] Autogenerated Update v2.137.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/SnowflakeConfiguration.md                |  3 +-
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/snowflake_configuration.py         | 36 ++++++++++++++++---
 8 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 0a6dfc3..f68ca63 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.132.4"
+    "packageVersion": "2.137.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 8007ab1..0a6dfc3 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.129.3"
+    "packageVersion": "2.132.4"
 }
diff --git a/README.md b/README.md
index 9f027fd..f736ffc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.132.4
+- Package version: 2.137.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/SnowflakeConfiguration.md b/docs/SnowflakeConfiguration.md
index db5c305..6b7d4bb 100644
--- a/docs/SnowflakeConfiguration.md
+++ b/docs/SnowflakeConfiguration.md
@@ -5,7 +5,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **account_id** | **str** | Snowflake AccountID | 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
-**password** | **str** | Snowflake Password | 
+**password** | **str** | Snowflake Password | [optional] 
+**private_key** | **str** | Snowflake Private Key | 
 **role** | **str** | Role to be used while querying snowflake database | [optional] 
 **user_name** | **str** | Snowflake Username | 
 **warehouse** | **str** | Warehouse to be used while querying snowflake database | [optional] 
diff --git a/setup.py b/setup.py
index f5460bd..abe1ca7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.132.4"
+VERSION = "2.137.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index be0c615..6a35f86 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.132.4/python'
+        self.user_agent = 'Swagger-Codegen/2.137.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 1fe19f3..3cc3159 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.132.4".\
+               "SDK Package Version: 2.137.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/snowflake_configuration.py b/wavefront_api_client/models/snowflake_configuration.py
index dc354fe..4e9592b 100644
--- a/wavefront_api_client/models/snowflake_configuration.py
+++ b/wavefront_api_client/models/snowflake_configuration.py
@@ -36,6 +36,7 @@ class SnowflakeConfiguration(object):
         'account_id': 'str',
         'metric_filter_regex': 'str',
         'password': 'str',
+        'private_key': 'str',
         'role': 'str',
         'user_name': 'str',
         'warehouse': 'str'
@@ -45,12 +46,13 @@ class SnowflakeConfiguration(object):
         'account_id': 'accountID',
         'metric_filter_regex': 'metricFilterRegex',
         'password': 'password',
+        'private_key': 'privateKey',
         'role': 'role',
         'user_name': 'userName',
         'warehouse': 'warehouse'
     }
 
-    def __init__(self, account_id=None, metric_filter_regex=None, password=None, role=None, user_name=None, warehouse=None, _configuration=None):  # noqa: E501
+    def __init__(self, account_id=None, metric_filter_regex=None, password=None, private_key=None, role=None, user_name=None, warehouse=None, _configuration=None):  # noqa: E501
         """SnowflakeConfiguration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -59,6 +61,7 @@ def __init__(self, account_id=None, metric_filter_regex=None, password=None, rol
         self._account_id = None
         self._metric_filter_regex = None
         self._password = None
+        self._private_key = None
         self._role = None
         self._user_name = None
         self._warehouse = None
@@ -67,7 +70,9 @@ def __init__(self, account_id=None, metric_filter_regex=None, password=None, rol
         self.account_id = account_id
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
-        self.password = password
+        if password is not None:
+            self.password = password
+        self.private_key = private_key
         if role is not None:
             self.role = role
         self.user_name = user_name
@@ -142,11 +147,34 @@ def password(self, password):
         :param password: The password of this SnowflakeConfiguration.  # noqa: E501
         :type: str
         """
-        if self._configuration.client_side_validation and password is None:
-            raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
 
         self._password = password
 
+    @property
+    def private_key(self):
+        """Gets the private_key of this SnowflakeConfiguration.  # noqa: E501
+
+        Snowflake Private Key  # noqa: E501
+
+        :return: The private_key of this SnowflakeConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._private_key
+
+    @private_key.setter
+    def private_key(self, private_key):
+        """Sets the private_key of this SnowflakeConfiguration.
+
+        Snowflake Private Key  # noqa: E501
+
+        :param private_key: The private_key of this SnowflakeConfiguration.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and private_key is None:
+            raise ValueError("Invalid value for `private_key`, must not be `None`")  # noqa: E501
+
+        self._private_key = private_key
+
     @property
     def role(self):
         """Gets the role of this SnowflakeConfiguration.  # noqa: E501

From e0d2a3bff92cbe965f9fd563fdadbcaa511d3056 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 29 Jun 2022 08:16:30 -0700
Subject: [PATCH 111/161] Autogenerated Update v2.140.0.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/IngestionPolicy.md                       |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/ingestion_policy.py                | 30 ++++++++++++++++++-
 8 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f68ca63..ed755dd 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.137.1"
+    "packageVersion": "2.140.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 0a6dfc3..f68ca63 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.132.4"
+    "packageVersion": "2.137.1"
 }
diff --git a/README.md b/README.md
index f736ffc..56cd77f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.137.1
+- Package version: 2.140.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/IngestionPolicy.md b/docs/IngestionPolicy.md
index 6864241..415f197 100644
--- a/docs/IngestionPolicy.md
+++ b/docs/IngestionPolicy.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **account_count** | **int** | Total number of accounts that are linked to the ingestion policy | [optional] 
+**alert_id** | **str** | The ingestion policy alert Id | [optional] 
 **customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
 **description** | **str** | The description of the ingestion policy | [optional] 
 **group_count** | **int** | Total number of groups that are linked to the ingestion policy | [optional] 
diff --git a/setup.py b/setup.py
index abe1ca7..cdc17bf 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.137.1"
+VERSION = "2.140.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6a35f86..3406a16 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.137.1/python'
+        self.user_agent = 'Swagger-Codegen/2.140.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 3cc3159..180ad87 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.137.1".\
+               "SDK Package Version: 2.140.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/ingestion_policy.py b/wavefront_api_client/models/ingestion_policy.py
index efea48e..cc1158b 100644
--- a/wavefront_api_client/models/ingestion_policy.py
+++ b/wavefront_api_client/models/ingestion_policy.py
@@ -34,6 +34,7 @@ class IngestionPolicy(object):
     """
     swagger_types = {
         'account_count': 'int',
+        'alert_id': 'str',
         'customer': 'str',
         'description': 'str',
         'group_count': 'int',
@@ -54,6 +55,7 @@ class IngestionPolicy(object):
 
     attribute_map = {
         'account_count': 'accountCount',
+        'alert_id': 'alertId',
         'customer': 'customer',
         'description': 'description',
         'group_count': 'groupCount',
@@ -72,13 +74,14 @@ class IngestionPolicy(object):
         'user_account_count': 'userAccountCount'
     }
 
-    def __init__(self, account_count=None, customer=None, description=None, group_count=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, sampled_accounts=None, sampled_groups=None, sampled_service_accounts=None, sampled_user_accounts=None, scope=None, service_account_count=None, user_account_count=None, _configuration=None):  # noqa: E501
+    def __init__(self, account_count=None, alert_id=None, customer=None, description=None, group_count=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, sampled_accounts=None, sampled_groups=None, sampled_service_accounts=None, sampled_user_accounts=None, scope=None, service_account_count=None, user_account_count=None, _configuration=None):  # noqa: E501
         """IngestionPolicy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._account_count = None
+        self._alert_id = None
         self._customer = None
         self._description = None
         self._group_count = None
@@ -99,6 +102,8 @@ def __init__(self, account_count=None, customer=None, description=None, group_co
 
         if account_count is not None:
             self.account_count = account_count
+        if alert_id is not None:
+            self.alert_id = alert_id
         if customer is not None:
             self.customer = customer
         if description is not None:
@@ -155,6 +160,29 @@ def account_count(self, account_count):
 
         self._account_count = account_count
 
+    @property
+    def alert_id(self):
+        """Gets the alert_id of this IngestionPolicy.  # noqa: E501
+
+        The ingestion policy alert Id  # noqa: E501
+
+        :return: The alert_id of this IngestionPolicy.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_id
+
+    @alert_id.setter
+    def alert_id(self, alert_id):
+        """Sets the alert_id of this IngestionPolicy.
+
+        The ingestion policy alert Id  # noqa: E501
+
+        :param alert_id: The alert_id of this IngestionPolicy.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_id = alert_id
+
     @property
     def customer(self):
         """Gets the customer of this IngestionPolicy.  # noqa: E501

From 20304a77e7ad7802516be7850800f54e3396f664 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Wed, 6 Jul 2022 08:16:32 -0700
Subject: [PATCH 112/161] Autogenerated Update v2.141.1.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/RoleDTO.md                               |   2 +
 docs/RolePropertiesDTO.md                     |  13 ++
 setup.py                                      |   2 +-
 test/test_role_properties_dto.py              |  40 ++++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 wavefront_api_client/models/role_dto.py       |  58 ++++-
 .../models/role_properties_dto.py             | 201 ++++++++++++++++++
 13 files changed, 322 insertions(+), 7 deletions(-)
 create mode 100644 docs/RolePropertiesDTO.md
 create mode 100644 test/test_role_properties_dto.py
 create mode 100644 wavefront_api_client/models/role_properties_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ed755dd..64b2d3d 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.140.0"
+    "packageVersion": "2.141.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f68ca63..ed755dd 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.137.1"
+    "packageVersion": "2.140.0"
 }
diff --git a/README.md b/README.md
index 56cd77f..988df21 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.140.0
+- Package version: 2.141.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -699,6 +699,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
  - [ResponseStatus](docs/ResponseStatus.md)
  - [RoleDTO](docs/RoleDTO.md)
+ - [RolePropertiesDTO](docs/RolePropertiesDTO.md)
  - [SavedAppMapSearch](docs/SavedAppMapSearch.md)
  - [SavedAppMapSearchGroup](docs/SavedAppMapSearchGroup.md)
  - [SavedSearch](docs/SavedSearch.md)
diff --git a/docs/RoleDTO.md b/docs/RoleDTO.md
index 3d52ac8..108c1e8 100644
--- a/docs/RoleDTO.md
+++ b/docs/RoleDTO.md
@@ -13,6 +13,8 @@ Name | Type | Description | Notes
 **linked_groups_count** | **int** | Total number of groups that are linked to the role | [optional] 
 **name** | **str** | The name of the role | [optional] 
 **permissions** | **list[str]** | List of permissions the role has been granted access to | [optional] 
+**properties** | [**RolePropertiesDTO**](RolePropertiesDTO.md) | The properties of the role | [optional] 
+**restricted_permissions** | **list[str]** | The list of permissions that are restricted with the role. Currently only CSP roles have restrictions. | [optional] 
 **sample_linked_accounts** | **list[str]** | A sample of the accounts assigned to this role. Please use the Role facet of the Account Search API to get the full list of accounts for this role | [optional] 
 **sample_linked_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this role. Please use the Role facet of the Group Search API to get the full list of groups for this role | [optional] 
 
diff --git a/docs/RolePropertiesDTO.md b/docs/RolePropertiesDTO.md
new file mode 100644
index 0000000..61edae8
--- /dev/null
+++ b/docs/RolePropertiesDTO.md
@@ -0,0 +1,13 @@
+# RolePropertiesDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name_editable** | **bool** |  | [optional] 
+**roles_editable** | **bool** |  | [optional] 
+**users_addable** | **bool** |  | [optional] 
+**users_removable** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index cdc17bf..411d88b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.140.0"
+VERSION = "2.141.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_role_properties_dto.py b/test/test_role_properties_dto.py
new file mode 100644
index 0000000..0819263
--- /dev/null
+++ b/test/test_role_properties_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRolePropertiesDTO(unittest.TestCase):
+    """RolePropertiesDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRolePropertiesDTO(self):
+        """Test RolePropertiesDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.role_properties_dto.RolePropertiesDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 61f2faa..a87e3ec 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -292,6 +292,7 @@
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
+from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO
 from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
 from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
 from wavefront_api_client.models.saved_search import SavedSearch
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3406a16..83b0e96 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.140.0/python'
+        self.user_agent = 'Swagger-Codegen/2.141.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 180ad87..e6030fe 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.140.0".\
+               "SDK Package Version: 2.141.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index a40ee6e..887f4aa 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -250,6 +250,7 @@
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_dto import RoleDTO
+from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO
 from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
 from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
 from wavefront_api_client.models.saved_search import SavedSearch
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
index 5cf0239..cd30e15 100644
--- a/wavefront_api_client/models/role_dto.py
+++ b/wavefront_api_client/models/role_dto.py
@@ -43,6 +43,8 @@ class RoleDTO(object):
         'linked_groups_count': 'int',
         'name': 'str',
         'permissions': 'list[str]',
+        'properties': 'RolePropertiesDTO',
+        'restricted_permissions': 'list[str]',
         'sample_linked_accounts': 'list[str]',
         'sample_linked_groups': 'list[UserGroup]'
     }
@@ -58,11 +60,13 @@ class RoleDTO(object):
         'linked_groups_count': 'linkedGroupsCount',
         'name': 'name',
         'permissions': 'permissions',
+        'properties': 'properties',
+        'restricted_permissions': 'restrictedPermissions',
         'sample_linked_accounts': 'sampleLinkedAccounts',
         'sample_linked_groups': 'sampleLinkedGroups'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, sample_linked_accounts=None, sample_linked_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, properties=None, restricted_permissions=None, sample_linked_accounts=None, sample_linked_groups=None, _configuration=None):  # noqa: E501
         """RoleDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -78,6 +82,8 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._linked_groups_count = None
         self._name = None
         self._permissions = None
+        self._properties = None
+        self._restricted_permissions = None
         self._sample_linked_accounts = None
         self._sample_linked_groups = None
         self.discriminator = None
@@ -102,6 +108,10 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
             self.name = name
         if permissions is not None:
             self.permissions = permissions
+        if properties is not None:
+            self.properties = properties
+        if restricted_permissions is not None:
+            self.restricted_permissions = restricted_permissions
         if sample_linked_accounts is not None:
             self.sample_linked_accounts = sample_linked_accounts
         if sample_linked_groups is not None:
@@ -335,6 +345,52 @@ def permissions(self, permissions):
 
         self._permissions = permissions
 
+    @property
+    def properties(self):
+        """Gets the properties of this RoleDTO.  # noqa: E501
+
+        The properties of the role  # noqa: E501
+
+        :return: The properties of this RoleDTO.  # noqa: E501
+        :rtype: RolePropertiesDTO
+        """
+        return self._properties
+
+    @properties.setter
+    def properties(self, properties):
+        """Sets the properties of this RoleDTO.
+
+        The properties of the role  # noqa: E501
+
+        :param properties: The properties of this RoleDTO.  # noqa: E501
+        :type: RolePropertiesDTO
+        """
+
+        self._properties = properties
+
+    @property
+    def restricted_permissions(self):
+        """Gets the restricted_permissions of this RoleDTO.  # noqa: E501
+
+        The list of permissions that are restricted with the role. Currently only CSP roles have restrictions.  # noqa: E501
+
+        :return: The restricted_permissions of this RoleDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._restricted_permissions
+
+    @restricted_permissions.setter
+    def restricted_permissions(self, restricted_permissions):
+        """Sets the restricted_permissions of this RoleDTO.
+
+        The list of permissions that are restricted with the role. Currently only CSP roles have restrictions.  # noqa: E501
+
+        :param restricted_permissions: The restricted_permissions of this RoleDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._restricted_permissions = restricted_permissions
+
     @property
     def sample_linked_accounts(self):
         """Gets the sample_linked_accounts of this RoleDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/role_properties_dto.py b/wavefront_api_client/models/role_properties_dto.py
new file mode 100644
index 0000000..5598be7
--- /dev/null
+++ b/wavefront_api_client/models/role_properties_dto.py
@@ -0,0 +1,201 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class RolePropertiesDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'name_editable': 'bool',
+        'roles_editable': 'bool',
+        'users_addable': 'bool',
+        'users_removable': 'bool'
+    }
+
+    attribute_map = {
+        'name_editable': 'nameEditable',
+        'roles_editable': 'rolesEditable',
+        'users_addable': 'usersAddable',
+        'users_removable': 'usersRemovable'
+    }
+
+    def __init__(self, name_editable=None, roles_editable=None, users_addable=None, users_removable=None, _configuration=None):  # noqa: E501
+        """RolePropertiesDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._name_editable = None
+        self._roles_editable = None
+        self._users_addable = None
+        self._users_removable = None
+        self.discriminator = None
+
+        if name_editable is not None:
+            self.name_editable = name_editable
+        if roles_editable is not None:
+            self.roles_editable = roles_editable
+        if users_addable is not None:
+            self.users_addable = users_addable
+        if users_removable is not None:
+            self.users_removable = users_removable
+
+    @property
+    def name_editable(self):
+        """Gets the name_editable of this RolePropertiesDTO.  # noqa: E501
+
+
+        :return: The name_editable of this RolePropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._name_editable
+
+    @name_editable.setter
+    def name_editable(self, name_editable):
+        """Sets the name_editable of this RolePropertiesDTO.
+
+
+        :param name_editable: The name_editable of this RolePropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._name_editable = name_editable
+
+    @property
+    def roles_editable(self):
+        """Gets the roles_editable of this RolePropertiesDTO.  # noqa: E501
+
+
+        :return: The roles_editable of this RolePropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._roles_editable
+
+    @roles_editable.setter
+    def roles_editable(self, roles_editable):
+        """Sets the roles_editable of this RolePropertiesDTO.
+
+
+        :param roles_editable: The roles_editable of this RolePropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._roles_editable = roles_editable
+
+    @property
+    def users_addable(self):
+        """Gets the users_addable of this RolePropertiesDTO.  # noqa: E501
+
+
+        :return: The users_addable of this RolePropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._users_addable
+
+    @users_addable.setter
+    def users_addable(self, users_addable):
+        """Sets the users_addable of this RolePropertiesDTO.
+
+
+        :param users_addable: The users_addable of this RolePropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._users_addable = users_addable
+
+    @property
+    def users_removable(self):
+        """Gets the users_removable of this RolePropertiesDTO.  # noqa: E501
+
+
+        :return: The users_removable of this RolePropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._users_removable
+
+    @users_removable.setter
+    def users_removable(self, users_removable):
+        """Sets the users_removable of this RolePropertiesDTO.
+
+
+        :param users_removable: The users_removable of this RolePropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._users_removable = users_removable
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RolePropertiesDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RolePropertiesDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, RolePropertiesDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()

From ee85154a9fd4bc0d88bd54518d399745dbf2165e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Mon, 25 Jul 2022 08:16:19 -0700
Subject: [PATCH 113/161] Autogenerated Update v2.144.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/RolePropertiesDTO.md                     |  3 +-
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/role_properties_dto.py             | 56 ++++++++++++++-----
 8 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 64b2d3d..6f4b5b9 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.141.1"
+    "packageVersion": "2.144.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ed755dd..64b2d3d 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.140.0"
+    "packageVersion": "2.141.1"
 }
diff --git a/README.md b/README.md
index 988df21..bf03ddf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.141.1
+- Package version: 2.144.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/RolePropertiesDTO.md b/docs/RolePropertiesDTO.md
index 61edae8..7381155 100644
--- a/docs/RolePropertiesDTO.md
+++ b/docs/RolePropertiesDTO.md
@@ -3,8 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**deletable** | **bool** |  | [optional] 
 **name_editable** | **bool** |  | [optional] 
-**roles_editable** | **bool** |  | [optional] 
+**perms_editable** | **bool** |  | [optional] 
 **users_addable** | **bool** |  | [optional] 
 **users_removable** | **bool** |  | [optional] 
 
diff --git a/setup.py b/setup.py
index 411d88b..18f201d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.141.1"
+VERSION = "2.144.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 83b0e96..24851cd 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.141.1/python'
+        self.user_agent = 'Swagger-Codegen/2.144.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e6030fe..e2b5e04 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.141.1".\
+               "SDK Package Version: 2.144.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/role_properties_dto.py b/wavefront_api_client/models/role_properties_dto.py
index 5598be7..d5740a1 100644
--- a/wavefront_api_client/models/role_properties_dto.py
+++ b/wavefront_api_client/models/role_properties_dto.py
@@ -33,40 +33,66 @@ class RolePropertiesDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'deletable': 'bool',
         'name_editable': 'bool',
-        'roles_editable': 'bool',
+        'perms_editable': 'bool',
         'users_addable': 'bool',
         'users_removable': 'bool'
     }
 
     attribute_map = {
+        'deletable': 'deletable',
         'name_editable': 'nameEditable',
-        'roles_editable': 'rolesEditable',
+        'perms_editable': 'permsEditable',
         'users_addable': 'usersAddable',
         'users_removable': 'usersRemovable'
     }
 
-    def __init__(self, name_editable=None, roles_editable=None, users_addable=None, users_removable=None, _configuration=None):  # noqa: E501
+    def __init__(self, deletable=None, name_editable=None, perms_editable=None, users_addable=None, users_removable=None, _configuration=None):  # noqa: E501
         """RolePropertiesDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._deletable = None
         self._name_editable = None
-        self._roles_editable = None
+        self._perms_editable = None
         self._users_addable = None
         self._users_removable = None
         self.discriminator = None
 
+        if deletable is not None:
+            self.deletable = deletable
         if name_editable is not None:
             self.name_editable = name_editable
-        if roles_editable is not None:
-            self.roles_editable = roles_editable
+        if perms_editable is not None:
+            self.perms_editable = perms_editable
         if users_addable is not None:
             self.users_addable = users_addable
         if users_removable is not None:
             self.users_removable = users_removable
 
+    @property
+    def deletable(self):
+        """Gets the deletable of this RolePropertiesDTO.  # noqa: E501
+
+
+        :return: The deletable of this RolePropertiesDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deletable
+
+    @deletable.setter
+    def deletable(self, deletable):
+        """Sets the deletable of this RolePropertiesDTO.
+
+
+        :param deletable: The deletable of this RolePropertiesDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._deletable = deletable
+
     @property
     def name_editable(self):
         """Gets the name_editable of this RolePropertiesDTO.  # noqa: E501
@@ -89,25 +115,25 @@ def name_editable(self, name_editable):
         self._name_editable = name_editable
 
     @property
-    def roles_editable(self):
-        """Gets the roles_editable of this RolePropertiesDTO.  # noqa: E501
+    def perms_editable(self):
+        """Gets the perms_editable of this RolePropertiesDTO.  # noqa: E501
 
 
-        :return: The roles_editable of this RolePropertiesDTO.  # noqa: E501
+        :return: The perms_editable of this RolePropertiesDTO.  # noqa: E501
         :rtype: bool
         """
-        return self._roles_editable
+        return self._perms_editable
 
-    @roles_editable.setter
-    def roles_editable(self, roles_editable):
-        """Sets the roles_editable of this RolePropertiesDTO.
+    @perms_editable.setter
+    def perms_editable(self, perms_editable):
+        """Sets the perms_editable of this RolePropertiesDTO.
 
 
-        :param roles_editable: The roles_editable of this RolePropertiesDTO.  # noqa: E501
+        :param perms_editable: The perms_editable of this RolePropertiesDTO.  # noqa: E501
         :type: bool
         """
 
-        self._roles_editable = roles_editable
+        self._perms_editable = perms_editable
 
     @property
     def users_addable(self):

From 758047521751cc0adc265af71dad13009108230e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 27 Sep 2022 08:16:25 -0700
Subject: [PATCH 114/161] Autogenerated Update v2.153.1.

---
 .swagger-codegen/config.json             |  2 +-
 .swagger-codegen/config.jsone            |  2 +-
 README.md                                |  2 +-
 docs/Dashboard.md                        |  1 +
 setup.py                                 |  2 +-
 wavefront_api_client/api_client.py       |  2 +-
 wavefront_api_client/configuration.py    |  2 +-
 wavefront_api_client/models/dashboard.py | 30 +++++++++++++++++++++++-
 8 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6f4b5b9..94df5f8 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.144.1"
+    "packageVersion": "2.153.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 64b2d3d..6f4b5b9 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.141.1"
+    "packageVersion": "2.144.1"
 }
diff --git a/README.md b/README.md
index bf03ddf..24c6067 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.144.1
+- Package version: 2.153.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Dashboard.md b/docs/Dashboard.md
index 66a69ba..045f0a3 100644
--- a/docs/Dashboard.md
+++ b/docs/Dashboard.md
@@ -25,6 +25,7 @@ Name | Type | Description | Notes
 **favorite** | **bool** |  | [optional] 
 **force_v2_ui** | **bool** | Whether to force this dashboard to use the V2 UI | [optional] 
 **hidden** | **bool** |  | [optional] 
+**hide_chart_warning** | **bool** | Hide chart warning | [optional] 
 **id** | **str** | Unique identifier, also URL slug, of the dashboard | 
 **include_obsolete_metrics** | **bool** | Whether to include the obsolete metrics | [optional] 
 **modify_acl_access** | **bool** | Whether the user has modify ACL access to the dashboard. | [optional] 
diff --git a/setup.py b/setup.py
index 18f201d..f503b89 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.144.1"
+VERSION = "2.153.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 24851cd..b14c185 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.144.1/python'
+        self.user_agent = 'Swagger-Codegen/2.153.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e2b5e04..d74e617 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.144.1".\
+               "SDK Package Version: 2.153.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index a2c5613..3b5f25a 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -55,6 +55,7 @@ class Dashboard(object):
         'favorite': 'bool',
         'force_v2_ui': 'bool',
         'hidden': 'bool',
+        'hide_chart_warning': 'bool',
         'id': 'str',
         'include_obsolete_metrics': 'bool',
         'modify_acl_access': 'bool',
@@ -98,6 +99,7 @@ class Dashboard(object):
         'favorite': 'favorite',
         'force_v2_ui': 'forceV2UI',
         'hidden': 'hidden',
+        'hide_chart_warning': 'hideChartWarning',
         'id': 'id',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
         'modify_acl_access': 'modifyAclAccess',
@@ -118,7 +120,7 @@ class Dashboard(object):
         'views_last_week': 'viewsLastWeek'
     }
 
-    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, disable_refresh_in_live_mode=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, id=None, include_obsolete_metrics=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None, chart_title_scalar=None, created_epoch_millis=None, creator_id=None, customer=None, dashboard_attributes=None, default_end_time=None, default_start_time=None, default_time_window=None, deleted=None, description=None, disable_refresh_in_live_mode=None, display_description=None, display_query_parameters=None, display_section_table_of_contents=None, event_filter_type=None, event_query=None, favorite=None, force_v2_ui=None, hidden=None, hide_chart_warning=None, id=None, include_obsolete_metrics=None, modify_acl_access=None, name=None, num_charts=None, num_favorites=None, orphan=None, parameter_details=None, parameters=None, sections=None, system_owned=None, tags=None, updated_epoch_millis=None, updater_id=None, url=None, views_last_day=None, views_last_month=None, views_last_week=None, _configuration=None):  # noqa: E501
         """Dashboard - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -146,6 +148,7 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
         self._favorite = None
         self._force_v2_ui = None
         self._hidden = None
+        self._hide_chart_warning = None
         self._id = None
         self._include_obsolete_metrics = None
         self._modify_acl_access = None
@@ -210,6 +213,8 @@ def __init__(self, acl=None, chart_title_bg_color=None, chart_title_color=None,
             self.force_v2_ui = force_v2_ui
         if hidden is not None:
             self.hidden = hidden
+        if hide_chart_warning is not None:
+            self.hide_chart_warning = hide_chart_warning
         self.id = id
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
@@ -744,6 +749,29 @@ def hidden(self, hidden):
 
         self._hidden = hidden
 
+    @property
+    def hide_chart_warning(self):
+        """Gets the hide_chart_warning of this Dashboard.  # noqa: E501
+
+        Hide chart warning  # noqa: E501
+
+        :return: The hide_chart_warning of this Dashboard.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hide_chart_warning
+
+    @hide_chart_warning.setter
+    def hide_chart_warning(self, hide_chart_warning):
+        """Sets the hide_chart_warning of this Dashboard.
+
+        Hide chart warning  # noqa: E501
+
+        :param hide_chart_warning: The hide_chart_warning of this Dashboard.  # noqa: E501
+        :type: bool
+        """
+
+        self._hide_chart_warning = hide_chart_warning
+
     @property
     def id(self):
         """Gets the id of this Dashboard.  # noqa: E501

From 97f6f582353f56fd59b97caa8f10d847fd6ae3c5 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 4 Oct 2022 08:16:16 -0700
Subject: [PATCH 115/161] Autogenerated Update v2.154.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  17 +-
 docs/AccountUserAndServiceAccountApi.md       | 110 ---
 docs/Annotation.md                            |   2 +
 docs/IngestionPolicyMetadata.md               |  12 +
 docs/IngestionPolicyReadModel.md              |  34 +
 docs/IngestionPolicyWriteModel.md             |  25 +
 docs/Integration.md                           |   1 +
 docs/PagedIngestionPolicyReadModel.md         |  16 +
 docs/Proxy.md                                 |   8 +-
 ...sponseContainerIngestionPolicyReadModel.md |  11 +
 ...eContainerPagedIngestionPolicyReadModel.md |  11 +
 docs/SearchApi.md                             |   4 +-
 docs/ServiceAccount.md                        |   4 +-
 docs/Setup.md                                 |  13 +
 docs/UsageApi.md                              | 119 ++-
 docs/UserDTO.md                               |   4 +-
 docs/UserGroupModel.md                        |   2 +-
 docs/UserModel.md                             |   4 +-
 setup.py                                      |   2 +-
 test/test_ingestion_policy_metadata.py        |  40 +
 test/test_ingestion_policy_read_model.py      |  40 +
 test/test_ingestion_policy_write_model.py     |  40 +
 .../test_paged_ingestion_policy_read_model.py |  40 +
 ...e_container_ingestion_policy_read_model.py |  40 +
 ...ainer_paged_ingestion_policy_read_model.py |  40 +
 test/test_setup.py                            |  40 +
 wavefront_api_client/__init__.py              |  12 +-
 .../account__user_and_service_account_api.py  | 190 -----
 wavefront_api_client/api/search_api.py        |   6 +-
 wavefront_api_client/api/usage_api.py         | 201 ++++-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  12 +-
 wavefront_api_client/models/annotation.py     |  56 +-
 .../models/ingestion_policy_metadata.py       | 181 ++++
 .../models/ingestion_policy_read_model.py     | 804 ++++++++++++++++++
 .../models/ingestion_policy_write_model.py    | 552 ++++++++++++
 wavefront_api_client/models/integration.py    |  30 +-
 .../paged_ingestion_policy_read_model.py      | 287 +++++++
 wavefront_api_client/models/proxy.py          | 126 ++-
 ...e_container_ingestion_policy_read_model.py | 150 ++++
 ...ainer_paged_ingestion_policy_read_model.py | 150 ++++
 ...esponse_container_set_business_function.py |   2 +-
 .../models/service_account.py                 |  12 +-
 wavefront_api_client/models/setup.py          | 219 +++++
 wavefront_api_client/models/user_dto.py       |  12 +-
 .../models/user_group_model.py                |   6 +-
 wavefront_api_client/models/user_model.py     |  12 +-
 50 files changed, 3278 insertions(+), 429 deletions(-)
 create mode 100644 docs/IngestionPolicyMetadata.md
 create mode 100644 docs/IngestionPolicyReadModel.md
 create mode 100644 docs/IngestionPolicyWriteModel.md
 create mode 100644 docs/PagedIngestionPolicyReadModel.md
 create mode 100644 docs/ResponseContainerIngestionPolicyReadModel.md
 create mode 100644 docs/ResponseContainerPagedIngestionPolicyReadModel.md
 create mode 100644 docs/Setup.md
 create mode 100644 test/test_ingestion_policy_metadata.py
 create mode 100644 test/test_ingestion_policy_read_model.py
 create mode 100644 test/test_ingestion_policy_write_model.py
 create mode 100644 test/test_paged_ingestion_policy_read_model.py
 create mode 100644 test/test_response_container_ingestion_policy_read_model.py
 create mode 100644 test/test_response_container_paged_ingestion_policy_read_model.py
 create mode 100644 test/test_setup.py
 create mode 100644 wavefront_api_client/models/ingestion_policy_metadata.py
 create mode 100644 wavefront_api_client/models/ingestion_policy_read_model.py
 create mode 100644 wavefront_api_client/models/ingestion_policy_write_model.py
 create mode 100644 wavefront_api_client/models/paged_ingestion_policy_read_model.py
 create mode 100644 wavefront_api_client/models/response_container_ingestion_policy_read_model.py
 create mode 100644 wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
 create mode 100644 wavefront_api_client/models/setup.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 94df5f8..fb05462 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.153.1"
+    "packageVersion": "2.154.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6f4b5b9..94df5f8 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.144.1"
+    "packageVersion": "2.153.1"
 }
diff --git a/README.md b/README.md
index 24c6067..94225c2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.153.1
+- Package version: 2.154.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -81,7 +81,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -99,7 +98,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -428,6 +426,7 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**get_ingestion_policy_history**](docs/UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 *UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 *UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
@@ -521,8 +520,10 @@ Class | Method | HTTP request | Description
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
- - [IngestionPolicy](docs/IngestionPolicy.md)
  - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
+ - [IngestionPolicyMetadata](docs/IngestionPolicyMetadata.md)
+ - [IngestionPolicyReadModel](docs/IngestionPolicyReadModel.md)
+ - [IngestionPolicyWriteModel](docs/IngestionPolicyWriteModel.md)
  - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
  - [IntegrationAlert](docs/IntegrationAlert.md)
@@ -566,7 +567,7 @@ Class | Method | HTTP request | Description
  - [PagedDerivedMetricDefinitionWithStats](docs/PagedDerivedMetricDefinitionWithStats.md)
  - [PagedEvent](docs/PagedEvent.md)
  - [PagedExternalLink](docs/PagedExternalLink.md)
- - [PagedIngestionPolicy](docs/PagedIngestionPolicy.md)
+ - [PagedIngestionPolicyReadModel](docs/PagedIngestionPolicyReadModel.md)
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
@@ -620,7 +621,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerFacetResponse](docs/ResponseContainerFacetResponse.md)
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
- - [ResponseContainerIngestionPolicy](docs/ResponseContainerIngestionPolicy.md)
+ - [ResponseContainerIngestionPolicyReadModel](docs/ResponseContainerIngestionPolicyReadModel.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
@@ -652,7 +653,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedDerivedMetricDefinitionWithStats](docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md)
  - [ResponseContainerPagedEvent](docs/ResponseContainerPagedEvent.md)
  - [ResponseContainerPagedExternalLink](docs/ResponseContainerPagedExternalLink.md)
- - [ResponseContainerPagedIngestionPolicy](docs/ResponseContainerPagedIngestionPolicy.md)
+ - [ResponseContainerPagedIngestionPolicyReadModel](docs/ResponseContainerPagedIngestionPolicyReadModel.md)
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
@@ -693,7 +694,6 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
- - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
@@ -709,6 +709,7 @@ Class | Method | HTTP request | Description
  - [SearchQuery](docs/SearchQuery.md)
  - [ServiceAccount](docs/ServiceAccount.md)
  - [ServiceAccountWrite](docs/ServiceAccountWrite.md)
+ - [Setup](docs/Setup.md)
  - [SnowflakeConfiguration](docs/SnowflakeConfiguration.md)
  - [SortableSearchRequest](docs/SortableSearchRequest.md)
  - [Sorting](docs/Sorting.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index 4de9bdf..8ca24b8 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -7,7 +7,6 @@ Method | HTTP request | Description
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
-[**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -25,7 +24,6 @@ Method | HTTP request | Description
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
-[**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -199,60 +197,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **add_ingestion_policy**
-> ResponseContainer add_ingestion_policy(body=body)
-
-Add a specific ingestion policy to multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Add a specific ingestion policy to multiple accounts
-    api_response = api_instance.add_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->add_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -1175,60 +1119,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_ingestion_policies**
-> ResponseContainer remove_ingestion_policies(body=body)
-
-Removes ingestion policies from multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of accounts from which ingestion policies should be removed (optional)
-
-try:
-    # Removes ingestion policies from multiple accounts
-    api_response = api_instance.remove_ingestion_policies(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->remove_ingestion_policies: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **list[str]**| identifiers of list of accounts from which ingestion policies should be removed | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IngestionPolicyMetadata.md b/docs/IngestionPolicyMetadata.md
new file mode 100644
index 0000000..5a72de7
--- /dev/null
+++ b/docs/IngestionPolicyMetadata.md
@@ -0,0 +1,12 @@
+# IngestionPolicyMetadata
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**customer** | **str** | ID of the customer to which the ingestion policy metadata belongs | [optional] 
+**ingestion_policy_id** | **str** | The unique ID for the ingestion policy to which the metadata belongs | [optional] 
+**usage_in_billing_period** | **int** | ingestion policy usage in billing period | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IngestionPolicyReadModel.md b/docs/IngestionPolicyReadModel.md
new file mode 100644
index 0000000..7c523fc
--- /dev/null
+++ b/docs/IngestionPolicyReadModel.md
@@ -0,0 +1,34 @@
+# IngestionPolicyReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**account_count** | **int** | Total number of accounts that are linked to the ingestion policy | [optional] 
+**accounts** | [**list[AccessControlElement]**](AccessControlElement.md) | The accounts associated with the ingestion policy | [optional] 
+**alert_id** | **str** | The ingestion policy alert Id | [optional] 
+**customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
+**description** | **str** | The description of the ingestion policy | [optional] 
+**group_count** | **int** | Total number of groups that are linked to the ingestion policy | [optional] 
+**groups** | [**list[AccessControlElement]**](AccessControlElement.md) | The groups associated with the ingestion policy | [optional] 
+**id** | **str** | The unique ID for the ingestion policy | [optional] 
+**is_limited** | **bool** | Whether the ingestion policy is limited | [optional] 
+**last_updated_account_id** | **str** | The account that updated this ingestion policy last time | [optional] 
+**last_updated_ms** | **int** | The last time when the ingestion policy is updated, in epoch milliseconds | [optional] 
+**limit_pps** | **int** | The PPS limit of the ingestion policy | [optional] 
+**metadata** | [**IngestionPolicyMetadata**](IngestionPolicyMetadata.md) | metadata associated with the ingestion policy | [optional] 
+**name** | **str** | The name of the ingestion policy | [optional] 
+**namespaces** | **list[str]** | The namespaces associated with the ingestion policy | [optional] 
+**point_tags** | [**list[Annotation]**](Annotation.md) | The point tags associated with the ingestion policy | [optional] 
+**sampled_accounts** | **list[str]** | A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy | [optional] 
+**sampled_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy | [optional] 
+**sampled_service_accounts** | **list[str]** | A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy | [optional] 
+**sampled_user_accounts** | **list[str]** | A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy | [optional] 
+**scope** | **str** | The scope of the ingestion policy | [optional] 
+**service_account_count** | **int** | Total number of service accounts that are linked to the ingestion policy | [optional] 
+**sources** | **list[str]** | The sources associated with the ingestion policy | [optional] 
+**tags_anded** | **bool** | Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false | [optional] 
+**user_account_count** | **int** | Total number of user accounts that are linked to the ingestion policy | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IngestionPolicyWriteModel.md b/docs/IngestionPolicyWriteModel.md
new file mode 100644
index 0000000..5d23fe7
--- /dev/null
+++ b/docs/IngestionPolicyWriteModel.md
@@ -0,0 +1,25 @@
+# IngestionPolicyWriteModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**accounts** | **list[str]** | The accounts associated with the ingestion policy | [optional] 
+**alert_id** | **str** | The ingestion policy alert Id | [optional] 
+**customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
+**description** | **str** | The description of the ingestion policy | [optional] 
+**groups** | **list[str]** | The groups associated with the ingestion policy | [optional] 
+**id** | **str** | The unique ID for the ingestion policy | [optional] 
+**is_limited** | **bool** | Whether the ingestion policy is limited | [optional] 
+**last_updated_account_id** | **str** | The account that updated this ingestion policy last time | [optional] 
+**last_updated_ms** | **int** | The last time when the ingestion policy is updated, in epoch milliseconds | [optional] 
+**limit_pps** | **int** | The PPS limit of the ingestion policy | [optional] 
+**name** | **str** | The name of the ingestion policy | [optional] 
+**namespaces** | **list[str]** | The namespaces associated with the ingestion policy | [optional] 
+**point_tags** | [**list[Annotation]**](Annotation.md) | The point tags associated with the ingestion policy | [optional] 
+**scope** | **str** | The scope of the ingestion policy | [optional] 
+**sources** | **list[str]** | The sources associated with the ingestion policy | [optional] 
+**tags_anded** | **bool** | Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Integration.md b/docs/Integration.md
index 59f19f6..7011f7d 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -21,6 +21,7 @@ Name | Type | Description | Notes
 **name** | **str** | Integration name | 
 **overview** | **str** | Descriptive text giving an overview of integration functionality | [optional] 
 **setup** | **str** | How the integration will be set-up | [optional] 
+**setups** | [**list[Setup]**](Setup.md) | A list of setup belonging to this integration | [optional] 
 **status** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
diff --git a/docs/PagedIngestionPolicyReadModel.md b/docs/PagedIngestionPolicyReadModel.md
new file mode 100644
index 0000000..662c0cb
--- /dev/null
+++ b/docs/PagedIngestionPolicyReadModel.md
@@ -0,0 +1,16 @@
+# PagedIngestionPolicyReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 0f57bd3..2c95d90 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -11,27 +11,31 @@ Name | Type | Description | Notes
 **deleted** | **bool** |  | [optional] 
 **ephemeral** | **bool** | When true, this proxy is expected to be ephemeral (possibly hosted on a short-lived container) and will be deleted after a period of inactivity (not checking in) | [optional] 
 **events_rate_limit** | **float** | Proxy&#39;s rate limit for events | [optional] 
+**histo_disabled** | **bool** | Proxy&#39;s histogram feature disabled | [optional] 
 **histogram_rate_limit** | **int** | Proxy&#39;s rate limit for histograms | [optional] 
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
 **last_known_error** | **str** | deprecated | [optional] 
 **local_queue_size** | **int** | Number of items in the persistent disk queue of this proxy | [optional] 
+**logs_disabled** | **bool** | Proxy&#39;s logs feature disabled for customer | [optional] 
 **name** | **str** | Proxy name (modifiable) | 
 **preprocessor_rules** | **str** | Proxy&#39;s preprocessor rules | [optional] 
 **shutdown** | **bool** | When true, attempt to shut down this proxy remotely | [optional] 
 **source_tags_rate_limit** | **float** | Proxy&#39;s rate limit for source tag operations | [optional] 
+**span_logs_disabled** | **bool** | Proxy&#39;s span logs feature disabled | [optional] 
 **span_logs_rate_limit** | **int** | Proxy&#39;s rate limit for span logs | [optional] 
 **span_rate_limit** | **int** | Proxy&#39;s rate limit for spans | [optional] 
 **ssh_agent** | **bool** | deprecated | [optional] 
 **status** | **str** | the proxy&#39;s status | [optional] 
 **status_cause** | **str** | The reason why the proxy is in current status | [optional] 
 **time_drift** | **int** | Time drift of the proxy&#39;s clock compared to Wavefront servers | [optional] 
+**trace_disabled** | **bool** | Proxy&#39;s spans feature disabled | [optional] 
 **truncate** | **bool** | When true, attempt to truncate down this proxy backlog remotely | [optional] 
 **user_id** | **str** | The user associated with this proxy | [optional] 
 **version** | **str** |  | [optional] 
diff --git a/docs/ResponseContainerIngestionPolicyReadModel.md b/docs/ResponseContainerIngestionPolicyReadModel.md
new file mode 100644
index 0000000..743f81b
--- /dev/null
+++ b/docs/ResponseContainerIngestionPolicyReadModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerIngestionPolicyReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedIngestionPolicyReadModel.md b/docs/ResponseContainerPagedIngestionPolicyReadModel.md
new file mode 100644
index 0000000..08548ec
--- /dev/null
+++ b/docs/ResponseContainerPagedIngestionPolicyReadModel.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedIngestionPolicyReadModel
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedIngestionPolicyReadModel**](PagedIngestionPolicyReadModel.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 02994b8..1d575e3 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -1408,7 +1408,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **search_ingestion_policy_entities**
-> ResponseContainerPagedIngestionPolicy search_ingestion_policy_entities(body=body)
+> ResponseContainerPagedIngestionPolicyReadModel search_ingestion_policy_entities(body=body)
 
 Search over a customer's ingestion policies
 
@@ -1448,7 +1448,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
 
 ### Authorization
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index a38980f..ae0f7ca 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | The list of service account&#39;s ingestion policies. | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | The list of service account&#39;s ingestion policies. | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/Setup.md b/docs/Setup.md
new file mode 100644
index 0000000..18f73c5
--- /dev/null
+++ b/docs/Setup.md
@@ -0,0 +1,13 @@
+# Setup
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** | Setup description | 
+**file_path** | **str** | Relative file path to the setup.md file | 
+**title** | **str** | Setup title | [optional] 
+**type** | **str** | Setup Type | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 42a07fb..771f485 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -11,13 +11,14 @@ Method | HTTP request | Description
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**get_ingestion_policy_history**](UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 [**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 [**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
 # **add_accounts**
-> ResponseContainerIngestionPolicy add_accounts(id, body=body)
+> ResponseContainerIngestionPolicyReadModel add_accounts(id, body=body)
 
 Add accounts to ingestion policy
 
@@ -59,7 +60,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -67,13 +68,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **add_groups**
-> ResponseContainerIngestionPolicy add_groups(id, body=body)
+> ResponseContainerIngestionPolicyReadModel add_groups(id, body=body)
 
 Add groups to the ingestion policy
 
@@ -115,7 +116,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -123,13 +124,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_ingestion_policy**
-> ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
+> ResponseContainerIngestionPolicyReadModel create_ingestion_policy(body=body)
 
 Create a specific ingestion policy
 
@@ -151,7 +152,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -165,11 +166,11 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -183,7 +184,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_ingestion_policy**
-> ResponseContainerIngestionPolicy delete_ingestion_policy(id)
+> ResponseContainerIngestionPolicyReadModel delete_ingestion_policy(id)
 
 Delete a specific ingestion policy
 
@@ -223,7 +224,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -231,7 +232,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -286,13 +287,13 @@ void (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/csv
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_ingestion_policies**
-> ResponseContainerPagedIngestionPolicy get_all_ingestion_policies(offset=offset, limit=limit)
+> ResponseContainerPagedIngestionPolicyReadModel get_all_ingestion_policies(offset=offset, limit=limit)
 
 Get all ingestion policies for a customer
 
@@ -334,7 +335,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -342,13 +343,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_ingestion_policy**
-> ResponseContainerIngestionPolicy get_ingestion_policy(id)
+> ResponseContainerIngestionPolicyReadModel get_ingestion_policy(id)
 
 Get a specific ingestion policy
 
@@ -388,7 +389,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -396,13 +397,71 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_ingestion_policy_history**
+> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
+
+Get the version history of ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of ingestion policy
+    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_accounts**
-> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
+> ResponseContainerIngestionPolicyReadModel remove_accounts(id, body=body)
 
 Remove accounts from ingestion policy
 
@@ -444,7 +503,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -452,13 +511,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_groups**
-> ResponseContainerIngestionPolicy remove_groups(id, body=body)
+> ResponseContainerIngestionPolicyReadModel remove_groups(id, body=body)
 
 Remove groups from the ingestion policy
 
@@ -500,7 +559,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -508,13 +567,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_ingestion_policy**
-> ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
+> ResponseContainerIngestionPolicyReadModel update_ingestion_policy(id, body=body)
 
 Update a specific ingestion policy
 
@@ -537,7 +596,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -552,11 +611,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index d4ceba2..b3d3f50 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 2c61529..4bdd203 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies linked with the user group | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 657200c..8af6c9c 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index f503b89..e4fe7e7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.153.1"
+VERSION = "2.154.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_ingestion_policy_metadata.py b/test/test_ingestion_policy_metadata.py
new file mode 100644
index 0000000..9f5a6af
--- /dev/null
+++ b/test/test_ingestion_policy_metadata.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionPolicyMetadata(unittest.TestCase):
+    """IngestionPolicyMetadata unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIngestionPolicyMetadata(self):
+        """Test IngestionPolicyMetadata"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ingestion_policy_metadata.IngestionPolicyMetadata()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_ingestion_policy_read_model.py b/test/test_ingestion_policy_read_model.py
new file mode 100644
index 0000000..5ee4656
--- /dev/null
+++ b/test/test_ingestion_policy_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionPolicyReadModel(unittest.TestCase):
+    """IngestionPolicyReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIngestionPolicyReadModel(self):
+        """Test IngestionPolicyReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ingestion_policy_read_model.IngestionPolicyReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_ingestion_policy_write_model.py b/test/test_ingestion_policy_write_model.py
new file mode 100644
index 0000000..3938f55
--- /dev/null
+++ b/test/test_ingestion_policy_write_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionPolicyWriteModel(unittest.TestCase):
+    """IngestionPolicyWriteModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIngestionPolicyWriteModel(self):
+        """Test IngestionPolicyWriteModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ingestion_policy_write_model.IngestionPolicyWriteModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_ingestion_policy_read_model.py b/test/test_paged_ingestion_policy_read_model.py
new file mode 100644
index 0000000..b47b1bc
--- /dev/null
+++ b/test/test_paged_ingestion_policy_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedIngestionPolicyReadModel(unittest.TestCase):
+    """PagedIngestionPolicyReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedIngestionPolicyReadModel(self):
+        """Test PagedIngestionPolicyReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_ingestion_policy_read_model.PagedIngestionPolicyReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_ingestion_policy_read_model.py b/test/test_response_container_ingestion_policy_read_model.py
new file mode 100644
index 0000000..c85b703
--- /dev/null
+++ b/test/test_response_container_ingestion_policy_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerIngestionPolicyReadModel(unittest.TestCase):
+    """ResponseContainerIngestionPolicyReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerIngestionPolicyReadModel(self):
+        """Test ResponseContainerIngestionPolicyReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_ingestion_policy_read_model.ResponseContainerIngestionPolicyReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_ingestion_policy_read_model.py b/test/test_response_container_paged_ingestion_policy_read_model.py
new file mode 100644
index 0000000..9d0f0fc
--- /dev/null
+++ b/test/test_response_container_paged_ingestion_policy_read_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedIngestionPolicyReadModel(unittest.TestCase):
+    """ResponseContainerPagedIngestionPolicyReadModel unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedIngestionPolicyReadModel(self):
+        """Test ResponseContainerPagedIngestionPolicyReadModel"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_ingestion_policy_read_model.ResponseContainerPagedIngestionPolicyReadModel()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_setup.py b/test/test_setup.py
new file mode 100644
index 0000000..ba8b692
--- /dev/null
+++ b/test/test_setup.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.setup import Setup  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSetup(unittest.TestCase):
+    """Setup unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testSetup(self):
+        """Test Setup"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.setup.Setup()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index a87e3ec..6bd0180 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -114,8 +114,10 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -159,7 +161,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -213,7 +215,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -245,7 +247,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -286,7 +288,6 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
-from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
@@ -302,6 +303,7 @@
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
 from wavefront_api_client.models.service_account_write import ServiceAccountWrite
+from wavefront_api_client.models.setup import Setup
 from wavefront_api_client.models.snowflake_configuration import SnowflakeConfiguration
 from wavefront_api_client.models.sortable_search_request import SortableSearchRequest
 from wavefront_api_client.models.sorting import Sorting
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 6f745a9..6424c0f 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -338,101 +338,6 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def add_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Add a specific ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Add a specific ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/addingestionpolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -2076,101 +1981,6 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_ingestion_policies(self, **kwargs):  # noqa: E501
-        """Removes ingestion policies from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policies(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
-        """Removes ingestion policies from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policies_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_ingestion_policies" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/removeingestionpolicies', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index b29e022..ea93637 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2388,7 +2388,7 @@ def search_ingestion_policy_entities(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2410,7 +2410,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2464,7 +2464,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 7c353f8..20dc03f 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -45,7 +45,7 @@ def add_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -68,7 +68,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -113,6 +113,10 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -124,7 +128,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -144,7 +148,7 @@ def add_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -167,7 +171,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -212,6 +216,10 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -223,7 +231,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -241,8 +249,8 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -263,8 +271,8 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -318,7 +326,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -337,7 +345,7 @@ def delete_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -359,7 +367,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -402,6 +410,10 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -413,7 +425,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -501,6 +513,10 @@ def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/csv'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -532,7 +548,7 @@ def get_all_ingestion_policies(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -555,7 +571,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -596,6 +612,10 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -607,7 +627,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -626,7 +646,7 @@ def get_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -648,7 +668,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -691,6 +711,10 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -702,7 +726,114 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_ingestion_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -722,7 +853,7 @@ def remove_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -745,7 +876,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -790,6 +921,10 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -801,7 +936,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -821,7 +956,7 @@ def remove_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -844,7 +979,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -889,6 +1024,10 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -900,7 +1039,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -919,8 +1058,8 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -942,8 +1081,8 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1003,7 +1142,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b14c185..408f7e1 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.153.1/python'
+        self.user_agent = 'Swagger-Codegen/2.154.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index d74e617..aa1fbf8 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.153.1".\
+               "SDK Package Version: 2.154.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 887f4aa..489e7ea 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -72,8 +72,10 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -117,7 +119,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -171,7 +173,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -203,7 +205,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -244,7 +246,6 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
-from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
@@ -260,6 +261,7 @@
 from wavefront_api_client.models.search_query import SearchQuery
 from wavefront_api_client.models.service_account import ServiceAccount
 from wavefront_api_client.models.service_account_write import ServiceAccountWrite
+from wavefront_api_client.models.setup import Setup
 from wavefront_api_client.models.snowflake_configuration import SnowflakeConfiguration
 from wavefront_api_client.models.sortable_search_request import SortableSearchRequest
 from wavefront_api_client.models.sorting import Sorting
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 7d5867a..59589d5 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -33,18 +33,72 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self, _configuration=None):  # noqa: E501
+    def __init__(self, key=None, value=None, _configuration=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/ingestion_policy_metadata.py b/wavefront_api_client/models/ingestion_policy_metadata.py
new file mode 100644
index 0000000..a28634e
--- /dev/null
+++ b/wavefront_api_client/models/ingestion_policy_metadata.py
@@ -0,0 +1,181 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class IngestionPolicyMetadata(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'customer': 'str',
+        'ingestion_policy_id': 'str',
+        'usage_in_billing_period': 'int'
+    }
+
+    attribute_map = {
+        'customer': 'customer',
+        'ingestion_policy_id': 'ingestionPolicyId',
+        'usage_in_billing_period': 'usageInBillingPeriod'
+    }
+
+    def __init__(self, customer=None, ingestion_policy_id=None, usage_in_billing_period=None, _configuration=None):  # noqa: E501
+        """IngestionPolicyMetadata - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._customer = None
+        self._ingestion_policy_id = None
+        self._usage_in_billing_period = None
+        self.discriminator = None
+
+        if customer is not None:
+            self.customer = customer
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
+        if usage_in_billing_period is not None:
+            self.usage_in_billing_period = usage_in_billing_period
+
+    @property
+    def customer(self):
+        """Gets the customer of this IngestionPolicyMetadata.  # noqa: E501
+
+        ID of the customer to which the ingestion policy metadata belongs  # noqa: E501
+
+        :return: The customer of this IngestionPolicyMetadata.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this IngestionPolicyMetadata.
+
+        ID of the customer to which the ingestion policy metadata belongs  # noqa: E501
+
+        :param customer: The customer of this IngestionPolicyMetadata.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this IngestionPolicyMetadata.  # noqa: E501
+
+        The unique ID for the ingestion policy to which the metadata belongs  # noqa: E501
+
+        :return: The ingestion_policy_id of this IngestionPolicyMetadata.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this IngestionPolicyMetadata.
+
+        The unique ID for the ingestion policy to which the metadata belongs  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this IngestionPolicyMetadata.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
+    @property
+    def usage_in_billing_period(self):
+        """Gets the usage_in_billing_period of this IngestionPolicyMetadata.  # noqa: E501
+
+        ingestion policy usage in billing period  # noqa: E501
+
+        :return: The usage_in_billing_period of this IngestionPolicyMetadata.  # noqa: E501
+        :rtype: int
+        """
+        return self._usage_in_billing_period
+
+    @usage_in_billing_period.setter
+    def usage_in_billing_period(self, usage_in_billing_period):
+        """Sets the usage_in_billing_period of this IngestionPolicyMetadata.
+
+        ingestion policy usage in billing period  # noqa: E501
+
+        :param usage_in_billing_period: The usage_in_billing_period of this IngestionPolicyMetadata.  # noqa: E501
+        :type: int
+        """
+
+        self._usage_in_billing_period = usage_in_billing_period
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IngestionPolicyMetadata, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IngestionPolicyMetadata):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, IngestionPolicyMetadata):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ingestion_policy_read_model.py b/wavefront_api_client/models/ingestion_policy_read_model.py
new file mode 100644
index 0000000..0539876
--- /dev/null
+++ b/wavefront_api_client/models/ingestion_policy_read_model.py
@@ -0,0 +1,804 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class IngestionPolicyReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'account_count': 'int',
+        'accounts': 'list[AccessControlElement]',
+        'alert_id': 'str',
+        'customer': 'str',
+        'description': 'str',
+        'group_count': 'int',
+        'groups': 'list[AccessControlElement]',
+        'id': 'str',
+        'is_limited': 'bool',
+        'last_updated_account_id': 'str',
+        'last_updated_ms': 'int',
+        'limit_pps': 'int',
+        'metadata': 'IngestionPolicyMetadata',
+        'name': 'str',
+        'namespaces': 'list[str]',
+        'point_tags': 'list[Annotation]',
+        'sampled_accounts': 'list[str]',
+        'sampled_groups': 'list[UserGroup]',
+        'sampled_service_accounts': 'list[str]',
+        'sampled_user_accounts': 'list[str]',
+        'scope': 'str',
+        'service_account_count': 'int',
+        'sources': 'list[str]',
+        'tags_anded': 'bool',
+        'user_account_count': 'int'
+    }
+
+    attribute_map = {
+        'account_count': 'accountCount',
+        'accounts': 'accounts',
+        'alert_id': 'alertId',
+        'customer': 'customer',
+        'description': 'description',
+        'group_count': 'groupCount',
+        'groups': 'groups',
+        'id': 'id',
+        'is_limited': 'isLimited',
+        'last_updated_account_id': 'lastUpdatedAccountId',
+        'last_updated_ms': 'lastUpdatedMs',
+        'limit_pps': 'limitPPS',
+        'metadata': 'metadata',
+        'name': 'name',
+        'namespaces': 'namespaces',
+        'point_tags': 'pointTags',
+        'sampled_accounts': 'sampledAccounts',
+        'sampled_groups': 'sampledGroups',
+        'sampled_service_accounts': 'sampledServiceAccounts',
+        'sampled_user_accounts': 'sampledUserAccounts',
+        'scope': 'scope',
+        'service_account_count': 'serviceAccountCount',
+        'sources': 'sources',
+        'tags_anded': 'tagsAnded',
+        'user_account_count': 'userAccountCount'
+    }
+
+    def __init__(self, account_count=None, accounts=None, alert_id=None, customer=None, description=None, group_count=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, metadata=None, name=None, namespaces=None, point_tags=None, sampled_accounts=None, sampled_groups=None, sampled_service_accounts=None, sampled_user_accounts=None, scope=None, service_account_count=None, sources=None, tags_anded=None, user_account_count=None, _configuration=None):  # noqa: E501
+        """IngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._account_count = None
+        self._accounts = None
+        self._alert_id = None
+        self._customer = None
+        self._description = None
+        self._group_count = None
+        self._groups = None
+        self._id = None
+        self._is_limited = None
+        self._last_updated_account_id = None
+        self._last_updated_ms = None
+        self._limit_pps = None
+        self._metadata = None
+        self._name = None
+        self._namespaces = None
+        self._point_tags = None
+        self._sampled_accounts = None
+        self._sampled_groups = None
+        self._sampled_service_accounts = None
+        self._sampled_user_accounts = None
+        self._scope = None
+        self._service_account_count = None
+        self._sources = None
+        self._tags_anded = None
+        self._user_account_count = None
+        self.discriminator = None
+
+        if account_count is not None:
+            self.account_count = account_count
+        if accounts is not None:
+            self.accounts = accounts
+        if alert_id is not None:
+            self.alert_id = alert_id
+        if customer is not None:
+            self.customer = customer
+        if description is not None:
+            self.description = description
+        if group_count is not None:
+            self.group_count = group_count
+        if groups is not None:
+            self.groups = groups
+        if id is not None:
+            self.id = id
+        if is_limited is not None:
+            self.is_limited = is_limited
+        if last_updated_account_id is not None:
+            self.last_updated_account_id = last_updated_account_id
+        if last_updated_ms is not None:
+            self.last_updated_ms = last_updated_ms
+        if limit_pps is not None:
+            self.limit_pps = limit_pps
+        if metadata is not None:
+            self.metadata = metadata
+        if name is not None:
+            self.name = name
+        if namespaces is not None:
+            self.namespaces = namespaces
+        if point_tags is not None:
+            self.point_tags = point_tags
+        if sampled_accounts is not None:
+            self.sampled_accounts = sampled_accounts
+        if sampled_groups is not None:
+            self.sampled_groups = sampled_groups
+        if sampled_service_accounts is not None:
+            self.sampled_service_accounts = sampled_service_accounts
+        if sampled_user_accounts is not None:
+            self.sampled_user_accounts = sampled_user_accounts
+        if scope is not None:
+            self.scope = scope
+        if service_account_count is not None:
+            self.service_account_count = service_account_count
+        if sources is not None:
+            self.sources = sources
+        if tags_anded is not None:
+            self.tags_anded = tags_anded
+        if user_account_count is not None:
+            self.user_account_count = user_account_count
+
+    @property
+    def account_count(self):
+        """Gets the account_count of this IngestionPolicyReadModel.  # noqa: E501
+
+        Total number of accounts that are linked to the ingestion policy  # noqa: E501
+
+        :return: The account_count of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._account_count
+
+    @account_count.setter
+    def account_count(self, account_count):
+        """Sets the account_count of this IngestionPolicyReadModel.
+
+        Total number of accounts that are linked to the ingestion policy  # noqa: E501
+
+        :param account_count: The account_count of this IngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._account_count = account_count
+
+    @property
+    def accounts(self):
+        """Gets the accounts of this IngestionPolicyReadModel.  # noqa: E501
+
+        The accounts associated with the ingestion policy  # noqa: E501
+
+        :return: The accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._accounts
+
+    @accounts.setter
+    def accounts(self, accounts):
+        """Sets the accounts of this IngestionPolicyReadModel.
+
+        The accounts associated with the ingestion policy  # noqa: E501
+
+        :param accounts: The accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._accounts = accounts
+
+    @property
+    def alert_id(self):
+        """Gets the alert_id of this IngestionPolicyReadModel.  # noqa: E501
+
+        The ingestion policy alert Id  # noqa: E501
+
+        :return: The alert_id of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_id
+
+    @alert_id.setter
+    def alert_id(self, alert_id):
+        """Sets the alert_id of this IngestionPolicyReadModel.
+
+        The ingestion policy alert Id  # noqa: E501
+
+        :param alert_id: The alert_id of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_id = alert_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this IngestionPolicyReadModel.  # noqa: E501
+
+        ID of the customer to which the ingestion policy belongs  # noqa: E501
+
+        :return: The customer of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this IngestionPolicyReadModel.
+
+        ID of the customer to which the ingestion policy belongs  # noqa: E501
+
+        :param customer: The customer of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def description(self):
+        """Gets the description of this IngestionPolicyReadModel.  # noqa: E501
+
+        The description of the ingestion policy  # noqa: E501
+
+        :return: The description of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this IngestionPolicyReadModel.
+
+        The description of the ingestion policy  # noqa: E501
+
+        :param description: The description of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def group_count(self):
+        """Gets the group_count of this IngestionPolicyReadModel.  # noqa: E501
+
+        Total number of groups that are linked to the ingestion policy  # noqa: E501
+
+        :return: The group_count of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._group_count
+
+    @group_count.setter
+    def group_count(self, group_count):
+        """Sets the group_count of this IngestionPolicyReadModel.
+
+        Total number of groups that are linked to the ingestion policy  # noqa: E501
+
+        :param group_count: The group_count of this IngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._group_count = group_count
+
+    @property
+    def groups(self):
+        """Gets the groups of this IngestionPolicyReadModel.  # noqa: E501
+
+        The groups associated with the ingestion policy  # noqa: E501
+
+        :return: The groups of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[AccessControlElement]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this IngestionPolicyReadModel.
+
+        The groups associated with the ingestion policy  # noqa: E501
+
+        :param groups: The groups of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[AccessControlElement]
+        """
+
+        self._groups = groups
+
+    @property
+    def id(self):
+        """Gets the id of this IngestionPolicyReadModel.  # noqa: E501
+
+        The unique ID for the ingestion policy  # noqa: E501
+
+        :return: The id of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this IngestionPolicyReadModel.
+
+        The unique ID for the ingestion policy  # noqa: E501
+
+        :param id: The id of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def is_limited(self):
+        """Gets the is_limited of this IngestionPolicyReadModel.  # noqa: E501
+
+        Whether the ingestion policy is limited  # noqa: E501
+
+        :return: The is_limited of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_limited
+
+    @is_limited.setter
+    def is_limited(self, is_limited):
+        """Sets the is_limited of this IngestionPolicyReadModel.
+
+        Whether the ingestion policy is limited  # noqa: E501
+
+        :param is_limited: The is_limited of this IngestionPolicyReadModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_limited = is_limited
+
+    @property
+    def last_updated_account_id(self):
+        """Gets the last_updated_account_id of this IngestionPolicyReadModel.  # noqa: E501
+
+        The account that updated this ingestion policy last time  # noqa: E501
+
+        :return: The last_updated_account_id of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_updated_account_id
+
+    @last_updated_account_id.setter
+    def last_updated_account_id(self, last_updated_account_id):
+        """Sets the last_updated_account_id of this IngestionPolicyReadModel.
+
+        The account that updated this ingestion policy last time  # noqa: E501
+
+        :param last_updated_account_id: The last_updated_account_id of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._last_updated_account_id = last_updated_account_id
+
+    @property
+    def last_updated_ms(self):
+        """Gets the last_updated_ms of this IngestionPolicyReadModel.  # noqa: E501
+
+        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
+
+        :return: The last_updated_ms of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated_ms
+
+    @last_updated_ms.setter
+    def last_updated_ms(self, last_updated_ms):
+        """Sets the last_updated_ms of this IngestionPolicyReadModel.
+
+        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
+
+        :param last_updated_ms: The last_updated_ms of this IngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated_ms = last_updated_ms
+
+    @property
+    def limit_pps(self):
+        """Gets the limit_pps of this IngestionPolicyReadModel.  # noqa: E501
+
+        The PPS limit of the ingestion policy  # noqa: E501
+
+        :return: The limit_pps of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit_pps
+
+    @limit_pps.setter
+    def limit_pps(self, limit_pps):
+        """Sets the limit_pps of this IngestionPolicyReadModel.
+
+        The PPS limit of the ingestion policy  # noqa: E501
+
+        :param limit_pps: The limit_pps of this IngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._limit_pps = limit_pps
+
+    @property
+    def metadata(self):
+        """Gets the metadata of this IngestionPolicyReadModel.  # noqa: E501
+
+        metadata associated with the ingestion policy  # noqa: E501
+
+        :return: The metadata of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: IngestionPolicyMetadata
+        """
+        return self._metadata
+
+    @metadata.setter
+    def metadata(self, metadata):
+        """Sets the metadata of this IngestionPolicyReadModel.
+
+        metadata associated with the ingestion policy  # noqa: E501
+
+        :param metadata: The metadata of this IngestionPolicyReadModel.  # noqa: E501
+        :type: IngestionPolicyMetadata
+        """
+
+        self._metadata = metadata
+
+    @property
+    def name(self):
+        """Gets the name of this IngestionPolicyReadModel.  # noqa: E501
+
+        The name of the ingestion policy  # noqa: E501
+
+        :return: The name of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IngestionPolicyReadModel.
+
+        The name of the ingestion policy  # noqa: E501
+
+        :param name: The name of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def namespaces(self):
+        """Gets the namespaces of this IngestionPolicyReadModel.  # noqa: E501
+
+        The namespaces associated with the ingestion policy  # noqa: E501
+
+        :return: The namespaces of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._namespaces
+
+    @namespaces.setter
+    def namespaces(self, namespaces):
+        """Sets the namespaces of this IngestionPolicyReadModel.
+
+        The namespaces associated with the ingestion policy  # noqa: E501
+
+        :param namespaces: The namespaces of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._namespaces = namespaces
+
+    @property
+    def point_tags(self):
+        """Gets the point_tags of this IngestionPolicyReadModel.  # noqa: E501
+
+        The point tags associated with the ingestion policy  # noqa: E501
+
+        :return: The point_tags of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._point_tags
+
+    @point_tags.setter
+    def point_tags(self, point_tags):
+        """Sets the point_tags of this IngestionPolicyReadModel.
+
+        The point tags associated with the ingestion policy  # noqa: E501
+
+        :param point_tags: The point_tags of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._point_tags = point_tags
+
+    @property
+    def sampled_accounts(self):
+        """Gets the sampled_accounts of this IngestionPolicyReadModel.  # noqa: E501
+
+        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
+
+        :return: The sampled_accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sampled_accounts
+
+    @sampled_accounts.setter
+    def sampled_accounts(self, sampled_accounts):
+        """Sets the sampled_accounts of this IngestionPolicyReadModel.
+
+        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
+
+        :param sampled_accounts: The sampled_accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sampled_accounts = sampled_accounts
+
+    @property
+    def sampled_groups(self):
+        """Gets the sampled_groups of this IngestionPolicyReadModel.  # noqa: E501
+
+        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
+
+        :return: The sampled_groups of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[UserGroup]
+        """
+        return self._sampled_groups
+
+    @sampled_groups.setter
+    def sampled_groups(self, sampled_groups):
+        """Sets the sampled_groups of this IngestionPolicyReadModel.
+
+        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
+
+        :param sampled_groups: The sampled_groups of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[UserGroup]
+        """
+
+        self._sampled_groups = sampled_groups
+
+    @property
+    def sampled_service_accounts(self):
+        """Gets the sampled_service_accounts of this IngestionPolicyReadModel.  # noqa: E501
+
+        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
+
+        :return: The sampled_service_accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sampled_service_accounts
+
+    @sampled_service_accounts.setter
+    def sampled_service_accounts(self, sampled_service_accounts):
+        """Sets the sampled_service_accounts of this IngestionPolicyReadModel.
+
+        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
+
+        :param sampled_service_accounts: The sampled_service_accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sampled_service_accounts = sampled_service_accounts
+
+    @property
+    def sampled_user_accounts(self):
+        """Gets the sampled_user_accounts of this IngestionPolicyReadModel.  # noqa: E501
+
+        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
+
+        :return: The sampled_user_accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sampled_user_accounts
+
+    @sampled_user_accounts.setter
+    def sampled_user_accounts(self, sampled_user_accounts):
+        """Sets the sampled_user_accounts of this IngestionPolicyReadModel.
+
+        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
+
+        :param sampled_user_accounts: The sampled_user_accounts of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sampled_user_accounts = sampled_user_accounts
+
+    @property
+    def scope(self):
+        """Gets the scope of this IngestionPolicyReadModel.  # noqa: E501
+
+        The scope of the ingestion policy  # noqa: E501
+
+        :return: The scope of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this IngestionPolicyReadModel.
+
+        The scope of the ingestion policy  # noqa: E501
+
+        :param scope: The scope of this IngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ACCOUNT", "GROUP", "NAMESPACE", "SOURCE", "TAGS"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                scope not in allowed_values):
+            raise ValueError(
+                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
+                .format(scope, allowed_values)
+            )
+
+        self._scope = scope
+
+    @property
+    def service_account_count(self):
+        """Gets the service_account_count of this IngestionPolicyReadModel.  # noqa: E501
+
+        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
+
+        :return: The service_account_count of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._service_account_count
+
+    @service_account_count.setter
+    def service_account_count(self, service_account_count):
+        """Sets the service_account_count of this IngestionPolicyReadModel.
+
+        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
+
+        :param service_account_count: The service_account_count of this IngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._service_account_count = service_account_count
+
+    @property
+    def sources(self):
+        """Gets the sources of this IngestionPolicyReadModel.  # noqa: E501
+
+        The sources associated with the ingestion policy  # noqa: E501
+
+        :return: The sources of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sources
+
+    @sources.setter
+    def sources(self, sources):
+        """Sets the sources of this IngestionPolicyReadModel.
+
+        The sources associated with the ingestion policy  # noqa: E501
+
+        :param sources: The sources of this IngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sources = sources
+
+    @property
+    def tags_anded(self):
+        """Gets the tags_anded of this IngestionPolicyReadModel.  # noqa: E501
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :return: The tags_anded of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._tags_anded
+
+    @tags_anded.setter
+    def tags_anded(self, tags_anded):
+        """Sets the tags_anded of this IngestionPolicyReadModel.
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :param tags_anded: The tags_anded of this IngestionPolicyReadModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._tags_anded = tags_anded
+
+    @property
+    def user_account_count(self):
+        """Gets the user_account_count of this IngestionPolicyReadModel.  # noqa: E501
+
+        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
+
+        :return: The user_account_count of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._user_account_count
+
+    @user_account_count.setter
+    def user_account_count(self, user_account_count):
+        """Sets the user_account_count of this IngestionPolicyReadModel.
+
+        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
+
+        :param user_account_count: The user_account_count of this IngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._user_account_count = user_account_count
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IngestionPolicyReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IngestionPolicyReadModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, IngestionPolicyReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ingestion_policy_write_model.py b/wavefront_api_client/models/ingestion_policy_write_model.py
new file mode 100644
index 0000000..cd6a265
--- /dev/null
+++ b/wavefront_api_client/models/ingestion_policy_write_model.py
@@ -0,0 +1,552 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class IngestionPolicyWriteModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'accounts': 'list[str]',
+        'alert_id': 'str',
+        'customer': 'str',
+        'description': 'str',
+        'groups': 'list[str]',
+        'id': 'str',
+        'is_limited': 'bool',
+        'last_updated_account_id': 'str',
+        'last_updated_ms': 'int',
+        'limit_pps': 'int',
+        'name': 'str',
+        'namespaces': 'list[str]',
+        'point_tags': 'list[Annotation]',
+        'scope': 'str',
+        'sources': 'list[str]',
+        'tags_anded': 'bool'
+    }
+
+    attribute_map = {
+        'accounts': 'accounts',
+        'alert_id': 'alertId',
+        'customer': 'customer',
+        'description': 'description',
+        'groups': 'groups',
+        'id': 'id',
+        'is_limited': 'isLimited',
+        'last_updated_account_id': 'lastUpdatedAccountId',
+        'last_updated_ms': 'lastUpdatedMs',
+        'limit_pps': 'limitPPS',
+        'name': 'name',
+        'namespaces': 'namespaces',
+        'point_tags': 'pointTags',
+        'scope': 'scope',
+        'sources': 'sources',
+        'tags_anded': 'tagsAnded'
+    }
+
+    def __init__(self, accounts=None, alert_id=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
+        """IngestionPolicyWriteModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._accounts = None
+        self._alert_id = None
+        self._customer = None
+        self._description = None
+        self._groups = None
+        self._id = None
+        self._is_limited = None
+        self._last_updated_account_id = None
+        self._last_updated_ms = None
+        self._limit_pps = None
+        self._name = None
+        self._namespaces = None
+        self._point_tags = None
+        self._scope = None
+        self._sources = None
+        self._tags_anded = None
+        self.discriminator = None
+
+        if accounts is not None:
+            self.accounts = accounts
+        if alert_id is not None:
+            self.alert_id = alert_id
+        if customer is not None:
+            self.customer = customer
+        if description is not None:
+            self.description = description
+        if groups is not None:
+            self.groups = groups
+        if id is not None:
+            self.id = id
+        if is_limited is not None:
+            self.is_limited = is_limited
+        if last_updated_account_id is not None:
+            self.last_updated_account_id = last_updated_account_id
+        if last_updated_ms is not None:
+            self.last_updated_ms = last_updated_ms
+        if limit_pps is not None:
+            self.limit_pps = limit_pps
+        if name is not None:
+            self.name = name
+        if namespaces is not None:
+            self.namespaces = namespaces
+        if point_tags is not None:
+            self.point_tags = point_tags
+        if scope is not None:
+            self.scope = scope
+        if sources is not None:
+            self.sources = sources
+        if tags_anded is not None:
+            self.tags_anded = tags_anded
+
+    @property
+    def accounts(self):
+        """Gets the accounts of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The accounts associated with the ingestion policy  # noqa: E501
+
+        :return: The accounts of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._accounts
+
+    @accounts.setter
+    def accounts(self, accounts):
+        """Sets the accounts of this IngestionPolicyWriteModel.
+
+        The accounts associated with the ingestion policy  # noqa: E501
+
+        :param accounts: The accounts of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._accounts = accounts
+
+    @property
+    def alert_id(self):
+        """Gets the alert_id of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The ingestion policy alert Id  # noqa: E501
+
+        :return: The alert_id of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_id
+
+    @alert_id.setter
+    def alert_id(self, alert_id):
+        """Sets the alert_id of this IngestionPolicyWriteModel.
+
+        The ingestion policy alert Id  # noqa: E501
+
+        :param alert_id: The alert_id of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_id = alert_id
+
+    @property
+    def customer(self):
+        """Gets the customer of this IngestionPolicyWriteModel.  # noqa: E501
+
+        ID of the customer to which the ingestion policy belongs  # noqa: E501
+
+        :return: The customer of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._customer
+
+    @customer.setter
+    def customer(self, customer):
+        """Sets the customer of this IngestionPolicyWriteModel.
+
+        ID of the customer to which the ingestion policy belongs  # noqa: E501
+
+        :param customer: The customer of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._customer = customer
+
+    @property
+    def description(self):
+        """Gets the description of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The description of the ingestion policy  # noqa: E501
+
+        :return: The description of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this IngestionPolicyWriteModel.
+
+        The description of the ingestion policy  # noqa: E501
+
+        :param description: The description of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def groups(self):
+        """Gets the groups of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The groups associated with the ingestion policy  # noqa: E501
+
+        :return: The groups of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._groups
+
+    @groups.setter
+    def groups(self, groups):
+        """Sets the groups of this IngestionPolicyWriteModel.
+
+        The groups associated with the ingestion policy  # noqa: E501
+
+        :param groups: The groups of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._groups = groups
+
+    @property
+    def id(self):
+        """Gets the id of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The unique ID for the ingestion policy  # noqa: E501
+
+        :return: The id of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this IngestionPolicyWriteModel.
+
+        The unique ID for the ingestion policy  # noqa: E501
+
+        :param id: The id of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def is_limited(self):
+        """Gets the is_limited of this IngestionPolicyWriteModel.  # noqa: E501
+
+        Whether the ingestion policy is limited  # noqa: E501
+
+        :return: The is_limited of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_limited
+
+    @is_limited.setter
+    def is_limited(self, is_limited):
+        """Sets the is_limited of this IngestionPolicyWriteModel.
+
+        Whether the ingestion policy is limited  # noqa: E501
+
+        :param is_limited: The is_limited of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_limited = is_limited
+
+    @property
+    def last_updated_account_id(self):
+        """Gets the last_updated_account_id of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The account that updated this ingestion policy last time  # noqa: E501
+
+        :return: The last_updated_account_id of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_updated_account_id
+
+    @last_updated_account_id.setter
+    def last_updated_account_id(self, last_updated_account_id):
+        """Sets the last_updated_account_id of this IngestionPolicyWriteModel.
+
+        The account that updated this ingestion policy last time  # noqa: E501
+
+        :param last_updated_account_id: The last_updated_account_id of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._last_updated_account_id = last_updated_account_id
+
+    @property
+    def last_updated_ms(self):
+        """Gets the last_updated_ms of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
+
+        :return: The last_updated_ms of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_updated_ms
+
+    @last_updated_ms.setter
+    def last_updated_ms(self, last_updated_ms):
+        """Sets the last_updated_ms of this IngestionPolicyWriteModel.
+
+        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
+
+        :param last_updated_ms: The last_updated_ms of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: int
+        """
+
+        self._last_updated_ms = last_updated_ms
+
+    @property
+    def limit_pps(self):
+        """Gets the limit_pps of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The PPS limit of the ingestion policy  # noqa: E501
+
+        :return: The limit_pps of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit_pps
+
+    @limit_pps.setter
+    def limit_pps(self, limit_pps):
+        """Sets the limit_pps of this IngestionPolicyWriteModel.
+
+        The PPS limit of the ingestion policy  # noqa: E501
+
+        :param limit_pps: The limit_pps of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: int
+        """
+
+        self._limit_pps = limit_pps
+
+    @property
+    def name(self):
+        """Gets the name of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The name of the ingestion policy  # noqa: E501
+
+        :return: The name of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IngestionPolicyWriteModel.
+
+        The name of the ingestion policy  # noqa: E501
+
+        :param name: The name of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def namespaces(self):
+        """Gets the namespaces of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The namespaces associated with the ingestion policy  # noqa: E501
+
+        :return: The namespaces of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._namespaces
+
+    @namespaces.setter
+    def namespaces(self, namespaces):
+        """Sets the namespaces of this IngestionPolicyWriteModel.
+
+        The namespaces associated with the ingestion policy  # noqa: E501
+
+        :param namespaces: The namespaces of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._namespaces = namespaces
+
+    @property
+    def point_tags(self):
+        """Gets the point_tags of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The point tags associated with the ingestion policy  # noqa: E501
+
+        :return: The point_tags of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: list[Annotation]
+        """
+        return self._point_tags
+
+    @point_tags.setter
+    def point_tags(self, point_tags):
+        """Sets the point_tags of this IngestionPolicyWriteModel.
+
+        The point tags associated with the ingestion policy  # noqa: E501
+
+        :param point_tags: The point_tags of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: list[Annotation]
+        """
+
+        self._point_tags = point_tags
+
+    @property
+    def scope(self):
+        """Gets the scope of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The scope of the ingestion policy  # noqa: E501
+
+        :return: The scope of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this IngestionPolicyWriteModel.
+
+        The scope of the ingestion policy  # noqa: E501
+
+        :param scope: The scope of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["ACCOUNT", "GROUP", "NAMESPACE", "SOURCE", "TAGS"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                scope not in allowed_values):
+            raise ValueError(
+                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
+                .format(scope, allowed_values)
+            )
+
+        self._scope = scope
+
+    @property
+    def sources(self):
+        """Gets the sources of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The sources associated with the ingestion policy  # noqa: E501
+
+        :return: The sources of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._sources
+
+    @sources.setter
+    def sources(self, sources):
+        """Sets the sources of this IngestionPolicyWriteModel.
+
+        The sources associated with the ingestion policy  # noqa: E501
+
+        :param sources: The sources of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._sources = sources
+
+    @property
+    def tags_anded(self):
+        """Gets the tags_anded of this IngestionPolicyWriteModel.  # noqa: E501
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :return: The tags_anded of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._tags_anded
+
+    @tags_anded.setter
+    def tags_anded(self, tags_anded):
+        """Sets the tags_anded of this IngestionPolicyWriteModel.
+
+        Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false  # noqa: E501
+
+        :param tags_anded: The tags_anded of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._tags_anded = tags_anded
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IngestionPolicyWriteModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IngestionPolicyWriteModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, IngestionPolicyWriteModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index d42cc34..5edc5ce 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -51,6 +51,7 @@ class Integration(object):
         'name': 'str',
         'overview': 'str',
         'setup': 'str',
+        'setups': 'list[Setup]',
         'status': 'IntegrationStatus',
         'updated_epoch_millis': 'int',
         'updater_id': 'str',
@@ -76,13 +77,14 @@ class Integration(object):
         'name': 'name',
         'overview': 'overview',
         'setup': 'setup',
+        'setups': 'setups',
         'status': 'status',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId',
         'version': 'version'
     }
 
-    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, have_metric_dropdown=None, hidden=None, icon=None, id=None, metrics=None, metrics_docs=None, name=None, overview=None, setup=None, status=None, updated_epoch_millis=None, updater_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url=None, created_epoch_millis=None, creator_id=None, dashboards=None, deleted=None, description=None, have_metric_dropdown=None, hidden=None, icon=None, id=None, metrics=None, metrics_docs=None, name=None, overview=None, setup=None, setups=None, status=None, updated_epoch_millis=None, updater_id=None, version=None, _configuration=None):  # noqa: E501
         """Integration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -106,6 +108,7 @@ def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url
         self._name = None
         self._overview = None
         self._setup = None
+        self._setups = None
         self._status = None
         self._updated_epoch_millis = None
         self._updater_id = None
@@ -143,6 +146,8 @@ def __init__(self, alerts=None, alias_integrations=None, alias_of=None, base_url
             self.overview = overview
         if setup is not None:
             self.setup = setup
+        if setups is not None:
+            self.setups = setups
         if status is not None:
             self.status = status
         if updated_epoch_millis is not None:
@@ -565,6 +570,29 @@ def setup(self, setup):
 
         self._setup = setup
 
+    @property
+    def setups(self):
+        """Gets the setups of this Integration.  # noqa: E501
+
+        A list of setup belonging to this integration  # noqa: E501
+
+        :return: The setups of this Integration.  # noqa: E501
+        :rtype: list[Setup]
+        """
+        return self._setups
+
+    @setups.setter
+    def setups(self, setups):
+        """Sets the setups of this Integration.
+
+        A list of setup belonging to this integration  # noqa: E501
+
+        :param setups: The setups of this Integration.  # noqa: E501
+        :type: list[Setup]
+        """
+
+        self._setups = setups
+
     @property
     def status(self):
         """Gets the status of this Integration.  # noqa: E501
diff --git a/wavefront_api_client/models/paged_ingestion_policy_read_model.py b/wavefront_api_client/models/paged_ingestion_policy_read_model.py
new file mode 100644
index 0000000..cc67fda
--- /dev/null
+++ b/wavefront_api_client/models/paged_ingestion_policy_read_model.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedIngestionPolicyReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[IngestionPolicyReadModel]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedIngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedIngestionPolicyReadModel.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[IngestionPolicyReadModel]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedIngestionPolicyReadModel.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: list[IngestionPolicyReadModel]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The limit of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedIngestionPolicyReadModel.
+
+
+        :param limit: The limit of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedIngestionPolicyReadModel.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The offset of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedIngestionPolicyReadModel.
+
+
+        :param offset: The offset of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The sort of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedIngestionPolicyReadModel.
+
+
+        :param sort: The sort of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedIngestionPolicyReadModel.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedIngestionPolicyReadModel.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedIngestionPolicyReadModel.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedIngestionPolicyReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedIngestionPolicyReadModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedIngestionPolicyReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 879168b..3328e08 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -41,27 +41,31 @@ class Proxy(object):
         'deleted': 'bool',
         'ephemeral': 'bool',
         'events_rate_limit': 'float',
+        'histo_disabled': 'bool',
         'histogram_rate_limit': 'int',
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
         'last_known_error': 'str',
         'local_queue_size': 'int',
+        'logs_disabled': 'bool',
         'name': 'str',
         'preprocessor_rules': 'str',
         'shutdown': 'bool',
         'source_tags_rate_limit': 'float',
+        'span_logs_disabled': 'bool',
         'span_logs_rate_limit': 'int',
         'span_rate_limit': 'int',
         'ssh_agent': 'bool',
         'status': 'str',
         'status_cause': 'str',
         'time_drift': 'int',
+        'trace_disabled': 'bool',
         'truncate': 'bool',
         'user_id': 'str',
         'version': 'str'
@@ -76,6 +80,7 @@ class Proxy(object):
         'deleted': 'deleted',
         'ephemeral': 'ephemeral',
         'events_rate_limit': 'eventsRateLimit',
+        'histo_disabled': 'histoDisabled',
         'histogram_rate_limit': 'histogramRateLimit',
         'hostname': 'hostname',
         'id': 'id',
@@ -87,22 +92,25 @@ class Proxy(object):
         'last_error_time': 'lastErrorTime',
         'last_known_error': 'lastKnownError',
         'local_queue_size': 'localQueueSize',
+        'logs_disabled': 'logsDisabled',
         'name': 'name',
         'preprocessor_rules': 'preprocessorRules',
         'shutdown': 'shutdown',
         'source_tags_rate_limit': 'sourceTagsRateLimit',
+        'span_logs_disabled': 'spanLogsDisabled',
         'span_logs_rate_limit': 'spanLogsRateLimit',
         'span_rate_limit': 'spanRateLimit',
         'ssh_agent': 'sshAgent',
         'status': 'status',
         'status_cause': 'statusCause',
         'time_drift': 'timeDrift',
+        'trace_disabled': 'traceDisabled',
         'truncate': 'truncate',
         'user_id': 'userId',
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histo_disabled=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, logs_disabled=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_disabled=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, trace_disabled=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -116,6 +124,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._deleted = None
         self._ephemeral = None
         self._events_rate_limit = None
+        self._histo_disabled = None
         self._histogram_rate_limit = None
         self._hostname = None
         self._id = None
@@ -127,16 +136,19 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._last_error_time = None
         self._last_known_error = None
         self._local_queue_size = None
+        self._logs_disabled = None
         self._name = None
         self._preprocessor_rules = None
         self._shutdown = None
         self._source_tags_rate_limit = None
+        self._span_logs_disabled = None
         self._span_logs_rate_limit = None
         self._span_rate_limit = None
         self._ssh_agent = None
         self._status = None
         self._status_cause = None
         self._time_drift = None
+        self._trace_disabled = None
         self._truncate = None
         self._user_id = None
         self._version = None
@@ -158,6 +170,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.ephemeral = ephemeral
         if events_rate_limit is not None:
             self.events_rate_limit = events_rate_limit
+        if histo_disabled is not None:
+            self.histo_disabled = histo_disabled
         if histogram_rate_limit is not None:
             self.histogram_rate_limit = histogram_rate_limit
         if hostname is not None:
@@ -180,6 +194,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.last_known_error = last_known_error
         if local_queue_size is not None:
             self.local_queue_size = local_queue_size
+        if logs_disabled is not None:
+            self.logs_disabled = logs_disabled
         self.name = name
         if preprocessor_rules is not None:
             self.preprocessor_rules = preprocessor_rules
@@ -187,6 +203,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.shutdown = shutdown
         if source_tags_rate_limit is not None:
             self.source_tags_rate_limit = source_tags_rate_limit
+        if span_logs_disabled is not None:
+            self.span_logs_disabled = span_logs_disabled
         if span_logs_rate_limit is not None:
             self.span_logs_rate_limit = span_logs_rate_limit
         if span_rate_limit is not None:
@@ -199,6 +217,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.status_cause = status_cause
         if time_drift is not None:
             self.time_drift = time_drift
+        if trace_disabled is not None:
+            self.trace_disabled = trace_disabled
         if truncate is not None:
             self.truncate = truncate
         if user_id is not None:
@@ -386,6 +406,29 @@ def events_rate_limit(self, events_rate_limit):
 
         self._events_rate_limit = events_rate_limit
 
+    @property
+    def histo_disabled(self):
+        """Gets the histo_disabled of this Proxy.  # noqa: E501
+
+        Proxy's histogram feature disabled  # noqa: E501
+
+        :return: The histo_disabled of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._histo_disabled
+
+    @histo_disabled.setter
+    def histo_disabled(self, histo_disabled):
+        """Sets the histo_disabled of this Proxy.
+
+        Proxy's histogram feature disabled  # noqa: E501
+
+        :param histo_disabled: The histo_disabled of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._histo_disabled = histo_disabled
+
     @property
     def histogram_rate_limit(self):
         """Gets the histogram_rate_limit of this Proxy.  # noqa: E501
@@ -481,7 +524,7 @@ def ingestion_policies(self):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :return: The ingestion_policies of this Proxy.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -492,7 +535,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -504,7 +547,7 @@ def ingestion_policy(self):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :return: The ingestion_policy of this Proxy.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -515,7 +558,7 @@ def ingestion_policy(self, ingestion_policy):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
@@ -633,6 +676,29 @@ def local_queue_size(self, local_queue_size):
 
         self._local_queue_size = local_queue_size
 
+    @property
+    def logs_disabled(self):
+        """Gets the logs_disabled of this Proxy.  # noqa: E501
+
+        Proxy's logs feature disabled for customer  # noqa: E501
+
+        :return: The logs_disabled of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._logs_disabled
+
+    @logs_disabled.setter
+    def logs_disabled(self, logs_disabled):
+        """Sets the logs_disabled of this Proxy.
+
+        Proxy's logs feature disabled for customer  # noqa: E501
+
+        :param logs_disabled: The logs_disabled of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._logs_disabled = logs_disabled
+
     @property
     def name(self):
         """Gets the name of this Proxy.  # noqa: E501
@@ -727,6 +793,29 @@ def source_tags_rate_limit(self, source_tags_rate_limit):
 
         self._source_tags_rate_limit = source_tags_rate_limit
 
+    @property
+    def span_logs_disabled(self):
+        """Gets the span_logs_disabled of this Proxy.  # noqa: E501
+
+        Proxy's span logs feature disabled  # noqa: E501
+
+        :return: The span_logs_disabled of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._span_logs_disabled
+
+    @span_logs_disabled.setter
+    def span_logs_disabled(self, span_logs_disabled):
+        """Sets the span_logs_disabled of this Proxy.
+
+        Proxy's span logs feature disabled  # noqa: E501
+
+        :param span_logs_disabled: The span_logs_disabled of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._span_logs_disabled = span_logs_disabled
+
     @property
     def span_logs_rate_limit(self):
         """Gets the span_logs_rate_limit of this Proxy.  # noqa: E501
@@ -872,6 +961,29 @@ def time_drift(self, time_drift):
 
         self._time_drift = time_drift
 
+    @property
+    def trace_disabled(self):
+        """Gets the trace_disabled of this Proxy.  # noqa: E501
+
+        Proxy's spans feature disabled  # noqa: E501
+
+        :return: The trace_disabled of this Proxy.  # noqa: E501
+        :rtype: bool
+        """
+        return self._trace_disabled
+
+    @trace_disabled.setter
+    def trace_disabled(self, trace_disabled):
+        """Sets the trace_disabled of this Proxy.
+
+        Proxy's spans feature disabled  # noqa: E501
+
+        :param trace_disabled: The trace_disabled of this Proxy.  # noqa: E501
+        :type: bool
+        """
+
+        self._trace_disabled = trace_disabled
+
     @property
     def truncate(self):
         """Gets the truncate of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
new file mode 100644
index 0000000..3574a7d
--- /dev/null
+++ b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerIngestionPolicyReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'IngestionPolicyReadModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerIngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+        :rtype: IngestionPolicyReadModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerIngestionPolicyReadModel.
+
+
+        :param response: The response of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+        :type: IngestionPolicyReadModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerIngestionPolicyReadModel.
+
+
+        :param status: The status of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerIngestionPolicyReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerIngestionPolicyReadModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerIngestionPolicyReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
new file mode 100644
index 0000000..9dd578b
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedIngestionPolicyReadModel(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedIngestionPolicyReadModel',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedIngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: PagedIngestionPolicyReadModel
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedIngestionPolicyReadModel.
+
+
+        :param response: The response of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+        :type: PagedIngestionPolicyReadModel
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedIngestionPolicyReadModel.
+
+
+        :param status: The status of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedIngestionPolicyReadModel, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedIngestionPolicyReadModel):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedIngestionPolicyReadModel):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 039afdf..e88a116 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index a891110..be30c7a 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,8 +37,8 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
@@ -208,7 +208,7 @@ def ingestion_policies(self):
         The list of service account's ingestion policies.  # noqa: E501
 
         :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -219,7 +219,7 @@ def ingestion_policies(self, ingestion_policies):
         The list of service account's ingestion policies.  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -231,7 +231,7 @@ def ingestion_policy(self):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -242,7 +242,7 @@ def ingestion_policy(self, ingestion_policy):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/setup.py b/wavefront_api_client/models/setup.py
new file mode 100644
index 0000000..fea95c8
--- /dev/null
+++ b/wavefront_api_client/models/setup.py
@@ -0,0 +1,219 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class Setup(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'file_path': 'str',
+        'title': 'str',
+        'type': 'str'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'file_path': 'filePath',
+        'title': 'title',
+        'type': 'type'
+    }
+
+    def __init__(self, description=None, file_path=None, title=None, type=None, _configuration=None):  # noqa: E501
+        """Setup - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._description = None
+        self._file_path = None
+        self._title = None
+        self._type = None
+        self.discriminator = None
+
+        self.description = description
+        self.file_path = file_path
+        if title is not None:
+            self.title = title
+        self.type = type
+
+    @property
+    def description(self):
+        """Gets the description of this Setup.  # noqa: E501
+
+        Setup description  # noqa: E501
+
+        :return: The description of this Setup.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Setup.
+
+        Setup description  # noqa: E501
+
+        :param description: The description of this Setup.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and description is None:
+            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
+
+        self._description = description
+
+    @property
+    def file_path(self):
+        """Gets the file_path of this Setup.  # noqa: E501
+
+        Relative file path to the setup.md file  # noqa: E501
+
+        :return: The file_path of this Setup.  # noqa: E501
+        :rtype: str
+        """
+        return self._file_path
+
+    @file_path.setter
+    def file_path(self, file_path):
+        """Sets the file_path of this Setup.
+
+        Relative file path to the setup.md file  # noqa: E501
+
+        :param file_path: The file_path of this Setup.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and file_path is None:
+            raise ValueError("Invalid value for `file_path`, must not be `None`")  # noqa: E501
+
+        self._file_path = file_path
+
+    @property
+    def title(self):
+        """Gets the title of this Setup.  # noqa: E501
+
+        Setup title  # noqa: E501
+
+        :return: The title of this Setup.  # noqa: E501
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this Setup.
+
+        Setup title  # noqa: E501
+
+        :param title: The title of this Setup.  # noqa: E501
+        :type: str
+        """
+
+        self._title = title
+
+    @property
+    def type(self):
+        """Gets the type of this Setup.  # noqa: E501
+
+        Setup Type  # noqa: E501
+
+        :return: The type of this Setup.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this Setup.
+
+        Setup Type  # noqa: E501
+
+        :param type: The type of this Setup.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and type is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
+        allowed_values = ["METRICS", "LOGS"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(Setup, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Setup):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, Setup):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 8d8b2a0..ec8ebd2 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,8 +36,8 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -161,7 +161,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserDTO.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -171,7 +171,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -182,7 +182,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserDTO.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -192,7 +192,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index d9fe7b4..7c450cf 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,7 +37,7 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -198,7 +198,7 @@ def ingestion_policies(self):
         Ingestion policies linked with the user group  # noqa: E501
 
         :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -209,7 +209,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies linked with the user group  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 38f0017..bb179ad 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,8 +36,8 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -169,7 +169,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserModel.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -179,7 +179,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -190,7 +190,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserModel.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -200,7 +200,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy

From e4c385a3f8fbd7bd64da5f45595786b936d094a4 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 20 Oct 2022 08:17:05 -0700
Subject: [PATCH 116/161] Autogenerated Update v2.156.1.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  16 +-
 docs/AccountUserAndServiceAccountApi.md       | 110 ++++++++++
 docs/Annotation.md                            |   2 -
 docs/Proxy.md                                 |   5 +-
 docs/SearchApi.md                             |   4 +-
 docs/ServiceAccount.md                        |   4 +-
 docs/UsageApi.md                              | 119 +++--------
 docs/UserDTO.md                               |   4 +-
 docs/UserGroupModel.md                        |   2 +-
 docs/UserModel.md                             |   4 +-
 setup.py                                      |   2 +-
 wavefront_api_client/__init__.py              |  11 +-
 .../account__user_and_service_account_api.py  | 190 +++++++++++++++++
 wavefront_api_client/api/search_api.py        |   6 +-
 wavefront_api_client/api/usage_api.py         | 201 +++---------------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  11 +-
 wavefront_api_client/models/annotation.py     |  56 +----
 wavefront_api_client/models/proxy.py          |  42 +++-
 ...esponse_container_set_business_function.py |   2 +-
 .../models/service_account.py                 |  12 +-
 wavefront_api_client/models/user_dto.py       |  12 +-
 .../models/user_group_model.py                |   6 +-
 wavefront_api_client/models/user_model.py     |  12 +-
 27 files changed, 457 insertions(+), 384 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index fb05462..2539b4e 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.154.3"
+    "packageVersion": "2.156.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 94df5f8..fb05462 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.153.1"
+    "packageVersion": "2.154.3"
 }
diff --git a/README.md b/README.md
index 94225c2..8fa8927 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.154.3
+- Package version: 2.156.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -81,6 +81,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -98,6 +99,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -426,7 +428,6 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
-*UsageApi* | [**get_ingestion_policy_history**](docs/UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 *UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 *UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
@@ -520,10 +521,8 @@ Class | Method | HTTP request | Description
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
+ - [IngestionPolicy](docs/IngestionPolicy.md)
  - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
- - [IngestionPolicyMetadata](docs/IngestionPolicyMetadata.md)
- - [IngestionPolicyReadModel](docs/IngestionPolicyReadModel.md)
- - [IngestionPolicyWriteModel](docs/IngestionPolicyWriteModel.md)
  - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
  - [IntegrationAlert](docs/IntegrationAlert.md)
@@ -567,7 +566,7 @@ Class | Method | HTTP request | Description
  - [PagedDerivedMetricDefinitionWithStats](docs/PagedDerivedMetricDefinitionWithStats.md)
  - [PagedEvent](docs/PagedEvent.md)
  - [PagedExternalLink](docs/PagedExternalLink.md)
- - [PagedIngestionPolicyReadModel](docs/PagedIngestionPolicyReadModel.md)
+ - [PagedIngestionPolicy](docs/PagedIngestionPolicy.md)
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
@@ -621,7 +620,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerFacetResponse](docs/ResponseContainerFacetResponse.md)
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
- - [ResponseContainerIngestionPolicyReadModel](docs/ResponseContainerIngestionPolicyReadModel.md)
+ - [ResponseContainerIngestionPolicy](docs/ResponseContainerIngestionPolicy.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
@@ -653,7 +652,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedDerivedMetricDefinitionWithStats](docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md)
  - [ResponseContainerPagedEvent](docs/ResponseContainerPagedEvent.md)
  - [ResponseContainerPagedExternalLink](docs/ResponseContainerPagedExternalLink.md)
- - [ResponseContainerPagedIngestionPolicyReadModel](docs/ResponseContainerPagedIngestionPolicyReadModel.md)
+ - [ResponseContainerPagedIngestionPolicy](docs/ResponseContainerPagedIngestionPolicy.md)
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
@@ -694,6 +693,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
+ - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index 8ca24b8..4de9bdf 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -7,6 +7,7 @@ Method | HTTP request | Description
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
+[**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -24,6 +25,7 @@ Method | HTTP request | Description
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
+[**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -197,6 +199,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **add_ingestion_policy**
+> ResponseContainer add_ingestion_policy(body=body)
+
+Add a specific ingestion policy to multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
+
+try:
+    # Add a specific ingestion policy to multiple accounts
+    api_response = api_instance.add_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->add_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -1119,6 +1175,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_ingestion_policies**
+> ResponseContainer remove_ingestion_policies(body=body)
+
+Removes ingestion policies from multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of accounts from which ingestion policies should be removed (optional)
+
+try:
+    # Removes ingestion policies from multiple accounts
+    api_response = api_instance.remove_ingestion_policies(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->remove_ingestion_policies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**| identifiers of list of accounts from which ingestion policies should be removed | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 2c95d90..43cbe80 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -16,8 +16,8 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | Ingestion policy associated with the proxy | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
@@ -26,6 +26,7 @@ Name | Type | Description | Notes
 **logs_disabled** | **bool** | Proxy&#39;s logs feature disabled for customer | [optional] 
 **name** | **str** | Proxy name (modifiable) | 
 **preprocessor_rules** | **str** | Proxy&#39;s preprocessor rules | [optional] 
+**proxyname** | **str** | Proxy name set by customer | [optional] 
 **shutdown** | **bool** | When true, attempt to shut down this proxy remotely | [optional] 
 **source_tags_rate_limit** | **float** | Proxy&#39;s rate limit for source tag operations | [optional] 
 **span_logs_disabled** | **bool** | Proxy&#39;s span logs feature disabled | [optional] 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 1d575e3..02994b8 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -1408,7 +1408,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **search_ingestion_policy_entities**
-> ResponseContainerPagedIngestionPolicyReadModel search_ingestion_policy_entities(body=body)
+> ResponseContainerPagedIngestionPolicy search_ingestion_policy_entities(body=body)
 
 Search over a customer's ingestion policies
 
@@ -1448,7 +1448,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
+[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
 
 ### Authorization
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index ae0f7ca..a38980f 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | The list of service account&#39;s ingestion policies. | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | The ingestion policy object linked with service account. | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | The list of service account&#39;s ingestion policies. | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 771f485..42a07fb 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -11,14 +11,13 @@ Method | HTTP request | Description
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
-[**get_ingestion_policy_history**](UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 [**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 [**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
 # **add_accounts**
-> ResponseContainerIngestionPolicyReadModel add_accounts(id, body=body)
+> ResponseContainerIngestionPolicy add_accounts(id, body=body)
 
 Add accounts to ingestion policy
 
@@ -60,7 +59,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -68,13 +67,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **add_groups**
-> ResponseContainerIngestionPolicyReadModel add_groups(id, body=body)
+> ResponseContainerIngestionPolicy add_groups(id, body=body)
 
 Add groups to the ingestion policy
 
@@ -116,7 +115,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -124,13 +123,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel create_ingestion_policy(body=body)
+> ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
 
 Create a specific ingestion policy
 
@@ -152,7 +151,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -166,11 +165,11 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -184,7 +183,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel delete_ingestion_policy(id)
+> ResponseContainerIngestionPolicy delete_ingestion_policy(id)
 
 Delete a specific ingestion policy
 
@@ -224,7 +223,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -232,7 +231,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -287,13 +286,13 @@ void (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/csv
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_ingestion_policies**
-> ResponseContainerPagedIngestionPolicyReadModel get_all_ingestion_policies(offset=offset, limit=limit)
+> ResponseContainerPagedIngestionPolicy get_all_ingestion_policies(offset=offset, limit=limit)
 
 Get all ingestion policies for a customer
 
@@ -335,7 +334,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
+[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
 
 ### Authorization
 
@@ -343,13 +342,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel get_ingestion_policy(id)
+> ResponseContainerIngestionPolicy get_ingestion_policy(id)
 
 Get a specific ingestion policy
 
@@ -389,7 +388,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -397,71 +396,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_ingestion_policy_history**
-> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
-
-Get the version history of ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
-
-try:
-    # Get the version history of ingestion policy
-    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
-
-### Return type
-
-[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_accounts**
-> ResponseContainerIngestionPolicyReadModel remove_accounts(id, body=body)
+> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
 
 Remove accounts from ingestion policy
 
@@ -503,7 +444,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -511,13 +452,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_groups**
-> ResponseContainerIngestionPolicyReadModel remove_groups(id, body=body)
+> ResponseContainerIngestionPolicy remove_groups(id, body=body)
 
 Remove groups from the ingestion policy
 
@@ -559,7 +500,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -567,13 +508,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel update_ingestion_policy(id, body=body)
+> ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
 
 Update a specific ingestion policy
 
@@ -596,7 +537,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -611,11 +552,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index b3d3f50..d4ceba2 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 4bdd203..2c61529 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies linked with the user group | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 8af6c9c..657200c 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index e4fe7e7..9e55923 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.154.3"
+VERSION = "2.156.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 6bd0180..913c83f 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -114,10 +114,8 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
-from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
-from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
-from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -161,7 +159,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -215,7 +213,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -247,7 +245,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -288,6 +286,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 6424c0f..6f745a9 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -338,6 +338,101 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def add_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Add a specific ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Add a specific ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/addingestionpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -1981,6 +2076,101 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_ingestion_policies(self, **kwargs):  # noqa: E501
+        """Removes ingestion policies from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policies(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes ingestion policies from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policies_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_ingestion_policies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/removeingestionpolicies', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index ea93637..b29e022 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2388,7 +2388,7 @@ def search_ingestion_policy_entities(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2410,7 +2410,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2464,7 +2464,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 20dc03f..7c353f8 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -45,7 +45,7 @@ def add_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -68,7 +68,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -113,10 +113,6 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -128,7 +124,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -148,7 +144,7 @@ def add_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -171,7 +167,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -216,10 +212,6 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -231,7 +223,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -249,8 +241,8 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -271,8 +263,8 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -326,7 +318,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -345,7 +337,7 @@ def delete_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -367,7 +359,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -410,10 +402,6 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -425,7 +413,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -513,10 +501,6 @@ def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/csv'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -548,7 +532,7 @@ def get_all_ingestion_policies(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -571,7 +555,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -612,10 +596,6 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -627,7 +607,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -646,7 +626,7 @@ def get_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -668,7 +648,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -711,10 +691,6 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -726,114 +702,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
-        """Get the version history of ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get the version history of ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_ingestion_policy_history" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -853,7 +722,7 @@ def remove_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -876,7 +745,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -921,10 +790,6 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -936,7 +801,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -956,7 +821,7 @@ def remove_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -979,7 +844,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1024,10 +889,6 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -1039,7 +900,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1058,8 +919,8 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1081,8 +942,8 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1142,7 +1003,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 408f7e1..30fa936 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.154.3/python'
+        self.user_agent = 'Swagger-Codegen/2.156.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index aa1fbf8..87afb30 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.154.3".\
+               "SDK Package Version: 2.156.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 489e7ea..5fb2ee0 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -72,10 +72,8 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
-from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
-from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
-from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -119,7 +117,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -173,7 +171,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -205,7 +203,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -246,6 +244,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 59589d5..7d5867a 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -33,72 +33,18 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None, _configuration=None):  # noqa: E501
+    def __init__(self, _configuration=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 3328e08..246111d 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -46,8 +46,8 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
@@ -56,6 +56,7 @@ class Proxy(object):
         'logs_disabled': 'bool',
         'name': 'str',
         'preprocessor_rules': 'str',
+        'proxyname': 'str',
         'shutdown': 'bool',
         'source_tags_rate_limit': 'float',
         'span_logs_disabled': 'bool',
@@ -95,6 +96,7 @@ class Proxy(object):
         'logs_disabled': 'logsDisabled',
         'name': 'name',
         'preprocessor_rules': 'preprocessorRules',
+        'proxyname': 'proxyname',
         'shutdown': 'shutdown',
         'source_tags_rate_limit': 'sourceTagsRateLimit',
         'span_logs_disabled': 'spanLogsDisabled',
@@ -110,7 +112,7 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histo_disabled=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, logs_disabled=None, name=None, preprocessor_rules=None, shutdown=None, source_tags_rate_limit=None, span_logs_disabled=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, trace_disabled=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histo_disabled=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, logs_disabled=None, name=None, preprocessor_rules=None, proxyname=None, shutdown=None, source_tags_rate_limit=None, span_logs_disabled=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, trace_disabled=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -139,6 +141,7 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._logs_disabled = None
         self._name = None
         self._preprocessor_rules = None
+        self._proxyname = None
         self._shutdown = None
         self._source_tags_rate_limit = None
         self._span_logs_disabled = None
@@ -199,6 +202,8 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self.name = name
         if preprocessor_rules is not None:
             self.preprocessor_rules = preprocessor_rules
+        if proxyname is not None:
+            self.proxyname = proxyname
         if shutdown is not None:
             self.shutdown = shutdown
         if source_tags_rate_limit is not None:
@@ -524,7 +529,7 @@ def ingestion_policies(self):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :return: The ingestion_policies of this Proxy.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -535,7 +540,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -547,7 +552,7 @@ def ingestion_policy(self):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :return: The ingestion_policy of this Proxy.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -558,7 +563,7 @@ def ingestion_policy(self, ingestion_policy):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy
@@ -747,6 +752,29 @@ def preprocessor_rules(self, preprocessor_rules):
 
         self._preprocessor_rules = preprocessor_rules
 
+    @property
+    def proxyname(self):
+        """Gets the proxyname of this Proxy.  # noqa: E501
+
+        Proxy name set by customer  # noqa: E501
+
+        :return: The proxyname of this Proxy.  # noqa: E501
+        :rtype: str
+        """
+        return self._proxyname
+
+    @proxyname.setter
+    def proxyname(self, proxyname):
+        """Sets the proxyname of this Proxy.
+
+        Proxy name set by customer  # noqa: E501
+
+        :param proxyname: The proxyname of this Proxy.  # noqa: E501
+        :type: str
+        """
+
+        self._proxyname = proxyname
+
     @property
     def shutdown(self):
         """Gets the shutdown of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index e88a116..039afdf 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index be30c7a..a891110 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,8 +37,8 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
@@ -208,7 +208,7 @@ def ingestion_policies(self):
         The list of service account's ingestion policies.  # noqa: E501
 
         :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -219,7 +219,7 @@ def ingestion_policies(self, ingestion_policies):
         The list of service account's ingestion policies.  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -231,7 +231,7 @@ def ingestion_policy(self):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -242,7 +242,7 @@ def ingestion_policy(self, ingestion_policy):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index ec8ebd2..8d8b2a0 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,8 +36,8 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -161,7 +161,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserDTO.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -171,7 +171,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -182,7 +182,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserDTO.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -192,7 +192,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 7c450cf..d9fe7b4 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,7 +37,7 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -198,7 +198,7 @@ def ingestion_policies(self):
         Ingestion policies linked with the user group  # noqa: E501
 
         :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -209,7 +209,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies linked with the user group  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index bb179ad..38f0017 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,8 +36,8 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -169,7 +169,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserModel.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -179,7 +179,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -190,7 +190,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserModel.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -200,7 +200,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy

From 4736ce2b373048325df108190f61110993ab08bb Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 1 Nov 2022 08:16:31 -0700
Subject: [PATCH 117/161] Autogenerated Update v2.158.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/AccountUserAndServiceAccountApi.md       |   4 +-
 docs/ResponseContainerListUserDTO.md          |  11 ++
 setup.py                                      |   2 +-
 test/test_response_container_list_user_dto.py |  40 +++++
 wavefront_api_client/__init__.py              |   1 +
 .../account__user_and_service_account_api.py  |   6 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 +
 .../response_container_list_user_dto.py       | 150 ++++++++++++++++++
 13 files changed, 215 insertions(+), 11 deletions(-)
 create mode 100644 docs/ResponseContainerListUserDTO.md
 create mode 100644 test/test_response_container_list_user_dto.py
 create mode 100644 wavefront_api_client/models/response_container_list_user_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 2539b4e..ae23648 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.156.1"
+    "packageVersion": "2.158.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index fb05462..2539b4e 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.154.3"
+    "packageVersion": "2.156.1"
 }
diff --git a/README.md b/README.md
index 8fa8927..3c81203 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.156.1
+- Package version: 2.158.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -631,6 +631,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerListServiceAccount](docs/ResponseContainerListServiceAccount.md)
  - [ResponseContainerListString](docs/ResponseContainerListString.md)
  - [ResponseContainerListUserApiToken](docs/ResponseContainerListUserApiToken.md)
+ - [ResponseContainerListUserDTO](docs/ResponseContainerListUserDTO.md)
  - [ResponseContainerMaintenanceWindow](docs/ResponseContainerMaintenanceWindow.md)
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index 4de9bdf..c0035f3 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -740,7 +740,7 @@ This endpoint does not need any parameter.
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_user_accounts**
-> list[UserModel] get_all_user_accounts()
+> ResponseContainerListUserDTO get_all_user_accounts()
 
 Get all user accounts
 
@@ -776,7 +776,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**list[UserModel]**](UserModel.md)
+[**ResponseContainerListUserDTO**](ResponseContainerListUserDTO.md)
 
 ### Authorization
 
diff --git a/docs/ResponseContainerListUserDTO.md b/docs/ResponseContainerListUserDTO.md
new file mode 100644
index 0000000..1f73496
--- /dev/null
+++ b/docs/ResponseContainerListUserDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerListUserDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[UserDTO]**](UserDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 9e55923..0700eeb 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.156.1"
+VERSION = "2.158.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_response_container_list_user_dto.py b/test/test_response_container_list_user_dto.py
new file mode 100644
index 0000000..1f85dc0
--- /dev/null
+++ b/test/test_response_container_list_user_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_user_dto import ResponseContainerListUserDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListUserDTO(unittest.TestCase):
+    """ResponseContainerListUserDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListUserDTO(self):
+        """Test ResponseContainerListUserDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_user_dto.ResponseContainerListUserDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 913c83f..727eaf2 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -224,6 +224,7 @@
 from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
+from wavefront_api_client.models.response_container_list_user_dto import ResponseContainerListUserDTO
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 6f745a9..8e7384c 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -1298,7 +1298,7 @@ def get_all_user_accounts(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :return: list[UserModel]
+        :return: ResponseContainerListUserDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1319,7 +1319,7 @@ def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :return: list[UserModel]
+        :return: ResponseContainerListUserDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1367,7 +1367,7 @@ def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='list[UserModel]',  # noqa: E501
+            response_type='ResponseContainerListUserDTO',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 30fa936..83c0bd6 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.156.1/python'
+        self.user_agent = 'Swagger-Codegen/2.158.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 87afb30..f1c958d 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.156.1".\
+               "SDK Package Version: 2.158.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 5fb2ee0..5cf2de1 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -182,6 +182,7 @@
 from wavefront_api_client.models.response_container_list_service_account import ResponseContainerListServiceAccount
 from wavefront_api_client.models.response_container_list_string import ResponseContainerListString
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
+from wavefront_api_client.models.response_container_list_user_dto import ResponseContainerListUserDTO
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
diff --git a/wavefront_api_client/models/response_container_list_user_dto.py b/wavefront_api_client/models/response_container_list_user_dto.py
new file mode 100644
index 0000000..74979fc
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_user_dto.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerListUserDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[UserDTO]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerListUserDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListUserDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListUserDTO.  # noqa: E501
+        :rtype: list[UserDTO]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListUserDTO.
+
+
+        :param response: The response of this ResponseContainerListUserDTO.  # noqa: E501
+        :type: list[UserDTO]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListUserDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListUserDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListUserDTO.
+
+
+        :param status: The status of this ResponseContainerListUserDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListUserDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListUserDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerListUserDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()

From d91b6bf9a0dc7c71efc395c50b908798c194cab1 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 8 Nov 2022 08:16:24 -0800
Subject: [PATCH 118/161] Autogenerated Update v2.159.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  16 +-
 docs/AccountUserAndServiceAccountApi.md       | 110 ----------
 docs/Annotation.md                            |   2 +
 docs/CloudWatchConfiguration.md               |   1 +
 docs/Proxy.md                                 |   4 +-
 docs/SearchApi.md                             |   4 +-
 docs/ServiceAccount.md                        |   4 +-
 docs/UsageApi.md                              | 119 ++++++++---
 docs/UserDTO.md                               |   4 +-
 docs/UserGroupModel.md                        |   2 +-
 docs/UserModel.md                             |   4 +-
 setup.py                                      |   2 +-
 wavefront_api_client/__init__.py              |  11 +-
 .../account__user_and_service_account_api.py  | 190 -----------------
 wavefront_api_client/api/search_api.py        |   6 +-
 wavefront_api_client/api/usage_api.py         | 201 +++++++++++++++---
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  11 +-
 wavefront_api_client/models/annotation.py     |  56 ++++-
 .../models/cloud_watch_configuration.py       |  30 ++-
 wavefront_api_client/models/proxy.py          |  12 +-
 ...esponse_container_set_business_function.py |   2 +-
 .../models/service_account.py                 |  12 +-
 wavefront_api_client/models/user_dto.py       |  12 +-
 .../models/user_group_model.py                |   6 +-
 wavefront_api_client/models/user_model.py     |  12 +-
 29 files changed, 413 insertions(+), 428 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ae23648..6c6868d 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.158.0"
+    "packageVersion": "2.159.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 2539b4e..ae23648 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.156.1"
+    "packageVersion": "2.158.0"
 }
diff --git a/README.md b/README.md
index 3c81203..15ac9ba 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.158.0
+- Package version: 2.159.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -81,7 +81,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -99,7 +98,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -428,6 +426,7 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**get_ingestion_policy_history**](docs/UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 *UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 *UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
@@ -521,8 +520,10 @@ Class | Method | HTTP request | Description
  - [GCPConfiguration](docs/GCPConfiguration.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
- - [IngestionPolicy](docs/IngestionPolicy.md)
  - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
+ - [IngestionPolicyMetadata](docs/IngestionPolicyMetadata.md)
+ - [IngestionPolicyReadModel](docs/IngestionPolicyReadModel.md)
+ - [IngestionPolicyWriteModel](docs/IngestionPolicyWriteModel.md)
  - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
  - [IntegrationAlert](docs/IntegrationAlert.md)
@@ -566,7 +567,7 @@ Class | Method | HTTP request | Description
  - [PagedDerivedMetricDefinitionWithStats](docs/PagedDerivedMetricDefinitionWithStats.md)
  - [PagedEvent](docs/PagedEvent.md)
  - [PagedExternalLink](docs/PagedExternalLink.md)
- - [PagedIngestionPolicy](docs/PagedIngestionPolicy.md)
+ - [PagedIngestionPolicyReadModel](docs/PagedIngestionPolicyReadModel.md)
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
@@ -620,7 +621,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerFacetResponse](docs/ResponseContainerFacetResponse.md)
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
- - [ResponseContainerIngestionPolicy](docs/ResponseContainerIngestionPolicy.md)
+ - [ResponseContainerIngestionPolicyReadModel](docs/ResponseContainerIngestionPolicyReadModel.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
@@ -653,7 +654,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedDerivedMetricDefinitionWithStats](docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md)
  - [ResponseContainerPagedEvent](docs/ResponseContainerPagedEvent.md)
  - [ResponseContainerPagedExternalLink](docs/ResponseContainerPagedExternalLink.md)
- - [ResponseContainerPagedIngestionPolicy](docs/ResponseContainerPagedIngestionPolicy.md)
+ - [ResponseContainerPagedIngestionPolicyReadModel](docs/ResponseContainerPagedIngestionPolicyReadModel.md)
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
@@ -694,7 +695,6 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
- - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index c0035f3..ccf2f20 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -7,7 +7,6 @@ Method | HTTP request | Description
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
-[**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -25,7 +24,6 @@ Method | HTTP request | Description
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
-[**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -199,60 +197,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **add_ingestion_policy**
-> ResponseContainer add_ingestion_policy(body=body)
-
-Add a specific ingestion policy to multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Add a specific ingestion policy to multiple accounts
-    api_response = api_instance.add_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->add_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -1175,60 +1119,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_ingestion_policies**
-> ResponseContainer remove_ingestion_policies(body=body)
-
-Removes ingestion policies from multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of accounts from which ingestion policies should be removed (optional)
-
-try:
-    # Removes ingestion policies from multiple accounts
-    api_response = api_instance.remove_ingestion_policies(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->remove_ingestion_policies: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **list[str]**| identifiers of list of accounts from which ingestion policies should be removed | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudWatchConfiguration.md b/docs/CloudWatchConfiguration.md
index 06e071c..916b435 100644
--- a/docs/CloudWatchConfiguration.md
+++ b/docs/CloudWatchConfiguration.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **metric_filter_regex** | **str** | A regular expression that a CloudWatch metric name must match (case-insensitively) in order to be ingested | [optional] 
 **namespaces** | **list[str]** | A list of namespace that limit what we query from CloudWatch. | [optional] 
 **point_tag_filter_regex** | **str** | A regular expression that AWS tag key name must match (case-insensitively) in order to be ingested | [optional] 
+**s3_bucket_name_filter_regex** | **str** | A regular expression that a AWS S3 Bucket name must match (case-insensitively) in order to be ingested | [optional] 
 **thread_distribution_in_mins** | **int** | ThreadDistributionInMins | [optional] 
 **volume_selection_tags** | **dict(str, str)** | A string-&gt;string map of allow list of AWS volume tag-value pairs (in AWS).  If the volume&#39;s AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed | [optional] 
 **volume_selection_tags_expr** | **str** | A string expressing the allow list of AWS volume tag-value pairs.  If the volume&#39;s AWS tags match this allow list, CloudWatch data about this volume is ingested.  Multiple entries are OR&#39;ed and also OR&#39;ed with entries from volumeSelectionTags.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 43cbe80..4adad15 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -16,8 +16,8 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 02994b8..1d575e3 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -1408,7 +1408,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **search_ingestion_policy_entities**
-> ResponseContainerPagedIngestionPolicy search_ingestion_policy_entities(body=body)
+> ResponseContainerPagedIngestionPolicyReadModel search_ingestion_policy_entities(body=body)
 
 Search over a customer's ingestion policies
 
@@ -1448,7 +1448,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
 
 ### Authorization
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index a38980f..ae0f7ca 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | The list of service account&#39;s ingestion policies. | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | The list of service account&#39;s ingestion policies. | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 42a07fb..771f485 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -11,13 +11,14 @@ Method | HTTP request | Description
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**get_ingestion_policy_history**](UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 [**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 [**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
 # **add_accounts**
-> ResponseContainerIngestionPolicy add_accounts(id, body=body)
+> ResponseContainerIngestionPolicyReadModel add_accounts(id, body=body)
 
 Add accounts to ingestion policy
 
@@ -59,7 +60,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -67,13 +68,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **add_groups**
-> ResponseContainerIngestionPolicy add_groups(id, body=body)
+> ResponseContainerIngestionPolicyReadModel add_groups(id, body=body)
 
 Add groups to the ingestion policy
 
@@ -115,7 +116,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -123,13 +124,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_ingestion_policy**
-> ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
+> ResponseContainerIngestionPolicyReadModel create_ingestion_policy(body=body)
 
 Create a specific ingestion policy
 
@@ -151,7 +152,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -165,11 +166,11 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -183,7 +184,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_ingestion_policy**
-> ResponseContainerIngestionPolicy delete_ingestion_policy(id)
+> ResponseContainerIngestionPolicyReadModel delete_ingestion_policy(id)
 
 Delete a specific ingestion policy
 
@@ -223,7 +224,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -231,7 +232,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -286,13 +287,13 @@ void (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/csv
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_ingestion_policies**
-> ResponseContainerPagedIngestionPolicy get_all_ingestion_policies(offset=offset, limit=limit)
+> ResponseContainerPagedIngestionPolicyReadModel get_all_ingestion_policies(offset=offset, limit=limit)
 
 Get all ingestion policies for a customer
 
@@ -334,7 +335,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -342,13 +343,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_ingestion_policy**
-> ResponseContainerIngestionPolicy get_ingestion_policy(id)
+> ResponseContainerIngestionPolicyReadModel get_ingestion_policy(id)
 
 Get a specific ingestion policy
 
@@ -388,7 +389,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -396,13 +397,71 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_ingestion_policy_history**
+> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
+
+Get the version history of ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of ingestion policy
+    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_accounts**
-> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
+> ResponseContainerIngestionPolicyReadModel remove_accounts(id, body=body)
 
 Remove accounts from ingestion policy
 
@@ -444,7 +503,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -452,13 +511,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_groups**
-> ResponseContainerIngestionPolicy remove_groups(id, body=body)
+> ResponseContainerIngestionPolicyReadModel remove_groups(id, body=body)
 
 Remove groups from the ingestion policy
 
@@ -500,7 +559,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -508,13 +567,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_ingestion_policy**
-> ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
+> ResponseContainerIngestionPolicyReadModel update_ingestion_policy(id, body=body)
 
 Update a specific ingestion policy
 
@@ -537,7 +596,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -552,11 +611,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index d4ceba2..b3d3f50 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 2c61529..4bdd203 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies linked with the user group | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 657200c..8af6c9c 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index 0700eeb..0c38e1c 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.158.0"
+VERSION = "2.159.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 727eaf2..5ea274a 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -114,8 +114,10 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -159,7 +161,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -213,7 +215,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -246,7 +248,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -287,7 +289,6 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
-from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 8e7384c..5b040e8 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -338,101 +338,6 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def add_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Add a specific ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Add a specific ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/addingestionpolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -2076,101 +1981,6 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_ingestion_policies(self, **kwargs):  # noqa: E501
-        """Removes ingestion policies from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policies(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
-        """Removes ingestion policies from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policies_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_ingestion_policies" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/removeingestionpolicies', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index b29e022..ea93637 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2388,7 +2388,7 @@ def search_ingestion_policy_entities(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2410,7 +2410,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2464,7 +2464,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 7c353f8..20dc03f 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -45,7 +45,7 @@ def add_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -68,7 +68,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -113,6 +113,10 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -124,7 +128,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -144,7 +148,7 @@ def add_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -167,7 +171,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -212,6 +216,10 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -223,7 +231,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -241,8 +249,8 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -263,8 +271,8 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -318,7 +326,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -337,7 +345,7 @@ def delete_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -359,7 +367,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -402,6 +410,10 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -413,7 +425,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -501,6 +513,10 @@ def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/csv'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -532,7 +548,7 @@ def get_all_ingestion_policies(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -555,7 +571,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -596,6 +612,10 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -607,7 +627,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -626,7 +646,7 @@ def get_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -648,7 +668,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -691,6 +711,10 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -702,7 +726,114 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_ingestion_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -722,7 +853,7 @@ def remove_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -745,7 +876,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -790,6 +921,10 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -801,7 +936,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -821,7 +956,7 @@ def remove_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -844,7 +979,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -889,6 +1024,10 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -900,7 +1039,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -919,8 +1058,8 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -942,8 +1081,8 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1003,7 +1142,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 83c0bd6..7e55940 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.158.0/python'
+        self.user_agent = 'Swagger-Codegen/2.159.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index f1c958d..fcaa174 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.158.0".\
+               "SDK Package Version: 2.159.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 5cf2de1..2b612e4 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -72,8 +72,10 @@
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -117,7 +119,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -171,7 +173,7 @@
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -204,7 +206,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -245,7 +247,6 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
-from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 7d5867a..59589d5 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -33,18 +33,72 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self, _configuration=None):  # noqa: E501
+    def __init__(self, key=None, value=None, _configuration=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 3731f90..f834b16 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -39,6 +39,7 @@ class CloudWatchConfiguration(object):
         'metric_filter_regex': 'str',
         'namespaces': 'list[str]',
         'point_tag_filter_regex': 'str',
+        's3_bucket_name_filter_regex': 'str',
         'thread_distribution_in_mins': 'int',
         'volume_selection_tags': 'dict(str, str)',
         'volume_selection_tags_expr': 'str'
@@ -51,12 +52,13 @@ class CloudWatchConfiguration(object):
         'metric_filter_regex': 'metricFilterRegex',
         'namespaces': 'namespaces',
         'point_tag_filter_regex': 'pointTagFilterRegex',
+        's3_bucket_name_filter_regex': 's3BucketNameFilterRegex',
         'thread_distribution_in_mins': 'threadDistributionInMins',
         'volume_selection_tags': 'volumeSelectionTags',
         'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, thread_distribution_in_mins=None, volume_selection_tags=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
+    def __init__(self, base_credentials=None, instance_selection_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, namespaces=None, point_tag_filter_regex=None, s3_bucket_name_filter_regex=None, thread_distribution_in_mins=None, volume_selection_tags=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
         """CloudWatchConfiguration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -68,6 +70,7 @@ def __init__(self, base_credentials=None, instance_selection_tags=None, instance
         self._metric_filter_regex = None
         self._namespaces = None
         self._point_tag_filter_regex = None
+        self._s3_bucket_name_filter_regex = None
         self._thread_distribution_in_mins = None
         self._volume_selection_tags = None
         self._volume_selection_tags_expr = None
@@ -85,6 +88,8 @@ def __init__(self, base_credentials=None, instance_selection_tags=None, instance
             self.namespaces = namespaces
         if point_tag_filter_regex is not None:
             self.point_tag_filter_regex = point_tag_filter_regex
+        if s3_bucket_name_filter_regex is not None:
+            self.s3_bucket_name_filter_regex = s3_bucket_name_filter_regex
         if thread_distribution_in_mins is not None:
             self.thread_distribution_in_mins = thread_distribution_in_mins
         if volume_selection_tags is not None:
@@ -228,6 +233,29 @@ def point_tag_filter_regex(self, point_tag_filter_regex):
 
         self._point_tag_filter_regex = point_tag_filter_regex
 
+    @property
+    def s3_bucket_name_filter_regex(self):
+        """Gets the s3_bucket_name_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+
+        A regular expression that a AWS S3 Bucket name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :return: The s3_bucket_name_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+        :rtype: str
+        """
+        return self._s3_bucket_name_filter_regex
+
+    @s3_bucket_name_filter_regex.setter
+    def s3_bucket_name_filter_regex(self, s3_bucket_name_filter_regex):
+        """Sets the s3_bucket_name_filter_regex of this CloudWatchConfiguration.
+
+        A regular expression that a AWS S3 Bucket name must match (case-insensitively) in order to be ingested  # noqa: E501
+
+        :param s3_bucket_name_filter_regex: The s3_bucket_name_filter_regex of this CloudWatchConfiguration.  # noqa: E501
+        :type: str
+        """
+
+        self._s3_bucket_name_filter_regex = s3_bucket_name_filter_regex
+
     @property
     def thread_distribution_in_mins(self):
         """Gets the thread_distribution_in_mins of this CloudWatchConfiguration.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 246111d..4c31267 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -46,8 +46,8 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
@@ -529,7 +529,7 @@ def ingestion_policies(self):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :return: The ingestion_policies of this Proxy.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -540,7 +540,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -552,7 +552,7 @@ def ingestion_policy(self):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :return: The ingestion_policy of this Proxy.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -563,7 +563,7 @@ def ingestion_policy(self, ingestion_policy):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 039afdf..e88a116 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index a891110..be30c7a 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,8 +37,8 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
@@ -208,7 +208,7 @@ def ingestion_policies(self):
         The list of service account's ingestion policies.  # noqa: E501
 
         :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -219,7 +219,7 @@ def ingestion_policies(self, ingestion_policies):
         The list of service account's ingestion policies.  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -231,7 +231,7 @@ def ingestion_policy(self):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -242,7 +242,7 @@ def ingestion_policy(self, ingestion_policy):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 8d8b2a0..ec8ebd2 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,8 +36,8 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -161,7 +161,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserDTO.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -171,7 +171,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -182,7 +182,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserDTO.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -192,7 +192,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index d9fe7b4..7c450cf 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,7 +37,7 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -198,7 +198,7 @@ def ingestion_policies(self):
         Ingestion policies linked with the user group  # noqa: E501
 
         :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -209,7 +209,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies linked with the user group  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 38f0017..bb179ad 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,8 +36,8 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -169,7 +169,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserModel.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -179,7 +179,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -190,7 +190,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserModel.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -200,7 +200,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy

From 6c3fb3fd86b5f5b6f5262bdd250bbefa1a1d361f Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Thu, 1 Dec 2022 08:16:15 -0800
Subject: [PATCH 119/161] Autogenerated Update v2.162.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  20 +-
 docs/AccountUserAndServiceAccountApi.md       | 110 ++++++++++
 docs/AlertAnalyticsApi.md                     |  65 ++++++
 docs/Annotation.md                            |   2 -
 docs/CloudIntegration.md                      |   1 -
 docs/GlobalAlertAnalytic.md                   |  12 ++
 docs/Proxy.md                                 |   4 +-
 docs/ResponseContainerGlobalAlertAnalytic.md  |  11 +
 docs/SearchApi.md                             |   4 +-
 docs/ServiceAccount.md                        |   4 +-
 docs/UsageApi.md                              | 119 +++--------
 docs/UserDTO.md                               |   4 +-
 docs/UserGroupModel.md                        |   2 +-
 docs/UserModel.md                             |   4 +-
 setup.py                                      |   2 +-
 test/test_alert_analytics_api.py              |  41 ++++
 test/test_global_alert_analytic.py            |  40 ++++
 ...esponse_container_global_alert_analytic.py |  40 ++++
 wavefront_api_client/__init__.py              |  15 +-
 wavefront_api_client/api/__init__.py          |   1 +
 .../account__user_and_service_account_api.py  | 190 +++++++++++++++++
 .../api/alert_analytics_api.py                | 137 ++++++++++++
 wavefront_api_client/api/search_api.py        |   6 +-
 wavefront_api_client/api/usage_api.py         | 201 +++---------------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  14 +-
 wavefront_api_client/models/annotation.py     |  56 +----
 .../models/cloud_integration.py               |  30 +--
 .../models/global_alert_analytic.py           | 175 +++++++++++++++
 wavefront_api_client/models/proxy.py          |  12 +-
 ...esponse_container_global_alert_analytic.py | 150 +++++++++++++
 ...esponse_container_set_business_function.py |   2 +-
 .../models/service_account.py                 |  12 +-
 wavefront_api_client/models/user_dto.py       |  12 +-
 .../models/user_group_model.py                |   6 +-
 wavefront_api_client/models/user_model.py     |  12 +-
 39 files changed, 1109 insertions(+), 415 deletions(-)
 create mode 100644 docs/AlertAnalyticsApi.md
 create mode 100644 docs/GlobalAlertAnalytic.md
 create mode 100644 docs/ResponseContainerGlobalAlertAnalytic.md
 create mode 100644 test/test_alert_analytics_api.py
 create mode 100644 test/test_global_alert_analytic.py
 create mode 100644 test/test_response_container_global_alert_analytic.py
 create mode 100644 wavefront_api_client/api/alert_analytics_api.py
 create mode 100644 wavefront_api_client/models/global_alert_analytic.py
 create mode 100644 wavefront_api_client/models/response_container_global_alert_analytic.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6c6868d..6d18772 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.159.0"
+    "packageVersion": "2.162.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ae23648..6c6868d 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.158.0"
+    "packageVersion": "2.159.0"
 }
diff --git a/README.md b/README.md
index 15ac9ba..d2dec3e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.159.0
+- Package version: 2.162.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -81,6 +81,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -98,6 +99,7 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
+*AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -127,6 +129,7 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
+*AlertAnalyticsApi* | [**get_global_alert_analytics**](docs/AlertAnalyticsApi.md#get_global_alert_analytics) | **GET** /api/v2/alert/analytics/global | Get Global Alert Analytics for a customer
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_customer_token**](docs/ApiTokenApi.md#delete_customer_token) | **PUT** /api/v2/apitoken/customertokens/revoke | Delete the specified api token for a customer
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
@@ -426,7 +429,6 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
-*UsageApi* | [**get_ingestion_policy_history**](docs/UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 *UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 *UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
@@ -518,12 +520,11 @@ Class | Method | HTTP request | Description
  - [Field](docs/Field.md)
  - [GCPBillingConfiguration](docs/GCPBillingConfiguration.md)
  - [GCPConfiguration](docs/GCPConfiguration.md)
+ - [GlobalAlertAnalytic](docs/GlobalAlertAnalytic.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
+ - [IngestionPolicy](docs/IngestionPolicy.md)
  - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
- - [IngestionPolicyMetadata](docs/IngestionPolicyMetadata.md)
- - [IngestionPolicyReadModel](docs/IngestionPolicyReadModel.md)
- - [IngestionPolicyWriteModel](docs/IngestionPolicyWriteModel.md)
  - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
  - [IntegrationAlert](docs/IntegrationAlert.md)
@@ -567,7 +568,7 @@ Class | Method | HTTP request | Description
  - [PagedDerivedMetricDefinitionWithStats](docs/PagedDerivedMetricDefinitionWithStats.md)
  - [PagedEvent](docs/PagedEvent.md)
  - [PagedExternalLink](docs/PagedExternalLink.md)
- - [PagedIngestionPolicyReadModel](docs/PagedIngestionPolicyReadModel.md)
+ - [PagedIngestionPolicy](docs/PagedIngestionPolicy.md)
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
@@ -620,8 +621,9 @@ Class | Method | HTTP request | Description
  - [ResponseContainerExternalLink](docs/ResponseContainerExternalLink.md)
  - [ResponseContainerFacetResponse](docs/ResponseContainerFacetResponse.md)
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
+ - [ResponseContainerGlobalAlertAnalytic](docs/ResponseContainerGlobalAlertAnalytic.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
- - [ResponseContainerIngestionPolicyReadModel](docs/ResponseContainerIngestionPolicyReadModel.md)
+ - [ResponseContainerIngestionPolicy](docs/ResponseContainerIngestionPolicy.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
@@ -654,7 +656,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedDerivedMetricDefinitionWithStats](docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md)
  - [ResponseContainerPagedEvent](docs/ResponseContainerPagedEvent.md)
  - [ResponseContainerPagedExternalLink](docs/ResponseContainerPagedExternalLink.md)
- - [ResponseContainerPagedIngestionPolicyReadModel](docs/ResponseContainerPagedIngestionPolicyReadModel.md)
+ - [ResponseContainerPagedIngestionPolicy](docs/ResponseContainerPagedIngestionPolicy.md)
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
@@ -695,6 +697,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
+ - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
@@ -724,7 +727,6 @@ Class | Method | HTTP request | Description
  - [Stripe](docs/Stripe.md)
  - [TagsResponse](docs/TagsResponse.md)
  - [TargetInfo](docs/TargetInfo.md)
- - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
  - [TriageDashboard](docs/TriageDashboard.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index ccf2f20..c0035f3 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -7,6 +7,7 @@ Method | HTTP request | Description
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
+[**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -24,6 +25,7 @@ Method | HTTP request | Description
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
+[**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -197,6 +199,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **add_ingestion_policy**
+> ResponseContainer add_ingestion_policy(body=body)
+
+Add a specific ingestion policy to multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
+
+try:
+    # Add a specific ingestion policy to multiple accounts
+    api_response = api_instance.add_ingestion_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->add_ingestion_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -1119,6 +1175,60 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **remove_ingestion_policies**
+> ResponseContainer remove_ingestion_policies(body=body)
+
+Removes ingestion policies from multiple accounts
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of accounts from which ingestion policies should be removed (optional)
+
+try:
+    # Removes ingestion policies from multiple accounts
+    api_response = api_instance.remove_ingestion_policies(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->remove_ingestion_policies: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **list[str]**| identifiers of list of accounts from which ingestion policies should be removed | [optional] 
+
+### Return type
+
+[**ResponseContainer**](ResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
diff --git a/docs/AlertAnalyticsApi.md b/docs/AlertAnalyticsApi.md
new file mode 100644
index 0000000..b35d5e3
--- /dev/null
+++ b/docs/AlertAnalyticsApi.md
@@ -0,0 +1,65 @@
+# wavefront_api_client.AlertAnalyticsApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_global_alert_analytics**](AlertAnalyticsApi.md#get_global_alert_analytics) | **GET** /api/v2/alert/analytics/global | Get Global Alert Analytics for a customer
+
+
+# **get_global_alert_analytics**
+> ResponseContainerGlobalAlertAnalytic get_global_alert_analytics(start, end=end)
+
+Get Global Alert Analytics for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds (optional)
+
+try:
+    # Get Global Alert Analytics for a customer
+    api_response = api_instance.get_global_alert_analytics(start, end=end)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertAnalyticsApi->get_global_alert_analytics: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds | [optional] 
+
+### Return type
+
+[**ResponseContainerGlobalAlertAnalytic**](ResponseContainerGlobalAlertAnalytic.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/Annotation.md b/docs/Annotation.md
index f8bf731..7c74ed2 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,8 +3,6 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | **str** |  | [optional] 
-**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 60041e8..ef3e10f 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -33,7 +33,6 @@ Name | Type | Description | Notes
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
 **service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **snowflake** | [**SnowflakeConfiguration**](SnowflakeConfiguration.md) |  | [optional] 
-**tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **vrops** | [**VropsConfiguration**](VropsConfiguration.md) |  | [optional] 
diff --git a/docs/GlobalAlertAnalytic.md b/docs/GlobalAlertAnalytic.md
new file mode 100644
index 0000000..259fd3f
--- /dev/null
+++ b/docs/GlobalAlertAnalytic.md
@@ -0,0 +1,12 @@
+# GlobalAlertAnalytic
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**error_breakdown** | **dict(str, int)** |  | [optional] 
+**failed** | **int** |  | [optional] 
+**success** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 4adad15..43cbe80 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -16,8 +16,8 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | Ingestion policy associated with the proxy | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
diff --git a/docs/ResponseContainerGlobalAlertAnalytic.md b/docs/ResponseContainerGlobalAlertAnalytic.md
new file mode 100644
index 0000000..3079f7a
--- /dev/null
+++ b/docs/ResponseContainerGlobalAlertAnalytic.md
@@ -0,0 +1,11 @@
+# ResponseContainerGlobalAlertAnalytic
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**GlobalAlertAnalytic**](GlobalAlertAnalytic.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 1d575e3..02994b8 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -1408,7 +1408,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **search_ingestion_policy_entities**
-> ResponseContainerPagedIngestionPolicyReadModel search_ingestion_policy_entities(body=body)
+> ResponseContainerPagedIngestionPolicy search_ingestion_policy_entities(body=body)
 
 Search over a customer's ingestion policies
 
@@ -1448,7 +1448,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
+[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
 
 ### Authorization
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index ae0f7ca..a38980f 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | The list of service account&#39;s ingestion policies. | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | The ingestion policy object linked with service account. | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | The list of service account&#39;s ingestion policies. | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 771f485..42a07fb 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -11,14 +11,13 @@ Method | HTTP request | Description
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
-[**get_ingestion_policy_history**](UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 [**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 [**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
 # **add_accounts**
-> ResponseContainerIngestionPolicyReadModel add_accounts(id, body=body)
+> ResponseContainerIngestionPolicy add_accounts(id, body=body)
 
 Add accounts to ingestion policy
 
@@ -60,7 +59,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -68,13 +67,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **add_groups**
-> ResponseContainerIngestionPolicyReadModel add_groups(id, body=body)
+> ResponseContainerIngestionPolicy add_groups(id, body=body)
 
 Add groups to the ingestion policy
 
@@ -116,7 +115,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -124,13 +123,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel create_ingestion_policy(body=body)
+> ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
 
 Create a specific ingestion policy
 
@@ -152,7 +151,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -166,11 +165,11 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -184,7 +183,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel delete_ingestion_policy(id)
+> ResponseContainerIngestionPolicy delete_ingestion_policy(id)
 
 Delete a specific ingestion policy
 
@@ -224,7 +223,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -232,7 +231,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -287,13 +286,13 @@ void (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/csv
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_ingestion_policies**
-> ResponseContainerPagedIngestionPolicyReadModel get_all_ingestion_policies(offset=offset, limit=limit)
+> ResponseContainerPagedIngestionPolicy get_all_ingestion_policies(offset=offset, limit=limit)
 
 Get all ingestion policies for a customer
 
@@ -335,7 +334,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
+[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
 
 ### Authorization
 
@@ -343,13 +342,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel get_ingestion_policy(id)
+> ResponseContainerIngestionPolicy get_ingestion_policy(id)
 
 Get a specific ingestion policy
 
@@ -389,7 +388,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -397,71 +396,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_ingestion_policy_history**
-> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
-
-Get the version history of ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
-
-try:
-    # Get the version history of ingestion policy
-    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
-
-### Return type
-
-[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_accounts**
-> ResponseContainerIngestionPolicyReadModel remove_accounts(id, body=body)
+> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
 
 Remove accounts from ingestion policy
 
@@ -503,7 +444,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -511,13 +452,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_groups**
-> ResponseContainerIngestionPolicyReadModel remove_groups(id, body=body)
+> ResponseContainerIngestionPolicy remove_groups(id, body=body)
 
 Remove groups from the ingestion policy
 
@@ -559,7 +500,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
@@ -567,13 +508,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not defined
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_ingestion_policy**
-> ResponseContainerIngestionPolicyReadModel update_ingestion_policy(id, body=body)
+> ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
 
 Update a specific ingestion policy
 
@@ -596,7 +537,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -611,11 +552,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
 
 ### Authorization
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index b3d3f50..d4ceba2 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 4bdd203..2c61529 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies linked with the user group | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 8af6c9c..657200c 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index 0c38e1c..4840d5b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.159.0"
+VERSION = "2.162.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_alert_analytics_api.py b/test/test_alert_analytics_api.py
new file mode 100644
index 0000000..c09bf3c
--- /dev/null
+++ b/test/test_alert_analytics_api.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertAnalyticsApi(unittest.TestCase):
+    """AlertAnalyticsApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.alert_analytics_api.AlertAnalyticsApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_global_alert_analytics(self):
+        """Test case for get_global_alert_analytics
+
+        Get Global Alert Analytics for a customer  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_global_alert_analytic.py b/test/test_global_alert_analytic.py
new file mode 100644
index 0000000..24fb367
--- /dev/null
+++ b/test/test_global_alert_analytic.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestGlobalAlertAnalytic(unittest.TestCase):
+    """GlobalAlertAnalytic unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testGlobalAlertAnalytic(self):
+        """Test GlobalAlertAnalytic"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.global_alert_analytic.GlobalAlertAnalytic()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_global_alert_analytic.py b/test/test_response_container_global_alert_analytic.py
new file mode 100644
index 0000000..b7dc5cc
--- /dev/null
+++ b/test/test_response_container_global_alert_analytic.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerGlobalAlertAnalytic(unittest.TestCase):
+    """ResponseContainerGlobalAlertAnalytic unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerGlobalAlertAnalytic(self):
+        """Test ResponseContainerGlobalAlertAnalytic"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_global_alert_analytic.ResponseContainerGlobalAlertAnalytic()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 5ea274a..059bdb5 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -19,6 +19,7 @@
 from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
@@ -112,12 +113,11 @@
 from wavefront_api_client.models.field import Field
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
+from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
-from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
-from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
-from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -161,7 +161,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -214,8 +214,9 @@
 from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
+from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -248,7 +249,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -289,6 +290,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
@@ -318,7 +320,6 @@
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
-from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 3df3a49..dd85422 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -6,6 +6,7 @@
 from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 5b040e8..8e7384c 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -338,6 +338,101 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def add_ingestion_policy(self, **kwargs):  # noqa: E501
+        """Add a specific ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Add a specific ingestion policy to multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method add_ingestion_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/addingestionpolicy', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -1981,6 +2076,101 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def remove_ingestion_policies(self, **kwargs):  # noqa: E501
+        """Removes ingestion policies from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policies(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
+        """Removes ingestion policies from multiple accounts  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.remove_ingestion_policies_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
+        :return: ResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method remove_ingestion_policies" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/removeingestionpolicies', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
diff --git a/wavefront_api_client/api/alert_analytics_api.py b/wavefront_api_client/api/alert_analytics_api.py
new file mode 100644
index 0000000..d953c4f
--- /dev/null
+++ b/wavefront_api_client/api/alert_analytics_api.py
@@ -0,0 +1,137 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class AlertAnalyticsApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_global_alert_analytics(self, start, **kwargs):  # noqa: E501
+        """Get Global Alert Analytics for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_global_alert_analytics(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :return: ResponseContainerGlobalAlertAnalytic
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_global_alert_analytics_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_global_alert_analytics_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def get_global_alert_analytics_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Get Global Alert Analytics for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_global_alert_analytics_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :return: ResponseContainerGlobalAlertAnalytic
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_global_alert_analytics" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `get_global_alert_analytics`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/analytics/global', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerGlobalAlertAnalytic',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index ea93637..b29e022 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2388,7 +2388,7 @@ def search_ingestion_policy_entities(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2410,7 +2410,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2464,7 +2464,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 20dc03f..7c353f8 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -45,7 +45,7 @@ def add_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -68,7 +68,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -113,10 +113,6 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -128,7 +124,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -148,7 +144,7 @@ def add_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -171,7 +167,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -216,10 +212,6 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -231,7 +223,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -249,8 +241,8 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -271,8 +263,8 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -326,7 +318,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -345,7 +337,7 @@ def delete_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -367,7 +359,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -410,10 +402,6 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -425,7 +413,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -513,10 +501,6 @@ def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/csv'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -548,7 +532,7 @@ def get_all_ingestion_policies(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -571,7 +555,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicyReadModel
+        :return: ResponseContainerPagedIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -612,10 +596,6 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -627,7 +607,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -646,7 +626,7 @@ def get_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -668,7 +648,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -711,10 +691,6 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -726,114 +702,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
-        """Get the version history of ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get the version history of ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_ingestion_policy_history" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -853,7 +722,7 @@ def remove_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -876,7 +745,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -921,10 +790,6 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -936,7 +801,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -956,7 +821,7 @@ def remove_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -979,7 +844,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1024,10 +889,6 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -1039,7 +900,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -1058,8 +919,8 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1081,8 +942,8 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicy
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1142,7 +1003,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 7e55940..dbbb621 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.159.0/python'
+        self.user_agent = 'Swagger-Codegen/2.162.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index fcaa174..6a159d4 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.159.0".\
+               "SDK Package Version: 2.162.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 2b612e4..6d31f3b 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -70,12 +70,11 @@
 from wavefront_api_client.models.field import Field
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
+from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
+from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
-from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
-from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
-from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -119,7 +118,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
+from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -172,8 +171,9 @@
 from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
+from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -206,7 +206,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
+from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -247,6 +247,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
@@ -276,7 +277,6 @@
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
-from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 59589d5..7d5867a 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -33,72 +33,18 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'str',
-        'value': 'str'
     }
 
     attribute_map = {
-        'key': 'key',
-        'value': 'value'
     }
 
-    def __init__(self, key=None, value=None, _configuration=None):  # noqa: E501
+    def __init__(self, _configuration=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
-
-        self._key = None
-        self._value = None
         self.discriminator = None
 
-        if key is not None:
-            self.key = key
-        if value is not None:
-            self.value = value
-
-    @property
-    def key(self):
-        """Gets the key of this Annotation.  # noqa: E501
-
-
-        :return: The key of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._key
-
-    @key.setter
-    def key(self, key):
-        """Sets the key of this Annotation.
-
-
-        :param key: The key of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._key = key
-
-    @property
-    def value(self):
-        """Gets the value of this Annotation.  # noqa: E501
-
-
-        :return: The value of this Annotation.  # noqa: E501
-        :rtype: str
-        """
-        return self._value
-
-    @value.setter
-    def value(self, value):
-        """Sets the value of this Annotation.
-
-
-        :param value: The value of this Annotation.  # noqa: E501
-        :type: str
-        """
-
-        self._value = value
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 6cc96c5..22540ed 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -63,7 +63,6 @@ class CloudIntegration(object):
         'service': 'str',
         'service_refresh_rate_in_mins': 'int',
         'snowflake': 'SnowflakeConfiguration',
-        'tesla': 'TeslaConfiguration',
         'updated_epoch_millis': 'int',
         'updater_id': 'str',
         'vrops': 'VropsConfiguration'
@@ -100,13 +99,12 @@ class CloudIntegration(object):
         'service': 'service',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'snowflake': 'snowflake',
-        'tesla': 'tesla',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId',
         'vrops': 'vrops'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -142,7 +140,6 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._service = None
         self._service_refresh_rate_in_mins = None
         self._snowflake = None
-        self._tesla = None
         self._updated_epoch_millis = None
         self._updater_id = None
         self._vrops = None
@@ -206,8 +203,6 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if snowflake is not None:
             self.snowflake = snowflake
-        if tesla is not None:
-            self.tesla = tesla
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
@@ -824,7 +819,7 @@ def service(self, service):
         """
         if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 service not in allowed_values):
             raise ValueError(
@@ -878,27 +873,6 @@ def snowflake(self, snowflake):
 
         self._snowflake = snowflake
 
-    @property
-    def tesla(self):
-        """Gets the tesla of this CloudIntegration.  # noqa: E501
-
-
-        :return: The tesla of this CloudIntegration.  # noqa: E501
-        :rtype: TeslaConfiguration
-        """
-        return self._tesla
-
-    @tesla.setter
-    def tesla(self, tesla):
-        """Sets the tesla of this CloudIntegration.
-
-
-        :param tesla: The tesla of this CloudIntegration.  # noqa: E501
-        :type: TeslaConfiguration
-        """
-
-        self._tesla = tesla
-
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this CloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/global_alert_analytic.py b/wavefront_api_client/models/global_alert_analytic.py
new file mode 100644
index 0000000..e82b57c
--- /dev/null
+++ b/wavefront_api_client/models/global_alert_analytic.py
@@ -0,0 +1,175 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class GlobalAlertAnalytic(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'error_breakdown': 'dict(str, int)',
+        'failed': 'int',
+        'success': 'int'
+    }
+
+    attribute_map = {
+        'error_breakdown': 'errorBreakdown',
+        'failed': 'failed',
+        'success': 'success'
+    }
+
+    def __init__(self, error_breakdown=None, failed=None, success=None, _configuration=None):  # noqa: E501
+        """GlobalAlertAnalytic - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._error_breakdown = None
+        self._failed = None
+        self._success = None
+        self.discriminator = None
+
+        if error_breakdown is not None:
+            self.error_breakdown = error_breakdown
+        if failed is not None:
+            self.failed = failed
+        if success is not None:
+            self.success = success
+
+    @property
+    def error_breakdown(self):
+        """Gets the error_breakdown of this GlobalAlertAnalytic.  # noqa: E501
+
+
+        :return: The error_breakdown of this GlobalAlertAnalytic.  # noqa: E501
+        :rtype: dict(str, int)
+        """
+        return self._error_breakdown
+
+    @error_breakdown.setter
+    def error_breakdown(self, error_breakdown):
+        """Sets the error_breakdown of this GlobalAlertAnalytic.
+
+
+        :param error_breakdown: The error_breakdown of this GlobalAlertAnalytic.  # noqa: E501
+        :type: dict(str, int)
+        """
+
+        self._error_breakdown = error_breakdown
+
+    @property
+    def failed(self):
+        """Gets the failed of this GlobalAlertAnalytic.  # noqa: E501
+
+
+        :return: The failed of this GlobalAlertAnalytic.  # noqa: E501
+        :rtype: int
+        """
+        return self._failed
+
+    @failed.setter
+    def failed(self, failed):
+        """Sets the failed of this GlobalAlertAnalytic.
+
+
+        :param failed: The failed of this GlobalAlertAnalytic.  # noqa: E501
+        :type: int
+        """
+
+        self._failed = failed
+
+    @property
+    def success(self):
+        """Gets the success of this GlobalAlertAnalytic.  # noqa: E501
+
+
+        :return: The success of this GlobalAlertAnalytic.  # noqa: E501
+        :rtype: int
+        """
+        return self._success
+
+    @success.setter
+    def success(self, success):
+        """Sets the success of this GlobalAlertAnalytic.
+
+
+        :param success: The success of this GlobalAlertAnalytic.  # noqa: E501
+        :type: int
+        """
+
+        self._success = success
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(GlobalAlertAnalytic, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, GlobalAlertAnalytic):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, GlobalAlertAnalytic):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 4c31267..246111d 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -46,8 +46,8 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
@@ -529,7 +529,7 @@ def ingestion_policies(self):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :return: The ingestion_policies of this Proxy.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -540,7 +540,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -552,7 +552,7 @@ def ingestion_policy(self):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :return: The ingestion_policy of this Proxy.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -563,7 +563,7 @@ def ingestion_policy(self, ingestion_policy):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/response_container_global_alert_analytic.py b/wavefront_api_client/models/response_container_global_alert_analytic.py
new file mode 100644
index 0000000..a7f23e7
--- /dev/null
+++ b/wavefront_api_client/models/response_container_global_alert_analytic.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerGlobalAlertAnalytic(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'GlobalAlertAnalytic',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerGlobalAlertAnalytic - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
+        :rtype: GlobalAlertAnalytic
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerGlobalAlertAnalytic.
+
+
+        :param response: The response of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
+        :type: GlobalAlertAnalytic
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerGlobalAlertAnalytic.
+
+
+        :param status: The status of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerGlobalAlertAnalytic, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerGlobalAlertAnalytic):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerGlobalAlertAnalytic):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index e88a116..039afdf 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index be30c7a..a891110 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,8 +37,8 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
@@ -208,7 +208,7 @@ def ingestion_policies(self):
         The list of service account's ingestion policies.  # noqa: E501
 
         :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -219,7 +219,7 @@ def ingestion_policies(self, ingestion_policies):
         The list of service account's ingestion policies.  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -231,7 +231,7 @@ def ingestion_policy(self):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -242,7 +242,7 @@ def ingestion_policy(self, ingestion_policy):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index ec8ebd2..8d8b2a0 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,8 +36,8 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -161,7 +161,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserDTO.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -171,7 +171,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -182,7 +182,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserDTO.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -192,7 +192,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 7c450cf..d9fe7b4 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,7 +37,7 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policies': 'list[IngestionPolicy]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -198,7 +198,7 @@ def ingestion_policies(self):
         Ingestion policies linked with the user group  # noqa: E501
 
         :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -209,7 +209,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies linked with the user group  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index bb179ad..38f0017 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,8 +36,8 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
+        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policy': 'IngestionPolicy',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -169,7 +169,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserModel.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
+        :rtype: list[IngestionPolicy]
         """
         return self._ingestion_policies
 
@@ -179,7 +179,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
+        :type: list[IngestionPolicy]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -190,7 +190,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserModel.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
+        :rtype: IngestionPolicy
         """
         return self._ingestion_policy
 
@@ -200,7 +200,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
-        :type: IngestionPolicyReadModel
+        :type: IngestionPolicy
         """
 
         self._ingestion_policy = ingestion_policy

From b10359dd8e546d0ef6fbf32719d7226ba6f8e2d7 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Mon, 5 Dec 2022 08:16:22 -0800
Subject: [PATCH 120/161] Autogenerated Update v2.163.3.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  17 +-
 docs/AccountUserAndServiceAccountApi.md       | 110 ----------
 docs/Annotation.md                            |   2 +
 docs/CloudIntegration.md                      |   1 +
 docs/Proxy.md                                 |   4 +-
 docs/SearchApi.md                             |   4 +-
 docs/ServiceAccount.md                        |   4 +-
 docs/UsageApi.md                              | 119 ++++++++---
 docs/UserDTO.md                               |   4 +-
 docs/UserGroupModel.md                        |   2 +-
 docs/UserModel.md                             |   4 +-
 setup.py                                      |   2 +-
 wavefront_api_client/__init__.py              |  12 +-
 .../account__user_and_service_account_api.py  | 190 -----------------
 wavefront_api_client/api/search_api.py        |   6 +-
 wavefront_api_client/api/usage_api.py         | 201 +++++++++++++++---
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  12 +-
 wavefront_api_client/models/annotation.py     |  56 ++++-
 .../models/cloud_integration.py               |  30 ++-
 wavefront_api_client/models/proxy.py          |  12 +-
 ...esponse_container_set_business_function.py |   2 +-
 .../models/service_account.py                 |  12 +-
 wavefront_api_client/models/user_dto.py       |  12 +-
 .../models/user_group_model.py                |   6 +-
 wavefront_api_client/models/user_model.py     |  12 +-
 29 files changed, 415 insertions(+), 429 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6d18772..32cb503 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.162.3"
+    "packageVersion": "2.163.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6c6868d..6d18772 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.159.0"
+    "packageVersion": "2.162.3"
 }
diff --git a/README.md b/README.md
index d2dec3e..6750787 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.162.3
+- Package version: 2.163.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -81,7 +81,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**activate_account**](docs/AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 *AccountUserAndServiceAccountApi* | [**add_account_to_roles**](docs/AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**add_account_to_user_groups**](docs/AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**add_ingestion_policy**](docs/AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 *AccountUserAndServiceAccountApi* | [**create_or_update_user_account**](docs/AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 *AccountUserAndServiceAccountApi* | [**create_service_account**](docs/AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 *AccountUserAndServiceAccountApi* | [**deactivate_account**](docs/AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -99,7 +98,6 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
-*AccountUserAndServiceAccountApi* | [**remove_ingestion_policies**](docs/AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -429,6 +427,7 @@ Class | Method | HTTP request | Description
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**get_ingestion_policy_history**](docs/UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 *UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 *UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
@@ -523,8 +522,10 @@ Class | Method | HTTP request | Description
  - [GlobalAlertAnalytic](docs/GlobalAlertAnalytic.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
- - [IngestionPolicy](docs/IngestionPolicy.md)
  - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
+ - [IngestionPolicyMetadata](docs/IngestionPolicyMetadata.md)
+ - [IngestionPolicyReadModel](docs/IngestionPolicyReadModel.md)
+ - [IngestionPolicyWriteModel](docs/IngestionPolicyWriteModel.md)
  - [InstallAlerts](docs/InstallAlerts.md)
  - [Integration](docs/Integration.md)
  - [IntegrationAlert](docs/IntegrationAlert.md)
@@ -568,7 +569,7 @@ Class | Method | HTTP request | Description
  - [PagedDerivedMetricDefinitionWithStats](docs/PagedDerivedMetricDefinitionWithStats.md)
  - [PagedEvent](docs/PagedEvent.md)
  - [PagedExternalLink](docs/PagedExternalLink.md)
- - [PagedIngestionPolicy](docs/PagedIngestionPolicy.md)
+ - [PagedIngestionPolicyReadModel](docs/PagedIngestionPolicyReadModel.md)
  - [PagedIntegration](docs/PagedIntegration.md)
  - [PagedMaintenanceWindow](docs/PagedMaintenanceWindow.md)
  - [PagedMessage](docs/PagedMessage.md)
@@ -623,7 +624,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
  - [ResponseContainerGlobalAlertAnalytic](docs/ResponseContainerGlobalAlertAnalytic.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
- - [ResponseContainerIngestionPolicy](docs/ResponseContainerIngestionPolicy.md)
+ - [ResponseContainerIngestionPolicyReadModel](docs/ResponseContainerIngestionPolicyReadModel.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
@@ -656,7 +657,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerPagedDerivedMetricDefinitionWithStats](docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md)
  - [ResponseContainerPagedEvent](docs/ResponseContainerPagedEvent.md)
  - [ResponseContainerPagedExternalLink](docs/ResponseContainerPagedExternalLink.md)
- - [ResponseContainerPagedIngestionPolicy](docs/ResponseContainerPagedIngestionPolicy.md)
+ - [ResponseContainerPagedIngestionPolicyReadModel](docs/ResponseContainerPagedIngestionPolicyReadModel.md)
  - [ResponseContainerPagedIntegration](docs/ResponseContainerPagedIntegration.md)
  - [ResponseContainerPagedMaintenanceWindow](docs/ResponseContainerPagedMaintenanceWindow.md)
  - [ResponseContainerPagedMessage](docs/ResponseContainerPagedMessage.md)
@@ -697,7 +698,6 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
- - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
@@ -727,6 +727,7 @@ Class | Method | HTTP request | Description
  - [Stripe](docs/Stripe.md)
  - [TagsResponse](docs/TagsResponse.md)
  - [TargetInfo](docs/TargetInfo.md)
+ - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
  - [TriageDashboard](docs/TriageDashboard.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index c0035f3..ccf2f20 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -7,7 +7,6 @@ Method | HTTP request | Description
 [**activate_account**](AccountUserAndServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
 [**add_account_to_roles**](AccountUserAndServiceAccountApi.md#add_account_to_roles) | **POST** /api/v2/account/{id}/addRoles | Adds specific roles to the account (user or service account)
 [**add_account_to_user_groups**](AccountUserAndServiceAccountApi.md#add_account_to_user_groups) | **POST** /api/v2/account/{id}/addUserGroups | Adds specific groups to the account (user or service account)
-[**add_ingestion_policy**](AccountUserAndServiceAccountApi.md#add_ingestion_policy) | **POST** /api/v2/account/addingestionpolicy | Add a specific ingestion policy to multiple accounts
 [**create_or_update_user_account**](AccountUserAndServiceAccountApi.md#create_or_update_user_account) | **POST** /api/v2/account/user | Creates or updates a user account
 [**create_service_account**](AccountUserAndServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
 [**deactivate_account**](AccountUserAndServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
@@ -25,7 +24,6 @@ Method | HTTP request | Description
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
-[**remove_ingestion_policies**](AccountUserAndServiceAccountApi.md#remove_ingestion_policies) | **POST** /api/v2/account/removeingestionpolicies | Removes ingestion policies from multiple accounts
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
 [**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
@@ -199,60 +197,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **add_ingestion_policy**
-> ResponseContainer add_ingestion_policy(body=body)
-
-Add a specific ingestion policy to multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyMapping() # IngestionPolicyMapping | Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre> (optional)
-
-try:
-    # Add a specific ingestion policy to multiple accounts
-    api_response = api_instance.add_ingestion_policy(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->add_ingestion_policy: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyMapping**](IngestionPolicyMapping.md)| Example Body:  &lt;pre&gt;{   \&quot;ingestionPolicyId\&quot;: \&quot;Ingestion policy identifier\&quot;,   \&quot;accounts\&quot;: [   \&quot;account1\&quot;,   \&quot;account2\&quot;,   \&quot;account3\&quot;   ],   \&quot;groups\&quot;: [   \&quot;group1\&quot;,   \&quot;group2\&quot;   ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **create_or_update_user_account**
 > UserModel create_or_update_user_account(send_email=send_email, body=body)
 
@@ -1175,60 +1119,6 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_ingestion_policies**
-> ResponseContainer remove_ingestion_policies(body=body)
-
-Removes ingestion policies from multiple accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.list[str]()] # list[str] | identifiers of list of accounts from which ingestion policies should be removed (optional)
-
-try:
-    # Removes ingestion policies from multiple accounts
-    api_response = api_instance.remove_ingestion_policies(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountUserAndServiceAccountApi->remove_ingestion_policies: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **list[str]**| identifiers of list of accounts from which ingestion policies should be removed | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **revoke_account_permission**
 > UserModel revoke_account_permission(id, permission)
 
diff --git a/docs/Annotation.md b/docs/Annotation.md
index 7c74ed2..f8bf731 100644
--- a/docs/Annotation.md
+++ b/docs/Annotation.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**key** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index ef3e10f..60041e8 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -33,6 +33,7 @@ Name | Type | Description | Notes
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
 **service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **snowflake** | [**SnowflakeConfiguration**](SnowflakeConfiguration.md) |  | [optional] 
+**tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **vrops** | [**VropsConfiguration**](VropsConfiguration.md) |  | [optional] 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 43cbe80..4adad15 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -16,8 +16,8 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | Ingestion policy associated with the proxy | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 02994b8..1d575e3 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -1408,7 +1408,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **search_ingestion_policy_entities**
-> ResponseContainerPagedIngestionPolicy search_ingestion_policy_entities(body=body)
+> ResponseContainerPagedIngestionPolicyReadModel search_ingestion_policy_entities(body=body)
 
 Search over a customer's ingestion policies
 
@@ -1448,7 +1448,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
 
 ### Authorization
 
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index a38980f..ae0f7ca 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | The list of service account&#39;s ingestion policies. | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) | The ingestion policy object linked with service account. | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | The list of service account&#39;s ingestion policies. | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 42a07fb..771f485 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -11,13 +11,14 @@ Method | HTTP request | Description
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**get_ingestion_policy_history**](UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
 [**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
 [**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
 # **add_accounts**
-> ResponseContainerIngestionPolicy add_accounts(id, body=body)
+> ResponseContainerIngestionPolicyReadModel add_accounts(id, body=body)
 
 Add accounts to ingestion policy
 
@@ -59,7 +60,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -67,13 +68,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **add_groups**
-> ResponseContainerIngestionPolicy add_groups(id, body=body)
+> ResponseContainerIngestionPolicyReadModel add_groups(id, body=body)
 
 Add groups to the ingestion policy
 
@@ -115,7 +116,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -123,13 +124,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_ingestion_policy**
-> ResponseContainerIngestionPolicy create_ingestion_policy(body=body)
+> ResponseContainerIngestionPolicyReadModel create_ingestion_policy(body=body)
 
 Create a specific ingestion policy
 
@@ -151,7 +152,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -165,11 +166,11 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -183,7 +184,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **delete_ingestion_policy**
-> ResponseContainerIngestionPolicy delete_ingestion_policy(id)
+> ResponseContainerIngestionPolicyReadModel delete_ingestion_policy(id)
 
 Delete a specific ingestion policy
 
@@ -223,7 +224,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -231,7 +232,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -286,13 +287,13 @@ void (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/csv
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_all_ingestion_policies**
-> ResponseContainerPagedIngestionPolicy get_all_ingestion_policies(offset=offset, limit=limit)
+> ResponseContainerPagedIngestionPolicyReadModel get_all_ingestion_policies(offset=offset, limit=limit)
 
 Get all ingestion policies for a customer
 
@@ -334,7 +335,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerPagedIngestionPolicy**](ResponseContainerPagedIngestionPolicy.md)
+[**ResponseContainerPagedIngestionPolicyReadModel**](ResponseContainerPagedIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -342,13 +343,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **get_ingestion_policy**
-> ResponseContainerIngestionPolicy get_ingestion_policy(id)
+> ResponseContainerIngestionPolicyReadModel get_ingestion_policy(id)
 
 Get a specific ingestion policy
 
@@ -388,7 +389,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -396,13 +397,71 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_ingestion_policy_history**
+> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
+
+Get the version history of ingestion policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of ingestion policy
+    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_accounts**
-> ResponseContainerIngestionPolicy remove_accounts(id, body=body)
+> ResponseContainerIngestionPolicyReadModel remove_accounts(id, body=body)
 
 Remove accounts from ingestion policy
 
@@ -444,7 +503,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -452,13 +511,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_groups**
-> ResponseContainerIngestionPolicy remove_groups(id, body=body)
+> ResponseContainerIngestionPolicyReadModel remove_groups(id, body=body)
 
 Remove groups from the ingestion policy
 
@@ -500,7 +559,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -508,13 +567,13 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json
  - **Accept**: application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_ingestion_policy**
-> ResponseContainerIngestionPolicy update_ingestion_policy(id, body=body)
+> ResponseContainerIngestionPolicyReadModel update_ingestion_policy(id, body=body)
 
 Update a specific ingestion policy
 
@@ -537,7 +596,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicy() # IngestionPolicy | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -552,11 +611,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicy**](IngestionPolicy.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
-[**ResponseContainerIngestionPolicy**](ResponseContainerIngestionPolicy.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index d4ceba2..b3d3f50 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 2c61529..4bdd203 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) | Ingestion policies linked with the user group | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 657200c..8af6c9c 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
-**ingestion_policies** | [**list[IngestionPolicy]**](IngestionPolicy.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
+**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
+**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/setup.py b/setup.py
index 4840d5b..fde5942 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.162.3"
+VERSION = "2.163.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 059bdb5..86331b3 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -116,8 +116,10 @@
 from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -161,7 +163,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -216,7 +218,7 @@
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -249,7 +251,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -290,7 +292,6 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
-from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
@@ -320,6 +321,7 @@
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
+from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 8e7384c..5b040e8 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -338,101 +338,6 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def add_ingestion_policy(self, **kwargs):  # noqa: E501
-        """Add a specific ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.add_ingestion_policy_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def add_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
-        """Add a specific ingestion policy to multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_ingestion_policy_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param IngestionPolicyMapping body: Example Body:  <pre>{   \"ingestionPolicyId\": \"Ingestion policy identifier\",   \"accounts\": [   \"account1\",   \"account2\",   \"account3\"   ],   \"groups\": [   \"group1\",   \"group2\"   ] }</pre>
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_ingestion_policy" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/addingestionpolicy', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
@@ -2076,101 +1981,6 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_ingestion_policies(self, **kwargs):  # noqa: E501
-        """Removes ingestion policies from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policies(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.remove_ingestion_policies_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def remove_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
-        """Removes ingestion policies from multiple accounts  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_ingestion_policies_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param list[str] body: identifiers of list of accounts from which ingestion policies should be removed
-        :return: ResponseContainer
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method remove_ingestion_policies" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/account/removeingestionpolicies', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainer',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index b29e022..ea93637 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -2388,7 +2388,7 @@ def search_ingestion_policy_entities(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2410,7 +2410,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
 
         :param async_req bool
         :param SortableSearchRequest body:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -2464,7 +2464,7 @@ def search_ingestion_policy_entities_with_http_info(self, **kwargs):  # noqa: E5
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 7c353f8..20dc03f 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -45,7 +45,7 @@ def add_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -68,7 +68,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -113,6 +113,10 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -124,7 +128,7 @@ def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -144,7 +148,7 @@ def add_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -167,7 +171,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -212,6 +216,10 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -223,7 +231,7 @@ def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -241,8 +249,8 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -263,8 +271,8 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -318,7 +326,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -337,7 +345,7 @@ def delete_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -359,7 +367,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -402,6 +410,10 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -413,7 +425,7 @@ def delete_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -501,6 +513,10 @@ def export_csv_with_http_info(self, start_time, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/csv'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -532,7 +548,7 @@ def get_all_ingestion_policies(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -555,7 +571,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         :param async_req bool
         :param int offset:
         :param int limit:
-        :return: ResponseContainerPagedIngestionPolicy
+        :return: ResponseContainerPagedIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -596,6 +612,10 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -607,7 +627,7 @@ def get_all_ingestion_policies_with_http_info(self, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerPagedIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerPagedIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -626,7 +646,7 @@ def get_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -648,7 +668,7 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -691,6 +711,10 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -702,7 +726,114 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_ingestion_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -722,7 +853,7 @@ def remove_accounts(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -745,7 +876,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -790,6 +921,10 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -801,7 +936,7 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -821,7 +956,7 @@ def remove_groups(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -844,7 +979,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param list[str] body: List of groups to be removed from the ingestion policy
-        :return: ResponseContainerIngestionPolicy
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -889,6 +1024,10 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
 
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
         # Authentication setting
         auth_settings = ['api_key']  # noqa: E501
 
@@ -900,7 +1039,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -919,8 +1058,8 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -942,8 +1081,8 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicy body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\"   \"scope\": \"GROUP\",   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
-        :return: ResponseContainerIngestionPolicy
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -1003,7 +1142,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicy',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index dbbb621..fdfb8db 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.162.3/python'
+        self.user_agent = 'Swagger-Codegen/2.163.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 6a159d4..bff465e 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.162.3".\
+               "SDK Package Version: 2.163.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 6d31f3b..1e880af 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -73,8 +73,10 @@
 from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy
 from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
+from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
+from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
 from wavefront_api_client.models.install_alerts import InstallAlerts
 from wavefront_api_client.models.integration import Integration
 from wavefront_api_client.models.integration_alert import IntegrationAlert
@@ -118,7 +120,7 @@
 from wavefront_api_client.models.paged_derived_metric_definition_with_stats import PagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.paged_event import PagedEvent
 from wavefront_api_client.models.paged_external_link import PagedExternalLink
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy
+from wavefront_api_client.models.paged_ingestion_policy_read_model import PagedIngestionPolicyReadModel
 from wavefront_api_client.models.paged_integration import PagedIntegration
 from wavefront_api_client.models.paged_maintenance_window import PagedMaintenanceWindow
 from wavefront_api_client.models.paged_message import PagedMessage
@@ -173,7 +175,7 @@
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
 from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy
+from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
@@ -206,7 +208,7 @@
 from wavefront_api_client.models.response_container_paged_derived_metric_definition_with_stats import ResponseContainerPagedDerivedMetricDefinitionWithStats
 from wavefront_api_client.models.response_container_paged_event import ResponseContainerPagedEvent
 from wavefront_api_client.models.response_container_paged_external_link import ResponseContainerPagedExternalLink
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy
+from wavefront_api_client.models.response_container_paged_ingestion_policy_read_model import ResponseContainerPagedIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_paged_integration import ResponseContainerPagedIntegration
 from wavefront_api_client.models.response_container_paged_maintenance_window import ResponseContainerPagedMaintenanceWindow
 from wavefront_api_client.models.response_container_paged_message import ResponseContainerPagedMessage
@@ -247,7 +249,6 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
-from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
@@ -277,6 +278,7 @@
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
+from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 7d5867a..59589d5 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -33,18 +33,72 @@ class Annotation(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'key': 'str',
+        'value': 'str'
     }
 
     attribute_map = {
+        'key': 'key',
+        'value': 'value'
     }
 
-    def __init__(self, _configuration=None):  # noqa: E501
+    def __init__(self, key=None, value=None, _configuration=None):  # noqa: E501
         """Annotation - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
+
+        self._key = None
+        self._value = None
         self.discriminator = None
 
+        if key is not None:
+            self.key = key
+        if value is not None:
+            self.value = value
+
+    @property
+    def key(self):
+        """Gets the key of this Annotation.  # noqa: E501
+
+
+        :return: The key of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._key
+
+    @key.setter
+    def key(self, key):
+        """Sets the key of this Annotation.
+
+
+        :param key: The key of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._key = key
+
+    @property
+    def value(self):
+        """Gets the value of this Annotation.  # noqa: E501
+
+
+        :return: The value of this Annotation.  # noqa: E501
+        :rtype: str
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Annotation.
+
+
+        :param value: The value of this Annotation.  # noqa: E501
+        :type: str
+        """
+
+        self._value = value
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 22540ed..6cc96c5 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -63,6 +63,7 @@ class CloudIntegration(object):
         'service': 'str',
         'service_refresh_rate_in_mins': 'int',
         'snowflake': 'SnowflakeConfiguration',
+        'tesla': 'TeslaConfiguration',
         'updated_epoch_millis': 'int',
         'updater_id': 'str',
         'vrops': 'VropsConfiguration'
@@ -99,12 +100,13 @@ class CloudIntegration(object):
         'service': 'service',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'snowflake': 'snowflake',
+        'tesla': 'tesla',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId',
         'vrops': 'vrops'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -140,6 +142,7 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._service = None
         self._service_refresh_rate_in_mins = None
         self._snowflake = None
+        self._tesla = None
         self._updated_epoch_millis = None
         self._updater_id = None
         self._vrops = None
@@ -203,6 +206,8 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if snowflake is not None:
             self.snowflake = snowflake
+        if tesla is not None:
+            self.tesla = tesla
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
@@ -819,7 +824,7 @@ def service(self, service):
         """
         if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 service not in allowed_values):
             raise ValueError(
@@ -873,6 +878,27 @@ def snowflake(self, snowflake):
 
         self._snowflake = snowflake
 
+    @property
+    def tesla(self):
+        """Gets the tesla of this CloudIntegration.  # noqa: E501
+
+
+        :return: The tesla of this CloudIntegration.  # noqa: E501
+        :rtype: TeslaConfiguration
+        """
+        return self._tesla
+
+    @tesla.setter
+    def tesla(self, tesla):
+        """Sets the tesla of this CloudIntegration.
+
+
+        :param tesla: The tesla of this CloudIntegration.  # noqa: E501
+        :type: TeslaConfiguration
+        """
+
+        self._tesla = tesla
+
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this CloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 246111d..4c31267 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -46,8 +46,8 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
@@ -529,7 +529,7 @@ def ingestion_policies(self):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :return: The ingestion_policies of this Proxy.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -540,7 +540,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies associated with the proxy through user and groups  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -552,7 +552,7 @@ def ingestion_policy(self):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :return: The ingestion_policy of this Proxy.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -563,7 +563,7 @@ def ingestion_policy(self, ingestion_policy):
         Ingestion policy associated with the proxy  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 039afdf..e88a116 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index a891110..be30c7a 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,8 +37,8 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
@@ -208,7 +208,7 @@ def ingestion_policies(self):
         The list of service account's ingestion policies.  # noqa: E501
 
         :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -219,7 +219,7 @@ def ingestion_policies(self, ingestion_policies):
         The list of service account's ingestion policies.  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -231,7 +231,7 @@ def ingestion_policy(self):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -242,7 +242,7 @@ def ingestion_policy(self, ingestion_policy):
         The ingestion policy object linked with service account.  # noqa: E501
 
         :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 8d8b2a0..ec8ebd2 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,8 +36,8 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -161,7 +161,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserDTO.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -171,7 +171,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -182,7 +182,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserDTO.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -192,7 +192,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index d9fe7b4..7c450cf 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,7 +37,7 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -198,7 +198,7 @@ def ingestion_policies(self):
         Ingestion policies linked with the user group  # noqa: E501
 
         :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -209,7 +209,7 @@ def ingestion_policies(self, ingestion_policies):
         Ingestion policies linked with the user group  # noqa: E501
 
         :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 38f0017..bb179ad 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,8 +36,8 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicy]',
-        'ingestion_policy': 'IngestionPolicy',
+        'ingestion_policies': 'list[IngestionPolicyReadModel]',
+        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -169,7 +169,7 @@ def ingestion_policies(self):
 
 
         :return: The ingestion_policies of this UserModel.  # noqa: E501
-        :rtype: list[IngestionPolicy]
+        :rtype: list[IngestionPolicyReadModel]
         """
         return self._ingestion_policies
 
@@ -179,7 +179,7 @@ def ingestion_policies(self, ingestion_policies):
 
 
         :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
-        :type: list[IngestionPolicy]
+        :type: list[IngestionPolicyReadModel]
         """
 
         self._ingestion_policies = ingestion_policies
@@ -190,7 +190,7 @@ def ingestion_policy(self):
 
 
         :return: The ingestion_policy of this UserModel.  # noqa: E501
-        :rtype: IngestionPolicy
+        :rtype: IngestionPolicyReadModel
         """
         return self._ingestion_policy
 
@@ -200,7 +200,7 @@ def ingestion_policy(self, ingestion_policy):
 
 
         :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
-        :type: IngestionPolicy
+        :type: IngestionPolicyReadModel
         """
 
         self._ingestion_policy = ingestion_policy

From 8b119299226ac6fd2fd8d4f8cbde21be86a7abbe Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Mon, 12 Dec 2022 08:16:25 -0800
Subject: [PATCH 121/161] Autogenerated Update v2.164.0.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 setup.py                              | 2 +-
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 wavefront_api_client/models/proxy.py  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 32cb503..62f444c 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.163.3"
+    "packageVersion": "2.164.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6d18772..32cb503 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.162.3"
+    "packageVersion": "2.163.3"
 }
diff --git a/README.md b/README.md
index 6750787..891a7f7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.163.3
+- Package version: 2.164.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index fde5942..d48c3d6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.163.3"
+VERSION = "2.164.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index fdfb8db..b5b8298 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.163.3/python'
+        self.user_agent = 'Swagger-Codegen/2.164.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index bff465e..0296345 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.163.3".\
+               "SDK Package Version: 2.164.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 4c31267..57caf68 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -933,7 +933,7 @@ def status(self, status):
         :param status: The status of this Proxy.  # noqa: E501
         :type: str
         """
-        allowed_values = ["ACTIVE", "STOPPED_UNKNOWN", "STOPPED_BY_SERVER"]  # noqa: E501
+        allowed_values = ["ACTIVE", "STOPPED_UNKNOWN", "STOPPED_BY_SERVER", "TOKEN_EXPIRED"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 status not in allowed_values):
             raise ValueError(

From fd7587c8fc16e10cd587fd1973c64188f9a0299b Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 10 Jan 2023 08:16:20 -0800
Subject: [PATCH 122/161] Autogenerated Update v2.166.1.

---
 .swagger-codegen/config.json                                | 2 +-
 .swagger-codegen/config.jsone                               | 2 +-
 README.md                                                   | 4 ++--
 docs/Alert.md                                               | 2 +-
 setup.py                                                    | 6 +++---
 wavefront_api_client/__init__.py                            | 2 +-
 wavefront_api_client/api/access_policy_api.py               | 2 +-
 .../api/account__user_and_service_account_api.py            | 2 +-
 wavefront_api_client/api/alert_analytics_api.py             | 2 +-
 wavefront_api_client/api/alert_api.py                       | 2 +-
 wavefront_api_client/api/api_token_api.py                   | 2 +-
 wavefront_api_client/api/cloud_integration_api.py           | 2 +-
 wavefront_api_client/api/dashboard_api.py                   | 2 +-
 wavefront_api_client/api/derived_metric_api.py              | 2 +-
 wavefront_api_client/api/direct_ingestion_api.py            | 2 +-
 wavefront_api_client/api/event_api.py                       | 2 +-
 wavefront_api_client/api/external_link_api.py               | 2 +-
 wavefront_api_client/api/ingestion_spy_api.py               | 2 +-
 wavefront_api_client/api/integration_api.py                 | 2 +-
 wavefront_api_client/api/maintenance_window_api.py          | 2 +-
 wavefront_api_client/api/message_api.py                     | 2 +-
 wavefront_api_client/api/metric_api.py                      | 2 +-
 wavefront_api_client/api/metrics_policy_api.py              | 2 +-
 wavefront_api_client/api/monitored_application_api.py       | 2 +-
 wavefront_api_client/api/monitored_service_api.py           | 2 +-
 wavefront_api_client/api/notificant_api.py                  | 2 +-
 wavefront_api_client/api/proxy_api.py                       | 2 +-
 wavefront_api_client/api/query_api.py                       | 2 +-
 wavefront_api_client/api/recent_app_map_search_api.py       | 2 +-
 wavefront_api_client/api/recent_traces_search_api.py        | 2 +-
 wavefront_api_client/api/role_api.py                        | 2 +-
 wavefront_api_client/api/saved_app_map_search_api.py        | 2 +-
 wavefront_api_client/api/saved_app_map_search_group_api.py  | 2 +-
 wavefront_api_client/api/saved_search_api.py                | 2 +-
 wavefront_api_client/api/saved_traces_search_api.py         | 2 +-
 wavefront_api_client/api/saved_traces_search_group_api.py   | 2 +-
 wavefront_api_client/api/search_api.py                      | 2 +-
 wavefront_api_client/api/source_api.py                      | 2 +-
 wavefront_api_client/api/span_sampling_policy_api.py        | 2 +-
 wavefront_api_client/api/usage_api.py                       | 2 +-
 wavefront_api_client/api/user_api.py                        | 2 +-
 wavefront_api_client/api/user_group_api.py                  | 2 +-
 wavefront_api_client/api/webhook_api.py                     | 2 +-
 wavefront_api_client/api_client.py                          | 4 ++--
 wavefront_api_client/configuration.py                       | 4 ++--
 wavefront_api_client/models/__init__.py                     | 2 +-
 wavefront_api_client/models/access_control_element.py       | 2 +-
 wavefront_api_client/models/access_control_list_read_dto.py | 2 +-
 wavefront_api_client/models/access_control_list_simple.py   | 2 +-
 .../models/access_control_list_write_dto.py                 | 2 +-
 wavefront_api_client/models/access_policy.py                | 2 +-
 wavefront_api_client/models/access_policy_rule_dto.py       | 2 +-
 wavefront_api_client/models/account.py                      | 2 +-
 wavefront_api_client/models/alert.py                        | 6 +++---
 wavefront_api_client/models/alert_dashboard.py              | 2 +-
 wavefront_api_client/models/alert_min.py                    | 2 +-
 wavefront_api_client/models/alert_route.py                  | 2 +-
 wavefront_api_client/models/alert_source.py                 | 2 +-
 wavefront_api_client/models/annotation.py                   | 2 +-
 wavefront_api_client/models/anomaly.py                      | 2 +-
 wavefront_api_client/models/api_token_model.py              | 2 +-
 wavefront_api_client/models/app_dynamics_configuration.py   | 2 +-
 wavefront_api_client/models/app_search_filter.py            | 2 +-
 wavefront_api_client/models/app_search_filter_value.py      | 2 +-
 wavefront_api_client/models/app_search_filters.py           | 2 +-
 wavefront_api_client/models/aws_base_credentials.py         | 2 +-
 .../models/azure_activity_log_configuration.py              | 2 +-
 wavefront_api_client/models/azure_base_credentials.py       | 2 +-
 wavefront_api_client/models/azure_configuration.py          | 2 +-
 wavefront_api_client/models/chart.py                        | 2 +-
 wavefront_api_client/models/chart_settings.py               | 2 +-
 wavefront_api_client/models/chart_source_query.py           | 2 +-
 wavefront_api_client/models/class_loader.py                 | 2 +-
 wavefront_api_client/models/cloud_integration.py            | 2 +-
 wavefront_api_client/models/cloud_trail_configuration.py    | 2 +-
 wavefront_api_client/models/cloud_watch_configuration.py    | 2 +-
 wavefront_api_client/models/conversion.py                   | 2 +-
 wavefront_api_client/models/conversion_object.py            | 2 +-
 wavefront_api_client/models/customer_facing_user_object.py  | 2 +-
 wavefront_api_client/models/dashboard.py                    | 2 +-
 wavefront_api_client/models/dashboard_min.py                | 2 +-
 wavefront_api_client/models/dashboard_parameter_value.py    | 2 +-
 wavefront_api_client/models/dashboard_section.py            | 2 +-
 wavefront_api_client/models/dashboard_section_row.py        | 2 +-
 wavefront_api_client/models/default_saved_app_map_search.py | 2 +-
 wavefront_api_client/models/default_saved_traces_search.py  | 2 +-
 wavefront_api_client/models/derived_metric_definition.py    | 2 +-
 wavefront_api_client/models/dynatrace_configuration.py      | 2 +-
 wavefront_api_client/models/ec2_configuration.py            | 2 +-
 wavefront_api_client/models/event.py                        | 2 +-
 wavefront_api_client/models/event_search_request.py         | 2 +-
 wavefront_api_client/models/event_time_range.py             | 2 +-
 wavefront_api_client/models/external_link.py                | 2 +-
 wavefront_api_client/models/facet_response.py               | 2 +-
 .../models/facet_search_request_container.py                | 2 +-
 wavefront_api_client/models/facets_response_container.py    | 2 +-
 .../models/facets_search_request_container.py               | 2 +-
 wavefront_api_client/models/fast_reader_builder.py          | 2 +-
 wavefront_api_client/models/field.py                        | 2 +-
 wavefront_api_client/models/gcp_billing_configuration.py    | 2 +-
 wavefront_api_client/models/gcp_configuration.py            | 2 +-
 wavefront_api_client/models/global_alert_analytic.py        | 2 +-
 wavefront_api_client/models/history_entry.py                | 2 +-
 wavefront_api_client/models/history_response.py             | 2 +-
 wavefront_api_client/models/ingestion_policy_mapping.py     | 2 +-
 wavefront_api_client/models/ingestion_policy_metadata.py    | 2 +-
 wavefront_api_client/models/ingestion_policy_read_model.py  | 2 +-
 wavefront_api_client/models/ingestion_policy_write_model.py | 2 +-
 wavefront_api_client/models/install_alerts.py               | 2 +-
 wavefront_api_client/models/integration.py                  | 2 +-
 wavefront_api_client/models/integration_alert.py            | 2 +-
 wavefront_api_client/models/integration_alias.py            | 2 +-
 wavefront_api_client/models/integration_dashboard.py        | 2 +-
 wavefront_api_client/models/integration_manifest_group.py   | 2 +-
 wavefront_api_client/models/integration_metrics.py          | 2 +-
 wavefront_api_client/models/integration_status.py           | 2 +-
 wavefront_api_client/models/json_node.py                    | 2 +-
 wavefront_api_client/models/kubernetes_component.py         | 2 +-
 wavefront_api_client/models/kubernetes_component_status.py  | 2 +-
 wavefront_api_client/models/logical_type.py                 | 2 +-
 wavefront_api_client/models/maintenance_window.py           | 2 +-
 wavefront_api_client/models/message.py                      | 2 +-
 wavefront_api_client/models/metric_details.py               | 2 +-
 wavefront_api_client/models/metric_details_response.py      | 2 +-
 wavefront_api_client/models/metric_status.py                | 2 +-
 wavefront_api_client/models/metrics_policy_read_model.py    | 2 +-
 wavefront_api_client/models/metrics_policy_write_model.py   | 2 +-
 wavefront_api_client/models/module.py                       | 2 +-
 wavefront_api_client/models/module_descriptor.py            | 2 +-
 wavefront_api_client/models/module_layer.py                 | 2 +-
 wavefront_api_client/models/monitored_application_dto.py    | 2 +-
 wavefront_api_client/models/monitored_cluster.py            | 2 +-
 wavefront_api_client/models/monitored_service_dto.py        | 2 +-
 wavefront_api_client/models/new_relic_configuration.py      | 2 +-
 wavefront_api_client/models/new_relic_metric_filters.py     | 2 +-
 wavefront_api_client/models/notificant.py                   | 2 +-
 wavefront_api_client/models/notification_messages.py        | 2 +-
 wavefront_api_client/models/package.py                      | 2 +-
 wavefront_api_client/models/paged.py                        | 2 +-
 wavefront_api_client/models/paged_account.py                | 2 +-
 wavefront_api_client/models/paged_alert.py                  | 2 +-
 wavefront_api_client/models/paged_alert_with_stats.py       | 2 +-
 wavefront_api_client/models/paged_anomaly.py                | 2 +-
 wavefront_api_client/models/paged_api_token_model.py        | 2 +-
 wavefront_api_client/models/paged_cloud_integration.py      | 2 +-
 .../models/paged_customer_facing_user_object.py             | 2 +-
 wavefront_api_client/models/paged_dashboard.py              | 2 +-
 .../models/paged_derived_metric_definition.py               | 2 +-
 .../models/paged_derived_metric_definition_with_stats.py    | 2 +-
 wavefront_api_client/models/paged_event.py                  | 2 +-
 wavefront_api_client/models/paged_external_link.py          | 2 +-
 .../models/paged_ingestion_policy_read_model.py             | 2 +-
 wavefront_api_client/models/paged_integration.py            | 2 +-
 wavefront_api_client/models/paged_maintenance_window.py     | 2 +-
 wavefront_api_client/models/paged_message.py                | 2 +-
 .../models/paged_monitored_application_dto.py               | 2 +-
 wavefront_api_client/models/paged_monitored_cluster.py      | 2 +-
 wavefront_api_client/models/paged_monitored_service_dto.py  | 2 +-
 wavefront_api_client/models/paged_notificant.py             | 2 +-
 wavefront_api_client/models/paged_proxy.py                  | 2 +-
 wavefront_api_client/models/paged_recent_app_map_search.py  | 2 +-
 wavefront_api_client/models/paged_recent_traces_search.py   | 2 +-
 wavefront_api_client/models/paged_related_event.py          | 2 +-
 .../models/paged_report_event_anomaly_dto.py                | 2 +-
 wavefront_api_client/models/paged_role_dto.py               | 2 +-
 wavefront_api_client/models/paged_saved_app_map_search.py   | 2 +-
 .../models/paged_saved_app_map_search_group.py              | 2 +-
 wavefront_api_client/models/paged_saved_search.py           | 2 +-
 wavefront_api_client/models/paged_saved_traces_search.py    | 2 +-
 .../models/paged_saved_traces_search_group.py               | 2 +-
 wavefront_api_client/models/paged_service_account.py        | 2 +-
 wavefront_api_client/models/paged_source.py                 | 2 +-
 wavefront_api_client/models/paged_span_sampling_policy.py   | 2 +-
 wavefront_api_client/models/paged_user_group_model.py       | 2 +-
 wavefront_api_client/models/point.py                        | 2 +-
 wavefront_api_client/models/policy_rule_read_model.py       | 2 +-
 wavefront_api_client/models/policy_rule_write_model.py      | 2 +-
 wavefront_api_client/models/proxy.py                        | 2 +-
 wavefront_api_client/models/query_event.py                  | 2 +-
 wavefront_api_client/models/query_result.py                 | 2 +-
 wavefront_api_client/models/query_type_dto.py               | 2 +-
 wavefront_api_client/models/raw_timeseries.py               | 2 +-
 wavefront_api_client/models/recent_app_map_search.py        | 2 +-
 wavefront_api_client/models/recent_traces_search.py         | 2 +-
 wavefront_api_client/models/related_anomaly.py              | 2 +-
 wavefront_api_client/models/related_data.py                 | 2 +-
 wavefront_api_client/models/related_event.py                | 2 +-
 wavefront_api_client/models/related_event_time_range.py     | 2 +-
 wavefront_api_client/models/report_event_anomaly_dto.py     | 2 +-
 wavefront_api_client/models/response_container.py           | 2 +-
 .../models/response_container_access_policy.py              | 2 +-
 .../models/response_container_access_policy_action.py       | 2 +-
 wavefront_api_client/models/response_container_account.py   | 2 +-
 wavefront_api_client/models/response_container_alert.py     | 2 +-
 .../models/response_container_api_token_model.py            | 2 +-
 .../models/response_container_cloud_integration.py          | 2 +-
 wavefront_api_client/models/response_container_dashboard.py | 2 +-
 .../response_container_default_saved_app_map_search.py      | 2 +-
 .../response_container_default_saved_traces_search.py       | 2 +-
 .../models/response_container_derived_metric_definition.py  | 2 +-
 wavefront_api_client/models/response_container_event.py     | 2 +-
 .../models/response_container_external_link.py              | 2 +-
 .../models/response_container_facet_response.py             | 2 +-
 .../models/response_container_facets_response_container.py  | 2 +-
 .../models/response_container_global_alert_analytic.py      | 2 +-
 .../models/response_container_history_response.py           | 2 +-
 .../response_container_ingestion_policy_read_model.py       | 2 +-
 .../models/response_container_integration.py                | 2 +-
 .../models/response_container_integration_status.py         | 2 +-
 .../response_container_list_access_control_list_read_dto.py | 2 +-
 .../models/response_container_list_api_token_model.py       | 2 +-
 .../models/response_container_list_integration.py           | 2 +-
 .../response_container_list_integration_manifest_group.py   | 2 +-
 .../models/response_container_list_notification_messages.py | 2 +-
 .../models/response_container_list_service_account.py       | 2 +-
 .../models/response_container_list_string.py                | 2 +-
 .../models/response_container_list_user_api_token.py        | 2 +-
 .../models/response_container_list_user_dto.py              | 2 +-
 .../models/response_container_maintenance_window.py         | 2 +-
 .../models/response_container_map_string_integer.py         | 2 +-
 .../response_container_map_string_integration_status.py     | 2 +-
 wavefront_api_client/models/response_container_message.py   | 2 +-
 .../models/response_container_metrics_policy_read_model.py  | 2 +-
 .../models/response_container_monitored_application_dto.py  | 2 +-
 .../models/response_container_monitored_cluster.py          | 2 +-
 .../models/response_container_monitored_service_dto.py      | 2 +-
 .../models/response_container_notificant.py                 | 2 +-
 .../models/response_container_paged_account.py              | 2 +-
 .../models/response_container_paged_alert.py                | 2 +-
 .../models/response_container_paged_alert_with_stats.py     | 2 +-
 .../models/response_container_paged_anomaly.py              | 2 +-
 .../models/response_container_paged_api_token_model.py      | 2 +-
 .../models/response_container_paged_cloud_integration.py    | 2 +-
 .../response_container_paged_customer_facing_user_object.py | 2 +-
 .../models/response_container_paged_dashboard.py            | 2 +-
 .../response_container_paged_derived_metric_definition.py   | 2 +-
 ..._container_paged_derived_metric_definition_with_stats.py | 2 +-
 .../models/response_container_paged_event.py                | 2 +-
 .../models/response_container_paged_external_link.py        | 2 +-
 .../response_container_paged_ingestion_policy_read_model.py | 2 +-
 .../models/response_container_paged_integration.py          | 2 +-
 .../models/response_container_paged_maintenance_window.py   | 2 +-
 .../models/response_container_paged_message.py              | 2 +-
 .../response_container_paged_monitored_application_dto.py   | 2 +-
 .../models/response_container_paged_monitored_cluster.py    | 2 +-
 .../response_container_paged_monitored_service_dto.py       | 2 +-
 .../models/response_container_paged_notificant.py           | 2 +-
 .../models/response_container_paged_proxy.py                | 2 +-
 .../response_container_paged_recent_app_map_search.py       | 2 +-
 .../models/response_container_paged_recent_traces_search.py | 2 +-
 .../models/response_container_paged_related_event.py        | 2 +-
 .../response_container_paged_report_event_anomaly_dto.py    | 2 +-
 .../models/response_container_paged_role_dto.py             | 2 +-
 .../models/response_container_paged_saved_app_map_search.py | 2 +-
 .../response_container_paged_saved_app_map_search_group.py  | 2 +-
 .../models/response_container_paged_saved_search.py         | 2 +-
 .../models/response_container_paged_saved_traces_search.py  | 2 +-
 .../response_container_paged_saved_traces_search_group.py   | 2 +-
 .../models/response_container_paged_service_account.py      | 2 +-
 .../models/response_container_paged_source.py               | 2 +-
 .../models/response_container_paged_span_sampling_policy.py | 2 +-
 .../models/response_container_paged_user_group_model.py     | 2 +-
 wavefront_api_client/models/response_container_proxy.py     | 2 +-
 .../models/response_container_query_type_dto.py             | 2 +-
 .../models/response_container_recent_app_map_search.py      | 2 +-
 .../models/response_container_recent_traces_search.py       | 2 +-
 wavefront_api_client/models/response_container_role_dto.py  | 2 +-
 .../models/response_container_saved_app_map_search.py       | 2 +-
 .../models/response_container_saved_app_map_search_group.py | 2 +-
 .../models/response_container_saved_search.py               | 2 +-
 .../models/response_container_saved_traces_search.py        | 2 +-
 .../models/response_container_saved_traces_search_group.py  | 2 +-
 .../models/response_container_service_account.py            | 2 +-
 .../models/response_container_set_business_function.py      | 2 +-
 .../models/response_container_set_source_label_pair.py      | 2 +-
 wavefront_api_client/models/response_container_source.py    | 2 +-
 .../models/response_container_span_sampling_policy.py       | 2 +-
 wavefront_api_client/models/response_container_string.py    | 2 +-
 .../models/response_container_tags_response.py              | 2 +-
 .../models/response_container_user_api_token.py             | 2 +-
 .../models/response_container_user_group_model.py           | 2 +-
 .../models/response_container_validated_users_dto.py        | 2 +-
 wavefront_api_client/models/response_container_void.py      | 2 +-
 wavefront_api_client/models/response_status.py              | 2 +-
 wavefront_api_client/models/role_dto.py                     | 2 +-
 wavefront_api_client/models/role_properties_dto.py          | 2 +-
 wavefront_api_client/models/saved_app_map_search.py         | 2 +-
 wavefront_api_client/models/saved_app_map_search_group.py   | 2 +-
 wavefront_api_client/models/saved_search.py                 | 2 +-
 wavefront_api_client/models/saved_traces_search.py          | 2 +-
 wavefront_api_client/models/saved_traces_search_group.py    | 2 +-
 wavefront_api_client/models/schema.py                       | 2 +-
 wavefront_api_client/models/search_query.py                 | 2 +-
 wavefront_api_client/models/service_account.py              | 2 +-
 wavefront_api_client/models/service_account_write.py        | 2 +-
 wavefront_api_client/models/setup.py                        | 2 +-
 wavefront_api_client/models/snowflake_configuration.py      | 2 +-
 wavefront_api_client/models/sortable_search_request.py      | 2 +-
 wavefront_api_client/models/sorting.py                      | 2 +-
 wavefront_api_client/models/source.py                       | 2 +-
 wavefront_api_client/models/source_label_pair.py            | 2 +-
 .../models/source_search_request_container.py               | 2 +-
 wavefront_api_client/models/span.py                         | 2 +-
 wavefront_api_client/models/span_sampling_policy.py         | 2 +-
 wavefront_api_client/models/specific_data.py                | 2 +-
 wavefront_api_client/models/stats_model_internal_use.py     | 2 +-
 wavefront_api_client/models/stripe.py                       | 2 +-
 wavefront_api_client/models/tags_response.py                | 2 +-
 wavefront_api_client/models/target_info.py                  | 2 +-
 wavefront_api_client/models/tesla_configuration.py          | 2 +-
 wavefront_api_client/models/timeseries.py                   | 2 +-
 wavefront_api_client/models/trace.py                        | 2 +-
 wavefront_api_client/models/triage_dashboard.py             | 2 +-
 wavefront_api_client/models/tuple.py                        | 2 +-
 wavefront_api_client/models/tuple_result.py                 | 2 +-
 wavefront_api_client/models/tuple_value_result.py           | 2 +-
 wavefront_api_client/models/user_api_token.py               | 2 +-
 wavefront_api_client/models/user_dto.py                     | 2 +-
 wavefront_api_client/models/user_group.py                   | 2 +-
 wavefront_api_client/models/user_group_model.py             | 2 +-
 wavefront_api_client/models/user_group_properties_dto.py    | 2 +-
 wavefront_api_client/models/user_group_write.py             | 2 +-
 wavefront_api_client/models/user_model.py                   | 2 +-
 wavefront_api_client/models/user_request_dto.py             | 2 +-
 wavefront_api_client/models/user_to_create.py               | 2 +-
 wavefront_api_client/models/validated_users_dto.py          | 2 +-
 wavefront_api_client/models/void.py                         | 2 +-
 wavefront_api_client/models/vrops_configuration.py          | 2 +-
 wavefront_api_client/models/wf_tags.py                      | 2 +-
 wavefront_api_client/rest.py                                | 2 +-
 330 files changed, 337 insertions(+), 337 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 62f444c..0710a25 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.164.0"
+    "packageVersion": "2.166.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 32cb503..62f444c 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.163.3"
+    "packageVersion": "2.164.0"
 }
diff --git a/README.md b/README.md
index 891a7f7..7d52883 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # wavefront-api-client
-<p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>
+<p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>
 
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.164.0
+- Package version: 2.166.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index 9dddec9..2a733aa 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -76,7 +76,7 @@ Name | Type | Description | Notes
 **system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
 **tagpaths** | **list[str]** |  | [optional] 
 **tags** | [**WFTags**](WFTags.md) |  | [optional] 
-**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}) | [optional] 
+**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}). You cannot update this value. | [optional] 
 **target_endpoints** | **list[str]** |  | [optional] 
 **target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
 **targets** | **dict(str, str)** | Targets for severity. | [optional] 
diff --git a/setup.py b/setup.py
index d48c3d6..0656bd0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.164.0"
+VERSION = "2.166.1"
 # To install the library, run the following
 #
 # python setup.py install
@@ -41,6 +41,6 @@
     packages=find_packages(),
     include_package_data=True,
     long_description="""\
-    &lt;p&gt;The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.&lt;/p&gt;&lt;p&gt;When you make REST API calls outside the Wavefront REST API documentation you must add the header \&quot;Authorization: Bearer &amp;lt;&amp;lt;API-TOKEN&amp;gt;&amp;gt;\&quot; to your HTTP requests.&lt;/p&gt;  # noqa: E501
+    &lt;p&gt;The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.&lt;/p&gt;&lt;p&gt;When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see &lt;a href&#x3D;\&quot;http://docs.wavefront.com/using_wavefront_api.html\&quot;&gt;Use the Wavefront REST API.&lt;/a&gt;&lt;/p&gt;  # noqa: E501
     """
 )
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 86331b3..6372b89 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -5,7 +5,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/access_policy_api.py b/wavefront_api_client/api/access_policy_api.py
index 4aeaf50..535358f 100644
--- a/wavefront_api_client/api/access_policy_api.py
+++ b/wavefront_api_client/api/access_policy_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 5b040e8..38df14a 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/alert_analytics_api.py b/wavefront_api_client/api/alert_analytics_api.py
index d953c4f..f1a5c31 100644
--- a/wavefront_api_client/api/alert_analytics_api.py
+++ b/wavefront_api_client/api/alert_analytics_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 86aaaa5..dc09763 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index 25a262c..bcd87cd 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 49d071f..3183833 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index 4337c06..85ec725 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index 2016598..480bc66 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/direct_ingestion_api.py b/wavefront_api_client/api/direct_ingestion_api.py
index 6d18aa7..2b3c60e 100644
--- a/wavefront_api_client/api/direct_ingestion_api.py
+++ b/wavefront_api_client/api/direct_ingestion_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index aa9bd37..7f86dce 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index 6316cc7..4c28f4d 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index 6c95f90..be5a112 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index 06098c7..e098e6b 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index 42318d4..9a1154b 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index 1be574c..c0ade09 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index 8f5d16e..5c52c32 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/metrics_policy_api.py b/wavefront_api_client/api/metrics_policy_api.py
index 615f1ed..9e24ba9 100644
--- a/wavefront_api_client/api/metrics_policy_api.py
+++ b/wavefront_api_client/api/metrics_policy_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/monitored_application_api.py b/wavefront_api_client/api/monitored_application_api.py
index c63c458..125c307 100644
--- a/wavefront_api_client/api/monitored_application_api.py
+++ b/wavefront_api_client/api/monitored_application_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index e2c3eb8..10b2d68 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 87153ee..861ad16 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 2675e0a..5b7acaa 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index e489299..54122e8 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/recent_app_map_search_api.py b/wavefront_api_client/api/recent_app_map_search_api.py
index 5b84eff..3fce60e 100644
--- a/wavefront_api_client/api/recent_app_map_search_api.py
+++ b/wavefront_api_client/api/recent_app_map_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/recent_traces_search_api.py b/wavefront_api_client/api/recent_traces_search_api.py
index 58ee4f2..ab5abf7 100644
--- a/wavefront_api_client/api/recent_traces_search_api.py
+++ b/wavefront_api_client/api/recent_traces_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index 4573a97..ba51e4d 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_app_map_search_api.py b/wavefront_api_client/api/saved_app_map_search_api.py
index 90f5cf9..f599c21 100644
--- a/wavefront_api_client/api/saved_app_map_search_api.py
+++ b/wavefront_api_client/api/saved_app_map_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_app_map_search_group_api.py b/wavefront_api_client/api/saved_app_map_search_group_api.py
index 873fad7..93076cb 100644
--- a/wavefront_api_client/api/saved_app_map_search_group_api.py
+++ b/wavefront_api_client/api/saved_app_map_search_group_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index 8c3e60d..ba5e777 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_traces_search_api.py b/wavefront_api_client/api/saved_traces_search_api.py
index 5bfbc77..9e45ef3 100644
--- a/wavefront_api_client/api/saved_traces_search_api.py
+++ b/wavefront_api_client/api/saved_traces_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_traces_search_group_api.py b/wavefront_api_client/api/saved_traces_search_group_api.py
index e40867f..64d030c 100644
--- a/wavefront_api_client/api/saved_traces_search_group_api.py
+++ b/wavefront_api_client/api/saved_traces_search_group_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index ea93637..cbbb356 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 7bd3720..95f61b9 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/span_sampling_policy_api.py b/wavefront_api_client/api/span_sampling_policy_api.py
index 0e2ede1..36417fc 100644
--- a/wavefront_api_client/api/span_sampling_policy_api.py
+++ b/wavefront_api_client/api/span_sampling_policy_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 20dc03f..b7502ca 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 5532db7..53dd214 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index eae86c1..45e6bd5 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 68a596f..42169e8 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b5b8298..84ccb25 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -2,7 +2,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.164.0/python'
+        self.user_agent = 'Swagger-Codegen/2.166.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 0296345..d0dfabb 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.164.0".\
+               "SDK Package Version: 2.166.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 1e880af..157e7a4 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -4,7 +4,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index fe2a935..3353714 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_list_read_dto.py b/wavefront_api_client/models/access_control_list_read_dto.py
index 6812e9b..5622d09 100644
--- a/wavefront_api_client/models/access_control_list_read_dto.py
+++ b/wavefront_api_client/models/access_control_list_read_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
index 04a6ef4..df6929d 100644
--- a/wavefront_api_client/models/access_control_list_simple.py
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_list_write_dto.py b/wavefront_api_client/models/access_control_list_write_dto.py
index 9bd47b2..826f570 100644
--- a/wavefront_api_client/models/access_control_list_write_dto.py
+++ b/wavefront_api_client/models/access_control_list_write_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_policy.py b/wavefront_api_client/models/access_policy.py
index 05a222c..c194176 100644
--- a/wavefront_api_client/models/access_policy.py
+++ b/wavefront_api_client/models/access_policy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_policy_rule_dto.py b/wavefront_api_client/models/access_policy_rule_dto.py
index 9e60a17..0372b53 100644
--- a/wavefront_api_client/models/access_policy_rule_dto.py
+++ b/wavefront_api_client/models/access_policy_rule_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index ffaf6b7..cdef6d3 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index b60eec7..cd1c8be 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -2141,7 +2141,7 @@ def tags(self, tags):
     def target(self):
         """Gets the target of this Alert.  # noqa: E501
 
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID})  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}). You cannot update this value.  # noqa: E501
 
         :return: The target of this Alert.  # noqa: E501
         :rtype: str
@@ -2152,7 +2152,7 @@ def target(self):
     def target(self, target):
         """Sets the target of this Alert.
 
-        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID})  # noqa: E501
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}). You cannot update this value.  # noqa: E501
 
         :param target: The target of this Alert.  # noqa: E501
         :type: str
diff --git a/wavefront_api_client/models/alert_dashboard.py b/wavefront_api_client/models/alert_dashboard.py
index 25ed658..40d1fe3 100644
--- a/wavefront_api_client/models/alert_dashboard.py
+++ b/wavefront_api_client/models/alert_dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_min.py b/wavefront_api_client/models/alert_min.py
index 50a52a5..d62a4ec 100644
--- a/wavefront_api_client/models/alert_min.py
+++ b/wavefront_api_client/models/alert_min.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_route.py b/wavefront_api_client/models/alert_route.py
index 8ecf192..2a3590e 100644
--- a/wavefront_api_client/models/alert_route.py
+++ b/wavefront_api_client/models/alert_route.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_source.py b/wavefront_api_client/models/alert_source.py
index 606cb33..5418258 100644
--- a/wavefront_api_client/models/alert_source.py
+++ b/wavefront_api_client/models/alert_source.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index 59589d5..f0d90eb 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/anomaly.py b/wavefront_api_client/models/anomaly.py
index f4947dc..239950f 100644
--- a/wavefront_api_client/models/anomaly.py
+++ b/wavefront_api_client/models/anomaly.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/api_token_model.py b/wavefront_api_client/models/api_token_model.py
index a5d069b..98dd390 100644
--- a/wavefront_api_client/models/api_token_model.py
+++ b/wavefront_api_client/models/api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_dynamics_configuration.py b/wavefront_api_client/models/app_dynamics_configuration.py
index 48e1996..39e7836 100644
--- a/wavefront_api_client/models/app_dynamics_configuration.py
+++ b/wavefront_api_client/models/app_dynamics_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_search_filter.py b/wavefront_api_client/models/app_search_filter.py
index 261fe80..79f7964 100644
--- a/wavefront_api_client/models/app_search_filter.py
+++ b/wavefront_api_client/models/app_search_filter.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_search_filter_value.py b/wavefront_api_client/models/app_search_filter_value.py
index 98c6227..8b9721f 100644
--- a/wavefront_api_client/models/app_search_filter_value.py
+++ b/wavefront_api_client/models/app_search_filter_value.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_search_filters.py b/wavefront_api_client/models/app_search_filters.py
index 650897b..a338a83 100644
--- a/wavefront_api_client/models/app_search_filters.py
+++ b/wavefront_api_client/models/app_search_filters.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index 159b459..87fc0ed 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index 44fc962..74ec11b 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 69eca36..7c80795 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index 6d0507d..7468b1a 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 49df37a..1189340 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 394f255..f987f94 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index 282af34..b31c307 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/class_loader.py b/wavefront_api_client/models/class_loader.py
index 1164e50..b2d4a3b 100644
--- a/wavefront_api_client/models/class_loader.py
+++ b/wavefront_api_client/models/class_loader.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 6cc96c5..f38f878 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index c8fed17..1e171a9 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index f834b16..151faa1 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/conversion.py b/wavefront_api_client/models/conversion.py
index 0361ce9..978d7f7 100644
--- a/wavefront_api_client/models/conversion.py
+++ b/wavefront_api_client/models/conversion.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/conversion_object.py b/wavefront_api_client/models/conversion_object.py
index 61a59b9..ee2a757 100644
--- a/wavefront_api_client/models/conversion_object.py
+++ b/wavefront_api_client/models/conversion_object.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index 37bf975..48ca7b7 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 3b5f25a..8ead580 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_min.py b/wavefront_api_client/models/dashboard_min.py
index 64797da..4015d43 100644
--- a/wavefront_api_client/models/dashboard_min.py
+++ b/wavefront_api_client/models/dashboard_min.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index 0a81a28..eb28da8 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index 768b1ae..8ccfe99 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index 26ad8ab..1fb84f1 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/default_saved_app_map_search.py b/wavefront_api_client/models/default_saved_app_map_search.py
index c5cc0ce..4f1bf3e 100644
--- a/wavefront_api_client/models/default_saved_app_map_search.py
+++ b/wavefront_api_client/models/default_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/default_saved_traces_search.py b/wavefront_api_client/models/default_saved_traces_search.py
index 715d80f..820c4a9 100644
--- a/wavefront_api_client/models/default_saved_traces_search.py
+++ b/wavefront_api_client/models/default_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index a9990f5..4f66b9c 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dynatrace_configuration.py b/wavefront_api_client/models/dynatrace_configuration.py
index afa93a0..d8e5d7a 100644
--- a/wavefront_api_client/models/dynatrace_configuration.py
+++ b/wavefront_api_client/models/dynatrace_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 812f8b6..52935c2 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index 1d89b98..a0c8831 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 0546646..4bc48d1 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/event_time_range.py b/wavefront_api_client/models/event_time_range.py
index ce849e0..ee3f2c5 100644
--- a/wavefront_api_client/models/event_time_range.py
+++ b/wavefront_api_client/models/event_time_range.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index 41b6a12..cf9d23b 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index 47b9943..4240c2e 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index e42bd7d..4b2903c 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index ffea04d..9425df4 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index e72818f..d921f0d 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/fast_reader_builder.py b/wavefront_api_client/models/fast_reader_builder.py
index 3732415..9677650 100644
--- a/wavefront_api_client/models/fast_reader_builder.py
+++ b/wavefront_api_client/models/fast_reader_builder.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/field.py b/wavefront_api_client/models/field.py
index a1fc62e..03b7e1c 100644
--- a/wavefront_api_client/models/field.py
+++ b/wavefront_api_client/models/field.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index 80e982a..5374d34 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 2d05f1c..b317a51 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/global_alert_analytic.py b/wavefront_api_client/models/global_alert_analytic.py
index e82b57c..2ffc914 100644
--- a/wavefront_api_client/models/global_alert_analytic.py
+++ b/wavefront_api_client/models/global_alert_analytic.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index 644fde3..6f6fffa 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index f00d5f0..94c0988 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_mapping.py b/wavefront_api_client/models/ingestion_policy_mapping.py
index 9d99ca4..c7ac160 100644
--- a/wavefront_api_client/models/ingestion_policy_mapping.py
+++ b/wavefront_api_client/models/ingestion_policy_mapping.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_metadata.py b/wavefront_api_client/models/ingestion_policy_metadata.py
index a28634e..4bc5546 100644
--- a/wavefront_api_client/models/ingestion_policy_metadata.py
+++ b/wavefront_api_client/models/ingestion_policy_metadata.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_read_model.py b/wavefront_api_client/models/ingestion_policy_read_model.py
index 0539876..ef159b3 100644
--- a/wavefront_api_client/models/ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_write_model.py b/wavefront_api_client/models/ingestion_policy_write_model.py
index cd6a265..7549e59 100644
--- a/wavefront_api_client/models/ingestion_policy_write_model.py
+++ b/wavefront_api_client/models/ingestion_policy_write_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/install_alerts.py b/wavefront_api_client/models/install_alerts.py
index 2272771..436f7bb 100644
--- a/wavefront_api_client/models/install_alerts.py
+++ b/wavefront_api_client/models/install_alerts.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index 5edc5ce..e8f25a4 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index caec4f1..d8ebf89 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index 819d874..f76f8f1 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 9b7a0bf..0345ecc 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 4285306..8b24f8a 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index d0b328f..f18c0b6 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index f0e358b..e49c61a 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/json_node.py b/wavefront_api_client/models/json_node.py
index 9d94f53..ad282f2 100644
--- a/wavefront_api_client/models/json_node.py
+++ b/wavefront_api_client/models/json_node.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
index b88a543..0d9283d 100644
--- a/wavefront_api_client/models/kubernetes_component.py
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/kubernetes_component_status.py b/wavefront_api_client/models/kubernetes_component_status.py
index 86b22b3..7859f39 100644
--- a/wavefront_api_client/models/kubernetes_component_status.py
+++ b/wavefront_api_client/models/kubernetes_component_status.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
index 0350271..8e44843 100644
--- a/wavefront_api_client/models/logical_type.py
+++ b/wavefront_api_client/models/logical_type.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index 8377447..baa9288 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index e477e13..78590e2 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metric_details.py b/wavefront_api_client/models/metric_details.py
index 7df55f4..458cc38 100644
--- a/wavefront_api_client/models/metric_details.py
+++ b/wavefront_api_client/models/metric_details.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index 0c30217..b0f12c8 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index 24a168a..b252637 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metrics_policy_read_model.py b/wavefront_api_client/models/metrics_policy_read_model.py
index de30781..3efef99 100644
--- a/wavefront_api_client/models/metrics_policy_read_model.py
+++ b/wavefront_api_client/models/metrics_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metrics_policy_write_model.py b/wavefront_api_client/models/metrics_policy_write_model.py
index d13bdb7..61896c6 100644
--- a/wavefront_api_client/models/metrics_policy_write_model.py
+++ b/wavefront_api_client/models/metrics_policy_write_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/module.py b/wavefront_api_client/models/module.py
index 358951a..64c35cb 100644
--- a/wavefront_api_client/models/module.py
+++ b/wavefront_api_client/models/module.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/module_descriptor.py b/wavefront_api_client/models/module_descriptor.py
index 0e93cf1..e288daa 100644
--- a/wavefront_api_client/models/module_descriptor.py
+++ b/wavefront_api_client/models/module_descriptor.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/module_layer.py b/wavefront_api_client/models/module_layer.py
index 944b4fb..5ace739 100644
--- a/wavefront_api_client/models/module_layer.py
+++ b/wavefront_api_client/models/module_layer.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/monitored_application_dto.py b/wavefront_api_client/models/monitored_application_dto.py
index 1013034..f661046 100644
--- a/wavefront_api_client/models/monitored_application_dto.py
+++ b/wavefront_api_client/models/monitored_application_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/monitored_cluster.py b/wavefront_api_client/models/monitored_cluster.py
index ee69e8e..0f800ae 100644
--- a/wavefront_api_client/models/monitored_cluster.py
+++ b/wavefront_api_client/models/monitored_cluster.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
index f64ffdd..528f1a1 100644
--- a/wavefront_api_client/models/monitored_service_dto.py
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index edcfaa6..66b8c94 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/new_relic_metric_filters.py b/wavefront_api_client/models/new_relic_metric_filters.py
index 200f1c7..5dd9ac5 100644
--- a/wavefront_api_client/models/new_relic_metric_filters.py
+++ b/wavefront_api_client/models/new_relic_metric_filters.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index ccb1160..d9c6da4 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/notification_messages.py b/wavefront_api_client/models/notification_messages.py
index 04ae911..0d23915 100644
--- a/wavefront_api_client/models/notification_messages.py
+++ b/wavefront_api_client/models/notification_messages.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/package.py b/wavefront_api_client/models/package.py
index 8eab274..d756ed9 100644
--- a/wavefront_api_client/models/package.py
+++ b/wavefront_api_client/models/package.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged.py b/wavefront_api_client/models/paged.py
index d867372..cfe84e1 100644
--- a/wavefront_api_client/models/paged.py
+++ b/wavefront_api_client/models/paged.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_account.py b/wavefront_api_client/models/paged_account.py
index 9c5723e..3d0d4ca 100644
--- a/wavefront_api_client/models/paged_account.py
+++ b/wavefront_api_client/models/paged_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index c2d37aa..a02b58d 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index c21375c..7105b8c 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_anomaly.py b/wavefront_api_client/models/paged_anomaly.py
index 05e3ba3..f8e1926 100644
--- a/wavefront_api_client/models/paged_anomaly.py
+++ b/wavefront_api_client/models/paged_anomaly.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_api_token_model.py b/wavefront_api_client/models/paged_api_token_model.py
index 42572e8..ae473a8 100644
--- a/wavefront_api_client/models/paged_api_token_model.py
+++ b/wavefront_api_client/models/paged_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index 69dafbc..e4c8776 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index 823c05e..ea7dd42 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index 6c905ef..085d51d 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index dfd95ce..985deec 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index d24316c..8b2967c 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index 38046ef..44fe0af 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index 473c474..2f11203 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_ingestion_policy_read_model.py b/wavefront_api_client/models/paged_ingestion_policy_read_model.py
index cc67fda..9355a9c 100644
--- a/wavefront_api_client/models/paged_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/paged_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index d0f8845..0b587ca 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index fb07a68..b7780b5 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index 2b667f0..4d1e130 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_monitored_application_dto.py b/wavefront_api_client/models/paged_monitored_application_dto.py
index 2207c1e..43343af 100644
--- a/wavefront_api_client/models/paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/paged_monitored_application_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_monitored_cluster.py b/wavefront_api_client/models/paged_monitored_cluster.py
index 4bbe1a5..d8379a5 100644
--- a/wavefront_api_client/models/paged_monitored_cluster.py
+++ b/wavefront_api_client/models/paged_monitored_cluster.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_monitored_service_dto.py b/wavefront_api_client/models/paged_monitored_service_dto.py
index d17ffbc..092d47d 100644
--- a/wavefront_api_client/models/paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/paged_monitored_service_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 9e9f65c..22fbd39 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index c920de5..4002e68 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_recent_app_map_search.py b/wavefront_api_client/models/paged_recent_app_map_search.py
index fa65ae7..db3d8de 100644
--- a/wavefront_api_client/models/paged_recent_app_map_search.py
+++ b/wavefront_api_client/models/paged_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_recent_traces_search.py b/wavefront_api_client/models/paged_recent_traces_search.py
index 84ee4ac..5b6e18b 100644
--- a/wavefront_api_client/models/paged_recent_traces_search.py
+++ b/wavefront_api_client/models/paged_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_related_event.py b/wavefront_api_client/models/paged_related_event.py
index 58126dc..f167538 100644
--- a/wavefront_api_client/models/paged_related_event.py
+++ b/wavefront_api_client/models/paged_related_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_report_event_anomaly_dto.py b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
index ee0593b..68d9876 100644
--- a/wavefront_api_client/models/paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_role_dto.py b/wavefront_api_client/models/paged_role_dto.py
index 00b76b2..c5e9be4 100644
--- a/wavefront_api_client/models/paged_role_dto.py
+++ b/wavefront_api_client/models/paged_role_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_app_map_search.py b/wavefront_api_client/models/paged_saved_app_map_search.py
index d3d9594..cc71dc7 100644
--- a/wavefront_api_client/models/paged_saved_app_map_search.py
+++ b/wavefront_api_client/models/paged_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_app_map_search_group.py b/wavefront_api_client/models/paged_saved_app_map_search_group.py
index d3fc164..a34fd84 100644
--- a/wavefront_api_client/models/paged_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/paged_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index 8c96216..48024cf 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_traces_search.py b/wavefront_api_client/models/paged_saved_traces_search.py
index e542675..d3e23fe 100644
--- a/wavefront_api_client/models/paged_saved_traces_search.py
+++ b/wavefront_api_client/models/paged_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_traces_search_group.py b/wavefront_api_client/models/paged_saved_traces_search_group.py
index 890bab8..e6e74c6 100644
--- a/wavefront_api_client/models/paged_saved_traces_search_group.py
+++ b/wavefront_api_client/models/paged_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_service_account.py b/wavefront_api_client/models/paged_service_account.py
index 16f27b3..bcb7f27 100644
--- a/wavefront_api_client/models/paged_service_account.py
+++ b/wavefront_api_client/models/paged_service_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index a292046..07150bf 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_span_sampling_policy.py b/wavefront_api_client/models/paged_span_sampling_policy.py
index ac2a805..caf514b 100644
--- a/wavefront_api_client/models/paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/paged_span_sampling_policy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_user_group_model.py b/wavefront_api_client/models/paged_user_group_model.py
index f632c81..bb49027 100644
--- a/wavefront_api_client/models/paged_user_group_model.py
+++ b/wavefront_api_client/models/paged_user_group_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index df8564f..403a227 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/policy_rule_read_model.py b/wavefront_api_client/models/policy_rule_read_model.py
index b5d1bca..2c0b5ab 100644
--- a/wavefront_api_client/models/policy_rule_read_model.py
+++ b/wavefront_api_client/models/policy_rule_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/policy_rule_write_model.py b/wavefront_api_client/models/policy_rule_write_model.py
index 23d3062..323327c 100644
--- a/wavefront_api_client/models/policy_rule_write_model.py
+++ b/wavefront_api_client/models/policy_rule_write_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 57caf68..063f77e 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index c418133..26b6aca 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index 6c71f16..307703d 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/query_type_dto.py b/wavefront_api_client/models/query_type_dto.py
index 1f7d963..e2a5b89 100644
--- a/wavefront_api_client/models/query_type_dto.py
+++ b/wavefront_api_client/models/query_type_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index e676c2e..47af883 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/recent_app_map_search.py b/wavefront_api_client/models/recent_app_map_search.py
index e13cffe..635f468 100644
--- a/wavefront_api_client/models/recent_app_map_search.py
+++ b/wavefront_api_client/models/recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/recent_traces_search.py b/wavefront_api_client/models/recent_traces_search.py
index 8bf9c82..7a32c01 100644
--- a/wavefront_api_client/models/recent_traces_search.py
+++ b/wavefront_api_client/models/recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_anomaly.py b/wavefront_api_client/models/related_anomaly.py
index 8c5b02d..3462d47 100644
--- a/wavefront_api_client/models/related_anomaly.py
+++ b/wavefront_api_client/models/related_anomaly.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_data.py b/wavefront_api_client/models/related_data.py
index b2c107d..be4d838 100644
--- a/wavefront_api_client/models/related_data.py
+++ b/wavefront_api_client/models/related_data.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index c2ca6e7..aad029b 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_event_time_range.py b/wavefront_api_client/models/related_event_time_range.py
index e061811..b93d90f 100644
--- a/wavefront_api_client/models/related_event_time_range.py
+++ b/wavefront_api_client/models/related_event_time_range.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/report_event_anomaly_dto.py b/wavefront_api_client/models/report_event_anomaly_dto.py
index a6b10c1..a69315e 100644
--- a/wavefront_api_client/models/report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/report_event_anomaly_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index c769243..77e9c6b 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_access_policy.py b/wavefront_api_client/models/response_container_access_policy.py
index 707f501..50d3503 100644
--- a/wavefront_api_client/models/response_container_access_policy.py
+++ b/wavefront_api_client/models/response_container_access_policy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_access_policy_action.py b/wavefront_api_client/models/response_container_access_policy_action.py
index 30bed59..b42c1de 100644
--- a/wavefront_api_client/models/response_container_access_policy_action.py
+++ b/wavefront_api_client/models/response_container_access_policy_action.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_account.py b/wavefront_api_client/models/response_container_account.py
index e535f0d..f49e0c2 100644
--- a/wavefront_api_client/models/response_container_account.py
+++ b/wavefront_api_client/models/response_container_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index b3b759f..cd455d9 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_api_token_model.py b/wavefront_api_client/models/response_container_api_token_model.py
index 93ebc25..77330e0 100644
--- a/wavefront_api_client/models/response_container_api_token_model.py
+++ b/wavefront_api_client/models/response_container_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 23908c3..5072d0c 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index 932d7f6..f6b1037 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_default_saved_app_map_search.py b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
index 2bd1a89..d1875c4 100644
--- a/wavefront_api_client/models/response_container_default_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_default_saved_traces_search.py b/wavefront_api_client/models/response_container_default_saved_traces_search.py
index ef4a97c..58caaa3 100644
--- a/wavefront_api_client/models/response_container_default_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_default_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 032c2c9..9da4a80 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 7c90423..9d8377b 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index c618283..5a90d7c 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 6e5c318..45e6130 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 1c7741d..5736436 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_global_alert_analytic.py b/wavefront_api_client/models/response_container_global_alert_analytic.py
index a7f23e7..1ea2610 100644
--- a/wavefront_api_client/models/response_container_global_alert_analytic.py
+++ b/wavefront_api_client/models/response_container_global_alert_analytic.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 11805d9..555105b 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
index 3574a7d..23b3591 100644
--- a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index 81a6b9d..f237be8 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 9cbb7a1..0e10e72 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
index 7284c4a..662f810 100644
--- a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_api_token_model.py b/wavefront_api_client/models/response_container_list_api_token_model.py
index 000396a..e1467c9 100644
--- a/wavefront_api_client/models/response_container_list_api_token_model.py
+++ b/wavefront_api_client/models/response_container_list_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index 2461cee..d2a87d1 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index 51c1954..e1a552e 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_notification_messages.py b/wavefront_api_client/models/response_container_list_notification_messages.py
index 018c070..c2cbf29 100644
--- a/wavefront_api_client/models/response_container_list_notification_messages.py
+++ b/wavefront_api_client/models/response_container_list_notification_messages.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
index 1c2a06a..03f92d3 100644
--- a/wavefront_api_client/models/response_container_list_service_account.py
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index 0baf37b..d933200 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
index b2c86df..3fc47a5 100644
--- a/wavefront_api_client/models/response_container_list_user_api_token.py
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_user_dto.py b/wavefront_api_client/models/response_container_list_user_dto.py
index 74979fc..5e7c38b 100644
--- a/wavefront_api_client/models/response_container_list_user_dto.py
+++ b/wavefront_api_client/models/response_container_list_user_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index d5b1161..24c84b3 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 4d9940c..2e56adf 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index 35f97b0..b71253e 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index 8422506..63982a7 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_metrics_policy_read_model.py b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
index c90630f..e73b0ba 100644
--- a/wavefront_api_client/models/response_container_metrics_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_monitored_application_dto.py b/wavefront_api_client/models/response_container_monitored_application_dto.py
index 80753d6..d085b85 100644
--- a/wavefront_api_client/models/response_container_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_application_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_monitored_cluster.py b/wavefront_api_client/models/response_container_monitored_cluster.py
index 0ba7e68..49084cc 100644
--- a/wavefront_api_client/models/response_container_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_monitored_cluster.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_monitored_service_dto.py b/wavefront_api_client/models/response_container_monitored_service_dto.py
index 56019a1..982121f 100644
--- a/wavefront_api_client/models/response_container_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_service_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index 7519806..aac9a75 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
index 7662457..13d5c3f 100644
--- a/wavefront_api_client/models/response_container_paged_account.py
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index 0fc98d8..3c207cd 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index bc2a649..19169c4 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_anomaly.py b/wavefront_api_client/models/response_container_paged_anomaly.py
index 77e8fd8..ab2a300 100644
--- a/wavefront_api_client/models/response_container_paged_anomaly.py
+++ b/wavefront_api_client/models/response_container_paged_anomaly.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_api_token_model.py b/wavefront_api_client/models/response_container_paged_api_token_model.py
index c91fa17..64f0c2f 100644
--- a/wavefront_api_client/models/response_container_paged_api_token_model.py
+++ b/wavefront_api_client/models/response_container_paged_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index 46ecb3d..543c2b0 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 7ff9cb3..1c27f02 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index 2b8c731..8aec387 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index 9db2c1f..9b8d19b 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 2ccc808..b29cd05 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index cb41a4c..4368723 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index cdb7208..5c61257 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
index 9dd578b..a278139 100644
--- a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 5fba75a..bf7f85f 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index e2a9075..d16a628 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index 8a56992..ccccfff 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
index b514b83..f869246 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_monitored_cluster.py b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
index 2c4855f..8cb07e6 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
index 2c302b4..af3f731 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index a0a5c46..d22f46d 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index dbde508..c7594ce 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
index 01571fd..f6b30e3 100644
--- a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
+++ b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_recent_traces_search.py b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
index c5dde67..a788836 100644
--- a/wavefront_api_client/models/response_container_paged_recent_traces_search.py
+++ b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_related_event.py b/wavefront_api_client/models/response_container_paged_related_event.py
index 96cac58..3ee7eb0 100644
--- a/wavefront_api_client/models/response_container_paged_related_event.py
+++ b/wavefront_api_client/models/response_container_paged_related_event.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
index ac3366f..41d9550 100644
--- a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_role_dto.py b/wavefront_api_client/models/response_container_paged_role_dto.py
index dc35581..829e3d8 100644
--- a/wavefront_api_client/models/response_container_paged_role_dto.py
+++ b/wavefront_api_client/models/response_container_paged_role_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
index 4f2e8fe..327358c 100644
--- a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
index 812c457..f807a36 100644
--- a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 7772556..328d1f2 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search.py b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
index fa4e09f..b08afd2 100644
--- a/wavefront_api_client/models/response_container_paged_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
index 1887f6e..8095ade 100644
--- a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
index aa9eb52..0fbc325 100644
--- a/wavefront_api_client/models/response_container_paged_service_account.py
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 1b6787d..0adde40 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
index 701b774..52de244 100644
--- a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
index 2ea577a..c1d6a1d 100644
--- a/wavefront_api_client/models/response_container_paged_user_group_model.py
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index 296a5f8..79aebe4 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_query_type_dto.py b/wavefront_api_client/models/response_container_query_type_dto.py
index d221a7b..216a72f 100644
--- a/wavefront_api_client/models/response_container_query_type_dto.py
+++ b/wavefront_api_client/models/response_container_query_type_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_recent_app_map_search.py b/wavefront_api_client/models/response_container_recent_app_map_search.py
index 8002045..048ae96 100644
--- a/wavefront_api_client/models/response_container_recent_app_map_search.py
+++ b/wavefront_api_client/models/response_container_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_recent_traces_search.py b/wavefront_api_client/models/response_container_recent_traces_search.py
index 72a7962..4082420 100644
--- a/wavefront_api_client/models/response_container_recent_traces_search.py
+++ b/wavefront_api_client/models/response_container_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_role_dto.py b/wavefront_api_client/models/response_container_role_dto.py
index 50f307f..d4912d9 100644
--- a/wavefront_api_client/models/response_container_role_dto.py
+++ b/wavefront_api_client/models/response_container_role_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search.py b/wavefront_api_client/models/response_container_saved_app_map_search.py
index 544fe80..9e7bf0a 100644
--- a/wavefront_api_client/models/response_container_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
index dfc0736..a57c60a 100644
--- a/wavefront_api_client/models/response_container_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index 6b11d34..a810621 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_traces_search.py b/wavefront_api_client/models/response_container_saved_traces_search.py
index 0aa3ee2..e6077a9 100644
--- a/wavefront_api_client/models/response_container_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_traces_search_group.py b/wavefront_api_client/models/response_container_saved_traces_search_group.py
index ae91dd6..e2d1482 100644
--- a/wavefront_api_client/models/response_container_saved_traces_search_group.py
+++ b/wavefront_api_client/models/response_container_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
index 27b3d11..a47006c 100644
--- a/wavefront_api_client/models/response_container_service_account.py
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index e88a116..19fe22d 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_set_source_label_pair.py b/wavefront_api_client/models/response_container_set_source_label_pair.py
index 562419b..a01e8b2 100644
--- a/wavefront_api_client/models/response_container_set_source_label_pair.py
+++ b/wavefront_api_client/models/response_container_set_source_label_pair.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 9fc56ee..03795c8 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_span_sampling_policy.py b/wavefront_api_client/models/response_container_span_sampling_policy.py
index ef474fd..78ebdb2 100644
--- a/wavefront_api_client/models/response_container_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_span_sampling_policy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_string.py b/wavefront_api_client/models/response_container_string.py
index c90d7de..f133ec3 100644
--- a/wavefront_api_client/models/response_container_string.py
+++ b/wavefront_api_client/models/response_container_string.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index 4f7e796..ebddf67 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
index 3dd57d1..1967df2 100644
--- a/wavefront_api_client/models/response_container_user_api_token.py
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
index f57262e..27f7bc2 100644
--- a/wavefront_api_client/models/response_container_user_group_model.py
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index 2c7b026..3ecd239 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_void.py b/wavefront_api_client/models/response_container_void.py
index 23ce1c7..0d8db42 100644
--- a/wavefront_api_client/models/response_container_void.py
+++ b/wavefront_api_client/models/response_container_void.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index 55ac162..ebe2841 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
index cd30e15..968b6be 100644
--- a/wavefront_api_client/models/role_dto.py
+++ b/wavefront_api_client/models/role_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/role_properties_dto.py b/wavefront_api_client/models/role_properties_dto.py
index d5740a1..42c591e 100644
--- a/wavefront_api_client/models/role_properties_dto.py
+++ b/wavefront_api_client/models/role_properties_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_app_map_search.py b/wavefront_api_client/models/saved_app_map_search.py
index 25de53c..551b07b 100644
--- a/wavefront_api_client/models/saved_app_map_search.py
+++ b/wavefront_api_client/models/saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_app_map_search_group.py b/wavefront_api_client/models/saved_app_map_search_group.py
index de2a5cd..92c4775 100644
--- a/wavefront_api_client/models/saved_app_map_search_group.py
+++ b/wavefront_api_client/models/saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 7d2600d..24b2dc4 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_traces_search.py b/wavefront_api_client/models/saved_traces_search.py
index 87d6fc7..ae8602a 100644
--- a/wavefront_api_client/models/saved_traces_search.py
+++ b/wavefront_api_client/models/saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_traces_search_group.py b/wavefront_api_client/models/saved_traces_search_group.py
index cc89d45..a7ae304 100644
--- a/wavefront_api_client/models/saved_traces_search_group.py
+++ b/wavefront_api_client/models/saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/schema.py b/wavefront_api_client/models/schema.py
index 51c161e..4b0396f 100644
--- a/wavefront_api_client/models/schema.py
+++ b/wavefront_api_client/models/schema.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 3d8bfed..6b6527e 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index be30c7a..daf2490 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index be7ecfe..5b59d2c 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/setup.py b/wavefront_api_client/models/setup.py
index fea95c8..9c13dd8 100644
--- a/wavefront_api_client/models/setup.py
+++ b/wavefront_api_client/models/setup.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/snowflake_configuration.py b/wavefront_api_client/models/snowflake_configuration.py
index 4e9592b..49b7104 100644
--- a/wavefront_api_client/models/snowflake_configuration.py
+++ b/wavefront_api_client/models/snowflake_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 7ad92e2..456a76f 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index 516fc2d..e551158 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index c583bcd..06705f9 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index b9bc19b..ba286c4 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index ba36362..e3f1e52 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/span.py b/wavefront_api_client/models/span.py
index 51a20f8..a91c400 100644
--- a/wavefront_api_client/models/span.py
+++ b/wavefront_api_client/models/span.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/span_sampling_policy.py b/wavefront_api_client/models/span_sampling_policy.py
index 679f8fe..c45050a 100644
--- a/wavefront_api_client/models/span_sampling_policy.py
+++ b/wavefront_api_client/models/span_sampling_policy.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/specific_data.py b/wavefront_api_client/models/specific_data.py
index d4b08f5..4243c73 100644
--- a/wavefront_api_client/models/specific_data.py
+++ b/wavefront_api_client/models/specific_data.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
index 79a046e..77f426a 100644
--- a/wavefront_api_client/models/stats_model_internal_use.py
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/stripe.py b/wavefront_api_client/models/stripe.py
index 51863f5..eeddf94 100644
--- a/wavefront_api_client/models/stripe.py
+++ b/wavefront_api_client/models/stripe.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 66399e2..2b1c6b3 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index 9d52415..985435f 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tesla_configuration.py b/wavefront_api_client/models/tesla_configuration.py
index e023c89..a0896ad 100644
--- a/wavefront_api_client/models/tesla_configuration.py
+++ b/wavefront_api_client/models/tesla_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index dd74777..c2efeba 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/trace.py b/wavefront_api_client/models/trace.py
index 19fce7a..5057b68 100644
--- a/wavefront_api_client/models/trace.py
+++ b/wavefront_api_client/models/trace.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/triage_dashboard.py b/wavefront_api_client/models/triage_dashboard.py
index d17def2..e31864e 100644
--- a/wavefront_api_client/models/triage_dashboard.py
+++ b/wavefront_api_client/models/triage_dashboard.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tuple.py b/wavefront_api_client/models/tuple.py
index 4f097a4..ebc5ce2 100644
--- a/wavefront_api_client/models/tuple.py
+++ b/wavefront_api_client/models/tuple.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tuple_result.py b/wavefront_api_client/models/tuple_result.py
index c34a2f3..890165d 100644
--- a/wavefront_api_client/models/tuple_result.py
+++ b/wavefront_api_client/models/tuple_result.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tuple_value_result.py b/wavefront_api_client/models/tuple_value_result.py
index b8bfc6b..ba8933a 100644
--- a/wavefront_api_client/models/tuple_value_result.py
+++ b/wavefront_api_client/models/tuple_value_result.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index 6b36a5f..cfd5a4e 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index ec8ebd2..8657f67 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index e9919c7..1591faa 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index 7c450cf..d881815 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index 06be906..e0f316a 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index 42616be..b682e2c 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index bb179ad..02723ea 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index ad257b0..42f0cbf 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index 7d0f795..b009066 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
index bfefab5..d08a00b 100644
--- a/wavefront_api_client/models/validated_users_dto.py
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/void.py b/wavefront_api_client/models/void.py
index 6b48302..a333d08 100644
--- a/wavefront_api_client/models/void.py
+++ b/wavefront_api_client/models/void.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/vrops_configuration.py b/wavefront_api_client/models/vrops_configuration.py
index 889691c..1129db9 100644
--- a/wavefront_api_client/models/vrops_configuration.py
+++ b/wavefront_api_client/models/vrops_configuration.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/wf_tags.py b/wavefront_api_client/models/wf_tags.py
index b079536..e9c128f 100644
--- a/wavefront_api_client/models/wf_tags.py
+++ b/wavefront_api_client/models/wf_tags.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/rest.py b/wavefront_api_client/rest.py
index 226f0e3..7018377 100644
--- a/wavefront_api_client/rest.py
+++ b/wavefront_api_client/rest.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com

From ee35fb6389adfcf3ff6e8d56d85ca00771cd39e2 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Mon, 30 Jan 2023 08:16:17 -0800
Subject: [PATCH 123/161] Autogenerated Update v2.169.0.

---
 .swagger-codegen/config.json                               | 2 +-
 .swagger-codegen/config.jsone                              | 2 +-
 README.md                                                  | 3 ++-
 setup.py                                                   | 2 +-
 wavefront_api_client/__init__.py                           | 1 +
 wavefront_api_client/api_client.py                         | 2 +-
 wavefront_api_client/configuration.py                      | 2 +-
 wavefront_api_client/models/__init__.py                    | 1 +
 wavefront_api_client/models/response_container_user_dto.py | 2 +-
 9 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 0710a25..3fb96ec 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.166.1"
+    "packageVersion": "2.169.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 62f444c..0710a25 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.164.0"
+    "packageVersion": "2.166.1"
 }
diff --git a/README.md b/README.md
index 7d52883..3937265 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.166.1
+- Package version: 2.169.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -698,6 +698,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerString](docs/ResponseContainerString.md)
  - [ResponseContainerTagsResponse](docs/ResponseContainerTagsResponse.md)
  - [ResponseContainerUserApiToken](docs/ResponseContainerUserApiToken.md)
+ - [ResponseContainerUserDTO](docs/ResponseContainerUserDTO.md)
  - [ResponseContainerUserGroupModel](docs/ResponseContainerUserGroupModel.md)
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
diff --git a/setup.py b/setup.py
index 0656bd0..c41b248 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.166.1"
+VERSION = "2.169.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 6372b89..6fb0342 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -292,6 +292,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 84ccb25..7e4a044 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.166.1/python'
+        self.user_agent = 'Swagger-Codegen/2.169.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index d0dfabb..7064710 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.166.1".\
+               "SDK Package Version: 2.169.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 157e7a4..e3247bc 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -249,6 +249,7 @@
 from wavefront_api_client.models.response_container_string import ResponseContainerString
 from wavefront_api_client.models.response_container_tags_response import ResponseContainerTagsResponse
 from wavefront_api_client.models.response_container_user_api_token import ResponseContainerUserApiToken
+from wavefront_api_client.models.response_container_user_dto import ResponseContainerUserDTO
 from wavefront_api_client.models.response_container_user_group_model import ResponseContainerUserGroupModel
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
diff --git a/wavefront_api_client/models/response_container_user_dto.py b/wavefront_api_client/models/response_container_user_dto.py
index 83d9e45..8aebe4c 100644
--- a/wavefront_api_client/models/response_container_user_dto.py
+++ b/wavefront_api_client/models/response_container_user_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com

From e53ffb263c03e9881a92a0c562c0488018819058 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.wf-jenkins@vmware.com>
Date: Tue, 7 Feb 2023 08:16:30 -0800
Subject: [PATCH 124/161] Autogenerated Update v2.170.1.

---
 .swagger-codegen/config.json                  |    2 +-
 .swagger-codegen/config.jsone                 |    2 +-
 README.md                                     |   37 +-
 docs/Account.md                               |    2 -
 docs/AccountUserAndServiceAccountApi.md       |   89 +-
 docs/Alert.md                                 |    1 +
 docs/CustomerFacingUserObject.md              |    1 -
 docs/IngestionPolicyAlert.md                  |   94 +
 docs/IngestionPolicyReadModel.md              |    9 +-
 docs/IngestionPolicyWriteModel.md             |    1 +
 docs/Proxy.md                                 |    2 -
 docs/RoleApi.md                               |  148 +-
 docs/RoleCreateDTO.md                         |   12 +
 docs/RoleUpdateDTO.md                         |   13 +
 docs/ServiceAccount.md                        |    2 -
 docs/ServiceAccountWrite.md                   |    2 -
 docs/UsageApi.md                              |  182 +-
 docs/UserApi.md                               |   12 +-
 docs/UserDTO.md                               |    2 -
 docs/UserGroupModel.md                        |    1 -
 docs/UserModel.md                             |    2 -
 docs/UserRequestDTO.md                        |    2 -
 docs/UserToCreate.md                          |    4 +-
 setup.py                                      |    2 +-
 test/test_ingestion_policy_alert.py           |   40 +
 test/test_role_create_dto.py                  |   40 +
 test/test_role_update_dto.py                  |   40 +
 wavefront_api_client/__init__.py              |    4 +-
 .../account__user_and_service_account_api.py  |  119 +-
 wavefront_api_client/api/role_api.py          |  220 +-
 wavefront_api_client/api/usage_api.py         |  338 +--
 wavefront_api_client/api/user_api.py          |   12 +-
 wavefront_api_client/api_client.py            |    2 +-
 wavefront_api_client/configuration.py         |    2 +-
 wavefront_api_client/models/__init__.py       |    4 +-
 wavefront_api_client/models/account.py        |   58 +-
 wavefront_api_client/models/alert.py          |   30 +-
 .../models/customer_facing_user_object.py     |   30 +-
 .../models/ingestion_policy_alert.py          | 2471 +++++++++++++++++
 .../models/ingestion_policy_read_model.py     |  258 +-
 .../models/ingestion_policy_write_model.py    |   30 +-
 wavefront_api_client/models/proxy.py          |   58 +-
 .../models/role_create_dto.py                 |  181 ++
 .../models/role_update_dto.py                 |  209 ++
 .../models/service_account.py                 |   58 +-
 .../models/service_account_write.py           |   58 +-
 wavefront_api_client/models/user_dto.py       |   54 +-
 .../models/user_group_model.py                |   30 +-
 wavefront_api_client/models/user_model.py     |   54 +-
 .../models/user_request_dto.py                |   54 +-
 wavefront_api_client/models/user_to_create.py |   62 +-
 51 files changed, 3720 insertions(+), 1420 deletions(-)
 create mode 100644 docs/IngestionPolicyAlert.md
 create mode 100644 docs/RoleCreateDTO.md
 create mode 100644 docs/RoleUpdateDTO.md
 create mode 100644 test/test_ingestion_policy_alert.py
 create mode 100644 test/test_role_create_dto.py
 create mode 100644 test/test_role_update_dto.py
 create mode 100644 wavefront_api_client/models/ingestion_policy_alert.py
 create mode 100644 wavefront_api_client/models/role_create_dto.py
 create mode 100644 wavefront_api_client/models/role_update_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 3fb96ec..8d27990 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.169.0"
+    "packageVersion": "2.170.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 0710a25..3fb96ec 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.166.1"
+    "packageVersion": "2.169.0"
 }
diff --git a/README.md b/README.md
index 3937265..c58e569 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.169.0
+- Package version: 2.170.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -93,15 +93,16 @@ Class | Method | HTTP request | Description
 *AccountUserAndServiceAccountApi* | [**get_all_user_accounts**](docs/AccountUserAndServiceAccountApi.md#get_all_user_accounts) | **GET** /api/v2/account/user | Get all user accounts
 *AccountUserAndServiceAccountApi* | [**get_service_account**](docs/AccountUserAndServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
 *AccountUserAndServiceAccountApi* | [**get_user_account**](docs/AccountUserAndServiceAccountApi.md#get_user_account) | **GET** /api/v2/account/user/{id} | Retrieves a user by identifier (email address)
+*AccountUserAndServiceAccountApi* | [**get_users_with_accounts_permission**](docs/AccountUserAndServiceAccountApi.md#get_users_with_accounts_permission) | **GET** /api/v2/account/user/admin | Get all users with Accounts permission
 *AccountUserAndServiceAccountApi* | [**grant_account_permission**](docs/AccountUserAndServiceAccountApi.md#grant_account_permission) | **POST** /api/v2/account/{id}/grant/{permission} | Grants a specific permission to account (user or service account)
-*AccountUserAndServiceAccountApi* | [**grant_permission_to_accounts**](docs/AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
+*AccountUserAndServiceAccountApi* | [**grant_permission_to_accounts**](docs/AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grant a permission to accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**invite_user_accounts**](docs/AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**remove_account_from_roles**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**remove_account_from_user_groups**](docs/AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 *AccountUserAndServiceAccountApi* | [**revoke_account_permission**](docs/AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
-*AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
+*AccountUserAndServiceAccountApi* | [**revoke_permission_from_accounts**](docs/AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revoke a permission from accounts (users or service accounts)
 *AccountUserAndServiceAccountApi* | [**update_service_account**](docs/AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
-*AccountUserAndServiceAccountApi* | [**update_user_account**](docs/AccountUserAndServiceAccountApi.md#update_user_account) | **PUT** /api/v2/account/user/{id} | Update user with given user groups, permissions and ingestion policy.
+*AccountUserAndServiceAccountApi* | [**update_user_account**](docs/AccountUserAndServiceAccountApi.md#update_user_account) | **PUT** /api/v2/account/user/{id} | Update user with given user groups and permissions.
 *AccountUserAndServiceAccountApi* | [**validate_accounts**](docs/AccountUserAndServiceAccountApi.md#validate_accounts) | **POST** /api/v2/account/validateAccounts | Returns valid accounts (users and service accounts), also invalid identifiers from the given list
 *AlertApi* | [**add_alert_access**](docs/AlertApi.md#add_alert_access) | **POST** /api/v2/alert/acl/add | Adds the specified ids to the given alerts&#39; ACL
 *AlertApi* | [**add_alert_tag**](docs/AlertApi.md#add_alert_tag) | **PUT** /api/v2/alert/{id}/tag/{tagValue} | Add a tag to a specific alert
@@ -258,15 +259,15 @@ Class | Method | HTTP request | Description
 *RecentTracesSearchApi* | [**create_recent_traces_search**](docs/RecentTracesSearchApi.md#create_recent_traces_search) | **POST** /api/v2/recenttracessearch | Create a search
 *RecentTracesSearchApi* | [**get_all_recent_traces_searches**](docs/RecentTracesSearchApi.md#get_all_recent_traces_searches) | **GET** /api/v2/recenttracessearch | Get all searches for a user
 *RecentTracesSearchApi* | [**get_recent_traces_search**](docs/RecentTracesSearchApi.md#get_recent_traces_search) | **GET** /api/v2/recenttracessearch/{id} | Get a specific search
-*RoleApi* | [**add_assignees**](docs/RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add multiple users and user groups to a specific role
-*RoleApi* | [**create_role**](docs/RoleApi.md#create_role) | **POST** /api/v2/role | Create a specific role
-*RoleApi* | [**delete_role**](docs/RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a specific role
-*RoleApi* | [**get_all_roles**](docs/RoleApi.md#get_all_roles) | **GET** /api/v2/role | Get all roles for a customer
-*RoleApi* | [**get_role**](docs/RoleApi.md#get_role) | **GET** /api/v2/role/{id} | Get a specific role
-*RoleApi* | [**grant_permission_to_roles**](docs/RoleApi.md#grant_permission_to_roles) | **POST** /api/v2/role/grant/{permission} | Grants a single permission to role(s)
-*RoleApi* | [**remove_assignees**](docs/RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove multiple users and user groups from a specific role
-*RoleApi* | [**revoke_permission_from_roles**](docs/RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revokes a single permission from role(s)
-*RoleApi* | [**update_role**](docs/RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a specific role
+*RoleApi* | [**add_assignees**](docs/RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add accounts and groups to a role
+*RoleApi* | [**create_role**](docs/RoleApi.md#create_role) | **POST** /api/v2/role | Create a role
+*RoleApi* | [**delete_role**](docs/RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a role by ID
+*RoleApi* | [**get_all_roles**](docs/RoleApi.md#get_all_roles) | **GET** /api/v2/role | Get all roles
+*RoleApi* | [**get_role**](docs/RoleApi.md#get_role) | **GET** /api/v2/role/{id} | Get a role by ID
+*RoleApi* | [**grant_permission_to_roles**](docs/RoleApi.md#grant_permission_to_roles) | **POST** /api/v2/role/grant/{permission} | Grant a permission to roles
+*RoleApi* | [**remove_assignees**](docs/RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove accounts and groups from a role
+*RoleApi* | [**revoke_permission_from_roles**](docs/RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revoke a permission from roles
+*RoleApi* | [**update_role**](docs/RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a role by ID
 *SavedAppMapSearchApi* | [**create_saved_app_map_search**](docs/SavedAppMapSearchApi.md#create_saved_app_map_search) | **POST** /api/v2/savedappmapsearch | Create a search
 *SavedAppMapSearchApi* | [**default_app_map_search**](docs/SavedAppMapSearchApi.md#default_app_map_search) | **GET** /api/v2/savedappmapsearch/defaultAppMapSearch | Get default app map search for a user
 *SavedAppMapSearchApi* | [**default_app_map_search_0**](docs/SavedAppMapSearchApi.md#default_app_map_search_0) | **POST** /api/v2/savedappmapsearch/defaultAppMapSearch | Set default app map search at user level
@@ -420,16 +421,14 @@ Class | Method | HTTP request | Description
 *SpanSamplingPolicyApi* | [**get_span_sampling_policy_version**](docs/SpanSamplingPolicyApi.md#get_span_sampling_policy_version) | **GET** /api/v2/spansamplingpolicy/{id}/history/{version} | Get a specific historical version of a specific sampling policy
 *SpanSamplingPolicyApi* | [**undelete_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#undelete_span_sampling_policy) | **POST** /api/v2/spansamplingpolicy/{id}/undelete | Restore a deleted span sampling policy
 *SpanSamplingPolicyApi* | [**update_span_sampling_policy**](docs/SpanSamplingPolicyApi.md#update_span_sampling_policy) | **PUT** /api/v2/spansamplingpolicy/{id} | Update a specific span sampling policy
-*UsageApi* | [**add_accounts**](docs/UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
-*UsageApi* | [**add_groups**](docs/UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 *UsageApi* | [**create_ingestion_policy**](docs/UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 *UsageApi* | [**delete_ingestion_policy**](docs/UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 *UsageApi* | [**export_csv**](docs/UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 *UsageApi* | [**get_all_ingestion_policies**](docs/UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 *UsageApi* | [**get_ingestion_policy**](docs/UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+*UsageApi* | [**get_ingestion_policy_by_version**](docs/UsageApi.md#get_ingestion_policy_by_version) | **GET** /api/v2/usage/ingestionpolicy/{id}/history/{version} | Get a specific historical version of a ingestion policy
 *UsageApi* | [**get_ingestion_policy_history**](docs/UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
-*UsageApi* | [**remove_accounts**](docs/UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
-*UsageApi* | [**remove_groups**](docs/UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
+*UsageApi* | [**revert_ingestion_policy_by_version**](docs/UsageApi.md#revert_ingestion_policy_by_version) | **POST** /api/v2/usage/ingestionpolicy/{id}/revert/{version} | Revert to a specific historical version of a ingestion policy
 *UsageApi* | [**update_ingestion_policy**](docs/UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 *UserApi* | [**add_user_to_user_groups**](docs/UserApi.md#add_user_to_user_groups) | **POST** /api/v2/user/{id}/addUserGroups | Adds specific groups to the user or service account
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /api/v2/user | Creates an user if the user doesn&#39;t already exist.
@@ -522,7 +521,7 @@ Class | Method | HTTP request | Description
  - [GlobalAlertAnalytic](docs/GlobalAlertAnalytic.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
- - [IngestionPolicyMapping](docs/IngestionPolicyMapping.md)
+ - [IngestionPolicyAlert](docs/IngestionPolicyAlert.md)
  - [IngestionPolicyMetadata](docs/IngestionPolicyMetadata.md)
  - [IngestionPolicyReadModel](docs/IngestionPolicyReadModel.md)
  - [IngestionPolicyWriteModel](docs/IngestionPolicyWriteModel.md)
@@ -703,8 +702,10 @@ Class | Method | HTTP request | Description
  - [ResponseContainerValidatedUsersDTO](docs/ResponseContainerValidatedUsersDTO.md)
  - [ResponseContainerVoid](docs/ResponseContainerVoid.md)
  - [ResponseStatus](docs/ResponseStatus.md)
+ - [RoleCreateDTO](docs/RoleCreateDTO.md)
  - [RoleDTO](docs/RoleDTO.md)
  - [RolePropertiesDTO](docs/RolePropertiesDTO.md)
+ - [RoleUpdateDTO](docs/RoleUpdateDTO.md)
  - [SavedAppMapSearch](docs/SavedAppMapSearch.md)
  - [SavedAppMapSearchGroup](docs/SavedAppMapSearchGroup.md)
  - [SavedSearch](docs/SavedSearch.md)
diff --git a/docs/Account.md b/docs/Account.md
index abca3c0..f0702f7 100644
--- a/docs/Account.md
+++ b/docs/Account.md
@@ -5,8 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **groups** | **list[str]** | The list of account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of an account. | 
-**ingestion_policies** | **list[str]** | The list of ingestion policies associated with the account. | [optional] 
-**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with account. | [optional] 
 **roles** | **list[str]** | The list of account&#39;s roles. | [optional] 
 **united_permissions** | **list[str]** | The list of account&#39;s permissions assigned directly or through united roles assigned to it | [optional] 
 **united_roles** | **list[str]** | The list of account&#39;s roles assigned directly or through user groups assigned to it | [optional] 
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index ccf2f20..792e284 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -19,15 +19,16 @@ Method | HTTP request | Description
 [**get_all_user_accounts**](AccountUserAndServiceAccountApi.md#get_all_user_accounts) | **GET** /api/v2/account/user | Get all user accounts
 [**get_service_account**](AccountUserAndServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
 [**get_user_account**](AccountUserAndServiceAccountApi.md#get_user_account) | **GET** /api/v2/account/user/{id} | Retrieves a user by identifier (email address)
+[**get_users_with_accounts_permission**](AccountUserAndServiceAccountApi.md#get_users_with_accounts_permission) | **GET** /api/v2/account/user/admin | Get all users with Accounts permission
 [**grant_account_permission**](AccountUserAndServiceAccountApi.md#grant_account_permission) | **POST** /api/v2/account/{id}/grant/{permission} | Grants a specific permission to account (user or service account)
-[**grant_permission_to_accounts**](AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grants a specific permission to multiple accounts (users or service accounts)
+[**grant_permission_to_accounts**](AccountUserAndServiceAccountApi.md#grant_permission_to_accounts) | **POST** /api/v2/account/grant/{permission} | Grant a permission to accounts (users or service accounts)
 [**invite_user_accounts**](AccountUserAndServiceAccountApi.md#invite_user_accounts) | **POST** /api/v2/account/user/invite | Invite user accounts with given user groups and permissions.
 [**remove_account_from_roles**](AccountUserAndServiceAccountApi.md#remove_account_from_roles) | **POST** /api/v2/account/{id}/removeRoles | Removes specific roles from the account (user or service account)
 [**remove_account_from_user_groups**](AccountUserAndServiceAccountApi.md#remove_account_from_user_groups) | **POST** /api/v2/account/{id}/removeUserGroups | Removes specific groups from the account (user or service account)
 [**revoke_account_permission**](AccountUserAndServiceAccountApi.md#revoke_account_permission) | **POST** /api/v2/account/{id}/revoke/{permission} | Revokes a specific permission from account (user or service account)
-[**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revokes a specific permission from multiple accounts (users or service accounts)
+[**revoke_permission_from_accounts**](AccountUserAndServiceAccountApi.md#revoke_permission_from_accounts) | **POST** /api/v2/account/revoke/{permission} | Revoke a permission from accounts (users or service accounts)
 [**update_service_account**](AccountUserAndServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
-[**update_user_account**](AccountUserAndServiceAccountApi.md#update_user_account) | **PUT** /api/v2/account/user/{id} | Update user with given user groups, permissions and ingestion policy.
+[**update_user_account**](AccountUserAndServiceAccountApi.md#update_user_account) | **PUT** /api/v2/account/user/{id} | Update user with given user groups and permissions.
 [**validate_accounts**](AccountUserAndServiceAccountApi.md#validate_accounts) | **POST** /api/v2/account/validateAccounts | Returns valid accounts (users and service accounts), also invalid identifiers from the given list
 
 
@@ -221,7 +222,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], }</pre> (optional)
 
 try:
     # Creates or updates a user account
@@ -236,7 +237,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ], }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -841,6 +842,56 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_users_with_accounts_permission**
+> ResponseContainerListString get_users_with_accounts_permission()
+
+Get all users with Accounts permission
+
+Returns all users with Accounts permission
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get all users with Accounts permission
+    api_response = api_instance.get_users_with_accounts_permission()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AccountUserAndServiceAccountApi->get_users_with_accounts_permission: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerListString**](ResponseContainerListString.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **grant_account_permission**
 > UserModel grant_account_permission(id, permission)
 
@@ -900,7 +951,7 @@ Name | Type | Description  | Notes
 # **grant_permission_to_accounts**
 > UserModel grant_permission_to_accounts(permission, body=body)
 
-Grants a specific permission to multiple accounts (users or service accounts)
+Grant a permission to accounts (users or service accounts)
 
 
 
@@ -920,11 +971,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to grant to the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+permission = 'permission_example' # str | The permission to grant. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission.
 body = [wavefront_api_client.list[str]()] # list[str] | List of accounts the specified permission to be granted to (optional)
 
 try:
-    # Grants a specific permission to multiple accounts (users or service accounts)
+    # Grant a permission to accounts (users or service accounts)
     api_response = api_instance.grant_permission_to_accounts(permission, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -935,7 +986,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to grant to the accounts. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **permission** | **str**| The permission to grant. Note that &lt;code&gt;host_tag_management&lt;/code&gt; is the equivalent of the **Source Tag Management** permission, &lt;code&gt;monitored_application_service_management&lt;/code&gt; is the equivalent of the **Integrations** permission, &lt;code&gt;agent_management&lt;/code&gt; is the equivalent of the **Proxies** permission. | 
  **body** | **list[str]**| List of accounts the specified permission to be granted to | [optional] 
 
 ### Return type
@@ -976,7 +1027,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], } ]</pre> (optional)
 
 try:
     # Invite user accounts with given user groups and permissions.
@@ -990,7 +1041,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ], } ]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -1178,7 +1229,7 @@ Name | Type | Description  | Notes
 # **revoke_permission_from_accounts**
 > UserModel revoke_permission_from_accounts(permission, body=body)
 
-Revokes a specific permission from multiple accounts (users or service accounts)
+Revoke a permission from accounts (users or service accounts)
 
 
 
@@ -1198,11 +1249,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission
+permission = 'permission_example' # str | The permission to revoke. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission.
 body = [wavefront_api_client.list[str]()] # list[str] | List of accounts the specified permission to be revoked from (optional)
 
 try:
-    # Revokes a specific permission from multiple accounts (users or service accounts)
+    # Revoke a permission from accounts (users or service accounts)
     api_response = api_instance.revoke_permission_from_accounts(permission, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -1213,7 +1264,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to revoke from the accounts. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission | 
+ **permission** | **str**| The permission to revoke. Note that &lt;code&gt;host_tag_management&lt;/code&gt; is the equivalent of the **Source Tag Management** permission, &lt;code&gt;monitored_application_service_management&lt;/code&gt; is the equivalent of the **Integrations** permission, &lt;code&gt;agent_management&lt;/code&gt; is the equivalent of the **Proxies** permission. | 
  **body** | **list[str]**| List of accounts the specified permission to be revoked from | [optional] 
 
 ### Return type
@@ -1290,7 +1341,7 @@ Name | Type | Description  | Notes
 # **update_user_account**
 > UserModel update_user_account(id, body=body)
 
-Update user with given user groups, permissions and ingestion policy.
+Update user with given user groups and permissions.
 
 
 
@@ -1311,10 +1362,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AccountUserAndServiceAccountApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
-    # Update user with given user groups, permissions and ingestion policy.
+    # Update user with given user groups and permissions.
     api_response = api_instance.update_user_account(id, body=body)
     pprint(api_response)
 except ApiException as e:
@@ -1326,7 +1377,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policy_id\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/Alert.md b/docs/Alert.md
index 2a733aa..779bd42 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -43,6 +43,7 @@ Name | Type | Description | Notes
 **in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
 **in_trash** | **bool** |  | [optional] 
 **include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
+**ingestion_policy_id** | **str** | Get the ingestion policy Id associated with ingestion policy alert. | [optional] 
 **last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
 **last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
 **last_failed_time** | **int** | The time of the last error encountered when running this alert&#39;s condition query, in epoch millis | [optional] 
diff --git a/docs/CustomerFacingUserObject.md b/docs/CustomerFacingUserObject.md
index f7badfe..739f2f5 100644
--- a/docs/CustomerFacingUserObject.md
+++ b/docs/CustomerFacingUserObject.md
@@ -9,7 +9,6 @@ Name | Type | Description | Notes
 **groups** | **list[str]** | List of permission groups this user has been granted access to | [optional] 
 **id** | **str** | The unique identifier of this user, which should be their valid email address | 
 **identifier** | **str** | The unique identifier of this user, which should be their valid email address | 
-**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
 **last_successful_login** | **int** | The last time the user logged in, in epoch milliseconds | [optional] 
 **_self** | **bool** | Whether this user is the one calling the API | 
 **united_permissions** | **list[str]** | The list of account&#39;s permissions assigned directly or through united roles assigned to it | [optional] 
diff --git a/docs/IngestionPolicyAlert.md b/docs/IngestionPolicyAlert.md
new file mode 100644
index 0000000..488b456
--- /dev/null
+++ b/docs/IngestionPolicyAlert.md
@@ -0,0 +1,94 @@
+# IngestionPolicyAlert
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**acl** | [**AccessControlListSimple**](AccessControlListSimple.md) |  | [optional] 
+**active_maintenance_windows** | **list[str]** | The names of the active maintenance windows that are affecting this alert | [optional] 
+**additional_information** | **str** | User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc | [optional] 
+**alert_chart_base** | **int** | The base of alert chart. A linear chart will have base as 1. A logarithmic chart will have the other base value.The value should be an integer and should greater than or equal to 1. | [optional] 
+**alert_chart_description** | **str** | The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart. | [optional] 
+**alert_chart_units** | **str** | The y-axis unit of Alert chart. | [optional] 
+**alert_sources** | [**list[AlertSource]**](AlertSource.md) | A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION. | [optional] 
+**alert_triage_dashboards** | [**list[AlertDashboard]**](AlertDashboard.md) | User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported | [optional] 
+**alert_type** | **str** | Alert type. | [optional] 
+**alerts_last_day** | **int** |  | [optional] 
+**alerts_last_month** | **int** |  | [optional] 
+**alerts_last_week** | **int** |  | [optional] 
+**application** | **list[str]** | Lists the applications from the failingHostLabelPair of the alert. | [optional] 
+**chart_attributes** | [**JsonNode**](JsonNode.md) | Additional chart settings for the alert (e.g. pie chart has its chart settings in this section). | [optional] 
+**chart_settings** | [**ChartSettings**](ChartSettings.md) | The old chart settings for the alert (e.g. chart type, chart range etc.). | [optional] 
+**condition** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes | 
+**condition_percentages** | **dict(str, int)** | Multi - alert conditions. | [optional] 
+**condition_qb_enabled** | **bool** | Whether the condition query was created using the Query Builder.  Default false | [optional] 
+**condition_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true | [optional] 
+**condition_query_type** | **str** |  | [optional] 
+**conditions** | **dict(str, str)** | Multi - alert conditions. | [optional] 
+**conditions_threshold_operator** | **str** |  | 
+**create_user_id** | **str** |  | [optional] 
+**created** | **int** | When this alert was created, in epoch millis | [optional] 
+**created_epoch_millis** | **int** |  | [optional] 
+**creator_id** | **str** |  | [optional] 
+**deleted** | **bool** |  | [optional] 
+**display_expression** | **str** | A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted | [optional] 
+**display_expression_qb_enabled** | **bool** | Whether the display expression query was created using the Query Builder. Default false | [optional] 
+**display_expression_qb_serialization** | **str** | The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true | [optional] 
+**display_expression_query_type** | **str** |  | [optional] 
+**enable_pd_incident_by_series** | **bool** |  | [optional] 
+**evaluate_realtime_data** | **bool** | Whether to alert on the real-time ingestion stream (may be noisy due to late data) | [optional] 
+**event** | [**Event**](Event.md) |  | [optional] 
+**failing_host_label_pair_links** | **list[str]** | List of links to tracing applications that caused a failing series | [optional] 
+**failing_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Failing host/metric pairs | [optional] 
+**hidden** | **bool** |  | [optional] 
+**hosts_used** | **list[str]** | Number of hosts checked by the alert condition | [optional] 
+**id** | **str** |  | [optional] 
+**in_maintenance_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the sources that will not be checked for this alert, due to matching a maintenance window | [optional] 
+**in_trash** | **bool** |  | [optional] 
+**include_obsolete_metrics** | **bool** | Whether to include obsolete metrics in alert query | [optional] 
+**ingestion_policy_id** | **str** | Get the ingestion policy Id associated with ingestion policy alert. | [optional] 
+**last_error_message** | **str** | The last error encountered when running this alert&#39;s condition query | [optional] 
+**last_event_time** | **int** | Start time (in epoch millis) of the last event associated with this alert. | [optional] 
+**last_failed_time** | **int** | The time of the last error encountered when running this alert&#39;s condition query, in epoch millis | [optional] 
+**last_notification_millis** | **int** | When this alert last caused a notification, in epoch millis | [optional] 
+**last_processed_millis** | **int** | The time when this alert was last checked, in epoch millis | [optional] 
+**last_query_time** | **int** | Last query time of the alert, averaged on hourly basis | [optional] 
+**metrics_used** | **list[str]** | Number of metrics checked by the alert condition | [optional] 
+**minutes** | **int** | The number of consecutive minutes that a series matching the condition query must evaluate to \&quot;true\&quot; (non-zero value) before the alert fires | 
+**modify_acl_access** | **bool** | Whether the user has modify ACL access to the alert. | [optional] 
+**name** | **str** |  | 
+**no_data_event** | [**Event**](Event.md) | No data event related to the alert | [optional] 
+**notificants** | **list[str]** | A derived field listing the webhook ids used by this alert | [optional] 
+**notification_resend_frequency_minutes** | **int** | How often to re-trigger a continually failing alert. If absent or &lt;&#x3D; 0, no retriggering occurs | [optional] 
+**num_points_in_failure_frame** | **int** | Number of points scanned in alert query time frame. | [optional] 
+**orphan** | **bool** |  | [optional] 
+**points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
+**prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
+**query_syntax_error** | **bool** | Whether there was an query syntax exception when the alert condition last ran | [optional] 
+**resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
+**runbook_links** | **list[str]** | User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered | [optional] 
+**secure_metric_details** | **bool** | Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security. | [optional] 
+**service** | **list[str]** | Lists the services from the failingHostLabelPair of the alert. | [optional] 
+**severity** | **str** | Severity of the alert | [optional] 
+**severity_list** | **list[str]** | Alert severity list for multi-threshold type. | [optional] 
+**snoozed** | **int** | The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely | [optional] 
+**sort_attr** | **int** | Attribute used for default alert sort that is derived from state and severity | [optional] 
+**status** | **list[str]** | Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA | [optional] 
+**system_alert_version** | **int** | If this is a system alert, the version of it | [optional] 
+**system_owned** | **bool** | Whether this alert is system-owned and not writeable | [optional] 
+**tagpaths** | **list[str]** |  | [optional] 
+**tags** | [**WFTags**](WFTags.md) |  | [optional] 
+**target** | **str** | The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}). You cannot update this value. | [optional] 
+**target_endpoints** | **list[str]** |  | [optional] 
+**target_info** | [**list[TargetInfo]**](TargetInfo.md) | List of alert targets display information that includes name, id and type. | [optional] 
+**targets** | **dict(str, str)** | Targets for severity. | [optional] 
+**triage_dashboards** | [**list[TriageDashboard]**](TriageDashboard.md) | Deprecated for alertTriageDashboards | [optional] 
+**update_user_id** | **str** | The user that last updated this alert | [optional] 
+**updated** | **int** | When the alert was last updated, in epoch millis | [optional] 
+**updated_epoch_millis** | **int** |  | [optional] 
+**updater_id** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/IngestionPolicyReadModel.md b/docs/IngestionPolicyReadModel.md
index 7c523fc..873dfd8 100644
--- a/docs/IngestionPolicyReadModel.md
+++ b/docs/IngestionPolicyReadModel.md
@@ -3,12 +3,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**account_count** | **int** | Total number of accounts that are linked to the ingestion policy | [optional] 
 **accounts** | [**list[AccessControlElement]**](AccessControlElement.md) | The accounts associated with the ingestion policy | [optional] 
+**alert** | [**Alert**](Alert.md) | The alert object connected with the ingestion policy. | [optional] 
 **alert_id** | **str** | The ingestion policy alert Id | [optional] 
 **customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
 **description** | **str** | The description of the ingestion policy | [optional] 
-**group_count** | **int** | Total number of groups that are linked to the ingestion policy | [optional] 
 **groups** | [**list[AccessControlElement]**](AccessControlElement.md) | The groups associated with the ingestion policy | [optional] 
 **id** | **str** | The unique ID for the ingestion policy | [optional] 
 **is_limited** | **bool** | Whether the ingestion policy is limited | [optional] 
@@ -19,15 +18,9 @@ Name | Type | Description | Notes
 **name** | **str** | The name of the ingestion policy | [optional] 
 **namespaces** | **list[str]** | The namespaces associated with the ingestion policy | [optional] 
 **point_tags** | [**list[Annotation]**](Annotation.md) | The point tags associated with the ingestion policy | [optional] 
-**sampled_accounts** | **list[str]** | A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy | [optional] 
-**sampled_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy | [optional] 
-**sampled_service_accounts** | **list[str]** | A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy | [optional] 
-**sampled_user_accounts** | **list[str]** | A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy | [optional] 
 **scope** | **str** | The scope of the ingestion policy | [optional] 
-**service_account_count** | **int** | Total number of service accounts that are linked to the ingestion policy | [optional] 
 **sources** | **list[str]** | The sources associated with the ingestion policy | [optional] 
 **tags_anded** | **bool** | Whether tags should be AND-ed or OR-ed.If true, a metric must contain all tags in order for the ingestion policy to apply. If false, the tags are OR-ed, and a metric must contain one of the tags. Default: false | [optional] 
-**user_account_count** | **int** | Total number of user accounts that are linked to the ingestion policy | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IngestionPolicyWriteModel.md b/docs/IngestionPolicyWriteModel.md
index 5d23fe7..0dbabaa 100644
--- a/docs/IngestionPolicyWriteModel.md
+++ b/docs/IngestionPolicyWriteModel.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **accounts** | **list[str]** | The accounts associated with the ingestion policy | [optional] 
+**alert** | [**IngestionPolicyAlert**](IngestionPolicyAlert.md) | The alert DTO object associated with the ingestion policy. | [optional] 
 **alert_id** | **str** | The ingestion policy alert Id | [optional] 
 **customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
 **description** | **str** | The description of the ingestion policy | [optional] 
diff --git a/docs/Proxy.md b/docs/Proxy.md
index 4adad15..e1ea815 100644
--- a/docs/Proxy.md
+++ b/docs/Proxy.md
@@ -16,8 +16,6 @@ Name | Type | Description | Notes
 **hostname** | **str** | Host name of the machine running the proxy | [optional] 
 **id** | **str** |  | [optional] 
 **in_trash** | **bool** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies associated with the proxy through user and groups | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | Ingestion policy associated with the proxy | [optional] 
 **last_check_in_time** | **int** | Last time when this proxy checked in (in milliseconds since the unix epoch) | [optional] 
 **last_error_event** | [**Event**](Event.md) |  | [optional] 
 **last_error_time** | **int** | deprecated | [optional] 
diff --git a/docs/RoleApi.md b/docs/RoleApi.md
index 8510782..8699adf 100644
--- a/docs/RoleApi.md
+++ b/docs/RoleApi.md
@@ -4,23 +4,23 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_assignees**](RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add multiple users and user groups to a specific role
-[**create_role**](RoleApi.md#create_role) | **POST** /api/v2/role | Create a specific role
-[**delete_role**](RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a specific role
-[**get_all_roles**](RoleApi.md#get_all_roles) | **GET** /api/v2/role | Get all roles for a customer
-[**get_role**](RoleApi.md#get_role) | **GET** /api/v2/role/{id} | Get a specific role
-[**grant_permission_to_roles**](RoleApi.md#grant_permission_to_roles) | **POST** /api/v2/role/grant/{permission} | Grants a single permission to role(s)
-[**remove_assignees**](RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove multiple users and user groups from a specific role
-[**revoke_permission_from_roles**](RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revokes a single permission from role(s)
-[**update_role**](RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a specific role
+[**add_assignees**](RoleApi.md#add_assignees) | **POST** /api/v2/role/{id}/addAssignees | Add accounts and groups to a role
+[**create_role**](RoleApi.md#create_role) | **POST** /api/v2/role | Create a role
+[**delete_role**](RoleApi.md#delete_role) | **DELETE** /api/v2/role/{id} | Delete a role by ID
+[**get_all_roles**](RoleApi.md#get_all_roles) | **GET** /api/v2/role | Get all roles
+[**get_role**](RoleApi.md#get_role) | **GET** /api/v2/role/{id} | Get a role by ID
+[**grant_permission_to_roles**](RoleApi.md#grant_permission_to_roles) | **POST** /api/v2/role/grant/{permission} | Grant a permission to roles
+[**remove_assignees**](RoleApi.md#remove_assignees) | **POST** /api/v2/role/{id}/removeAssignees | Remove accounts and groups from a role
+[**revoke_permission_from_roles**](RoleApi.md#revoke_permission_from_roles) | **POST** /api/v2/role/revoke/{permission} | Revoke a permission from roles
+[**update_role**](RoleApi.md#update_role) | **PUT** /api/v2/role/{id} | Update a role by ID
 
 
 # **add_assignees**
-> ResponseContainerRoleDTO add_assignees(id, body=body)
-
-Add multiple users and user groups to a specific role
+> ResponseContainerRoleDTO add_assignees(id, body)
 
+Add accounts and groups to a role
 
+Assigns a role with a given ID to a list of user and service accounts and groups.
 
 ### Example
 ```python
@@ -38,12 +38,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of users and user groups thatshould be added to role (optional)
+id = 'id_example' # str | The ID of the role to assign. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs.
+body = [wavefront_api_client.list[str]()] # list[str] | A list of accounts and groups to add to the role.
 
 try:
-    # Add multiple users and user groups to a specific role
-    api_response = api_instance.add_assignees(id, body=body)
+    # Add accounts and groups to a role
+    api_response = api_instance.add_assignees(id, body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling RoleApi->add_assignees: %s\n" % e)
@@ -53,8 +53,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of users and user groups thatshould be added to role | [optional] 
+ **id** | **str**| The ID of the role to assign. If you don&#39;t know the role&#39;s ID, run the &lt;code&gt;Get all roles&lt;/code&gt; API call to return all roles and their IDs. | 
+ **body** | **list[str]**| A list of accounts and groups to add to the role. | 
 
 ### Return type
 
@@ -72,11 +72,11 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_role**
-> ResponseContainerRoleDTO create_role(body=body)
-
-Create a specific role
+> ResponseContainerRoleDTO create_role(body)
 
+Create a role
 
+Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role.
 
 ### Example
 ```python
@@ -94,11 +94,11 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.RoleDTO() # RoleDTO | Example Body:  <pre>{   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre> (optional)
+body = wavefront_api_client.RoleCreateDTO() # RoleCreateDTO | An example body for a role with all permissions:  <pre>{    \"name\": \"<i>Role_name</i>\",    \"permissions\": [        \"agent_management\", \"alerts_management\",        \"application_management\", \"batch_query_priority\",        \"dashboard_management\", \"derived_metrics_management\",        \"embedded_charts\", \"events_management\",        \"external_links_management\", \"host_tag_management\",        \"ingestion\", \"metrics_management\",        \"monitored_application_service_management\", \"saml_sso_management\",        \"token_management\", \"user_management\"    ],    \"description\": \"<i>Role_description</i>\" }</pre>
 
 try:
-    # Create a specific role
-    api_response = api_instance.create_role(body=body)
+    # Create a role
+    api_response = api_instance.create_role(body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling RoleApi->create_role: %s\n" % e)
@@ -108,7 +108,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**RoleDTO**](RoleDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Role name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;Role description\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**RoleCreateDTO**](RoleCreateDTO.md)| An example body for a role with all permissions:  &lt;pre&gt;{    \&quot;name\&quot;: \&quot;&lt;i&gt;Role_name&lt;/i&gt;\&quot;,    \&quot;permissions\&quot;: [        \&quot;agent_management\&quot;, \&quot;alerts_management\&quot;,        \&quot;application_management\&quot;, \&quot;batch_query_priority\&quot;,        \&quot;dashboard_management\&quot;, \&quot;derived_metrics_management\&quot;,        \&quot;embedded_charts\&quot;, \&quot;events_management\&quot;,        \&quot;external_links_management\&quot;, \&quot;host_tag_management\&quot;,        \&quot;ingestion\&quot;, \&quot;metrics_management\&quot;,        \&quot;monitored_application_service_management\&quot;, \&quot;saml_sso_management\&quot;,        \&quot;token_management\&quot;, \&quot;user_management\&quot;    ],    \&quot;description\&quot;: \&quot;&lt;i&gt;Role_description&lt;/i&gt;\&quot; }&lt;/pre&gt; | 
 
 ### Return type
 
@@ -128,9 +128,9 @@ Name | Type | Description  | Notes
 # **delete_role**
 > ResponseContainerRoleDTO delete_role(id)
 
-Delete a specific role
-
+Delete a role by ID
 
+Deletes a role with a given ID.
 
 ### Example
 ```python
@@ -148,10 +148,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+id = 'id_example' # str | The ID of the role to delete. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs.
 
 try:
-    # Delete a specific role
+    # Delete a role by ID
     api_response = api_instance.delete_role(id)
     pprint(api_response)
 except ApiException as e:
@@ -162,7 +162,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
+ **id** | **str**| The ID of the role to delete. If you don&#39;t know the role&#39;s ID, run the &lt;code&gt;Get all roles&lt;/code&gt; API call to return all roles and their IDs. | 
 
 ### Return type
 
@@ -182,9 +182,9 @@ Name | Type | Description  | Notes
 # **get_all_roles**
 > ResponseContainerPagedRoleDTO get_all_roles(offset=offset, limit=limit)
 
-Get all roles for a customer
-
+Get all roles
 
+Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it.
 
 ### Example
 ```python
@@ -206,7 +206,7 @@ offset = 0 # int |  (optional) (default to 0)
 limit = 100 # int |  (optional) (default to 100)
 
 try:
-    # Get all roles for a customer
+    # Get all roles
     api_response = api_instance.get_all_roles(offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
@@ -238,9 +238,9 @@ Name | Type | Description  | Notes
 # **get_role**
 > ResponseContainerRoleDTO get_role(id)
 
-Get a specific role
-
+Get a role by ID
 
+Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it.
 
 ### Example
 ```python
@@ -258,10 +258,10 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
+id = 'id_example' # str | The ID of the role to get. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs.
 
 try:
-    # Get a specific role
+    # Get a role by ID
     api_response = api_instance.get_role(id)
     pprint(api_response)
 except ApiException as e:
@@ -272,7 +272,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
+ **id** | **str**| The ID of the role to get. If you don&#39;t know the role&#39;s ID, run the &lt;code&gt;Get all roles&lt;/code&gt; API call to return all roles and their IDs. | 
 
 ### Return type
 
@@ -290,11 +290,11 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **grant_permission_to_roles**
-> ResponseContainerRoleDTO grant_permission_to_roles(permission, body=body)
-
-Grants a single permission to role(s)
+> ResponseContainerRoleDTO grant_permission_to_roles(permission, body)
 
+Grant a permission to roles
 
+Grants a given permission to a list of roles.
 
 ### Example
 ```python
@@ -312,12 +312,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to grant to role(s).
-body = [wavefront_api_client.list[str]()] # list[str] | List of roles. (optional)
+permission = 'permission_example' # str | The permission to grant. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission.
+body = [wavefront_api_client.list[str]()] # list[str] | A list of role IDs to which to grant the permission.
 
 try:
-    # Grants a single permission to role(s)
-    api_response = api_instance.grant_permission_to_roles(permission, body=body)
+    # Grant a permission to roles
+    api_response = api_instance.grant_permission_to_roles(permission, body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling RoleApi->grant_permission_to_roles: %s\n" % e)
@@ -327,8 +327,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to grant to role(s). | 
- **body** | **list[str]**| List of roles. | [optional] 
+ **permission** | **str**| The permission to grant. Note that &lt;code&gt;host_tag_management&lt;/code&gt; is the equivalent of the **Source Tag Management** permission, &lt;code&gt;monitored_application_service_management&lt;/code&gt; is the equivalent of the **Integrations** permission, &lt;code&gt;agent_management&lt;/code&gt; is the equivalent of the **Proxies** permission. | 
+ **body** | **list[str]**| A list of role IDs to which to grant the permission. | 
 
 ### Return type
 
@@ -346,11 +346,11 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **remove_assignees**
-> ResponseContainerRoleDTO remove_assignees(id, body=body)
-
-Remove multiple users and user groups from a specific role
+> ResponseContainerRoleDTO remove_assignees(id, body)
 
+Remove accounts and groups from a role
 
+Revokes a role with a given ID from a list of user and service accounts and groups.
 
 ### Example
 ```python
@@ -368,12 +368,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of users and user groups thatshould be removed from role (optional)
+id = 'id_example' # str | The ID of the role to revoke. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs.
+body = [wavefront_api_client.list[str]()] # list[str] | A list of accounts and groups to remove from the role.
 
 try:
-    # Remove multiple users and user groups from a specific role
-    api_response = api_instance.remove_assignees(id, body=body)
+    # Remove accounts and groups from a role
+    api_response = api_instance.remove_assignees(id, body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling RoleApi->remove_assignees: %s\n" % e)
@@ -383,8 +383,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of users and user groups thatshould be removed from role | [optional] 
+ **id** | **str**| The ID of the role to revoke. If you don&#39;t know the role&#39;s ID, run the &lt;code&gt;Get all roles&lt;/code&gt; API call to return all roles and their IDs. | 
+ **body** | **list[str]**| A list of accounts and groups to remove from the role. | 
 
 ### Return type
 
@@ -402,11 +402,11 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **revoke_permission_from_roles**
-> ResponseContainerRoleDTO revoke_permission_from_roles(permission, body=body)
-
-Revokes a single permission from role(s)
+> ResponseContainerRoleDTO revoke_permission_from_roles(permission, body)
 
+Revoke a permission from roles
 
+Revokes a given permission from a list of roles.
 
 ### Example
 ```python
@@ -424,12 +424,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-permission = 'permission_example' # str | Permission to revoke from role(s).
-body = [wavefront_api_client.list[str]()] # list[str] | List of roles. (optional)
+permission = 'permission_example' # str | The permission to revoke. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission.
+body = [wavefront_api_client.list[str]()] # list[str] | A list of role IDs from which to revoke the permission.
 
 try:
-    # Revokes a single permission from role(s)
-    api_response = api_instance.revoke_permission_from_roles(permission, body=body)
+    # Revoke a permission from roles
+    api_response = api_instance.revoke_permission_from_roles(permission, body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling RoleApi->revoke_permission_from_roles: %s\n" % e)
@@ -439,8 +439,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **permission** | **str**| Permission to revoke from role(s). | 
- **body** | **list[str]**| List of roles. | [optional] 
+ **permission** | **str**| The permission to revoke. Note that &lt;code&gt;host_tag_management&lt;/code&gt; is the equivalent of the **Source Tag Management** permission, &lt;code&gt;monitored_application_service_management&lt;/code&gt; is the equivalent of the **Integrations** permission, &lt;code&gt;agent_management&lt;/code&gt; is the equivalent of the **Proxies** permission. | 
+ **body** | **list[str]**| A list of role IDs from which to revoke the permission. | 
 
 ### Return type
 
@@ -458,11 +458,11 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_role**
-> ResponseContainerRoleDTO update_role(id, body=body)
-
-Update a specific role
+> ResponseContainerRoleDTO update_role(id, body)
 
+Update a role by ID
 
+Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description.
 
 ### Example
 ```python
@@ -480,12 +480,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.RoleApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = wavefront_api_client.RoleDTO() # RoleDTO | Example Body:  <pre>{   \"id\": \"Role identifier\",   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre> (optional)
+id = 'id_example' # str | The ID of the role to update. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs.
+body = wavefront_api_client.RoleUpdateDTO() # RoleUpdateDTO | You can first run the <code>Get a role by ID</code> API call, and then you can copy and edit the response body. An example body for a role with all permissions:  <pre>{   \"id\": \"<i>Role_ID</i>\",   \"name\": \"<i>Role_name</i>\",   \"permissions\": [      \"agent_management\", \"alerts_management\",      \"application_management\", \"batch_query_priority\",      \"derived_metrics_management\", \"dashboard_management\",      \"embedded_charts\", \"events_management\",      \"external_links_management\", \"host_tag_management\",      \"ingestion\", \"metrics_management\",      \"monitored_application_service_management\", \"saml_sso_management\",      \"token_management\", \"user_management\"   ],   \"description\": \"<i>Role_description</i>\" }</pre>
 
 try:
-    # Update a specific role
-    api_response = api_instance.update_role(id, body=body)
+    # Update a role by ID
+    api_response = api_instance.update_role(id, body)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling RoleApi->update_role: %s\n" % e)
@@ -495,8 +495,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | [**RoleDTO**](RoleDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;Role identifier\&quot;,   \&quot;name\&quot;: \&quot;Role name\&quot;,   \&quot;permissions\&quot;: [   \&quot;permission1\&quot;,   \&quot;permission2\&quot;,   \&quot;permission3\&quot;   ],   \&quot;description\&quot;: \&quot;Role description\&quot; }&lt;/pre&gt; | [optional] 
+ **id** | **str**| The ID of the role to update. If you don&#39;t know the role&#39;s ID, run the &lt;code&gt;Get all roles&lt;/code&gt; API call to return all roles and their IDs. | 
+ **body** | [**RoleUpdateDTO**](RoleUpdateDTO.md)| You can first run the &lt;code&gt;Get a role by ID&lt;/code&gt; API call, and then you can copy and edit the response body. An example body for a role with all permissions:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;&lt;i&gt;Role_ID&lt;/i&gt;\&quot;,   \&quot;name\&quot;: \&quot;&lt;i&gt;Role_name&lt;/i&gt;\&quot;,   \&quot;permissions\&quot;: [      \&quot;agent_management\&quot;, \&quot;alerts_management\&quot;,      \&quot;application_management\&quot;, \&quot;batch_query_priority\&quot;,      \&quot;derived_metrics_management\&quot;, \&quot;dashboard_management\&quot;,      \&quot;embedded_charts\&quot;, \&quot;events_management\&quot;,      \&quot;external_links_management\&quot;, \&quot;host_tag_management\&quot;,      \&quot;ingestion\&quot;, \&quot;metrics_management\&quot;,      \&quot;monitored_application_service_management\&quot;, \&quot;saml_sso_management\&quot;,      \&quot;token_management\&quot;, \&quot;user_management\&quot;   ],   \&quot;description\&quot;: \&quot;&lt;i&gt;Role_description&lt;/i&gt;\&quot; }&lt;/pre&gt; | 
 
 ### Return type
 
diff --git a/docs/RoleCreateDTO.md b/docs/RoleCreateDTO.md
new file mode 100644
index 0000000..3ea7a55
--- /dev/null
+++ b/docs/RoleCreateDTO.md
@@ -0,0 +1,12 @@
+# RoleCreateDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** | The description of the role | [optional] 
+**name** | **str** | The name of the role | [optional] 
+**permissions** | **list[str]** | List of permissions the role has been granted access to | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/RoleUpdateDTO.md b/docs/RoleUpdateDTO.md
new file mode 100644
index 0000000..5147229
--- /dev/null
+++ b/docs/RoleUpdateDTO.md
@@ -0,0 +1,13 @@
+# RoleUpdateDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**description** | **str** | The description of the role | [optional] 
+**id** | **str** | The unique identifier of the role | [optional] 
+**name** | **str** | The name of the role | [optional] 
+**permissions** | **list[str]** | List of permissions the role has been granted access to | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ServiceAccount.md b/docs/ServiceAccount.md
index ae0f7ca..830bc16 100644
--- a/docs/ServiceAccount.md
+++ b/docs/ServiceAccount.md
@@ -7,8 +7,6 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account. | [optional] 
 **groups** | **list[str]** | The list of service account&#39;s permissions. | [optional] 
 **identifier** | **str** | The unique identifier of a service account. | 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | The list of service account&#39;s ingestion policies. | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) | The ingestion policy object linked with service account. | [optional] 
 **last_used** | **int** | The last time when a token of the service account was used. | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) | The list of service account&#39;s roles. | [optional] 
 **tokens** | [**list[UserApiToken]**](UserApiToken.md) | The service account&#39;s API tokens. | [optional] 
diff --git a/docs/ServiceAccountWrite.md b/docs/ServiceAccountWrite.md
index c316703..ba5598c 100644
--- a/docs/ServiceAccountWrite.md
+++ b/docs/ServiceAccountWrite.md
@@ -7,8 +7,6 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the service account to be created. | [optional] 
 **groups** | **list[str]** | The list of permissions, the service account will be granted. | [optional] 
 **identifier** | **str** | The unique identifier for a service account. | 
-**ingestion_policies** | **list[str]** | The list of ingestion policy ids, the service account will be added to.\&quot; | [optional] 
-**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with service account. | [optional] 
 **roles** | **list[str]** | The list of role ids, the service account will be added to.\&quot; | [optional] 
 **tokens** | **list[str]** | The service account&#39;s API tokens. | [optional] 
 **user_groups** | **list[str]** | The list of user group ids, the service account will be added to. | [optional] 
diff --git a/docs/UsageApi.md b/docs/UsageApi.md
index 771f485..4b5c216 100644
--- a/docs/UsageApi.md
+++ b/docs/UsageApi.md
@@ -4,131 +4,17 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**add_accounts**](UsageApi.md#add_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/addAccounts | Add accounts to ingestion policy
-[**add_groups**](UsageApi.md#add_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/addGroups | Add groups to the ingestion policy
 [**create_ingestion_policy**](UsageApi.md#create_ingestion_policy) | **POST** /api/v2/usage/ingestionpolicy | Create a specific ingestion policy
 [**delete_ingestion_policy**](UsageApi.md#delete_ingestion_policy) | **DELETE** /api/v2/usage/ingestionpolicy/{id} | Delete a specific ingestion policy
 [**export_csv**](UsageApi.md#export_csv) | **GET** /api/v2/usage/exportcsv | Export a CSV report
 [**get_all_ingestion_policies**](UsageApi.md#get_all_ingestion_policies) | **GET** /api/v2/usage/ingestionpolicy | Get all ingestion policies for a customer
 [**get_ingestion_policy**](UsageApi.md#get_ingestion_policy) | **GET** /api/v2/usage/ingestionpolicy/{id} | Get a specific ingestion policy
+[**get_ingestion_policy_by_version**](UsageApi.md#get_ingestion_policy_by_version) | **GET** /api/v2/usage/ingestionpolicy/{id}/history/{version} | Get a specific historical version of a ingestion policy
 [**get_ingestion_policy_history**](UsageApi.md#get_ingestion_policy_history) | **GET** /api/v2/usage/ingestionpolicy/{id}/history | Get the version history of ingestion policy
-[**remove_accounts**](UsageApi.md#remove_accounts) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeAccounts | Remove accounts from ingestion policy
-[**remove_groups**](UsageApi.md#remove_groups) | **POST** /api/v2/usage/ingestionpolicy/{id}/removeGroups | Remove groups from the ingestion policy
+[**revert_ingestion_policy_by_version**](UsageApi.md#revert_ingestion_policy_by_version) | **POST** /api/v2/usage/ingestionpolicy/{id}/revert/{version} | Revert to a specific historical version of a ingestion policy
 [**update_ingestion_policy**](UsageApi.md#update_ingestion_policy) | **PUT** /api/v2/usage/ingestionpolicy/{id} | Update a specific ingestion policy
 
 
-# **add_accounts**
-> ResponseContainerIngestionPolicyReadModel add_accounts(id, body=body)
-
-Add accounts to ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
-
-try:
-    # Add accounts to ingestion policy
-    api_response = api_instance.add_accounts(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->add_accounts: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
-
-### Return type
-
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **add_groups**
-> ResponseContainerIngestionPolicyReadModel add_groups(id, body=body)
-
-Add groups to the ingestion policy
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be added to the ingestion policy (optional)
-
-try:
-    # Add groups to the ingestion policy
-    api_response = api_instance.add_groups(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling UsageApi->add_groups: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**| List of groups to be added to the ingestion policy | [optional] 
-
-### Return type
-
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **create_ingestion_policy**
 > ResponseContainerIngestionPolicyReadModel create_ingestion_policy(body=body)
 
@@ -152,7 +38,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\",   \"alert\": {        \"name\": \"Alert Name\",        \"targets\": {            \"severe\": \"user1@mail.com\"         },        \"conditionPercentages\": {            \"info\": 70,            \"warn\": 90         },        \"minutes\": 5,        \"resolveAfterMinutes\": 2,        \"evaluateRealtimeData\": false,        \"additionalInformation\": \"Additional Info\",        \"tags\": {           \"customerTags\": [             \"alertTag1\"           ]         },        \"conditionsThresholdOperator\": \">\"     } }</pre> (optional)
 
 try:
     # Create a specific ingestion policy
@@ -166,7 +52,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot;,   \&quot;alert\&quot;: {        \&quot;name\&quot;: \&quot;Alert Name\&quot;,        \&quot;targets\&quot;: {            \&quot;severe\&quot;: \&quot;user1@mail.com\&quot;         },        \&quot;conditionPercentages\&quot;: {            \&quot;info\&quot;: 70,            \&quot;warn\&quot;: 90         },        \&quot;minutes\&quot;: 5,        \&quot;resolveAfterMinutes\&quot;: 2,        \&quot;evaluateRealtimeData\&quot;: false,        \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,        \&quot;tags\&quot;: {           \&quot;customerTags\&quot;: [             \&quot;alertTag1\&quot;           ]         },        \&quot;conditionsThresholdOperator\&quot;: \&quot;&gt;\&quot;     } }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -402,10 +288,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **get_ingestion_policy_history**
-> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
+# **get_ingestion_policy_by_version**
+> ResponseContainerIngestionPolicyReadModel get_ingestion_policy_by_version(id, version)
 
-Get the version history of ingestion policy
+Get a specific historical version of a ingestion policy
 
 
 
@@ -426,15 +312,14 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
+version = 789 # int | 
 
 try:
-    # Get the version history of ingestion policy
-    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
+    # Get a specific historical version of a ingestion policy
+    api_response = api_instance.get_ingestion_policy_by_version(id, version)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
+    print("Exception when calling UsageApi->get_ingestion_policy_by_version: %s\n" % e)
 ```
 
 ### Parameters
@@ -442,12 +327,11 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
+ **version** | **int**|  | 
 
 ### Return type
 
-[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
 
 ### Authorization
 
@@ -460,10 +344,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_accounts**
-> ResponseContainerIngestionPolicyReadModel remove_accounts(id, body=body)
+# **get_ingestion_policy_history**
+> ResponseContainerHistoryResponse get_ingestion_policy_history(id, offset=offset, limit=limit)
 
-Remove accounts from ingestion policy
+Get the version history of ingestion policy
 
 
 
@@ -484,14 +368,15 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of accounts to be added to ingestion policy (optional)
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
 
 try:
-    # Remove accounts from ingestion policy
-    api_response = api_instance.remove_accounts(id, body=body)
+    # Get the version history of ingestion policy
+    api_response = api_instance.get_ingestion_policy_history(id, offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling UsageApi->remove_accounts: %s\n" % e)
+    print("Exception when calling UsageApi->get_ingestion_policy_history: %s\n" % e)
 ```
 
 ### Parameters
@@ -499,11 +384,12 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| List of accounts to be added to ingestion policy | [optional] 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
 
 ### Return type
 
-[**ResponseContainerIngestionPolicyReadModel**](ResponseContainerIngestionPolicyReadModel.md)
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
 
 ### Authorization
 
@@ -516,10 +402,10 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **remove_groups**
-> ResponseContainerIngestionPolicyReadModel remove_groups(id, body=body)
+# **revert_ingestion_policy_by_version**
+> ResponseContainerIngestionPolicyReadModel revert_ingestion_policy_by_version(id, version)
 
-Remove groups from the ingestion policy
+Revert to a specific historical version of a ingestion policy
 
 
 
@@ -540,14 +426,14 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] | List of groups to be removed from the ingestion policy (optional)
+version = 789 # int | 
 
 try:
-    # Remove groups from the ingestion policy
-    api_response = api_instance.remove_groups(id, body=body)
+    # Revert to a specific historical version of a ingestion policy
+    api_response = api_instance.revert_ingestion_policy_by_version(id, version)
     pprint(api_response)
 except ApiException as e:
-    print("Exception when calling UsageApi->remove_groups: %s\n" % e)
+    print("Exception when calling UsageApi->revert_ingestion_policy_by_version: %s\n" % e)
 ```
 
 ### Parameters
@@ -555,7 +441,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | **list[str]**| List of groups to be removed from the ingestion policy | [optional] 
+ **version** | **int**|  | 
 
 ### Return type
 
@@ -596,7 +482,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UsageApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre> (optional)
+body = wavefront_api_client.IngestionPolicyWriteModel() # IngestionPolicyWriteModel | Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\",   \"alert\": {        \"name\": \"Alert Name\",        \"targets\": {            \"severe\": \"user1@mail.com\"         },        \"conditionPercentages\": {            \"info\": 70,            \"warn\": 90         },        \"minutes\": 5,        \"resolveAfterMinutes\": 2,        \"evaluateRealtimeData\": false,        \"additionalInformation\": \"Additional Info\",        \"tags\": {           \"customerTags\": [             \"alertTag1\"           ]         },        \"conditionsThresholdOperator\": \">\"     } }</pre> (optional)
 
 try:
     # Update a specific ingestion policy
@@ -611,7 +497,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot; }&lt;/pre&gt; | [optional] 
+ **body** | [**IngestionPolicyWriteModel**](IngestionPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Ingestion policy name\&quot;,   \&quot;description\&quot;: \&quot;Ingestion policy description\&quot;,   \&quot;scope\&quot;: \&quot;GROUP\&quot;,   \&quot;groups\&quot;: [\&quot;g1\&quot;,\&quot;g2\&quot;],   \&quot;isLimited\&quot;: \&quot;true\&quot;,   \&quot;limitPPS\&quot;: \&quot;1000\&quot;,   \&quot;alert\&quot;: {        \&quot;name\&quot;: \&quot;Alert Name\&quot;,        \&quot;targets\&quot;: {            \&quot;severe\&quot;: \&quot;user1@mail.com\&quot;         },        \&quot;conditionPercentages\&quot;: {            \&quot;info\&quot;: 70,            \&quot;warn\&quot;: 90         },        \&quot;minutes\&quot;: 5,        \&quot;resolveAfterMinutes\&quot;: 2,        \&quot;evaluateRealtimeData\&quot;: false,        \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,        \&quot;tags\&quot;: {           \&quot;customerTags\&quot;: [             \&quot;alertTag1\&quot;           ]         },        \&quot;conditionsThresholdOperator\&quot;: \&quot;&gt;\&quot;     } }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 0841885..16b2101 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -101,7 +101,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 send_email = true # bool | Whether to send email notification to the user, if created.  Default: false (optional)
-body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre> (optional)
+body = wavefront_api_client.UserToCreate() # UserToCreate | Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], }</pre> (optional)
 
 try:
     # Creates an user if the user doesn't already exist.
@@ -116,7 +116,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **send_email** | **bool**| Whether to send email notification to the user, if created.  Default: false | [optional] 
- **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserToCreate**](UserToCreate.md)| Example Body:  &lt;pre&gt;{   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ], }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -533,7 +533,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
-body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre> (optional)
+body = [wavefront_api_client.UserToCreate()] # list[UserToCreate] | Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], } ]</pre> (optional)
 
 try:
     # Invite users with given user groups and permissions.
@@ -547,7 +547,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policyId1\&quot;,     \&quot;policyId2\&quot;   ] } ]&lt;/pre&gt; | [optional] 
+ **body** | [**list[UserToCreate]**](UserToCreate.md)| Example Body:  &lt;pre&gt;[ {   \&quot;emailAddress\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ], } ]&lt;/pre&gt; | [optional] 
 
 ### Return type
 
@@ -756,7 +756,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.UserApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
-body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre> (optional)
+body = wavefront_api_client.UserRequestDTO() # UserRequestDTO | Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ] }</pre> (optional)
 
 try:
     # Update user with given user groups, permissions and ingestion policy.
@@ -771,7 +771,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
- **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;ingestionPolicies\&quot;: [     \&quot;policy_id\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
+ **body** | [**UserRequestDTO**](UserRequestDTO.md)| Example Body:  &lt;pre&gt;{   \&quot;identifier\&quot;: \&quot;user@example.com\&quot;,   \&quot;groups\&quot;: [     \&quot;user_management\&quot;   ],   \&quot;userGroups\&quot;: [     \&quot;8b23136b-ecd2-4cb5-8c92-62477dcc4090\&quot;   ],   \&quot;roles\&quot;: [     \&quot;Role\&quot;   ] }&lt;/pre&gt; | [optional] 
 
 ### Return type
 
diff --git a/docs/UserDTO.md b/docs/UserDTO.md
index b3d3f50..7718608 100644
--- a/docs/UserDTO.md
+++ b/docs/UserDTO.md
@@ -6,8 +6,6 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserGroupModel.md b/docs/UserGroupModel.md
index 4bdd203..b8cfca6 100644
--- a/docs/UserGroupModel.md
+++ b/docs/UserGroupModel.md
@@ -7,7 +7,6 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which the user group belongs | [optional] 
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) | Ingestion policies linked with the user group | [optional] 
 **name** | **str** | The name of the user group | 
 **properties** | [**UserGroupPropertiesDTO**](UserGroupPropertiesDTO.md) | The properties of the user group(name editable, users editable, etc.) | [optional] 
 **role_count** | **int** | Total number of roles that are linked the the user group | [optional] 
diff --git a/docs/UserModel.md b/docs/UserModel.md
index 8af6c9c..af67d61 100644
--- a/docs/UserModel.md
+++ b/docs/UserModel.md
@@ -6,8 +6,6 @@ Name | Type | Description | Notes
 **customer** | **str** | The id of the customer to which this user belongs | 
 **groups** | **list[str]** | The permissions granted to this user | 
 **identifier** | **str** | The unique identifier of this user, which must be their valid email address | 
-**ingestion_policies** | [**list[IngestionPolicyReadModel]**](IngestionPolicyReadModel.md) |  | [optional] 
-**ingestion_policy** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **last_successful_login** | **int** |  | [optional] 
 **roles** | [**list[RoleDTO]**](RoleDTO.md) |  | [optional] 
 **sso_id** | **str** |  | [optional] 
diff --git a/docs/UserRequestDTO.md b/docs/UserRequestDTO.md
index c10a83e..26ccc8c 100644
--- a/docs/UserRequestDTO.md
+++ b/docs/UserRequestDTO.md
@@ -7,8 +7,6 @@ Name | Type | Description | Notes
 **customer** | **str** |  | [optional] 
 **groups** | **list[str]** |  | [optional] 
 **identifier** | **str** |  | [optional] 
-**ingestion_policies** | **list[str]** |  | [optional] 
-**ingestion_policy_id** | **str** |  | [optional] 
 **roles** | **list[str]** |  | [optional] 
 **sso_id** | **str** |  | [optional] 
 **user_groups** | **list[str]** |  | [optional] 
diff --git a/docs/UserToCreate.md b/docs/UserToCreate.md
index 7f3069c..1a27925 100644
--- a/docs/UserToCreate.md
+++ b/docs/UserToCreate.md
@@ -4,9 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **email_address** | **str** | The (unique) identifier of the user to create. Must be a valid email address | 
-**groups** | **list[str]** | List of permission groups to grant to this user. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management | 
-**ingestion_policies** | **list[str]** | The list of ingestion policy ids, the user will be added to. | [optional] 
-**ingestion_policy_id** | **str** | The identifier of the ingestion policy linked with user. | [optional] 
+**groups** | **list[str]** | List of permission groups to grant to this user. Please note that &#39;host_tag_management&#39; is the equivalent of the &#39;Source Tag Management&#39; permission.  Possible values are log_management, dashboard_management, events_management, alerts_management, derived_metrics_management, host_tag_management, agent_management, token_management, ingestion, user_management, embedded_charts, metrics_management, external_links_management, application_management, batch_query_priority, saml_sso_management, monitored_application_service_management | 
 **roles** | **list[str]** | The list of role ids, the user will be added to. | [optional] 
 **user_groups** | **list[str]** | List of user groups to this user.  | 
 
diff --git a/setup.py b/setup.py
index c41b248..3fdb06c 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.169.0"
+VERSION = "2.170.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_ingestion_policy_alert.py b/test/test_ingestion_policy_alert.py
new file mode 100644
index 0000000..ec09f37
--- /dev/null
+++ b/test/test_ingestion_policy_alert.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.ingestion_policy_alert import IngestionPolicyAlert  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestIngestionPolicyAlert(unittest.TestCase):
+    """IngestionPolicyAlert unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testIngestionPolicyAlert(self):
+        """Test IngestionPolicyAlert"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.ingestion_policy_alert.IngestionPolicyAlert()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_role_create_dto.py b/test/test_role_create_dto.py
new file mode 100644
index 0000000..bca46cf
--- /dev/null
+++ b/test/test_role_create_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.role_create_dto import RoleCreateDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRoleCreateDTO(unittest.TestCase):
+    """RoleCreateDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRoleCreateDTO(self):
+        """Test RoleCreateDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.role_create_dto.RoleCreateDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_role_update_dto.py b/test/test_role_update_dto.py
new file mode 100644
index 0000000..e349ef7
--- /dev/null
+++ b/test/test_role_update_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.role_update_dto import RoleUpdateDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestRoleUpdateDTO(unittest.TestCase):
+    """RoleUpdateDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testRoleUpdateDTO(self):
+        """Test RoleUpdateDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.role_update_dto.RoleUpdateDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 6fb0342..42ed69b 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -116,7 +116,7 @@
 from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_alert import IngestionPolicyAlert
 from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
 from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
 from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
@@ -297,8 +297,10 @@
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
+from wavefront_api_client.models.role_create_dto import RoleCreateDTO
 from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO
+from wavefront_api_client.models.role_update_dto import RoleUpdateDTO
 from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
 from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
 from wavefront_api_client.models.saved_search import SavedSearch
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 38df14a..7a24c38 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -349,7 +349,7 @@ def create_or_update_user_account(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -372,7 +372,7 @@ def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1470,6 +1470,93 @@ def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
+        """Get all users with Accounts permission  # noqa: E501
+
+        Returns all users with Accounts permission  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_users_with_accounts_permission(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_users_with_accounts_permission_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_users_with_accounts_permission_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all users with Accounts permission  # noqa: E501
+
+        Returns all users with Accounts permission  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_users_with_accounts_permission_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerListString
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_users_with_accounts_permission" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/account/user/admin', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListString',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
@@ -1578,7 +1665,7 @@ def grant_account_permission_with_http_info(self, id, permission, **kwargs):  #
             collection_formats=collection_formats)
 
     def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
-        """Grants a specific permission to multiple accounts (users or service accounts)  # noqa: E501
+        """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1587,7 +1674,7 @@ def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param str permission: The permission to grant. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
         :param list[str] body: List of accounts the specified permission to be granted to
         :return: UserModel
                  If the method is called asynchronously,
@@ -1601,7 +1688,7 @@ def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
             return data
 
     def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Grants a specific permission to multiple accounts (users or service accounts)  # noqa: E501
+        """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -1610,7 +1697,7 @@ def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  #
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param str permission: The permission to grant. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
         :param list[str] body: List of accounts the specified permission to be granted to
         :return: UserModel
                  If the method is called asynchronously,
@@ -1690,7 +1777,7 @@ def invite_user_accounts(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1712,7 +1799,7 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2089,7 +2176,7 @@ def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  #
             collection_formats=collection_formats)
 
     def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
-        """Revokes a specific permission from multiple accounts (users or service accounts)  # noqa: E501
+        """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2098,7 +2185,7 @@ def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param str permission: The permission to revoke. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
         :param list[str] body: List of accounts the specified permission to be revoked from
         :return: UserModel
                  If the method is called asynchronously,
@@ -2112,7 +2199,7 @@ def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
             return data
 
     def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Revokes a specific permission from multiple accounts (users or service accounts)  # noqa: E501
+        """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2121,7 +2208,7 @@ def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to revoke from the accounts. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission (required)
+        :param str permission: The permission to revoke. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
         :param list[str] body: List of accounts the specified permission to be revoked from
         :return: UserModel
                  If the method is called asynchronously,
@@ -2295,7 +2382,7 @@ def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def update_user_account(self, id, **kwargs):  # noqa: E501
-        """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
+        """Update user with given user groups and permissions.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2305,7 +2392,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2318,7 +2405,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
             return data
 
     def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
+        """Update user with given user groups and permissions.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -2328,7 +2415,7 @@ def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index ba51e4d..4ae86eb 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -33,41 +33,41 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def add_assignees(self, id, **kwargs):  # noqa: E501
-        """Add multiple users and user groups to a specific role  # noqa: E501
+    def add_assignees(self, id, body, **kwargs):  # noqa: E501
+        """Add accounts and groups to a role  # noqa: E501
 
-          # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_assignees(id, async_req=True)
+        >>> thread = api.add_assignees(id, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of users and user groups thatshould be added to role
+        :param str id: The ID of the role to assign. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
+        :param list[str] body: A list of accounts and groups to add to the role. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.add_assignees_with_http_info(id, **kwargs)  # noqa: E501
+            return self.add_assignees_with_http_info(id, body, **kwargs)  # noqa: E501
         else:
-            (data) = self.add_assignees_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.add_assignees_with_http_info(id, body, **kwargs)  # noqa: E501
             return data
 
-    def add_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Add multiple users and user groups to a specific role  # noqa: E501
+    def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
+        """Add accounts and groups to a role  # noqa: E501
 
-          # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_assignees_with_http_info(id, async_req=True)
+        >>> thread = api.add_assignees_with_http_info(id, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of users and user groups thatshould be added to role
+        :param str id: The ID of the role to assign. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
+        :param list[str] body: A list of accounts and groups to add to the role. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -92,6 +92,10 @@ def add_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `add_assignees`")  # noqa: E501
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `add_assignees`")  # noqa: E501
 
         collection_formats = {}
 
@@ -136,39 +140,39 @@ def add_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def create_role(self, **kwargs):  # noqa: E501
-        """Create a specific role  # noqa: E501
+    def create_role(self, body, **kwargs):  # noqa: E501
+        """Create a role  # noqa: E501
 
-          # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_role(async_req=True)
+        >>> thread = api.create_role(body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param RoleDTO body: Example Body:  <pre>{   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :param RoleCreateDTO body: An example body for a role with all permissions:  <pre>{    \"name\": \"<i>Role_name</i>\",    \"permissions\": [        \"agent_management\", \"alerts_management\",        \"application_management\", \"batch_query_priority\",        \"dashboard_management\", \"derived_metrics_management\",        \"embedded_charts\", \"events_management\",        \"external_links_management\", \"host_tag_management\",        \"ingestion\", \"metrics_management\",        \"monitored_application_service_management\", \"saml_sso_management\",        \"token_management\", \"user_management\"    ],    \"description\": \"<i>Role_description</i>\" }</pre> (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.create_role_with_http_info(**kwargs)  # noqa: E501
+            return self.create_role_with_http_info(body, **kwargs)  # noqa: E501
         else:
-            (data) = self.create_role_with_http_info(**kwargs)  # noqa: E501
+            (data) = self.create_role_with_http_info(body, **kwargs)  # noqa: E501
             return data
 
-    def create_role_with_http_info(self, **kwargs):  # noqa: E501
-        """Create a specific role  # noqa: E501
+    def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
+        """Create a role  # noqa: E501
 
-          # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_role_with_http_info(async_req=True)
+        >>> thread = api.create_role_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param RoleDTO body: Example Body:  <pre>{   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :param RoleCreateDTO body: An example body for a role with all permissions:  <pre>{    \"name\": \"<i>Role_name</i>\",    \"permissions\": [        \"agent_management\", \"alerts_management\",        \"application_management\", \"batch_query_priority\",        \"dashboard_management\", \"derived_metrics_management\",        \"embedded_charts\", \"events_management\",        \"external_links_management\", \"host_tag_management\",        \"ingestion\", \"metrics_management\",        \"monitored_application_service_management\", \"saml_sso_management\",        \"token_management\", \"user_management\"    ],    \"description\": \"<i>Role_description</i>\" }</pre> (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -189,6 +193,10 @@ def create_role_with_http_info(self, **kwargs):  # noqa: E501
                 )
             params[key] = val
         del params['kwargs']
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `create_role`")  # noqa: E501
 
         collection_formats = {}
 
@@ -232,16 +240,16 @@ def create_role_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def delete_role(self, id, **kwargs):  # noqa: E501
-        """Delete a specific role  # noqa: E501
+        """Delete a role by ID  # noqa: E501
 
-          # noqa: E501
+        Deletes a role with a given ID.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param str id: The ID of the role to delete. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -254,16 +262,16 @@ def delete_role(self, id, **kwargs):  # noqa: E501
             return data
 
     def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Delete a specific role  # noqa: E501
+        """Delete a role by ID  # noqa: E501
 
-          # noqa: E501
+        Deletes a role with a given ID.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param str id: The ID of the role to delete. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -331,9 +339,9 @@ def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_all_roles(self, **kwargs):  # noqa: E501
-        """Get all roles for a customer  # noqa: E501
+        """Get all roles  # noqa: E501
 
-          # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles(async_req=True)
@@ -354,9 +362,9 @@ def get_all_roles(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all roles for a customer  # noqa: E501
+        """Get all roles  # noqa: E501
 
-          # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles_with_http_info(async_req=True)
@@ -430,16 +438,16 @@ def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_role(self, id, **kwargs):  # noqa: E501
-        """Get a specific role  # noqa: E501
+        """Get a role by ID  # noqa: E501
 
-          # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param str id: The ID of the role to get. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -452,16 +460,16 @@ def get_role(self, id, **kwargs):  # noqa: E501
             return data
 
     def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get a specific role  # noqa: E501
+        """Get a role by ID  # noqa: E501
 
-          # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
+        :param str id: The ID of the role to get. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -528,41 +536,41 @@ def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def grant_permission_to_roles(self, permission, **kwargs):  # noqa: E501
-        """Grants a single permission to role(s)  # noqa: E501
+    def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
+        """Grant a permission to roles  # noqa: E501
 
-          # noqa: E501
+        Grants a given permission to a list of roles.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.grant_permission_to_roles(permission, async_req=True)
+        >>> thread = api.grant_permission_to_roles(permission, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to role(s). (required)
-        :param list[str] body: List of roles.
+        :param str permission: The permission to grant. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
+        :param list[str] body: A list of role IDs to which to grant the permission. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.grant_permission_to_roles_with_http_info(permission, **kwargs)  # noqa: E501
+            return self.grant_permission_to_roles_with_http_info(permission, body, **kwargs)  # noqa: E501
         else:
-            (data) = self.grant_permission_to_roles_with_http_info(permission, **kwargs)  # noqa: E501
+            (data) = self.grant_permission_to_roles_with_http_info(permission, body, **kwargs)  # noqa: E501
             return data
 
-    def grant_permission_to_roles_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Grants a single permission to role(s)  # noqa: E501
+    def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
+        """Grant a permission to roles  # noqa: E501
 
-          # noqa: E501
+        Grants a given permission to a list of roles.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.grant_permission_to_roles_with_http_info(permission, async_req=True)
+        >>> thread = api.grant_permission_to_roles_with_http_info(permission, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to grant to role(s). (required)
-        :param list[str] body: List of roles.
+        :param str permission: The permission to grant. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
+        :param list[str] body: A list of role IDs to which to grant the permission. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -587,6 +595,10 @@ def grant_permission_to_roles_with_http_info(self, permission, **kwargs):  # noq
         if self.api_client.client_side_validation and ('permission' not in params or
                                                        params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `grant_permission_to_roles`")  # noqa: E501
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `grant_permission_to_roles`")  # noqa: E501
 
         collection_formats = {}
 
@@ -631,41 +643,41 @@ def grant_permission_to_roles_with_http_info(self, permission, **kwargs):  # noq
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_assignees(self, id, **kwargs):  # noqa: E501
-        """Remove multiple users and user groups from a specific role  # noqa: E501
+    def remove_assignees(self, id, body, **kwargs):  # noqa: E501
+        """Remove accounts and groups from a role  # noqa: E501
 
-          # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_assignees(id, async_req=True)
+        >>> thread = api.remove_assignees(id, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of users and user groups thatshould be removed from role
+        :param str id: The ID of the role to revoke. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
+        :param list[str] body: A list of accounts and groups to remove from the role. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.remove_assignees_with_http_info(id, **kwargs)  # noqa: E501
+            return self.remove_assignees_with_http_info(id, body, **kwargs)  # noqa: E501
         else:
-            (data) = self.remove_assignees_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.remove_assignees_with_http_info(id, body, **kwargs)  # noqa: E501
             return data
 
-    def remove_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Remove multiple users and user groups from a specific role  # noqa: E501
+    def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
+        """Remove accounts and groups from a role  # noqa: E501
 
-          # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_assignees_with_http_info(id, async_req=True)
+        >>> thread = api.remove_assignees_with_http_info(id, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of users and user groups thatshould be removed from role
+        :param str id: The ID of the role to revoke. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
+        :param list[str] body: A list of accounts and groups to remove from the role. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -690,6 +702,10 @@ def remove_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `remove_assignees`")  # noqa: E501
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `remove_assignees`")  # noqa: E501
 
         collection_formats = {}
 
@@ -734,41 +750,41 @@ def remove_assignees_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def revoke_permission_from_roles(self, permission, **kwargs):  # noqa: E501
-        """Revokes a single permission from role(s)  # noqa: E501
+    def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E501
+        """Revoke a permission from roles  # noqa: E501
 
-          # noqa: E501
+        Revokes a given permission from a list of roles.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.revoke_permission_from_roles(permission, async_req=True)
+        >>> thread = api.revoke_permission_from_roles(permission, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to revoke from role(s). (required)
-        :param list[str] body: List of roles.
+        :param str permission: The permission to revoke. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
+        :param list[str] body: A list of role IDs from which to revoke the permission. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.revoke_permission_from_roles_with_http_info(permission, **kwargs)  # noqa: E501
+            return self.revoke_permission_from_roles_with_http_info(permission, body, **kwargs)  # noqa: E501
         else:
-            (data) = self.revoke_permission_from_roles_with_http_info(permission, **kwargs)  # noqa: E501
+            (data) = self.revoke_permission_from_roles_with_http_info(permission, body, **kwargs)  # noqa: E501
             return data
 
-    def revoke_permission_from_roles_with_http_info(self, permission, **kwargs):  # noqa: E501
-        """Revokes a single permission from role(s)  # noqa: E501
+    def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
+        """Revoke a permission from roles  # noqa: E501
 
-          # noqa: E501
+        Revokes a given permission from a list of roles.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.revoke_permission_from_roles_with_http_info(permission, async_req=True)
+        >>> thread = api.revoke_permission_from_roles_with_http_info(permission, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str permission: Permission to revoke from role(s). (required)
-        :param list[str] body: List of roles.
+        :param str permission: The permission to revoke. Note that <code>host_tag_management</code> is the equivalent of the **Source Tag Management** permission, <code>monitored_application_service_management</code> is the equivalent of the **Integrations** permission, <code>agent_management</code> is the equivalent of the **Proxies** permission. (required)
+        :param list[str] body: A list of role IDs from which to revoke the permission. (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -793,6 +809,10 @@ def revoke_permission_from_roles_with_http_info(self, permission, **kwargs):  #
         if self.api_client.client_side_validation and ('permission' not in params or
                                                        params['permission'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `permission` when calling `revoke_permission_from_roles`")  # noqa: E501
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `revoke_permission_from_roles`")  # noqa: E501
 
         collection_formats = {}
 
@@ -837,41 +857,41 @@ def revoke_permission_from_roles_with_http_info(self, permission, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def update_role(self, id, **kwargs):  # noqa: E501
-        """Update a specific role  # noqa: E501
+    def update_role(self, id, body, **kwargs):  # noqa: E501
+        """Update a role by ID  # noqa: E501
 
-          # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_role(id, async_req=True)
+        >>> thread = api.update_role(id, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param RoleDTO body: Example Body:  <pre>{   \"id\": \"Role identifier\",   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :param str id: The ID of the role to update. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
+        :param RoleUpdateDTO body: You can first run the <code>Get a role by ID</code> API call, and then you can copy and edit the response body. An example body for a role with all permissions:  <pre>{   \"id\": \"<i>Role_ID</i>\",   \"name\": \"<i>Role_name</i>\",   \"permissions\": [      \"agent_management\", \"alerts_management\",      \"application_management\", \"batch_query_priority\",      \"derived_metrics_management\", \"dashboard_management\",      \"embedded_charts\", \"events_management\",      \"external_links_management\", \"host_tag_management\",      \"ingestion\", \"metrics_management\",      \"monitored_application_service_management\", \"saml_sso_management\",      \"token_management\", \"user_management\"   ],   \"description\": \"<i>Role_description</i>\" }</pre> (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.update_role_with_http_info(id, **kwargs)  # noqa: E501
+            return self.update_role_with_http_info(id, body, **kwargs)  # noqa: E501
         else:
-            (data) = self.update_role_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.update_role_with_http_info(id, body, **kwargs)  # noqa: E501
             return data
 
-    def update_role_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Update a specific role  # noqa: E501
+    def update_role_with_http_info(self, id, body, **kwargs):  # noqa: E501
+        """Update a role by ID  # noqa: E501
 
-          # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.update_role_with_http_info(id, async_req=True)
+        >>> thread = api.update_role_with_http_info(id, body, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str id: (required)
-        :param RoleDTO body: Example Body:  <pre>{   \"id\": \"Role identifier\",   \"name\": \"Role name\",   \"permissions\": [   \"permission1\",   \"permission2\",   \"permission3\"   ],   \"description\": \"Role description\" }</pre>
+        :param str id: The ID of the role to update. If you don't know the role's ID, run the <code>Get all roles</code> API call to return all roles and their IDs. (required)
+        :param RoleUpdateDTO body: You can first run the <code>Get a role by ID</code> API call, and then you can copy and edit the response body. An example body for a role with all permissions:  <pre>{   \"id\": \"<i>Role_ID</i>\",   \"name\": \"<i>Role_name</i>\",   \"permissions\": [      \"agent_management\", \"alerts_management\",      \"application_management\", \"batch_query_priority\",      \"derived_metrics_management\", \"dashboard_management\",      \"embedded_charts\", \"events_management\",      \"external_links_management\", \"host_tag_management\",      \"ingestion\", \"metrics_management\",      \"monitored_application_service_management\", \"saml_sso_management\",      \"token_management\", \"user_management\"   ],   \"description\": \"<i>Role_description</i>\" }</pre> (required)
         :return: ResponseContainerRoleDTO
                  If the method is called asynchronously,
                  returns the request thread.
@@ -896,6 +916,10 @@ def update_role_with_http_info(self, id, **kwargs):  # noqa: E501
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
             raise ValueError("Missing the required parameter `id` when calling `update_role`")  # noqa: E501
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `update_role`")  # noqa: E501
 
         collection_formats = {}
 
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index b7502ca..32f99aa 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -33,212 +33,6 @@ def __init__(self, api_client=None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def add_accounts(self, id, **kwargs):  # noqa: E501
-        """Add accounts to ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_accounts(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.add_accounts_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def add_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Add accounts to ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_accounts_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_accounts" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `add_accounts`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/addAccounts', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def add_groups(self, id, **kwargs):  # noqa: E501
-        """Add groups to the ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_groups(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.add_groups_with_http_info(id, **kwargs)  # noqa: E501
-            return data
-
-    def add_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Add groups to the ingestion policy  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.add_groups_with_http_info(id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str id: (required)
-        :param list[str] body: List of groups to be added to the ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'body']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method add_groups" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if self.api_client.client_side_validation and ('id' not in params or
-                                                       params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `add_groups`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/addGroups', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def create_ingestion_policy(self, **kwargs):  # noqa: E501
         """Create a specific ingestion policy  # noqa: E501
 
@@ -249,7 +43,7 @@ def create_ingestion_policy(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\",   \"alert\": {        \"name\": \"Alert Name\",        \"targets\": {            \"severe\": \"user1@mail.com\"         },        \"conditionPercentages\": {            \"info\": 70,            \"warn\": 90         },        \"minutes\": 5,        \"resolveAfterMinutes\": 2,        \"evaluateRealtimeData\": false,        \"additionalInformation\": \"Additional Info\",        \"tags\": {           \"customerTags\": [             \"alertTag1\"           ]         },        \"conditionsThresholdOperator\": \">\"     } }</pre>
         :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -271,7 +65,7 @@ def create_ingestion_policy_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\",   \"alert\": {        \"name\": \"Alert Name\",        \"targets\": {            \"severe\": \"user1@mail.com\"         },        \"conditionPercentages\": {            \"info\": 70,            \"warn\": 90         },        \"minutes\": 5,        \"resolveAfterMinutes\": 2,        \"evaluateRealtimeData\": false,        \"additionalInformation\": \"Additional Info\",        \"tags\": {           \"customerTags\": [             \"alertTag1\"           ]         },        \"conditionsThresholdOperator\": \">\"     } }</pre>
         :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -734,49 +528,47 @@ def get_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
-        """Get the version history of ingestion policy  # noqa: E501
+    def get_ingestion_policy_by_version(self, id, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a ingestion policy  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
+        >>> thread = api.get_ingestion_policy_by_version(id, version, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
+        :param int version: (required)
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+            return self.get_ingestion_policy_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.get_ingestion_policy_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
             return data
 
-    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Get the version history of ingestion policy  # noqa: E501
+    def get_ingestion_policy_by_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a ingestion policy  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
+        >>> thread = api.get_ingestion_policy_by_version_with_http_info(id, version, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerHistoryResponse
+        :param int version: (required)
+        :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id', 'offset', 'limit']  # noqa: E501
+        all_params = ['id', 'version']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -787,26 +579,28 @@ def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E5
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method get_ingestion_policy_history" % key
+                    " to method get_ingestion_policy_by_version" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_by_version`")  # noqa: E501
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `get_ingestion_policy_by_version`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
         if 'id' in params:
             path_params['id'] = params['id']  # noqa: E501
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
 
         query_params = []
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -826,14 +620,14 @@ def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E5
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
+            '/api/v2/usage/ingestionpolicy/{id}/history/{version}', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -841,47 +635,49 @@ def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_accounts(self, id, **kwargs):  # noqa: E501
-        """Remove accounts from ingestion policy  # noqa: E501
+    def get_ingestion_policy_history(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_accounts(id, async_req=True)
+        >>> thread = api.get_ingestion_policy_history(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
+            return self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
         else:
-            (data) = self.remove_accounts_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.get_ingestion_policy_history_with_http_info(id, **kwargs)  # noqa: E501
             return data
 
-    def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Remove accounts from ingestion policy  # noqa: E501
+    def get_ingestion_policy_history_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get the version history of ingestion policy  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_accounts_with_http_info(id, async_req=True)
+        >>> thread = api.get_ingestion_policy_history_with_http_info(id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: List of accounts to be added to ingestion policy
-        :return: ResponseContainerIngestionPolicyReadModel
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id', 'body']  # noqa: E501
+        all_params = ['id', 'offset', 'limit']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -892,14 +688,14 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method remove_accounts" % key
+                    " to method get_ingestion_policy_history" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `remove_accounts`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_ingestion_policy_history`")  # noqa: E501
 
         collection_formats = {}
 
@@ -908,6 +704,10 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             path_params['id'] = params['id']  # noqa: E501
 
         query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
 
         header_params = {}
 
@@ -915,8 +715,6 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         local_var_files = {}
 
         body_params = None
-        if 'body' in params:
-            body_params = params['body']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -929,14 +727,14 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/removeAccounts', 'POST',
+            '/api/v2/usage/ingestionpolicy/{id}/history', 'GET',
             path_params,
             query_params,
             header_params,
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='ResponseContainerIngestionPolicyReadModel',  # noqa: E501
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -944,47 +742,47 @@ def remove_accounts_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def remove_groups(self, id, **kwargs):  # noqa: E501
-        """Remove groups from the ingestion policy  # noqa: E501
+    def revert_ingestion_policy_by_version(self, id, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a ingestion policy  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_groups(id, async_req=True)
+        >>> thread = api.revert_ingestion_policy_by_version(id, version, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: List of groups to be removed from the ingestion policy
+        :param int version: (required)
         :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
+            return self.revert_ingestion_policy_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
         else:
-            (data) = self.remove_groups_with_http_info(id, **kwargs)  # noqa: E501
+            (data) = self.revert_ingestion_policy_by_version_with_http_info(id, version, **kwargs)  # noqa: E501
             return data
 
-    def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Remove groups from the ingestion policy  # noqa: E501
+    def revert_ingestion_policy_by_version_with_http_info(self, id, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a ingestion policy  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.remove_groups_with_http_info(id, async_req=True)
+        >>> thread = api.revert_ingestion_policy_by_version_with_http_info(id, version, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str id: (required)
-        :param list[str] body: List of groups to be removed from the ingestion policy
+        :param int version: (required)
         :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['id', 'body']  # noqa: E501
+        all_params = ['id', 'version']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -995,20 +793,26 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method remove_groups" % key
+                    " to method revert_ingestion_policy_by_version" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'id' is set
         if self.api_client.client_side_validation and ('id' not in params or
                                                        params['id'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `id` when calling `remove_groups`")  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `revert_ingestion_policy_by_version`")  # noqa: E501
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `revert_ingestion_policy_by_version`")  # noqa: E501
 
         collection_formats = {}
 
         path_params = {}
         if 'id' in params:
             path_params['id'] = params['id']  # noqa: E501
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
 
         query_params = []
 
@@ -1018,8 +822,6 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         local_var_files = {}
 
         body_params = None
-        if 'body' in params:
-            body_params = params['body']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
             ['application/json'])  # noqa: E501
@@ -1032,7 +834,7 @@ def remove_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         auth_settings = ['api_key']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/v2/usage/ingestionpolicy/{id}/removeGroups', 'POST',
+            '/api/v2/usage/ingestionpolicy/{id}/revert/{version}', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1058,7 +860,7 @@ def update_ingestion_policy(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\",   \"alert\": {        \"name\": \"Alert Name\",        \"targets\": {            \"severe\": \"user1@mail.com\"         },        \"conditionPercentages\": {            \"info\": 70,            \"warn\": 90         },        \"minutes\": 5,        \"resolveAfterMinutes\": 2,        \"evaluateRealtimeData\": false,        \"additionalInformation\": \"Additional Info\",        \"tags\": {           \"customerTags\": [             \"alertTag1\"           ]         },        \"conditionsThresholdOperator\": \">\"     } }</pre>
         :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1081,7 +883,7 @@ def update_ingestion_policy_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\" }</pre>
+        :param IngestionPolicyWriteModel body: Example Body:  <pre>{   \"name\": \"Ingestion policy name\",   \"description\": \"Ingestion policy description\",   \"scope\": \"GROUP\",   \"groups\": [\"g1\",\"g2\"],   \"isLimited\": \"true\",   \"limitPPS\": \"1000\",   \"alert\": {        \"name\": \"Alert Name\",        \"targets\": {            \"severe\": \"user1@mail.com\"         },        \"conditionPercentages\": {            \"info\": 70,            \"warn\": 90         },        \"minutes\": 5,        \"resolveAfterMinutes\": 2,        \"evaluateRealtimeData\": false,        \"additionalInformation\": \"Additional Info\",        \"tags\": {           \"customerTags\": [             \"alertTag1\"           ]         },        \"conditionsThresholdOperator\": \">\"     } }</pre>
         :return: ResponseContainerIngestionPolicyReadModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 53dd214..afe17f1 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -147,7 +147,7 @@ def create_user(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -170,7 +170,7 @@ def create_user_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool send_email: Whether to send email notification to the user, if created.  Default: false
-        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] }</pre>
+        :param UserToCreate body: Example Body:  <pre>{   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -918,7 +918,7 @@ def invite_users(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -940,7 +940,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         >>> result = thread.get()
 
         :param async_req bool
-        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ],   \"ingestionPolicies\": [     \"policyId1\",     \"policyId2\"   ] } ]</pre>
+        :param list[UserToCreate] body: Example Body:  <pre>[ {   \"emailAddress\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ], } ]</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1323,7 +1323,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
@@ -1346,7 +1346,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param str id: (required)
-        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"ingestionPolicies\": [     \"policy_id\"   ],   \"roles\": [     \"Role\"   ] }</pre>
+        :param UserRequestDTO body: Example Body:  <pre>{   \"identifier\": \"user@example.com\",   \"groups\": [     \"user_management\"   ],   \"userGroups\": [     \"8b23136b-ecd2-4cb5-8c92-62477dcc4090\"   ],   \"roles\": [     \"Role\"   ] }</pre>
         :return: UserModel
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 7e4a044..9d4d789 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.169.0/python'
+        self.user_agent = 'Swagger-Codegen/2.170.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 7064710..fafbded 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.169.0".\
+               "SDK Package Version: 2.170.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index e3247bc..93785b3 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -73,7 +73,7 @@
 from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
-from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping
+from wavefront_api_client.models.ingestion_policy_alert import IngestionPolicyAlert
 from wavefront_api_client.models.ingestion_policy_metadata import IngestionPolicyMetadata
 from wavefront_api_client.models.ingestion_policy_read_model import IngestionPolicyReadModel
 from wavefront_api_client.models.ingestion_policy_write_model import IngestionPolicyWriteModel
@@ -254,8 +254,10 @@
 from wavefront_api_client.models.response_container_validated_users_dto import ResponseContainerValidatedUsersDTO
 from wavefront_api_client.models.response_container_void import ResponseContainerVoid
 from wavefront_api_client.models.response_status import ResponseStatus
+from wavefront_api_client.models.role_create_dto import RoleCreateDTO
 from wavefront_api_client.models.role_dto import RoleDTO
 from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO
+from wavefront_api_client.models.role_update_dto import RoleUpdateDTO
 from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
 from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
 from wavefront_api_client.models.saved_search import SavedSearch
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index cdef6d3..5c8db86 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -35,8 +35,6 @@ class Account(object):
     swagger_types = {
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[str]',
-        'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'united_permissions': 'list[str]',
         'united_roles': 'list[str]',
@@ -46,15 +44,13 @@ class Account(object):
     attribute_map = {
         'groups': 'groups',
         'identifier': 'identifier',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'united_permissions': 'unitedPermissions',
         'united_roles': 'unitedRoles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, groups=None, identifier=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, groups=None, identifier=None, roles=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """Account - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -62,8 +58,6 @@ def __init__(self, groups=None, identifier=None, ingestion_policies=None, ingest
 
         self._groups = None
         self._identifier = None
-        self._ingestion_policies = None
-        self._ingestion_policy_id = None
         self._roles = None
         self._united_permissions = None
         self._united_roles = None
@@ -73,10 +67,6 @@ def __init__(self, groups=None, identifier=None, ingestion_policies=None, ingest
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy_id is not None:
-            self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
             self.roles = roles
         if united_permissions is not None:
@@ -134,52 +124,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this Account.  # noqa: E501
-
-        The list of ingestion policies associated with the account.  # noqa: E501
-
-        :return: The ingestion_policies of this Account.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this Account.
-
-        The list of ingestion policies associated with the account.  # noqa: E501
-
-        :param ingestion_policies: The ingestion_policies of this Account.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this Account.  # noqa: E501
-
-        The identifier of the ingestion policy linked with account.  # noqa: E501
-
-        :return: The ingestion_policy_id of this Account.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this Account.
-
-        The identifier of the ingestion policy linked with account.  # noqa: E501
-
-        :param ingestion_policy_id: The ingestion_policy_id of this Account.  # noqa: E501
-        :type: str
-        """
-
-        self._ingestion_policy_id = ingestion_policy_id
-
     @property
     def roles(self):
         """Gets the roles of this Account.  # noqa: E501
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index cd1c8be..b566490 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -73,6 +73,7 @@ class Alert(object):
         'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
         'in_trash': 'bool',
         'include_obsolete_metrics': 'bool',
+        'ingestion_policy_id': 'str',
         'last_error_message': 'str',
         'last_event_time': 'int',
         'last_failed_time': 'int',
@@ -158,6 +159,7 @@ class Alert(object):
         'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
         'in_trash': 'inTrash',
         'include_obsolete_metrics': 'includeObsoleteMetrics',
+        'ingestion_policy_id': 'ingestionPolicyId',
         'last_error_message': 'lastErrorMessage',
         'last_event_time': 'lastEventTime',
         'last_failed_time': 'lastFailedTime',
@@ -202,7 +204,7 @@ class Alert(object):
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_chart_base=None, alert_chart_description=None, alert_chart_units=None, alert_sources=None, alert_triage_dashboards=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, chart_attributes=None, chart_settings=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_chart_base=None, alert_chart_description=None, alert_chart_units=None, alert_sources=None, alert_triage_dashboards=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, chart_attributes=None, chart_settings=None, condition=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, ingestion_policy_id=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """Alert - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -248,6 +250,7 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
         self._in_maintenance_host_label_pairs = None
         self._in_trash = None
         self._include_obsolete_metrics = None
+        self._ingestion_policy_id = None
         self._last_error_message = None
         self._last_event_time = None
         self._last_failed_time = None
@@ -371,6 +374,8 @@ def __init__(self, acl=None, active_maintenance_windows=None, additional_informa
             self.in_trash = in_trash
         if include_obsolete_metrics is not None:
             self.include_obsolete_metrics = include_obsolete_metrics
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
         if last_error_message is not None:
             self.last_error_message = last_error_message
         if last_event_time is not None:
@@ -1367,6 +1372,29 @@ def include_obsolete_metrics(self, include_obsolete_metrics):
 
         self._include_obsolete_metrics = include_obsolete_metrics
 
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this Alert.  # noqa: E501
+
+        Get the ingestion policy Id associated with ingestion policy alert.  # noqa: E501
+
+        :return: The ingestion_policy_id of this Alert.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this Alert.
+
+        Get the ingestion policy Id associated with ingestion policy alert.  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this Alert.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
     @property
     def last_error_message(self):
         """Gets the last_error_message of this Alert.  # noqa: E501
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index 48ca7b7..c3c912b 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -39,7 +39,6 @@ class CustomerFacingUserObject(object):
         'groups': 'list[str]',
         'id': 'str',
         'identifier': 'str',
-        'ingestion_policy_id': 'str',
         'last_successful_login': 'int',
         '_self': 'bool',
         'united_permissions': 'list[str]',
@@ -54,7 +53,6 @@ class CustomerFacingUserObject(object):
         'groups': 'groups',
         'id': 'id',
         'identifier': 'identifier',
-        'ingestion_policy_id': 'ingestionPolicyId',
         'last_successful_login': 'lastSuccessfulLogin',
         '_self': 'self',
         'united_permissions': 'unitedPermissions',
@@ -62,7 +60,7 @@ class CustomerFacingUserObject(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, ingestion_policy_id=None, last_successful_login=None, _self=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, groups=None, id=None, identifier=None, last_successful_login=None, _self=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """CustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -74,7 +72,6 @@ def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, gr
         self._groups = None
         self._id = None
         self._identifier = None
-        self._ingestion_policy_id = None
         self._last_successful_login = None
         self.__self = None
         self._united_permissions = None
@@ -91,8 +88,6 @@ def __init__(self, customer=None, escaped_identifier=None, gravatar_url=None, gr
             self.groups = groups
         self.id = id
         self.identifier = identifier
-        if ingestion_policy_id is not None:
-            self.ingestion_policy_id = ingestion_policy_id
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         self._self = _self
@@ -247,29 +242,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this CustomerFacingUserObject.  # noqa: E501
-
-        The identifier of the ingestion policy linked with user.  # noqa: E501
-
-        :return: The ingestion_policy_id of this CustomerFacingUserObject.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this CustomerFacingUserObject.
-
-        The identifier of the ingestion policy linked with user.  # noqa: E501
-
-        :param ingestion_policy_id: The ingestion_policy_id of this CustomerFacingUserObject.  # noqa: E501
-        :type: str
-        """
-
-        self._ingestion_policy_id = ingestion_policy_id
-
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this CustomerFacingUserObject.  # noqa: E501
diff --git a/wavefront_api_client/models/ingestion_policy_alert.py b/wavefront_api_client/models/ingestion_policy_alert.py
new file mode 100644
index 0000000..2e75ab7
--- /dev/null
+++ b/wavefront_api_client/models/ingestion_policy_alert.py
@@ -0,0 +1,2471 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class IngestionPolicyAlert(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'acl': 'AccessControlListSimple',
+        'active_maintenance_windows': 'list[str]',
+        'additional_information': 'str',
+        'alert_chart_base': 'int',
+        'alert_chart_description': 'str',
+        'alert_chart_units': 'str',
+        'alert_sources': 'list[AlertSource]',
+        'alert_triage_dashboards': 'list[AlertDashboard]',
+        'alert_type': 'str',
+        'alerts_last_day': 'int',
+        'alerts_last_month': 'int',
+        'alerts_last_week': 'int',
+        'application': 'list[str]',
+        'chart_attributes': 'JsonNode',
+        'chart_settings': 'ChartSettings',
+        'condition': 'str',
+        'condition_percentages': 'dict(str, int)',
+        'condition_qb_enabled': 'bool',
+        'condition_qb_serialization': 'str',
+        'condition_query_type': 'str',
+        'conditions': 'dict(str, str)',
+        'conditions_threshold_operator': 'str',
+        'create_user_id': 'str',
+        'created': 'int',
+        'created_epoch_millis': 'int',
+        'creator_id': 'str',
+        'deleted': 'bool',
+        'display_expression': 'str',
+        'display_expression_qb_enabled': 'bool',
+        'display_expression_qb_serialization': 'str',
+        'display_expression_query_type': 'str',
+        'enable_pd_incident_by_series': 'bool',
+        'evaluate_realtime_data': 'bool',
+        'event': 'Event',
+        'failing_host_label_pair_links': 'list[str]',
+        'failing_host_label_pairs': 'list[SourceLabelPair]',
+        'hidden': 'bool',
+        'hosts_used': 'list[str]',
+        'id': 'str',
+        'in_maintenance_host_label_pairs': 'list[SourceLabelPair]',
+        'in_trash': 'bool',
+        'include_obsolete_metrics': 'bool',
+        'ingestion_policy_id': 'str',
+        'last_error_message': 'str',
+        'last_event_time': 'int',
+        'last_failed_time': 'int',
+        'last_notification_millis': 'int',
+        'last_processed_millis': 'int',
+        'last_query_time': 'int',
+        'metrics_used': 'list[str]',
+        'minutes': 'int',
+        'modify_acl_access': 'bool',
+        'name': 'str',
+        'no_data_event': 'Event',
+        'notificants': 'list[str]',
+        'notification_resend_frequency_minutes': 'int',
+        'num_points_in_failure_frame': 'int',
+        'orphan': 'bool',
+        'points_scanned_at_last_query': 'int',
+        'prefiring_host_label_pairs': 'list[SourceLabelPair]',
+        'process_rate_minutes': 'int',
+        'query_failing': 'bool',
+        'query_syntax_error': 'bool',
+        'resolve_after_minutes': 'int',
+        'runbook_links': 'list[str]',
+        'secure_metric_details': 'bool',
+        'service': 'list[str]',
+        'severity': 'str',
+        'severity_list': 'list[str]',
+        'snoozed': 'int',
+        'sort_attr': 'int',
+        'status': 'list[str]',
+        'system_alert_version': 'int',
+        'system_owned': 'bool',
+        'tagpaths': 'list[str]',
+        'tags': 'WFTags',
+        'target': 'str',
+        'target_endpoints': 'list[str]',
+        'target_info': 'list[TargetInfo]',
+        'targets': 'dict(str, str)',
+        'triage_dashboards': 'list[TriageDashboard]',
+        'update_user_id': 'str',
+        'updated': 'int',
+        'updated_epoch_millis': 'int',
+        'updater_id': 'str'
+    }
+
+    attribute_map = {
+        'acl': 'acl',
+        'active_maintenance_windows': 'activeMaintenanceWindows',
+        'additional_information': 'additionalInformation',
+        'alert_chart_base': 'alertChartBase',
+        'alert_chart_description': 'alertChartDescription',
+        'alert_chart_units': 'alertChartUnits',
+        'alert_sources': 'alertSources',
+        'alert_triage_dashboards': 'alertTriageDashboards',
+        'alert_type': 'alertType',
+        'alerts_last_day': 'alertsLastDay',
+        'alerts_last_month': 'alertsLastMonth',
+        'alerts_last_week': 'alertsLastWeek',
+        'application': 'application',
+        'chart_attributes': 'chartAttributes',
+        'chart_settings': 'chartSettings',
+        'condition': 'condition',
+        'condition_percentages': 'conditionPercentages',
+        'condition_qb_enabled': 'conditionQBEnabled',
+        'condition_qb_serialization': 'conditionQBSerialization',
+        'condition_query_type': 'conditionQueryType',
+        'conditions': 'conditions',
+        'conditions_threshold_operator': 'conditionsThresholdOperator',
+        'create_user_id': 'createUserId',
+        'created': 'created',
+        'created_epoch_millis': 'createdEpochMillis',
+        'creator_id': 'creatorId',
+        'deleted': 'deleted',
+        'display_expression': 'displayExpression',
+        'display_expression_qb_enabled': 'displayExpressionQBEnabled',
+        'display_expression_qb_serialization': 'displayExpressionQBSerialization',
+        'display_expression_query_type': 'displayExpressionQueryType',
+        'enable_pd_incident_by_series': 'enablePDIncidentBySeries',
+        'evaluate_realtime_data': 'evaluateRealtimeData',
+        'event': 'event',
+        'failing_host_label_pair_links': 'failingHostLabelPairLinks',
+        'failing_host_label_pairs': 'failingHostLabelPairs',
+        'hidden': 'hidden',
+        'hosts_used': 'hostsUsed',
+        'id': 'id',
+        'in_maintenance_host_label_pairs': 'inMaintenanceHostLabelPairs',
+        'in_trash': 'inTrash',
+        'include_obsolete_metrics': 'includeObsoleteMetrics',
+        'ingestion_policy_id': 'ingestionPolicyId',
+        'last_error_message': 'lastErrorMessage',
+        'last_event_time': 'lastEventTime',
+        'last_failed_time': 'lastFailedTime',
+        'last_notification_millis': 'lastNotificationMillis',
+        'last_processed_millis': 'lastProcessedMillis',
+        'last_query_time': 'lastQueryTime',
+        'metrics_used': 'metricsUsed',
+        'minutes': 'minutes',
+        'modify_acl_access': 'modifyAclAccess',
+        'name': 'name',
+        'no_data_event': 'noDataEvent',
+        'notificants': 'notificants',
+        'notification_resend_frequency_minutes': 'notificationResendFrequencyMinutes',
+        'num_points_in_failure_frame': 'numPointsInFailureFrame',
+        'orphan': 'orphan',
+        'points_scanned_at_last_query': 'pointsScannedAtLastQuery',
+        'prefiring_host_label_pairs': 'prefiringHostLabelPairs',
+        'process_rate_minutes': 'processRateMinutes',
+        'query_failing': 'queryFailing',
+        'query_syntax_error': 'querySyntaxError',
+        'resolve_after_minutes': 'resolveAfterMinutes',
+        'runbook_links': 'runbookLinks',
+        'secure_metric_details': 'secureMetricDetails',
+        'service': 'service',
+        'severity': 'severity',
+        'severity_list': 'severityList',
+        'snoozed': 'snoozed',
+        'sort_attr': 'sortAttr',
+        'status': 'status',
+        'system_alert_version': 'systemAlertVersion',
+        'system_owned': 'systemOwned',
+        'tagpaths': 'tagpaths',
+        'tags': 'tags',
+        'target': 'target',
+        'target_endpoints': 'targetEndpoints',
+        'target_info': 'targetInfo',
+        'targets': 'targets',
+        'triage_dashboards': 'triageDashboards',
+        'update_user_id': 'updateUserId',
+        'updated': 'updated',
+        'updated_epoch_millis': 'updatedEpochMillis',
+        'updater_id': 'updaterId'
+    }
+
+    def __init__(self, acl=None, active_maintenance_windows=None, additional_information=None, alert_chart_base=None, alert_chart_description=None, alert_chart_units=None, alert_sources=None, alert_triage_dashboards=None, alert_type=None, alerts_last_day=None, alerts_last_month=None, alerts_last_week=None, application=None, chart_attributes=None, chart_settings=None, condition=None, condition_percentages=None, condition_qb_enabled=None, condition_qb_serialization=None, condition_query_type=None, conditions=None, conditions_threshold_operator=None, create_user_id=None, created=None, created_epoch_millis=None, creator_id=None, deleted=None, display_expression=None, display_expression_qb_enabled=None, display_expression_qb_serialization=None, display_expression_query_type=None, enable_pd_incident_by_series=None, evaluate_realtime_data=None, event=None, failing_host_label_pair_links=None, failing_host_label_pairs=None, hidden=None, hosts_used=None, id=None, in_maintenance_host_label_pairs=None, in_trash=None, include_obsolete_metrics=None, ingestion_policy_id=None, last_error_message=None, last_event_time=None, last_failed_time=None, last_notification_millis=None, last_processed_millis=None, last_query_time=None, metrics_used=None, minutes=None, modify_acl_access=None, name=None, no_data_event=None, notificants=None, notification_resend_frequency_minutes=None, num_points_in_failure_frame=None, orphan=None, points_scanned_at_last_query=None, prefiring_host_label_pairs=None, process_rate_minutes=None, query_failing=None, query_syntax_error=None, resolve_after_minutes=None, runbook_links=None, secure_metric_details=None, service=None, severity=None, severity_list=None, snoozed=None, sort_attr=None, status=None, system_alert_version=None, system_owned=None, tagpaths=None, tags=None, target=None, target_endpoints=None, target_info=None, targets=None, triage_dashboards=None, update_user_id=None, updated=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+        """IngestionPolicyAlert - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._acl = None
+        self._active_maintenance_windows = None
+        self._additional_information = None
+        self._alert_chart_base = None
+        self._alert_chart_description = None
+        self._alert_chart_units = None
+        self._alert_sources = None
+        self._alert_triage_dashboards = None
+        self._alert_type = None
+        self._alerts_last_day = None
+        self._alerts_last_month = None
+        self._alerts_last_week = None
+        self._application = None
+        self._chart_attributes = None
+        self._chart_settings = None
+        self._condition = None
+        self._condition_percentages = None
+        self._condition_qb_enabled = None
+        self._condition_qb_serialization = None
+        self._condition_query_type = None
+        self._conditions = None
+        self._conditions_threshold_operator = None
+        self._create_user_id = None
+        self._created = None
+        self._created_epoch_millis = None
+        self._creator_id = None
+        self._deleted = None
+        self._display_expression = None
+        self._display_expression_qb_enabled = None
+        self._display_expression_qb_serialization = None
+        self._display_expression_query_type = None
+        self._enable_pd_incident_by_series = None
+        self._evaluate_realtime_data = None
+        self._event = None
+        self._failing_host_label_pair_links = None
+        self._failing_host_label_pairs = None
+        self._hidden = None
+        self._hosts_used = None
+        self._id = None
+        self._in_maintenance_host_label_pairs = None
+        self._in_trash = None
+        self._include_obsolete_metrics = None
+        self._ingestion_policy_id = None
+        self._last_error_message = None
+        self._last_event_time = None
+        self._last_failed_time = None
+        self._last_notification_millis = None
+        self._last_processed_millis = None
+        self._last_query_time = None
+        self._metrics_used = None
+        self._minutes = None
+        self._modify_acl_access = None
+        self._name = None
+        self._no_data_event = None
+        self._notificants = None
+        self._notification_resend_frequency_minutes = None
+        self._num_points_in_failure_frame = None
+        self._orphan = None
+        self._points_scanned_at_last_query = None
+        self._prefiring_host_label_pairs = None
+        self._process_rate_minutes = None
+        self._query_failing = None
+        self._query_syntax_error = None
+        self._resolve_after_minutes = None
+        self._runbook_links = None
+        self._secure_metric_details = None
+        self._service = None
+        self._severity = None
+        self._severity_list = None
+        self._snoozed = None
+        self._sort_attr = None
+        self._status = None
+        self._system_alert_version = None
+        self._system_owned = None
+        self._tagpaths = None
+        self._tags = None
+        self._target = None
+        self._target_endpoints = None
+        self._target_info = None
+        self._targets = None
+        self._triage_dashboards = None
+        self._update_user_id = None
+        self._updated = None
+        self._updated_epoch_millis = None
+        self._updater_id = None
+        self.discriminator = None
+
+        if acl is not None:
+            self.acl = acl
+        if active_maintenance_windows is not None:
+            self.active_maintenance_windows = active_maintenance_windows
+        if additional_information is not None:
+            self.additional_information = additional_information
+        if alert_chart_base is not None:
+            self.alert_chart_base = alert_chart_base
+        if alert_chart_description is not None:
+            self.alert_chart_description = alert_chart_description
+        if alert_chart_units is not None:
+            self.alert_chart_units = alert_chart_units
+        if alert_sources is not None:
+            self.alert_sources = alert_sources
+        if alert_triage_dashboards is not None:
+            self.alert_triage_dashboards = alert_triage_dashboards
+        if alert_type is not None:
+            self.alert_type = alert_type
+        if alerts_last_day is not None:
+            self.alerts_last_day = alerts_last_day
+        if alerts_last_month is not None:
+            self.alerts_last_month = alerts_last_month
+        if alerts_last_week is not None:
+            self.alerts_last_week = alerts_last_week
+        if application is not None:
+            self.application = application
+        if chart_attributes is not None:
+            self.chart_attributes = chart_attributes
+        if chart_settings is not None:
+            self.chart_settings = chart_settings
+        self.condition = condition
+        if condition_percentages is not None:
+            self.condition_percentages = condition_percentages
+        if condition_qb_enabled is not None:
+            self.condition_qb_enabled = condition_qb_enabled
+        if condition_qb_serialization is not None:
+            self.condition_qb_serialization = condition_qb_serialization
+        if condition_query_type is not None:
+            self.condition_query_type = condition_query_type
+        if conditions is not None:
+            self.conditions = conditions
+        self.conditions_threshold_operator = conditions_threshold_operator
+        if create_user_id is not None:
+            self.create_user_id = create_user_id
+        if created is not None:
+            self.created = created
+        if created_epoch_millis is not None:
+            self.created_epoch_millis = created_epoch_millis
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if deleted is not None:
+            self.deleted = deleted
+        if display_expression is not None:
+            self.display_expression = display_expression
+        if display_expression_qb_enabled is not None:
+            self.display_expression_qb_enabled = display_expression_qb_enabled
+        if display_expression_qb_serialization is not None:
+            self.display_expression_qb_serialization = display_expression_qb_serialization
+        if display_expression_query_type is not None:
+            self.display_expression_query_type = display_expression_query_type
+        if enable_pd_incident_by_series is not None:
+            self.enable_pd_incident_by_series = enable_pd_incident_by_series
+        if evaluate_realtime_data is not None:
+            self.evaluate_realtime_data = evaluate_realtime_data
+        if event is not None:
+            self.event = event
+        if failing_host_label_pair_links is not None:
+            self.failing_host_label_pair_links = failing_host_label_pair_links
+        if failing_host_label_pairs is not None:
+            self.failing_host_label_pairs = failing_host_label_pairs
+        if hidden is not None:
+            self.hidden = hidden
+        if hosts_used is not None:
+            self.hosts_used = hosts_used
+        if id is not None:
+            self.id = id
+        if in_maintenance_host_label_pairs is not None:
+            self.in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+        if in_trash is not None:
+            self.in_trash = in_trash
+        if include_obsolete_metrics is not None:
+            self.include_obsolete_metrics = include_obsolete_metrics
+        if ingestion_policy_id is not None:
+            self.ingestion_policy_id = ingestion_policy_id
+        if last_error_message is not None:
+            self.last_error_message = last_error_message
+        if last_event_time is not None:
+            self.last_event_time = last_event_time
+        if last_failed_time is not None:
+            self.last_failed_time = last_failed_time
+        if last_notification_millis is not None:
+            self.last_notification_millis = last_notification_millis
+        if last_processed_millis is not None:
+            self.last_processed_millis = last_processed_millis
+        if last_query_time is not None:
+            self.last_query_time = last_query_time
+        if metrics_used is not None:
+            self.metrics_used = metrics_used
+        self.minutes = minutes
+        if modify_acl_access is not None:
+            self.modify_acl_access = modify_acl_access
+        self.name = name
+        if no_data_event is not None:
+            self.no_data_event = no_data_event
+        if notificants is not None:
+            self.notificants = notificants
+        if notification_resend_frequency_minutes is not None:
+            self.notification_resend_frequency_minutes = notification_resend_frequency_minutes
+        if num_points_in_failure_frame is not None:
+            self.num_points_in_failure_frame = num_points_in_failure_frame
+        if orphan is not None:
+            self.orphan = orphan
+        if points_scanned_at_last_query is not None:
+            self.points_scanned_at_last_query = points_scanned_at_last_query
+        if prefiring_host_label_pairs is not None:
+            self.prefiring_host_label_pairs = prefiring_host_label_pairs
+        if process_rate_minutes is not None:
+            self.process_rate_minutes = process_rate_minutes
+        if query_failing is not None:
+            self.query_failing = query_failing
+        if query_syntax_error is not None:
+            self.query_syntax_error = query_syntax_error
+        if resolve_after_minutes is not None:
+            self.resolve_after_minutes = resolve_after_minutes
+        if runbook_links is not None:
+            self.runbook_links = runbook_links
+        if secure_metric_details is not None:
+            self.secure_metric_details = secure_metric_details
+        if service is not None:
+            self.service = service
+        if severity is not None:
+            self.severity = severity
+        if severity_list is not None:
+            self.severity_list = severity_list
+        if snoozed is not None:
+            self.snoozed = snoozed
+        if sort_attr is not None:
+            self.sort_attr = sort_attr
+        if status is not None:
+            self.status = status
+        if system_alert_version is not None:
+            self.system_alert_version = system_alert_version
+        if system_owned is not None:
+            self.system_owned = system_owned
+        if tagpaths is not None:
+            self.tagpaths = tagpaths
+        if tags is not None:
+            self.tags = tags
+        if target is not None:
+            self.target = target
+        if target_endpoints is not None:
+            self.target_endpoints = target_endpoints
+        if target_info is not None:
+            self.target_info = target_info
+        if targets is not None:
+            self.targets = targets
+        if triage_dashboards is not None:
+            self.triage_dashboards = triage_dashboards
+        if update_user_id is not None:
+            self.update_user_id = update_user_id
+        if updated is not None:
+            self.updated = updated
+        if updated_epoch_millis is not None:
+            self.updated_epoch_millis = updated_epoch_millis
+        if updater_id is not None:
+            self.updater_id = updater_id
+
+    @property
+    def acl(self):
+        """Gets the acl of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The acl of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: AccessControlListSimple
+        """
+        return self._acl
+
+    @acl.setter
+    def acl(self, acl):
+        """Sets the acl of this IngestionPolicyAlert.
+
+
+        :param acl: The acl of this IngestionPolicyAlert.  # noqa: E501
+        :type: AccessControlListSimple
+        """
+
+        self._acl = acl
+
+    @property
+    def active_maintenance_windows(self):
+        """Gets the active_maintenance_windows of this IngestionPolicyAlert.  # noqa: E501
+
+        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+
+        :return: The active_maintenance_windows of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._active_maintenance_windows
+
+    @active_maintenance_windows.setter
+    def active_maintenance_windows(self, active_maintenance_windows):
+        """Sets the active_maintenance_windows of this IngestionPolicyAlert.
+
+        The names of the active maintenance windows that are affecting this alert  # noqa: E501
+
+        :param active_maintenance_windows: The active_maintenance_windows of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._active_maintenance_windows = active_maintenance_windows
+
+    @property
+    def additional_information(self):
+        """Gets the additional_information of this IngestionPolicyAlert.  # noqa: E501
+
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+
+        :return: The additional_information of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._additional_information
+
+    @additional_information.setter
+    def additional_information(self, additional_information):
+        """Sets the additional_information of this IngestionPolicyAlert.
+
+        User-supplied additional explanatory information for this alert.  Useful for linking runbooks, mitigations,, etc  # noqa: E501
+
+        :param additional_information: The additional_information of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._additional_information = additional_information
+
+    @property
+    def alert_chart_base(self):
+        """Gets the alert_chart_base of this IngestionPolicyAlert.  # noqa: E501
+
+        The base of alert chart. A linear chart will have base as 1. A logarithmic chart will have the other base value.The value should be an integer and should greater than or equal to 1.  # noqa: E501
+
+        :return: The alert_chart_base of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alert_chart_base
+
+    @alert_chart_base.setter
+    def alert_chart_base(self, alert_chart_base):
+        """Sets the alert_chart_base of this IngestionPolicyAlert.
+
+        The base of alert chart. A linear chart will have base as 1. A logarithmic chart will have the other base value.The value should be an integer and should greater than or equal to 1.  # noqa: E501
+
+        :param alert_chart_base: The alert_chart_base of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._alert_chart_base = alert_chart_base
+
+    @property
+    def alert_chart_description(self):
+        """Gets the alert_chart_description of this IngestionPolicyAlert.  # noqa: E501
+
+        The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart.  # noqa: E501
+
+        :return: The alert_chart_description of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_chart_description
+
+    @alert_chart_description.setter
+    def alert_chart_description(self, alert_chart_description):
+        """Sets the alert_chart_description of this IngestionPolicyAlert.
+
+        The description of alert chart. Different from alert additional info, this is used to describe the characteristics of the chart.  # noqa: E501
+
+        :param alert_chart_description: The alert_chart_description of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_chart_description = alert_chart_description
+
+    @property
+    def alert_chart_units(self):
+        """Gets the alert_chart_units of this IngestionPolicyAlert.  # noqa: E501
+
+        The y-axis unit of Alert chart.  # noqa: E501
+
+        :return: The alert_chart_units of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_chart_units
+
+    @alert_chart_units.setter
+    def alert_chart_units(self, alert_chart_units):
+        """Sets the alert_chart_units of this IngestionPolicyAlert.
+
+        The y-axis unit of Alert chart.  # noqa: E501
+
+        :param alert_chart_units: The alert_chart_units of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_chart_units = alert_chart_units
+
+    @property
+    def alert_sources(self):
+        """Gets the alert_sources of this IngestionPolicyAlert.  # noqa: E501
+
+        A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION.  # noqa: E501
+
+        :return: The alert_sources of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[AlertSource]
+        """
+        return self._alert_sources
+
+    @alert_sources.setter
+    def alert_sources(self, alert_sources):
+        """Sets the alert_sources of this IngestionPolicyAlert.
+
+        A list of queries represent multiple queries in alert. It must contains at least one query with AlertSourceType as CONDITION.  # noqa: E501
+
+        :param alert_sources: The alert_sources of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[AlertSource]
+        """
+
+        self._alert_sources = alert_sources
+
+    @property
+    def alert_triage_dashboards(self):
+        """Gets the alert_triage_dashboards of this IngestionPolicyAlert.  # noqa: E501
+
+        User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported  # noqa: E501
+
+        :return: The alert_triage_dashboards of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[AlertDashboard]
+        """
+        return self._alert_triage_dashboards
+
+    @alert_triage_dashboards.setter
+    def alert_triage_dashboards(self, alert_triage_dashboards):
+        """Sets the alert_triage_dashboards of this IngestionPolicyAlert.
+
+        User-supplied dashboard and parameters to create dashboard links. Parameters must be specified as constants or variables. Constant parameters currently only supported  # noqa: E501
+
+        :param alert_triage_dashboards: The alert_triage_dashboards of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[AlertDashboard]
+        """
+
+        self._alert_triage_dashboards = alert_triage_dashboards
+
+    @property
+    def alert_type(self):
+        """Gets the alert_type of this IngestionPolicyAlert.  # noqa: E501
+
+        Alert type.  # noqa: E501
+
+        :return: The alert_type of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_type
+
+    @alert_type.setter
+    def alert_type(self, alert_type):
+        """Sets the alert_type of this IngestionPolicyAlert.
+
+        Alert type.  # noqa: E501
+
+        :param alert_type: The alert_type of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["CLASSIC", "THRESHOLD"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                alert_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `alert_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(alert_type, allowed_values)
+            )
+
+        self._alert_type = alert_type
+
+    @property
+    def alerts_last_day(self):
+        """Gets the alerts_last_day of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The alerts_last_day of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alerts_last_day
+
+    @alerts_last_day.setter
+    def alerts_last_day(self, alerts_last_day):
+        """Sets the alerts_last_day of this IngestionPolicyAlert.
+
+
+        :param alerts_last_day: The alerts_last_day of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._alerts_last_day = alerts_last_day
+
+    @property
+    def alerts_last_month(self):
+        """Gets the alerts_last_month of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The alerts_last_month of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alerts_last_month
+
+    @alerts_last_month.setter
+    def alerts_last_month(self, alerts_last_month):
+        """Sets the alerts_last_month of this IngestionPolicyAlert.
+
+
+        :param alerts_last_month: The alerts_last_month of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._alerts_last_month = alerts_last_month
+
+    @property
+    def alerts_last_week(self):
+        """Gets the alerts_last_week of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The alerts_last_week of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._alerts_last_week
+
+    @alerts_last_week.setter
+    def alerts_last_week(self, alerts_last_week):
+        """Sets the alerts_last_week of this IngestionPolicyAlert.
+
+
+        :param alerts_last_week: The alerts_last_week of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._alerts_last_week = alerts_last_week
+
+    @property
+    def application(self):
+        """Gets the application of this IngestionPolicyAlert.  # noqa: E501
+
+        Lists the applications from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :return: The application of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._application
+
+    @application.setter
+    def application(self, application):
+        """Sets the application of this IngestionPolicyAlert.
+
+        Lists the applications from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :param application: The application of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._application = application
+
+    @property
+    def chart_attributes(self):
+        """Gets the chart_attributes of this IngestionPolicyAlert.  # noqa: E501
+
+        Additional chart settings for the alert (e.g. pie chart has its chart settings in this section).  # noqa: E501
+
+        :return: The chart_attributes of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: JsonNode
+        """
+        return self._chart_attributes
+
+    @chart_attributes.setter
+    def chart_attributes(self, chart_attributes):
+        """Sets the chart_attributes of this IngestionPolicyAlert.
+
+        Additional chart settings for the alert (e.g. pie chart has its chart settings in this section).  # noqa: E501
+
+        :param chart_attributes: The chart_attributes of this IngestionPolicyAlert.  # noqa: E501
+        :type: JsonNode
+        """
+
+        self._chart_attributes = chart_attributes
+
+    @property
+    def chart_settings(self):
+        """Gets the chart_settings of this IngestionPolicyAlert.  # noqa: E501
+
+        The old chart settings for the alert (e.g. chart type, chart range etc.).  # noqa: E501
+
+        :return: The chart_settings of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: ChartSettings
+        """
+        return self._chart_settings
+
+    @chart_settings.setter
+    def chart_settings(self, chart_settings):
+        """Sets the chart_settings of this IngestionPolicyAlert.
+
+        The old chart settings for the alert (e.g. chart type, chart range etc.).  # noqa: E501
+
+        :param chart_settings: The chart_settings of this IngestionPolicyAlert.  # noqa: E501
+        :type: ChartSettings
+        """
+
+        self._chart_settings = chart_settings
+
+    @property
+    def condition(self):
+        """Gets the condition of this IngestionPolicyAlert.  # noqa: E501
+
+        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
+
+        :return: The condition of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._condition
+
+    @condition.setter
+    def condition(self, condition):
+        """Sets the condition of this IngestionPolicyAlert.
+
+        A Wavefront query that is evaluated at regular intervals (default 1m).  The alert fires and notifications are triggered when a data series matching this query evaluates to a non-zero value for a set number of consecutive minutes  # noqa: E501
+
+        :param condition: The condition of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and condition is None:
+            raise ValueError("Invalid value for `condition`, must not be `None`")  # noqa: E501
+
+        self._condition = condition
+
+    @property
+    def condition_percentages(self):
+        """Gets the condition_percentages of this IngestionPolicyAlert.  # noqa: E501
+
+        Multi - alert conditions.  # noqa: E501
+
+        :return: The condition_percentages of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: dict(str, int)
+        """
+        return self._condition_percentages
+
+    @condition_percentages.setter
+    def condition_percentages(self, condition_percentages):
+        """Sets the condition_percentages of this IngestionPolicyAlert.
+
+        Multi - alert conditions.  # noqa: E501
+
+        :param condition_percentages: The condition_percentages of this IngestionPolicyAlert.  # noqa: E501
+        :type: dict(str, int)
+        """
+
+        self._condition_percentages = condition_percentages
+
+    @property
+    def condition_qb_enabled(self):
+        """Gets the condition_qb_enabled of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether the condition query was created using the Query Builder.  Default false  # noqa: E501
+
+        :return: The condition_qb_enabled of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._condition_qb_enabled
+
+    @condition_qb_enabled.setter
+    def condition_qb_enabled(self, condition_qb_enabled):
+        """Sets the condition_qb_enabled of this IngestionPolicyAlert.
+
+        Whether the condition query was created using the Query Builder.  Default false  # noqa: E501
+
+        :param condition_qb_enabled: The condition_qb_enabled of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._condition_qb_enabled = condition_qb_enabled
+
+    @property
+    def condition_qb_serialization(self):
+        """Gets the condition_qb_serialization of this IngestionPolicyAlert.  # noqa: E501
+
+        The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true  # noqa: E501
+
+        :return: The condition_qb_serialization of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._condition_qb_serialization
+
+    @condition_qb_serialization.setter
+    def condition_qb_serialization(self, condition_qb_serialization):
+        """Sets the condition_qb_serialization of this IngestionPolicyAlert.
+
+        The special serialization of the Query Builder that corresponds to the condition query.  Applicable only when conditionQBEnabled is true  # noqa: E501
+
+        :param condition_qb_serialization: The condition_qb_serialization of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._condition_qb_serialization = condition_qb_serialization
+
+    @property
+    def condition_query_type(self):
+        """Gets the condition_query_type of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The condition_query_type of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._condition_query_type
+
+    @condition_query_type.setter
+    def condition_query_type(self, condition_query_type):
+        """Sets the condition_query_type of this IngestionPolicyAlert.
+
+
+        :param condition_query_type: The condition_query_type of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                condition_query_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `condition_query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(condition_query_type, allowed_values)
+            )
+
+        self._condition_query_type = condition_query_type
+
+    @property
+    def conditions(self):
+        """Gets the conditions of this IngestionPolicyAlert.  # noqa: E501
+
+        Multi - alert conditions.  # noqa: E501
+
+        :return: The conditions of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._conditions
+
+    @conditions.setter
+    def conditions(self, conditions):
+        """Sets the conditions of this IngestionPolicyAlert.
+
+        Multi - alert conditions.  # noqa: E501
+
+        :param conditions: The conditions of this IngestionPolicyAlert.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._conditions = conditions
+
+    @property
+    def conditions_threshold_operator(self):
+        """Gets the conditions_threshold_operator of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The conditions_threshold_operator of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._conditions_threshold_operator
+
+    @conditions_threshold_operator.setter
+    def conditions_threshold_operator(self, conditions_threshold_operator):
+        """Sets the conditions_threshold_operator of this IngestionPolicyAlert.
+
+
+        :param conditions_threshold_operator: The conditions_threshold_operator of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and conditions_threshold_operator is None:
+            raise ValueError("Invalid value for `conditions_threshold_operator`, must not be `None`")  # noqa: E501
+
+        self._conditions_threshold_operator = conditions_threshold_operator
+
+    @property
+    def create_user_id(self):
+        """Gets the create_user_id of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The create_user_id of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._create_user_id
+
+    @create_user_id.setter
+    def create_user_id(self, create_user_id):
+        """Sets the create_user_id of this IngestionPolicyAlert.
+
+
+        :param create_user_id: The create_user_id of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._create_user_id = create_user_id
+
+    @property
+    def created(self):
+        """Gets the created of this IngestionPolicyAlert.  # noqa: E501
+
+        When this alert was created, in epoch millis  # noqa: E501
+
+        :return: The created of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._created
+
+    @created.setter
+    def created(self, created):
+        """Sets the created of this IngestionPolicyAlert.
+
+        When this alert was created, in epoch millis  # noqa: E501
+
+        :param created: The created of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._created = created
+
+    @property
+    def created_epoch_millis(self):
+        """Gets the created_epoch_millis of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The created_epoch_millis of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._created_epoch_millis
+
+    @created_epoch_millis.setter
+    def created_epoch_millis(self, created_epoch_millis):
+        """Sets the created_epoch_millis of this IngestionPolicyAlert.
+
+
+        :param created_epoch_millis: The created_epoch_millis of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._created_epoch_millis = created_epoch_millis
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The creator_id of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this IngestionPolicyAlert.
+
+
+        :param creator_id: The creator_id of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def deleted(self):
+        """Gets the deleted of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The deleted of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deleted
+
+    @deleted.setter
+    def deleted(self, deleted):
+        """Sets the deleted of this IngestionPolicyAlert.
+
+
+        :param deleted: The deleted of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._deleted = deleted
+
+    @property
+    def display_expression(self):
+        """Gets the display_expression of this IngestionPolicyAlert.  # noqa: E501
+
+        A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted  # noqa: E501
+
+        :return: The display_expression of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._display_expression
+
+    @display_expression.setter
+    def display_expression(self, display_expression):
+        """Sets the display_expression of this IngestionPolicyAlert.
+
+        A second query whose results are displayed in the alert user interface instead of the condition query. This field is often used to display a version of the condition query with Boolean operators removed so that numerical values are plotted  # noqa: E501
+
+        :param display_expression: The display_expression of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._display_expression = display_expression
+
+    @property
+    def display_expression_qb_enabled(self):
+        """Gets the display_expression_qb_enabled of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether the display expression query was created using the Query Builder. Default false  # noqa: E501
+
+        :return: The display_expression_qb_enabled of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._display_expression_qb_enabled
+
+    @display_expression_qb_enabled.setter
+    def display_expression_qb_enabled(self, display_expression_qb_enabled):
+        """Sets the display_expression_qb_enabled of this IngestionPolicyAlert.
+
+        Whether the display expression query was created using the Query Builder. Default false  # noqa: E501
+
+        :param display_expression_qb_enabled: The display_expression_qb_enabled of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._display_expression_qb_enabled = display_expression_qb_enabled
+
+    @property
+    def display_expression_qb_serialization(self):
+        """Gets the display_expression_qb_serialization of this IngestionPolicyAlert.  # noqa: E501
+
+        The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true  # noqa: E501
+
+        :return: The display_expression_qb_serialization of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._display_expression_qb_serialization
+
+    @display_expression_qb_serialization.setter
+    def display_expression_qb_serialization(self, display_expression_qb_serialization):
+        """Sets the display_expression_qb_serialization of this IngestionPolicyAlert.
+
+        The special serialization of the Query Builder that corresponds to the display expression query.  Applicable only when displayExpressionQBEnabled is true  # noqa: E501
+
+        :param display_expression_qb_serialization: The display_expression_qb_serialization of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._display_expression_qb_serialization = display_expression_qb_serialization
+
+    @property
+    def display_expression_query_type(self):
+        """Gets the display_expression_query_type of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The display_expression_query_type of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._display_expression_query_type
+
+    @display_expression_query_type.setter
+    def display_expression_query_type(self, display_expression_query_type):
+        """Sets the display_expression_query_type of this IngestionPolicyAlert.
+
+
+        :param display_expression_query_type: The display_expression_query_type of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["WQL", "PROMQL", "HYBRID"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                display_expression_query_type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `display_expression_query_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(display_expression_query_type, allowed_values)
+            )
+
+        self._display_expression_query_type = display_expression_query_type
+
+    @property
+    def enable_pd_incident_by_series(self):
+        """Gets the enable_pd_incident_by_series of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The enable_pd_incident_by_series of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._enable_pd_incident_by_series
+
+    @enable_pd_incident_by_series.setter
+    def enable_pd_incident_by_series(self, enable_pd_incident_by_series):
+        """Sets the enable_pd_incident_by_series of this IngestionPolicyAlert.
+
+
+        :param enable_pd_incident_by_series: The enable_pd_incident_by_series of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._enable_pd_incident_by_series = enable_pd_incident_by_series
+
+    @property
+    def evaluate_realtime_data(self):
+        """Gets the evaluate_realtime_data of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether to alert on the real-time ingestion stream (may be noisy due to late data)  # noqa: E501
+
+        :return: The evaluate_realtime_data of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._evaluate_realtime_data
+
+    @evaluate_realtime_data.setter
+    def evaluate_realtime_data(self, evaluate_realtime_data):
+        """Sets the evaluate_realtime_data of this IngestionPolicyAlert.
+
+        Whether to alert on the real-time ingestion stream (may be noisy due to late data)  # noqa: E501
+
+        :param evaluate_realtime_data: The evaluate_realtime_data of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._evaluate_realtime_data = evaluate_realtime_data
+
+    @property
+    def event(self):
+        """Gets the event of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The event of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: Event
+        """
+        return self._event
+
+    @event.setter
+    def event(self, event):
+        """Sets the event of this IngestionPolicyAlert.
+
+
+        :param event: The event of this IngestionPolicyAlert.  # noqa: E501
+        :type: Event
+        """
+
+        self._event = event
+
+    @property
+    def failing_host_label_pair_links(self):
+        """Gets the failing_host_label_pair_links of this IngestionPolicyAlert.  # noqa: E501
+
+        List of links to tracing applications that caused a failing series  # noqa: E501
+
+        :return: The failing_host_label_pair_links of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._failing_host_label_pair_links
+
+    @failing_host_label_pair_links.setter
+    def failing_host_label_pair_links(self, failing_host_label_pair_links):
+        """Sets the failing_host_label_pair_links of this IngestionPolicyAlert.
+
+        List of links to tracing applications that caused a failing series  # noqa: E501
+
+        :param failing_host_label_pair_links: The failing_host_label_pair_links of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._failing_host_label_pair_links = failing_host_label_pair_links
+
+    @property
+    def failing_host_label_pairs(self):
+        """Gets the failing_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+
+        Failing host/metric pairs  # noqa: E501
+
+        :return: The failing_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._failing_host_label_pairs
+
+    @failing_host_label_pairs.setter
+    def failing_host_label_pairs(self, failing_host_label_pairs):
+        """Sets the failing_host_label_pairs of this IngestionPolicyAlert.
+
+        Failing host/metric pairs  # noqa: E501
+
+        :param failing_host_label_pairs: The failing_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._failing_host_label_pairs = failing_host_label_pairs
+
+    @property
+    def hidden(self):
+        """Gets the hidden of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The hidden of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._hidden
+
+    @hidden.setter
+    def hidden(self, hidden):
+        """Sets the hidden of this IngestionPolicyAlert.
+
+
+        :param hidden: The hidden of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._hidden = hidden
+
+    @property
+    def hosts_used(self):
+        """Gets the hosts_used of this IngestionPolicyAlert.  # noqa: E501
+
+        Number of hosts checked by the alert condition  # noqa: E501
+
+        :return: The hosts_used of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._hosts_used
+
+    @hosts_used.setter
+    def hosts_used(self, hosts_used):
+        """Sets the hosts_used of this IngestionPolicyAlert.
+
+        Number of hosts checked by the alert condition  # noqa: E501
+
+        :param hosts_used: The hosts_used of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._hosts_used = hosts_used
+
+    @property
+    def id(self):
+        """Gets the id of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The id of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this IngestionPolicyAlert.
+
+
+        :param id: The id of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def in_maintenance_host_label_pairs(self):
+        """Gets the in_maintenance_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+
+        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
+
+        :return: The in_maintenance_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._in_maintenance_host_label_pairs
+
+    @in_maintenance_host_label_pairs.setter
+    def in_maintenance_host_label_pairs(self, in_maintenance_host_label_pairs):
+        """Sets the in_maintenance_host_label_pairs of this IngestionPolicyAlert.
+
+        Lists the sources that will not be checked for this alert, due to matching a maintenance window  # noqa: E501
+
+        :param in_maintenance_host_label_pairs: The in_maintenance_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._in_maintenance_host_label_pairs = in_maintenance_host_label_pairs
+
+    @property
+    def in_trash(self):
+        """Gets the in_trash of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The in_trash of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._in_trash
+
+    @in_trash.setter
+    def in_trash(self, in_trash):
+        """Sets the in_trash of this IngestionPolicyAlert.
+
+
+        :param in_trash: The in_trash of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._in_trash = in_trash
+
+    @property
+    def include_obsolete_metrics(self):
+        """Gets the include_obsolete_metrics of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether to include obsolete metrics in alert query  # noqa: E501
+
+        :return: The include_obsolete_metrics of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._include_obsolete_metrics
+
+    @include_obsolete_metrics.setter
+    def include_obsolete_metrics(self, include_obsolete_metrics):
+        """Sets the include_obsolete_metrics of this IngestionPolicyAlert.
+
+        Whether to include obsolete metrics in alert query  # noqa: E501
+
+        :param include_obsolete_metrics: The include_obsolete_metrics of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._include_obsolete_metrics = include_obsolete_metrics
+
+    @property
+    def ingestion_policy_id(self):
+        """Gets the ingestion_policy_id of this IngestionPolicyAlert.  # noqa: E501
+
+        Get the ingestion policy Id associated with ingestion policy alert.  # noqa: E501
+
+        :return: The ingestion_policy_id of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._ingestion_policy_id
+
+    @ingestion_policy_id.setter
+    def ingestion_policy_id(self, ingestion_policy_id):
+        """Sets the ingestion_policy_id of this IngestionPolicyAlert.
+
+        Get the ingestion policy Id associated with ingestion policy alert.  # noqa: E501
+
+        :param ingestion_policy_id: The ingestion_policy_id of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._ingestion_policy_id = ingestion_policy_id
+
+    @property
+    def last_error_message(self):
+        """Gets the last_error_message of this IngestionPolicyAlert.  # noqa: E501
+
+        The last error encountered when running this alert's condition query  # noqa: E501
+
+        :return: The last_error_message of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_error_message
+
+    @last_error_message.setter
+    def last_error_message(self, last_error_message):
+        """Sets the last_error_message of this IngestionPolicyAlert.
+
+        The last error encountered when running this alert's condition query  # noqa: E501
+
+        :param last_error_message: The last_error_message of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._last_error_message = last_error_message
+
+    @property
+    def last_event_time(self):
+        """Gets the last_event_time of this IngestionPolicyAlert.  # noqa: E501
+
+        Start time (in epoch millis) of the last event associated with this alert.  # noqa: E501
+
+        :return: The last_event_time of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_event_time
+
+    @last_event_time.setter
+    def last_event_time(self, last_event_time):
+        """Sets the last_event_time of this IngestionPolicyAlert.
+
+        Start time (in epoch millis) of the last event associated with this alert.  # noqa: E501
+
+        :param last_event_time: The last_event_time of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_event_time = last_event_time
+
+    @property
+    def last_failed_time(self):
+        """Gets the last_failed_time of this IngestionPolicyAlert.  # noqa: E501
+
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
+
+        :return: The last_failed_time of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_failed_time
+
+    @last_failed_time.setter
+    def last_failed_time(self, last_failed_time):
+        """Sets the last_failed_time of this IngestionPolicyAlert.
+
+        The time of the last error encountered when running this alert's condition query, in epoch millis  # noqa: E501
+
+        :param last_failed_time: The last_failed_time of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_failed_time = last_failed_time
+
+    @property
+    def last_notification_millis(self):
+        """Gets the last_notification_millis of this IngestionPolicyAlert.  # noqa: E501
+
+        When this alert last caused a notification, in epoch millis  # noqa: E501
+
+        :return: The last_notification_millis of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_notification_millis
+
+    @last_notification_millis.setter
+    def last_notification_millis(self, last_notification_millis):
+        """Sets the last_notification_millis of this IngestionPolicyAlert.
+
+        When this alert last caused a notification, in epoch millis  # noqa: E501
+
+        :param last_notification_millis: The last_notification_millis of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_notification_millis = last_notification_millis
+
+    @property
+    def last_processed_millis(self):
+        """Gets the last_processed_millis of this IngestionPolicyAlert.  # noqa: E501
+
+        The time when this alert was last checked, in epoch millis  # noqa: E501
+
+        :return: The last_processed_millis of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_processed_millis
+
+    @last_processed_millis.setter
+    def last_processed_millis(self, last_processed_millis):
+        """Sets the last_processed_millis of this IngestionPolicyAlert.
+
+        The time when this alert was last checked, in epoch millis  # noqa: E501
+
+        :param last_processed_millis: The last_processed_millis of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_processed_millis = last_processed_millis
+
+    @property
+    def last_query_time(self):
+        """Gets the last_query_time of this IngestionPolicyAlert.  # noqa: E501
+
+        Last query time of the alert, averaged on hourly basis  # noqa: E501
+
+        :return: The last_query_time of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._last_query_time
+
+    @last_query_time.setter
+    def last_query_time(self, last_query_time):
+        """Sets the last_query_time of this IngestionPolicyAlert.
+
+        Last query time of the alert, averaged on hourly basis  # noqa: E501
+
+        :param last_query_time: The last_query_time of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._last_query_time = last_query_time
+
+    @property
+    def metrics_used(self):
+        """Gets the metrics_used of this IngestionPolicyAlert.  # noqa: E501
+
+        Number of metrics checked by the alert condition  # noqa: E501
+
+        :return: The metrics_used of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._metrics_used
+
+    @metrics_used.setter
+    def metrics_used(self, metrics_used):
+        """Sets the metrics_used of this IngestionPolicyAlert.
+
+        Number of metrics checked by the alert condition  # noqa: E501
+
+        :param metrics_used: The metrics_used of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._metrics_used = metrics_used
+
+    @property
+    def minutes(self):
+        """Gets the minutes of this IngestionPolicyAlert.  # noqa: E501
+
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+
+        :return: The minutes of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._minutes
+
+    @minutes.setter
+    def minutes(self, minutes):
+        """Sets the minutes of this IngestionPolicyAlert.
+
+        The number of consecutive minutes that a series matching the condition query must evaluate to \"true\" (non-zero value) before the alert fires  # noqa: E501
+
+        :param minutes: The minutes of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+        if self._configuration.client_side_validation and minutes is None:
+            raise ValueError("Invalid value for `minutes`, must not be `None`")  # noqa: E501
+
+        self._minutes = minutes
+
+    @property
+    def modify_acl_access(self):
+        """Gets the modify_acl_access of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether the user has modify ACL access to the alert.  # noqa: E501
+
+        :return: The modify_acl_access of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._modify_acl_access
+
+    @modify_acl_access.setter
+    def modify_acl_access(self, modify_acl_access):
+        """Sets the modify_acl_access of this IngestionPolicyAlert.
+
+        Whether the user has modify ACL access to the alert.  # noqa: E501
+
+        :param modify_acl_access: The modify_acl_access of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._modify_acl_access = modify_acl_access
+
+    @property
+    def name(self):
+        """Gets the name of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The name of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this IngestionPolicyAlert.
+
+
+        :param name: The name of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        if self._configuration.client_side_validation and name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
+
+        self._name = name
+
+    @property
+    def no_data_event(self):
+        """Gets the no_data_event of this IngestionPolicyAlert.  # noqa: E501
+
+        No data event related to the alert  # noqa: E501
+
+        :return: The no_data_event of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: Event
+        """
+        return self._no_data_event
+
+    @no_data_event.setter
+    def no_data_event(self, no_data_event):
+        """Sets the no_data_event of this IngestionPolicyAlert.
+
+        No data event related to the alert  # noqa: E501
+
+        :param no_data_event: The no_data_event of this IngestionPolicyAlert.  # noqa: E501
+        :type: Event
+        """
+
+        self._no_data_event = no_data_event
+
+    @property
+    def notificants(self):
+        """Gets the notificants of this IngestionPolicyAlert.  # noqa: E501
+
+        A derived field listing the webhook ids used by this alert  # noqa: E501
+
+        :return: The notificants of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._notificants
+
+    @notificants.setter
+    def notificants(self, notificants):
+        """Sets the notificants of this IngestionPolicyAlert.
+
+        A derived field listing the webhook ids used by this alert  # noqa: E501
+
+        :param notificants: The notificants of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._notificants = notificants
+
+    @property
+    def notification_resend_frequency_minutes(self):
+        """Gets the notification_resend_frequency_minutes of this IngestionPolicyAlert.  # noqa: E501
+
+        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
+
+        :return: The notification_resend_frequency_minutes of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._notification_resend_frequency_minutes
+
+    @notification_resend_frequency_minutes.setter
+    def notification_resend_frequency_minutes(self, notification_resend_frequency_minutes):
+        """Sets the notification_resend_frequency_minutes of this IngestionPolicyAlert.
+
+        How often to re-trigger a continually failing alert. If absent or <= 0, no retriggering occurs  # noqa: E501
+
+        :param notification_resend_frequency_minutes: The notification_resend_frequency_minutes of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._notification_resend_frequency_minutes = notification_resend_frequency_minutes
+
+    @property
+    def num_points_in_failure_frame(self):
+        """Gets the num_points_in_failure_frame of this IngestionPolicyAlert.  # noqa: E501
+
+        Number of points scanned in alert query time frame.  # noqa: E501
+
+        :return: The num_points_in_failure_frame of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._num_points_in_failure_frame
+
+    @num_points_in_failure_frame.setter
+    def num_points_in_failure_frame(self, num_points_in_failure_frame):
+        """Sets the num_points_in_failure_frame of this IngestionPolicyAlert.
+
+        Number of points scanned in alert query time frame.  # noqa: E501
+
+        :param num_points_in_failure_frame: The num_points_in_failure_frame of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._num_points_in_failure_frame = num_points_in_failure_frame
+
+    @property
+    def orphan(self):
+        """Gets the orphan of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The orphan of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._orphan
+
+    @orphan.setter
+    def orphan(self, orphan):
+        """Sets the orphan of this IngestionPolicyAlert.
+
+
+        :param orphan: The orphan of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._orphan = orphan
+
+    @property
+    def points_scanned_at_last_query(self):
+        """Gets the points_scanned_at_last_query of this IngestionPolicyAlert.  # noqa: E501
+
+        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
+
+        :return: The points_scanned_at_last_query of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._points_scanned_at_last_query
+
+    @points_scanned_at_last_query.setter
+    def points_scanned_at_last_query(self, points_scanned_at_last_query):
+        """Sets the points_scanned_at_last_query of this IngestionPolicyAlert.
+
+        A derived field recording the number of data points scanned when the system last computed this alert's condition  # noqa: E501
+
+        :param points_scanned_at_last_query: The points_scanned_at_last_query of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._points_scanned_at_last_query = points_scanned_at_last_query
+
+    @property
+    def prefiring_host_label_pairs(self):
+        """Gets the prefiring_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+
+        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
+
+        :return: The prefiring_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[SourceLabelPair]
+        """
+        return self._prefiring_host_label_pairs
+
+    @prefiring_host_label_pairs.setter
+    def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
+        """Sets the prefiring_host_label_pairs of this IngestionPolicyAlert.
+
+        Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \"minutes\" parameter  # noqa: E501
+
+        :param prefiring_host_label_pairs: The prefiring_host_label_pairs of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[SourceLabelPair]
+        """
+
+        self._prefiring_host_label_pairs = prefiring_host_label_pairs
+
+    @property
+    def process_rate_minutes(self):
+        """Gets the process_rate_minutes of this IngestionPolicyAlert.  # noqa: E501
+
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :return: The process_rate_minutes of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._process_rate_minutes
+
+    @process_rate_minutes.setter
+    def process_rate_minutes(self, process_rate_minutes):
+        """Sets the process_rate_minutes of this IngestionPolicyAlert.
+
+        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+
+        :param process_rate_minutes: The process_rate_minutes of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._process_rate_minutes = process_rate_minutes
+
+    @property
+    def query_failing(self):
+        """Gets the query_failing of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether there was an exception when the alert condition last ran  # noqa: E501
+
+        :return: The query_failing of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._query_failing
+
+    @query_failing.setter
+    def query_failing(self, query_failing):
+        """Sets the query_failing of this IngestionPolicyAlert.
+
+        Whether there was an exception when the alert condition last ran  # noqa: E501
+
+        :param query_failing: The query_failing of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._query_failing = query_failing
+
+    @property
+    def query_syntax_error(self):
+        """Gets the query_syntax_error of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether there was an query syntax exception when the alert condition last ran  # noqa: E501
+
+        :return: The query_syntax_error of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._query_syntax_error
+
+    @query_syntax_error.setter
+    def query_syntax_error(self, query_syntax_error):
+        """Sets the query_syntax_error of this IngestionPolicyAlert.
+
+        Whether there was an query syntax exception when the alert condition last ran  # noqa: E501
+
+        :param query_syntax_error: The query_syntax_error of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._query_syntax_error = query_syntax_error
+
+    @property
+    def resolve_after_minutes(self):
+        """Gets the resolve_after_minutes of this IngestionPolicyAlert.  # noqa: E501
+
+        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
+
+        :return: The resolve_after_minutes of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._resolve_after_minutes
+
+    @resolve_after_minutes.setter
+    def resolve_after_minutes(self, resolve_after_minutes):
+        """Sets the resolve_after_minutes of this IngestionPolicyAlert.
+
+        The number of consecutive minutes that a firing series matching the condition query must evaluate to \"false\" (zero value) before the alert resolves.  When unset, this defaults to the same value as \"minutes\"  # noqa: E501
+
+        :param resolve_after_minutes: The resolve_after_minutes of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._resolve_after_minutes = resolve_after_minutes
+
+    @property
+    def runbook_links(self):
+        """Gets the runbook_links of this IngestionPolicyAlert.  # noqa: E501
+
+        User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered  # noqa: E501
+
+        :return: The runbook_links of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._runbook_links
+
+    @runbook_links.setter
+    def runbook_links(self, runbook_links):
+        """Sets the runbook_links of this IngestionPolicyAlert.
+
+        User-supplied runbook links for this alert. Useful for linking wiki page or documentation, etc to refer to when alert is triggered  # noqa: E501
+
+        :param runbook_links: The runbook_links of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._runbook_links = runbook_links
+
+    @property
+    def secure_metric_details(self):
+        """Gets the secure_metric_details of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security.  # noqa: E501
+
+        :return: The secure_metric_details of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._secure_metric_details
+
+    @secure_metric_details.setter
+    def secure_metric_details(self, secure_metric_details):
+        """Sets the secure_metric_details of this IngestionPolicyAlert.
+
+        Whether to secure sensitive metric details and alert images in alert notifications, to not break Metrics Security.  # noqa: E501
+
+        :param secure_metric_details: The secure_metric_details of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._secure_metric_details = secure_metric_details
+
+    @property
+    def service(self):
+        """Gets the service of this IngestionPolicyAlert.  # noqa: E501
+
+        Lists the services from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :return: The service of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._service
+
+    @service.setter
+    def service(self, service):
+        """Sets the service of this IngestionPolicyAlert.
+
+        Lists the services from the failingHostLabelPair of the alert.  # noqa: E501
+
+        :param service: The service of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._service = service
+
+    @property
+    def severity(self):
+        """Gets the severity of this IngestionPolicyAlert.  # noqa: E501
+
+        Severity of the alert  # noqa: E501
+
+        :return: The severity of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._severity
+
+    @severity.setter
+    def severity(self, severity):
+        """Sets the severity of this IngestionPolicyAlert.
+
+        Severity of the alert  # noqa: E501
+
+        :param severity: The severity of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                severity not in allowed_values):
+            raise ValueError(
+                "Invalid value for `severity` ({0}), must be one of {1}"  # noqa: E501
+                .format(severity, allowed_values)
+            )
+
+        self._severity = severity
+
+    @property
+    def severity_list(self):
+        """Gets the severity_list of this IngestionPolicyAlert.  # noqa: E501
+
+        Alert severity list for multi-threshold type.  # noqa: E501
+
+        :return: The severity_list of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._severity_list
+
+    @severity_list.setter
+    def severity_list(self, severity_list):
+        """Sets the severity_list of this IngestionPolicyAlert.
+
+        Alert severity list for multi-threshold type.  # noqa: E501
+
+        :param severity_list: The severity_list of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+        allowed_values = ["INFO", "SMOKE", "WARN", "SEVERE"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                not set(severity_list).issubset(set(allowed_values))):  # noqa: E501
+            raise ValueError(
+                "Invalid values for `severity_list` [{0}], must be a subset of [{1}]"  # noqa: E501
+                .format(", ".join(map(str, set(severity_list) - set(allowed_values))),  # noqa: E501
+                        ", ".join(map(str, allowed_values)))
+            )
+
+        self._severity_list = severity_list
+
+    @property
+    def snoozed(self):
+        """Gets the snoozed of this IngestionPolicyAlert.  # noqa: E501
+
+        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
+
+        :return: The snoozed of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._snoozed
+
+    @snoozed.setter
+    def snoozed(self, snoozed):
+        """Sets the snoozed of this IngestionPolicyAlert.
+
+        The until which time this alert is snoozed (not checked), in epoch millis.  A negative value implies the alert is snoozed indefinitely  # noqa: E501
+
+        :param snoozed: The snoozed of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._snoozed = snoozed
+
+    @property
+    def sort_attr(self):
+        """Gets the sort_attr of this IngestionPolicyAlert.  # noqa: E501
+
+        Attribute used for default alert sort that is derived from state and severity  # noqa: E501
+
+        :return: The sort_attr of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._sort_attr
+
+    @sort_attr.setter
+    def sort_attr(self, sort_attr):
+        """Sets the sort_attr of this IngestionPolicyAlert.
+
+        Attribute used for default alert sort that is derived from state and severity  # noqa: E501
+
+        :param sort_attr: The sort_attr of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._sort_attr = sort_attr
+
+    @property
+    def status(self):
+        """Gets the status of this IngestionPolicyAlert.  # noqa: E501
+
+        Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA  # noqa: E501
+
+        :return: The status of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this IngestionPolicyAlert.
+
+        Lists the current state of the alert. Can be one or more of: FIRING,SNOOZED, IN_MAINTENANCE, INVALID, NONE, CHECKING, TRASH, NO_DATA  # noqa: E501
+
+        :param status: The status of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._status = status
+
+    @property
+    def system_alert_version(self):
+        """Gets the system_alert_version of this IngestionPolicyAlert.  # noqa: E501
+
+        If this is a system alert, the version of it  # noqa: E501
+
+        :return: The system_alert_version of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._system_alert_version
+
+    @system_alert_version.setter
+    def system_alert_version(self, system_alert_version):
+        """Sets the system_alert_version of this IngestionPolicyAlert.
+
+        If this is a system alert, the version of it  # noqa: E501
+
+        :param system_alert_version: The system_alert_version of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._system_alert_version = system_alert_version
+
+    @property
+    def system_owned(self):
+        """Gets the system_owned of this IngestionPolicyAlert.  # noqa: E501
+
+        Whether this alert is system-owned and not writeable  # noqa: E501
+
+        :return: The system_owned of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._system_owned
+
+    @system_owned.setter
+    def system_owned(self, system_owned):
+        """Sets the system_owned of this IngestionPolicyAlert.
+
+        Whether this alert is system-owned and not writeable  # noqa: E501
+
+        :param system_owned: The system_owned of this IngestionPolicyAlert.  # noqa: E501
+        :type: bool
+        """
+
+        self._system_owned = system_owned
+
+    @property
+    def tagpaths(self):
+        """Gets the tagpaths of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The tagpaths of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tagpaths
+
+    @tagpaths.setter
+    def tagpaths(self, tagpaths):
+        """Sets the tagpaths of this IngestionPolicyAlert.
+
+
+        :param tagpaths: The tagpaths of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tagpaths = tagpaths
+
+    @property
+    def tags(self):
+        """Gets the tags of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The tags of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: WFTags
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this IngestionPolicyAlert.
+
+
+        :param tags: The tags of this IngestionPolicyAlert.  # noqa: E501
+        :type: WFTags
+        """
+
+        self._tags = tags
+
+    @property
+    def target(self):
+        """Gets the target of this IngestionPolicyAlert.  # noqa: E501
+
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}). You cannot update this value.  # noqa: E501
+
+        :return: The target of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._target
+
+    @target.setter
+    def target(self, target):
+        """Sets the target of this IngestionPolicyAlert.
+
+        The email address or integration endpoint (such as PagerDuty or web hook) to notify when the alert status changes. Comma-separated list of targets. Multiple target types can be in the list. Alert target format: ({email}|pd:{pd_key}|target:{alert target ID}). You cannot update this value.  # noqa: E501
+
+        :param target: The target of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._target = target
+
+    @property
+    def target_endpoints(self):
+        """Gets the target_endpoints of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The target_endpoints of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._target_endpoints
+
+    @target_endpoints.setter
+    def target_endpoints(self, target_endpoints):
+        """Sets the target_endpoints of this IngestionPolicyAlert.
+
+
+        :param target_endpoints: The target_endpoints of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._target_endpoints = target_endpoints
+
+    @property
+    def target_info(self):
+        """Gets the target_info of this IngestionPolicyAlert.  # noqa: E501
+
+        List of alert targets display information that includes name, id and type.  # noqa: E501
+
+        :return: The target_info of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[TargetInfo]
+        """
+        return self._target_info
+
+    @target_info.setter
+    def target_info(self, target_info):
+        """Sets the target_info of this IngestionPolicyAlert.
+
+        List of alert targets display information that includes name, id and type.  # noqa: E501
+
+        :param target_info: The target_info of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[TargetInfo]
+        """
+
+        self._target_info = target_info
+
+    @property
+    def targets(self):
+        """Gets the targets of this IngestionPolicyAlert.  # noqa: E501
+
+        Targets for severity.  # noqa: E501
+
+        :return: The targets of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: dict(str, str)
+        """
+        return self._targets
+
+    @targets.setter
+    def targets(self, targets):
+        """Sets the targets of this IngestionPolicyAlert.
+
+        Targets for severity.  # noqa: E501
+
+        :param targets: The targets of this IngestionPolicyAlert.  # noqa: E501
+        :type: dict(str, str)
+        """
+
+        self._targets = targets
+
+    @property
+    def triage_dashboards(self):
+        """Gets the triage_dashboards of this IngestionPolicyAlert.  # noqa: E501
+
+        Deprecated for alertTriageDashboards  # noqa: E501
+
+        :return: The triage_dashboards of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: list[TriageDashboard]
+        """
+        return self._triage_dashboards
+
+    @triage_dashboards.setter
+    def triage_dashboards(self, triage_dashboards):
+        """Sets the triage_dashboards of this IngestionPolicyAlert.
+
+        Deprecated for alertTriageDashboards  # noqa: E501
+
+        :param triage_dashboards: The triage_dashboards of this IngestionPolicyAlert.  # noqa: E501
+        :type: list[TriageDashboard]
+        """
+
+        self._triage_dashboards = triage_dashboards
+
+    @property
+    def update_user_id(self):
+        """Gets the update_user_id of this IngestionPolicyAlert.  # noqa: E501
+
+        The user that last updated this alert  # noqa: E501
+
+        :return: The update_user_id of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._update_user_id
+
+    @update_user_id.setter
+    def update_user_id(self, update_user_id):
+        """Sets the update_user_id of this IngestionPolicyAlert.
+
+        The user that last updated this alert  # noqa: E501
+
+        :param update_user_id: The update_user_id of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._update_user_id = update_user_id
+
+    @property
+    def updated(self):
+        """Gets the updated of this IngestionPolicyAlert.  # noqa: E501
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :return: The updated of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated
+
+    @updated.setter
+    def updated(self, updated):
+        """Sets the updated of this IngestionPolicyAlert.
+
+        When the alert was last updated, in epoch millis  # noqa: E501
+
+        :param updated: The updated of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._updated = updated
+
+    @property
+    def updated_epoch_millis(self):
+        """Gets the updated_epoch_millis of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The updated_epoch_millis of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: int
+        """
+        return self._updated_epoch_millis
+
+    @updated_epoch_millis.setter
+    def updated_epoch_millis(self, updated_epoch_millis):
+        """Sets the updated_epoch_millis of this IngestionPolicyAlert.
+
+
+        :param updated_epoch_millis: The updated_epoch_millis of this IngestionPolicyAlert.  # noqa: E501
+        :type: int
+        """
+
+        self._updated_epoch_millis = updated_epoch_millis
+
+    @property
+    def updater_id(self):
+        """Gets the updater_id of this IngestionPolicyAlert.  # noqa: E501
+
+
+        :return: The updater_id of this IngestionPolicyAlert.  # noqa: E501
+        :rtype: str
+        """
+        return self._updater_id
+
+    @updater_id.setter
+    def updater_id(self, updater_id):
+        """Sets the updater_id of this IngestionPolicyAlert.
+
+
+        :param updater_id: The updater_id of this IngestionPolicyAlert.  # noqa: E501
+        :type: str
+        """
+
+        self._updater_id = updater_id
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(IngestionPolicyAlert, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, IngestionPolicyAlert):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, IngestionPolicyAlert):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ingestion_policy_read_model.py b/wavefront_api_client/models/ingestion_policy_read_model.py
index ef159b3..3b7aa24 100644
--- a/wavefront_api_client/models/ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/ingestion_policy_read_model.py
@@ -33,12 +33,11 @@ class IngestionPolicyReadModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'account_count': 'int',
         'accounts': 'list[AccessControlElement]',
+        'alert': 'Alert',
         'alert_id': 'str',
         'customer': 'str',
         'description': 'str',
-        'group_count': 'int',
         'groups': 'list[AccessControlElement]',
         'id': 'str',
         'is_limited': 'bool',
@@ -49,24 +48,17 @@ class IngestionPolicyReadModel(object):
         'name': 'str',
         'namespaces': 'list[str]',
         'point_tags': 'list[Annotation]',
-        'sampled_accounts': 'list[str]',
-        'sampled_groups': 'list[UserGroup]',
-        'sampled_service_accounts': 'list[str]',
-        'sampled_user_accounts': 'list[str]',
         'scope': 'str',
-        'service_account_count': 'int',
         'sources': 'list[str]',
-        'tags_anded': 'bool',
-        'user_account_count': 'int'
+        'tags_anded': 'bool'
     }
 
     attribute_map = {
-        'account_count': 'accountCount',
         'accounts': 'accounts',
+        'alert': 'alert',
         'alert_id': 'alertId',
         'customer': 'customer',
         'description': 'description',
-        'group_count': 'groupCount',
         'groups': 'groups',
         'id': 'id',
         'is_limited': 'isLimited',
@@ -77,29 +69,22 @@ class IngestionPolicyReadModel(object):
         'name': 'name',
         'namespaces': 'namespaces',
         'point_tags': 'pointTags',
-        'sampled_accounts': 'sampledAccounts',
-        'sampled_groups': 'sampledGroups',
-        'sampled_service_accounts': 'sampledServiceAccounts',
-        'sampled_user_accounts': 'sampledUserAccounts',
         'scope': 'scope',
-        'service_account_count': 'serviceAccountCount',
         'sources': 'sources',
-        'tags_anded': 'tagsAnded',
-        'user_account_count': 'userAccountCount'
+        'tags_anded': 'tagsAnded'
     }
 
-    def __init__(self, account_count=None, accounts=None, alert_id=None, customer=None, description=None, group_count=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, metadata=None, name=None, namespaces=None, point_tags=None, sampled_accounts=None, sampled_groups=None, sampled_service_accounts=None, sampled_user_accounts=None, scope=None, service_account_count=None, sources=None, tags_anded=None, user_account_count=None, _configuration=None):  # noqa: E501
+    def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, metadata=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
         """IngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
-        self._account_count = None
         self._accounts = None
+        self._alert = None
         self._alert_id = None
         self._customer = None
         self._description = None
-        self._group_count = None
         self._groups = None
         self._id = None
         self._is_limited = None
@@ -110,29 +95,21 @@ def __init__(self, account_count=None, accounts=None, alert_id=None, customer=No
         self._name = None
         self._namespaces = None
         self._point_tags = None
-        self._sampled_accounts = None
-        self._sampled_groups = None
-        self._sampled_service_accounts = None
-        self._sampled_user_accounts = None
         self._scope = None
-        self._service_account_count = None
         self._sources = None
         self._tags_anded = None
-        self._user_account_count = None
         self.discriminator = None
 
-        if account_count is not None:
-            self.account_count = account_count
         if accounts is not None:
             self.accounts = accounts
+        if alert is not None:
+            self.alert = alert
         if alert_id is not None:
             self.alert_id = alert_id
         if customer is not None:
             self.customer = customer
         if description is not None:
             self.description = description
-        if group_count is not None:
-            self.group_count = group_count
         if groups is not None:
             self.groups = groups
         if id is not None:
@@ -153,47 +130,12 @@ def __init__(self, account_count=None, accounts=None, alert_id=None, customer=No
             self.namespaces = namespaces
         if point_tags is not None:
             self.point_tags = point_tags
-        if sampled_accounts is not None:
-            self.sampled_accounts = sampled_accounts
-        if sampled_groups is not None:
-            self.sampled_groups = sampled_groups
-        if sampled_service_accounts is not None:
-            self.sampled_service_accounts = sampled_service_accounts
-        if sampled_user_accounts is not None:
-            self.sampled_user_accounts = sampled_user_accounts
         if scope is not None:
             self.scope = scope
-        if service_account_count is not None:
-            self.service_account_count = service_account_count
         if sources is not None:
             self.sources = sources
         if tags_anded is not None:
             self.tags_anded = tags_anded
-        if user_account_count is not None:
-            self.user_account_count = user_account_count
-
-    @property
-    def account_count(self):
-        """Gets the account_count of this IngestionPolicyReadModel.  # noqa: E501
-
-        Total number of accounts that are linked to the ingestion policy  # noqa: E501
-
-        :return: The account_count of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._account_count
-
-    @account_count.setter
-    def account_count(self, account_count):
-        """Sets the account_count of this IngestionPolicyReadModel.
-
-        Total number of accounts that are linked to the ingestion policy  # noqa: E501
-
-        :param account_count: The account_count of this IngestionPolicyReadModel.  # noqa: E501
-        :type: int
-        """
-
-        self._account_count = account_count
 
     @property
     def accounts(self):
@@ -218,6 +160,29 @@ def accounts(self, accounts):
 
         self._accounts = accounts
 
+    @property
+    def alert(self):
+        """Gets the alert of this IngestionPolicyReadModel.  # noqa: E501
+
+        The alert object connected with the ingestion policy.  # noqa: E501
+
+        :return: The alert of this IngestionPolicyReadModel.  # noqa: E501
+        :rtype: Alert
+        """
+        return self._alert
+
+    @alert.setter
+    def alert(self, alert):
+        """Sets the alert of this IngestionPolicyReadModel.
+
+        The alert object connected with the ingestion policy.  # noqa: E501
+
+        :param alert: The alert of this IngestionPolicyReadModel.  # noqa: E501
+        :type: Alert
+        """
+
+        self._alert = alert
+
     @property
     def alert_id(self):
         """Gets the alert_id of this IngestionPolicyReadModel.  # noqa: E501
@@ -287,29 +252,6 @@ def description(self, description):
 
         self._description = description
 
-    @property
-    def group_count(self):
-        """Gets the group_count of this IngestionPolicyReadModel.  # noqa: E501
-
-        Total number of groups that are linked to the ingestion policy  # noqa: E501
-
-        :return: The group_count of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._group_count
-
-    @group_count.setter
-    def group_count(self, group_count):
-        """Sets the group_count of this IngestionPolicyReadModel.
-
-        Total number of groups that are linked to the ingestion policy  # noqa: E501
-
-        :param group_count: The group_count of this IngestionPolicyReadModel.  # noqa: E501
-        :type: int
-        """
-
-        self._group_count = group_count
-
     @property
     def groups(self):
         """Gets the groups of this IngestionPolicyReadModel.  # noqa: E501
@@ -540,98 +482,6 @@ def point_tags(self, point_tags):
 
         self._point_tags = point_tags
 
-    @property
-    def sampled_accounts(self):
-        """Gets the sampled_accounts of this IngestionPolicyReadModel.  # noqa: E501
-
-        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
-
-        :return: The sampled_accounts of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sampled_accounts
-
-    @sampled_accounts.setter
-    def sampled_accounts(self, sampled_accounts):
-        """Sets the sampled_accounts of this IngestionPolicyReadModel.
-
-        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
-
-        :param sampled_accounts: The sampled_accounts of this IngestionPolicyReadModel.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sampled_accounts = sampled_accounts
-
-    @property
-    def sampled_groups(self):
-        """Gets the sampled_groups of this IngestionPolicyReadModel.  # noqa: E501
-
-        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
-
-        :return: The sampled_groups of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: list[UserGroup]
-        """
-        return self._sampled_groups
-
-    @sampled_groups.setter
-    def sampled_groups(self, sampled_groups):
-        """Sets the sampled_groups of this IngestionPolicyReadModel.
-
-        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
-
-        :param sampled_groups: The sampled_groups of this IngestionPolicyReadModel.  # noqa: E501
-        :type: list[UserGroup]
-        """
-
-        self._sampled_groups = sampled_groups
-
-    @property
-    def sampled_service_accounts(self):
-        """Gets the sampled_service_accounts of this IngestionPolicyReadModel.  # noqa: E501
-
-        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
-
-        :return: The sampled_service_accounts of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sampled_service_accounts
-
-    @sampled_service_accounts.setter
-    def sampled_service_accounts(self, sampled_service_accounts):
-        """Sets the sampled_service_accounts of this IngestionPolicyReadModel.
-
-        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
-
-        :param sampled_service_accounts: The sampled_service_accounts of this IngestionPolicyReadModel.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sampled_service_accounts = sampled_service_accounts
-
-    @property
-    def sampled_user_accounts(self):
-        """Gets the sampled_user_accounts of this IngestionPolicyReadModel.  # noqa: E501
-
-        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
-
-        :return: The sampled_user_accounts of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sampled_user_accounts
-
-    @sampled_user_accounts.setter
-    def sampled_user_accounts(self, sampled_user_accounts):
-        """Sets the sampled_user_accounts of this IngestionPolicyReadModel.
-
-        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
-
-        :param sampled_user_accounts: The sampled_user_accounts of this IngestionPolicyReadModel.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sampled_user_accounts = sampled_user_accounts
-
     @property
     def scope(self):
         """Gets the scope of this IngestionPolicyReadModel.  # noqa: E501
@@ -662,29 +512,6 @@ def scope(self, scope):
 
         self._scope = scope
 
-    @property
-    def service_account_count(self):
-        """Gets the service_account_count of this IngestionPolicyReadModel.  # noqa: E501
-
-        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
-
-        :return: The service_account_count of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._service_account_count
-
-    @service_account_count.setter
-    def service_account_count(self, service_account_count):
-        """Sets the service_account_count of this IngestionPolicyReadModel.
-
-        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
-
-        :param service_account_count: The service_account_count of this IngestionPolicyReadModel.  # noqa: E501
-        :type: int
-        """
-
-        self._service_account_count = service_account_count
-
     @property
     def sources(self):
         """Gets the sources of this IngestionPolicyReadModel.  # noqa: E501
@@ -731,29 +558,6 @@ def tags_anded(self, tags_anded):
 
         self._tags_anded = tags_anded
 
-    @property
-    def user_account_count(self):
-        """Gets the user_account_count of this IngestionPolicyReadModel.  # noqa: E501
-
-        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
-
-        :return: The user_account_count of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: int
-        """
-        return self._user_account_count
-
-    @user_account_count.setter
-    def user_account_count(self, user_account_count):
-        """Sets the user_account_count of this IngestionPolicyReadModel.
-
-        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
-
-        :param user_account_count: The user_account_count of this IngestionPolicyReadModel.  # noqa: E501
-        :type: int
-        """
-
-        self._user_account_count = user_account_count
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/ingestion_policy_write_model.py b/wavefront_api_client/models/ingestion_policy_write_model.py
index 7549e59..0ef61ef 100644
--- a/wavefront_api_client/models/ingestion_policy_write_model.py
+++ b/wavefront_api_client/models/ingestion_policy_write_model.py
@@ -34,6 +34,7 @@ class IngestionPolicyWriteModel(object):
     """
     swagger_types = {
         'accounts': 'list[str]',
+        'alert': 'IngestionPolicyAlert',
         'alert_id': 'str',
         'customer': 'str',
         'description': 'str',
@@ -53,6 +54,7 @@ class IngestionPolicyWriteModel(object):
 
     attribute_map = {
         'accounts': 'accounts',
+        'alert': 'alert',
         'alert_id': 'alertId',
         'customer': 'customer',
         'description': 'description',
@@ -70,13 +72,14 @@ class IngestionPolicyWriteModel(object):
         'tags_anded': 'tagsAnded'
     }
 
-    def __init__(self, accounts=None, alert_id=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
+    def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
         """IngestionPolicyWriteModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._accounts = None
+        self._alert = None
         self._alert_id = None
         self._customer = None
         self._description = None
@@ -96,6 +99,8 @@ def __init__(self, accounts=None, alert_id=None, customer=None, description=None
 
         if accounts is not None:
             self.accounts = accounts
+        if alert is not None:
+            self.alert = alert
         if alert_id is not None:
             self.alert_id = alert_id
         if customer is not None:
@@ -150,6 +155,29 @@ def accounts(self, accounts):
 
         self._accounts = accounts
 
+    @property
+    def alert(self):
+        """Gets the alert of this IngestionPolicyWriteModel.  # noqa: E501
+
+        The alert DTO object associated with the ingestion policy.  # noqa: E501
+
+        :return: The alert of this IngestionPolicyWriteModel.  # noqa: E501
+        :rtype: IngestionPolicyAlert
+        """
+        return self._alert
+
+    @alert.setter
+    def alert(self, alert):
+        """Sets the alert of this IngestionPolicyWriteModel.
+
+        The alert DTO object associated with the ingestion policy.  # noqa: E501
+
+        :param alert: The alert of this IngestionPolicyWriteModel.  # noqa: E501
+        :type: IngestionPolicyAlert
+        """
+
+        self._alert = alert
+
     @property
     def alert_id(self):
         """Gets the alert_id of this IngestionPolicyWriteModel.  # noqa: E501
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index 063f77e..d1efecf 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -46,8 +46,6 @@ class Proxy(object):
         'hostname': 'str',
         'id': 'str',
         'in_trash': 'bool',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_check_in_time': 'int',
         'last_error_event': 'Event',
         'last_error_time': 'int',
@@ -86,8 +84,6 @@ class Proxy(object):
         'hostname': 'hostname',
         'id': 'id',
         'in_trash': 'inTrash',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy': 'ingestionPolicy',
         'last_check_in_time': 'lastCheckInTime',
         'last_error_event': 'lastErrorEvent',
         'last_error_time': 'lastErrorTime',
@@ -112,7 +108,7 @@ class Proxy(object):
         'version': 'version'
     }
 
-    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histo_disabled=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, ingestion_policies=None, ingestion_policy=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, logs_disabled=None, name=None, preprocessor_rules=None, proxyname=None, shutdown=None, source_tags_rate_limit=None, span_logs_disabled=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, trace_disabled=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
+    def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None, collector_rate_limit=None, collector_sets_rate_limit=None, customer_id=None, deleted=None, ephemeral=None, events_rate_limit=None, histo_disabled=None, histogram_rate_limit=None, hostname=None, id=None, in_trash=None, last_check_in_time=None, last_error_event=None, last_error_time=None, last_known_error=None, local_queue_size=None, logs_disabled=None, name=None, preprocessor_rules=None, proxyname=None, shutdown=None, source_tags_rate_limit=None, span_logs_disabled=None, span_logs_rate_limit=None, span_rate_limit=None, ssh_agent=None, status=None, status_cause=None, time_drift=None, trace_disabled=None, truncate=None, user_id=None, version=None, _configuration=None):  # noqa: E501
         """Proxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -131,8 +127,6 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
         self._hostname = None
         self._id = None
         self._in_trash = None
-        self._ingestion_policies = None
-        self._ingestion_policy = None
         self._last_check_in_time = None
         self._last_error_event = None
         self._last_error_time = None
@@ -183,10 +177,6 @@ def __init__(self, bytes_left_for_buffer=None, bytes_per_minute_for_buffer=None,
             self.id = id
         if in_trash is not None:
             self.in_trash = in_trash
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy is not None:
-            self.ingestion_policy = ingestion_policy
         if last_check_in_time is not None:
             self.last_check_in_time = last_check_in_time
         if last_error_event is not None:
@@ -522,52 +512,6 @@ def in_trash(self, in_trash):
 
         self._in_trash = in_trash
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this Proxy.  # noqa: E501
-
-        Ingestion policies associated with the proxy through user and groups  # noqa: E501
-
-        :return: The ingestion_policies of this Proxy.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this Proxy.
-
-        Ingestion policies associated with the proxy through user and groups  # noqa: E501
-
-        :param ingestion_policies: The ingestion_policies of this Proxy.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy(self):
-        """Gets the ingestion_policy of this Proxy.  # noqa: E501
-
-        Ingestion policy associated with the proxy  # noqa: E501
-
-        :return: The ingestion_policy of this Proxy.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
-        """
-        return self._ingestion_policy
-
-    @ingestion_policy.setter
-    def ingestion_policy(self, ingestion_policy):
-        """Sets the ingestion_policy of this Proxy.
-
-        Ingestion policy associated with the proxy  # noqa: E501
-
-        :param ingestion_policy: The ingestion_policy of this Proxy.  # noqa: E501
-        :type: IngestionPolicyReadModel
-        """
-
-        self._ingestion_policy = ingestion_policy
-
     @property
     def last_check_in_time(self):
         """Gets the last_check_in_time of this Proxy.  # noqa: E501
diff --git a/wavefront_api_client/models/role_create_dto.py b/wavefront_api_client/models/role_create_dto.py
new file mode 100644
index 0000000..afe756c
--- /dev/null
+++ b/wavefront_api_client/models/role_create_dto.py
@@ -0,0 +1,181 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class RoleCreateDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'name': 'str',
+        'permissions': 'list[str]'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'name': 'name',
+        'permissions': 'permissions'
+    }
+
+    def __init__(self, description=None, name=None, permissions=None, _configuration=None):  # noqa: E501
+        """RoleCreateDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._description = None
+        self._name = None
+        self._permissions = None
+        self.discriminator = None
+
+        if description is not None:
+            self.description = description
+        if name is not None:
+            self.name = name
+        if permissions is not None:
+            self.permissions = permissions
+
+    @property
+    def description(self):
+        """Gets the description of this RoleCreateDTO.  # noqa: E501
+
+        The description of the role  # noqa: E501
+
+        :return: The description of this RoleCreateDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this RoleCreateDTO.
+
+        The description of the role  # noqa: E501
+
+        :param description: The description of this RoleCreateDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def name(self):
+        """Gets the name of this RoleCreateDTO.  # noqa: E501
+
+        The name of the role  # noqa: E501
+
+        :return: The name of this RoleCreateDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this RoleCreateDTO.
+
+        The name of the role  # noqa: E501
+
+        :param name: The name of this RoleCreateDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def permissions(self):
+        """Gets the permissions of this RoleCreateDTO.  # noqa: E501
+
+        List of permissions the role has been granted access to  # noqa: E501
+
+        :return: The permissions of this RoleCreateDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this RoleCreateDTO.
+
+        List of permissions the role has been granted access to  # noqa: E501
+
+        :param permissions: The permissions of this RoleCreateDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._permissions = permissions
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RoleCreateDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RoleCreateDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, RoleCreateDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/role_update_dto.py b/wavefront_api_client/models/role_update_dto.py
new file mode 100644
index 0000000..373fc2f
--- /dev/null
+++ b/wavefront_api_client/models/role_update_dto.py
@@ -0,0 +1,209 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class RoleUpdateDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'description': 'str',
+        'id': 'str',
+        'name': 'str',
+        'permissions': 'list[str]'
+    }
+
+    attribute_map = {
+        'description': 'description',
+        'id': 'id',
+        'name': 'name',
+        'permissions': 'permissions'
+    }
+
+    def __init__(self, description=None, id=None, name=None, permissions=None, _configuration=None):  # noqa: E501
+        """RoleUpdateDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._description = None
+        self._id = None
+        self._name = None
+        self._permissions = None
+        self.discriminator = None
+
+        if description is not None:
+            self.description = description
+        if id is not None:
+            self.id = id
+        if name is not None:
+            self.name = name
+        if permissions is not None:
+            self.permissions = permissions
+
+    @property
+    def description(self):
+        """Gets the description of this RoleUpdateDTO.  # noqa: E501
+
+        The description of the role  # noqa: E501
+
+        :return: The description of this RoleUpdateDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this RoleUpdateDTO.
+
+        The description of the role  # noqa: E501
+
+        :param description: The description of this RoleUpdateDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._description = description
+
+    @property
+    def id(self):
+        """Gets the id of this RoleUpdateDTO.  # noqa: E501
+
+        The unique identifier of the role  # noqa: E501
+
+        :return: The id of this RoleUpdateDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this RoleUpdateDTO.
+
+        The unique identifier of the role  # noqa: E501
+
+        :param id: The id of this RoleUpdateDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
+    @property
+    def name(self):
+        """Gets the name of this RoleUpdateDTO.  # noqa: E501
+
+        The name of the role  # noqa: E501
+
+        :return: The name of this RoleUpdateDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """Sets the name of this RoleUpdateDTO.
+
+        The name of the role  # noqa: E501
+
+        :param name: The name of this RoleUpdateDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._name = name
+
+    @property
+    def permissions(self):
+        """Gets the permissions of this RoleUpdateDTO.  # noqa: E501
+
+        List of permissions the role has been granted access to  # noqa: E501
+
+        :return: The permissions of this RoleUpdateDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._permissions
+
+    @permissions.setter
+    def permissions(self, permissions):
+        """Sets the permissions of this RoleUpdateDTO.
+
+        List of permissions the role has been granted access to  # noqa: E501
+
+        :param permissions: The permissions of this RoleUpdateDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._permissions = permissions
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(RoleUpdateDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, RoleUpdateDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, RoleUpdateDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index daf2490..09c6674 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -37,8 +37,6 @@ class ServiceAccount(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_used': 'int',
         'roles': 'list[RoleDTO]',
         'tokens': 'list[UserApiToken]',
@@ -52,8 +50,6 @@ class ServiceAccount(object):
         'description': 'description',
         'groups': 'groups',
         'identifier': 'identifier',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy': 'ingestionPolicy',
         'last_used': 'lastUsed',
         'roles': 'roles',
         'tokens': 'tokens',
@@ -62,7 +58,7 @@ class ServiceAccount(object):
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, last_used=None, roles=None, tokens=None, united_permissions=None, united_roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """ServiceAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -72,8 +68,6 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self._description = None
         self._groups = None
         self._identifier = None
-        self._ingestion_policies = None
-        self._ingestion_policy = None
         self._last_used = None
         self._roles = None
         self._tokens = None
@@ -88,10 +82,6 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy is not None:
-            self.ingestion_policy = ingestion_policy
         if last_used is not None:
             self.last_used = last_used
         if roles is not None:
@@ -201,52 +191,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this ServiceAccount.  # noqa: E501
-
-        The list of service account's ingestion policies.  # noqa: E501
-
-        :return: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this ServiceAccount.
-
-        The list of service account's ingestion policies.  # noqa: E501
-
-        :param ingestion_policies: The ingestion_policies of this ServiceAccount.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy(self):
-        """Gets the ingestion_policy of this ServiceAccount.  # noqa: E501
-
-        The ingestion policy object linked with service account.  # noqa: E501
-
-        :return: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
-        """
-        return self._ingestion_policy
-
-    @ingestion_policy.setter
-    def ingestion_policy(self, ingestion_policy):
-        """Sets the ingestion_policy of this ServiceAccount.
-
-        The ingestion policy object linked with service account.  # noqa: E501
-
-        :param ingestion_policy: The ingestion_policy of this ServiceAccount.  # noqa: E501
-        :type: IngestionPolicyReadModel
-        """
-
-        self._ingestion_policy = ingestion_policy
-
     @property
     def last_used(self):
         """Gets the last_used of this ServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index 5b59d2c..b499a80 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -37,8 +37,6 @@ class ServiceAccountWrite(object):
         'description': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[str]',
-        'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'tokens': 'list[str]',
         'user_groups': 'list[str]'
@@ -49,14 +47,12 @@ class ServiceAccountWrite(object):
         'description': 'description',
         'groups': 'groups',
         'identifier': 'identifier',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'tokens': 'tokens',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, active=None, description=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, tokens=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, active=None, description=None, groups=None, identifier=None, roles=None, tokens=None, user_groups=None, _configuration=None):  # noqa: E501
         """ServiceAccountWrite - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -66,8 +62,6 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         self._description = None
         self._groups = None
         self._identifier = None
-        self._ingestion_policies = None
-        self._ingestion_policy_id = None
         self._roles = None
         self._tokens = None
         self._user_groups = None
@@ -80,10 +74,6 @@ def __init__(self, active=None, description=None, groups=None, identifier=None,
         if groups is not None:
             self.groups = groups
         self.identifier = identifier
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy_id is not None:
-            self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
             self.roles = roles
         if tokens is not None:
@@ -185,52 +175,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this ServiceAccountWrite.  # noqa: E501
-
-        The list of ingestion policy ids, the service account will be added to.\"  # noqa: E501
-
-        :return: The ingestion_policies of this ServiceAccountWrite.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this ServiceAccountWrite.
-
-        The list of ingestion policy ids, the service account will be added to.\"  # noqa: E501
-
-        :param ingestion_policies: The ingestion_policies of this ServiceAccountWrite.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
-
-        The identifier of the ingestion policy linked with service account.  # noqa: E501
-
-        :return: The ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this ServiceAccountWrite.
-
-        The identifier of the ingestion policy linked with service account.  # noqa: E501
-
-        :param ingestion_policy_id: The ingestion_policy_id of this ServiceAccountWrite.  # noqa: E501
-        :type: str
-        """
-
-        self._ingestion_policy_id = ingestion_policy_id
-
     @property
     def roles(self):
         """Gets the roles of this ServiceAccountWrite.  # noqa: E501
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index 8657f67..e8fcb9e 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -36,8 +36,6 @@ class UserDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -48,15 +46,13 @@ class UserDTO(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
         'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -65,8 +61,6 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_polici
         self._customer = None
         self._groups = None
         self._identifier = None
-        self._ingestion_policies = None
-        self._ingestion_policy = None
         self._last_successful_login = None
         self._roles = None
         self._sso_id = None
@@ -79,10 +73,6 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_polici
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy is not None:
-            self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         if roles is not None:
@@ -155,48 +145,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this UserDTO.  # noqa: E501
-
-
-        :return: The ingestion_policies of this UserDTO.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this UserDTO.
-
-
-        :param ingestion_policies: The ingestion_policies of this UserDTO.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy(self):
-        """Gets the ingestion_policy of this UserDTO.  # noqa: E501
-
-
-        :return: The ingestion_policy of this UserDTO.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
-        """
-        return self._ingestion_policy
-
-    @ingestion_policy.setter
-    def ingestion_policy(self, ingestion_policy):
-        """Sets the ingestion_policy of this UserDTO.
-
-
-        :param ingestion_policy: The ingestion_policy of this UserDTO.  # noqa: E501
-        :type: IngestionPolicyReadModel
-        """
-
-        self._ingestion_policy = ingestion_policy
-
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this UserDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index d881815..c1aa7f1 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -37,7 +37,6 @@ class UserGroupModel(object):
         'customer': 'str',
         'description': 'str',
         'id': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
         'name': 'str',
         'properties': 'UserGroupPropertiesDTO',
         'role_count': 'int',
@@ -51,7 +50,6 @@ class UserGroupModel(object):
         'customer': 'customer',
         'description': 'description',
         'id': 'id',
-        'ingestion_policies': 'ingestionPolicies',
         'name': 'name',
         'properties': 'properties',
         'role_count': 'roleCount',
@@ -60,7 +58,7 @@ class UserGroupModel(object):
         'users': 'users'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, ingestion_policies=None, name=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, properties=None, role_count=None, roles=None, user_count=None, users=None, _configuration=None):  # noqa: E501
         """UserGroupModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -70,7 +68,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._customer = None
         self._description = None
         self._id = None
-        self._ingestion_policies = None
         self._name = None
         self._properties = None
         self._role_count = None
@@ -87,8 +84,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
             self.description = description
         if id is not None:
             self.id = id
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
         self.name = name
         if properties is not None:
             self.properties = properties
@@ -191,29 +186,6 @@ def id(self, id):
 
         self._id = id
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this UserGroupModel.  # noqa: E501
-
-        Ingestion policies linked with the user group  # noqa: E501
-
-        :return: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this UserGroupModel.
-
-        Ingestion policies linked with the user group  # noqa: E501
-
-        :param ingestion_policies: The ingestion_policies of this UserGroupModel.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
     @property
     def name(self):
         """Gets the name of this UserGroupModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 02723ea..0f73cec 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -36,8 +36,6 @@ class UserModel(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[IngestionPolicyReadModel]',
-        'ingestion_policy': 'IngestionPolicyReadModel',
         'last_successful_login': 'int',
         'roles': 'list[RoleDTO]',
         'sso_id': 'str',
@@ -48,15 +46,13 @@ class UserModel(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy': 'ingestionPolicy',
         'last_successful_login': 'lastSuccessfulLogin',
         'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, customer=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, groups=None, identifier=None, last_successful_login=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -65,8 +61,6 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_polici
         self._customer = None
         self._groups = None
         self._identifier = None
-        self._ingestion_policies = None
-        self._ingestion_policy = None
         self._last_successful_login = None
         self._roles = None
         self._sso_id = None
@@ -76,10 +70,6 @@ def __init__(self, customer=None, groups=None, identifier=None, ingestion_polici
         self.customer = customer
         self.groups = groups
         self.identifier = identifier
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy is not None:
-            self.ingestion_policy = ingestion_policy
         if last_successful_login is not None:
             self.last_successful_login = last_successful_login
         if roles is not None:
@@ -163,48 +153,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this UserModel.  # noqa: E501
-
-
-        :return: The ingestion_policies of this UserModel.  # noqa: E501
-        :rtype: list[IngestionPolicyReadModel]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this UserModel.
-
-
-        :param ingestion_policies: The ingestion_policies of this UserModel.  # noqa: E501
-        :type: list[IngestionPolicyReadModel]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy(self):
-        """Gets the ingestion_policy of this UserModel.  # noqa: E501
-
-
-        :return: The ingestion_policy of this UserModel.  # noqa: E501
-        :rtype: IngestionPolicyReadModel
-        """
-        return self._ingestion_policy
-
-    @ingestion_policy.setter
-    def ingestion_policy(self, ingestion_policy):
-        """Sets the ingestion_policy of this UserModel.
-
-
-        :param ingestion_policy: The ingestion_policy of this UserModel.  # noqa: E501
-        :type: IngestionPolicyReadModel
-        """
-
-        self._ingestion_policy = ingestion_policy
-
     @property
     def last_successful_login(self):
         """Gets the last_successful_login of this UserModel.  # noqa: E501
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 42f0cbf..550ebd4 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -37,8 +37,6 @@ class UserRequestDTO(object):
         'customer': 'str',
         'groups': 'list[str]',
         'identifier': 'str',
-        'ingestion_policies': 'list[str]',
-        'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'sso_id': 'str',
         'user_groups': 'list[str]'
@@ -49,14 +47,12 @@ class UserRequestDTO(object):
         'customer': 'customer',
         'groups': 'groups',
         'identifier': 'identifier',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'sso_id': 'ssoId',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, credential=None, customer=None, groups=None, identifier=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, credential=None, customer=None, groups=None, identifier=None, roles=None, sso_id=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserRequestDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -66,8 +62,6 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
         self._customer = None
         self._groups = None
         self._identifier = None
-        self._ingestion_policies = None
-        self._ingestion_policy_id = None
         self._roles = None
         self._sso_id = None
         self._user_groups = None
@@ -81,10 +75,6 @@ def __init__(self, credential=None, customer=None, groups=None, identifier=None,
             self.groups = groups
         if identifier is not None:
             self.identifier = identifier
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy_id is not None:
-            self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
             self.roles = roles
         if sso_id is not None:
@@ -176,48 +166,6 @@ def identifier(self, identifier):
 
         self._identifier = identifier
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this UserRequestDTO.  # noqa: E501
-
-
-        :return: The ingestion_policies of this UserRequestDTO.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this UserRequestDTO.
-
-
-        :param ingestion_policies: The ingestion_policies of this UserRequestDTO.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this UserRequestDTO.  # noqa: E501
-
-
-        :return: The ingestion_policy_id of this UserRequestDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this UserRequestDTO.
-
-
-        :param ingestion_policy_id: The ingestion_policy_id of this UserRequestDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._ingestion_policy_id = ingestion_policy_id
-
     @property
     def roles(self):
         """Gets the roles of this UserRequestDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index b009066..460ea31 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -35,8 +35,6 @@ class UserToCreate(object):
     swagger_types = {
         'email_address': 'str',
         'groups': 'list[str]',
-        'ingestion_policies': 'list[str]',
-        'ingestion_policy_id': 'str',
         'roles': 'list[str]',
         'user_groups': 'list[str]'
     }
@@ -44,13 +42,11 @@ class UserToCreate(object):
     attribute_map = {
         'email_address': 'emailAddress',
         'groups': 'groups',
-        'ingestion_policies': 'ingestionPolicies',
-        'ingestion_policy_id': 'ingestionPolicyId',
         'roles': 'roles',
         'user_groups': 'userGroups'
     }
 
-    def __init__(self, email_address=None, groups=None, ingestion_policies=None, ingestion_policy_id=None, roles=None, user_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, email_address=None, groups=None, roles=None, user_groups=None, _configuration=None):  # noqa: E501
         """UserToCreate - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -58,18 +54,12 @@ def __init__(self, email_address=None, groups=None, ingestion_policies=None, ing
 
         self._email_address = None
         self._groups = None
-        self._ingestion_policies = None
-        self._ingestion_policy_id = None
         self._roles = None
         self._user_groups = None
         self.discriminator = None
 
         self.email_address = email_address
         self.groups = groups
-        if ingestion_policies is not None:
-            self.ingestion_policies = ingestion_policies
-        if ingestion_policy_id is not None:
-            self.ingestion_policy_id = ingestion_policy_id
         if roles is not None:
             self.roles = roles
         self.user_groups = user_groups
@@ -103,7 +93,7 @@ def email_address(self, email_address):
     def groups(self):
         """Gets the groups of this UserToCreate.  # noqa: E501
 
-        List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management  # noqa: E501
+        List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are log_management, dashboard_management, events_management, alerts_management, derived_metrics_management, host_tag_management, agent_management, token_management, ingestion, user_management, embedded_charts, metrics_management, external_links_management, application_management, batch_query_priority, saml_sso_management, monitored_application_service_management  # noqa: E501
 
         :return: The groups of this UserToCreate.  # noqa: E501
         :rtype: list[str]
@@ -114,7 +104,7 @@ def groups(self):
     def groups(self, groups):
         """Sets the groups of this UserToCreate.
 
-        List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are agent_management, alerts_management, dashboard_management, embedded_charts, events_management, external_links_management, host_tag_management, metrics_management, user_management  # noqa: E501
+        List of permission groups to grant to this user. Please note that 'host_tag_management' is the equivalent of the 'Source Tag Management' permission.  Possible values are log_management, dashboard_management, events_management, alerts_management, derived_metrics_management, host_tag_management, agent_management, token_management, ingestion, user_management, embedded_charts, metrics_management, external_links_management, application_management, batch_query_priority, saml_sso_management, monitored_application_service_management  # noqa: E501
 
         :param groups: The groups of this UserToCreate.  # noqa: E501
         :type: list[str]
@@ -124,52 +114,6 @@ def groups(self, groups):
 
         self._groups = groups
 
-    @property
-    def ingestion_policies(self):
-        """Gets the ingestion_policies of this UserToCreate.  # noqa: E501
-
-        The list of ingestion policy ids, the user will be added to.  # noqa: E501
-
-        :return: The ingestion_policies of this UserToCreate.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._ingestion_policies
-
-    @ingestion_policies.setter
-    def ingestion_policies(self, ingestion_policies):
-        """Sets the ingestion_policies of this UserToCreate.
-
-        The list of ingestion policy ids, the user will be added to.  # noqa: E501
-
-        :param ingestion_policies: The ingestion_policies of this UserToCreate.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._ingestion_policies = ingestion_policies
-
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this UserToCreate.  # noqa: E501
-
-        The identifier of the ingestion policy linked with user.  # noqa: E501
-
-        :return: The ingestion_policy_id of this UserToCreate.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this UserToCreate.
-
-        The identifier of the ingestion policy linked with user.  # noqa: E501
-
-        :param ingestion_policy_id: The ingestion_policy_id of this UserToCreate.  # noqa: E501
-        :type: str
-        """
-
-        self._ingestion_policy_id = ingestion_policy_id
-
     @property
     def roles(self):
         """Gets the roles of this UserToCreate.  # noqa: E501

From b6ebaae23d8d4174d8943cc8a5a3ed87e2396bf7 Mon Sep 17 00:00:00 2001
From: wf-jenkins <tobs-sre@vmware.com>
Date: Tue, 14 Feb 2023 08:16:28 -0800
Subject: [PATCH 125/161] Autogenerated Update v2.171.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   5 +-
 docs/ClusterInfoDTO.md                        |  11 ++
 docs/ResponseContainerClusterInfoDTO.md       |  11 ++
 docs/WavefrontApi.md                          |  59 +++++++
 setup.py                                      |   2 +-
 test/test_cluster_info_dto.py                 |  40 +++++
 ...est_response_container_cluster_info_dto.py |  40 +++++
 test/test_wavefront_api.py                    |  41 +++++
 wavefront_api_client/__init__.py              |   3 +
 wavefront_api_client/api/__init__.py          |   1 +
 wavefront_api_client/api/wavefront_api.py     | 125 +++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   2 +
 .../models/cluster_info_dto.py                | 149 +++++++++++++++++
 .../response_container_cluster_info_dto.py    | 150 ++++++++++++++++++
 ...esponse_container_set_business_function.py |   2 +-
 19 files changed, 642 insertions(+), 7 deletions(-)
 create mode 100644 docs/ClusterInfoDTO.md
 create mode 100644 docs/ResponseContainerClusterInfoDTO.md
 create mode 100644 docs/WavefrontApi.md
 create mode 100644 test/test_cluster_info_dto.py
 create mode 100644 test/test_response_container_cluster_info_dto.py
 create mode 100644 test/test_wavefront_api.py
 create mode 100644 wavefront_api_client/api/wavefront_api.py
 create mode 100644 wavefront_api_client/models/cluster_info_dto.py
 create mode 100644 wavefront_api_client/models/response_container_cluster_info_dto.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 8d27990..066fbc5 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.170.1"
+    "packageVersion": "2.171.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 3fb96ec..8d27990 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.169.0"
+    "packageVersion": "2.170.1"
 }
diff --git a/README.md b/README.md
index c58e569..206f771 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.170.1
+- Package version: 2.171.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -454,6 +454,7 @@ Class | Method | HTTP request | Description
 *UserGroupApi* | [**remove_roles_from_user_group**](docs/UserGroupApi.md#remove_roles_from_user_group) | **POST** /api/v2/usergroup/{id}/removeRoles | Remove multiple roles from a specific user group
 *UserGroupApi* | [**remove_users_from_user_group**](docs/UserGroupApi.md#remove_users_from_user_group) | **POST** /api/v2/usergroup/{id}/removeUsers | Remove multiple users from a specific user group
 *UserGroupApi* | [**update_user_group**](docs/UserGroupApi.md#update_user_group) | **PUT** /api/v2/usergroup/{id} | Update a specific user group
+*WavefrontApi* | [**get_cluster_info**](docs/WavefrontApi.md#get_cluster_info) | **GET** /api/v2/cluster/info | API endpoint to get cluster info
 *WebhookApi* | [**create_webhook**](docs/WebhookApi.md#create_webhook) | **POST** /api/v2/webhook | Create a specific webhook
 *WebhookApi* | [**delete_webhook**](docs/WebhookApi.md#delete_webhook) | **DELETE** /api/v2/webhook/{id} | Delete a specific webhook
 *WebhookApi* | [**get_all_webhooks**](docs/WebhookApi.md#get_all_webhooks) | **GET** /api/v2/webhook | Get all webhooks for a customer
@@ -493,6 +494,7 @@ Class | Method | HTTP request | Description
  - [CloudIntegration](docs/CloudIntegration.md)
  - [CloudTrailConfiguration](docs/CloudTrailConfiguration.md)
  - [CloudWatchConfiguration](docs/CloudWatchConfiguration.md)
+ - [ClusterInfoDTO](docs/ClusterInfoDTO.md)
  - [Conversion](docs/Conversion.md)
  - [ConversionObject](docs/ConversionObject.md)
  - [CustomerFacingUserObject](docs/CustomerFacingUserObject.md)
@@ -613,6 +615,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
  - [ResponseContainerApiTokenModel](docs/ResponseContainerApiTokenModel.md)
  - [ResponseContainerCloudIntegration](docs/ResponseContainerCloudIntegration.md)
+ - [ResponseContainerClusterInfoDTO](docs/ResponseContainerClusterInfoDTO.md)
  - [ResponseContainerDashboard](docs/ResponseContainerDashboard.md)
  - [ResponseContainerDefaultSavedAppMapSearch](docs/ResponseContainerDefaultSavedAppMapSearch.md)
  - [ResponseContainerDefaultSavedTracesSearch](docs/ResponseContainerDefaultSavedTracesSearch.md)
diff --git a/docs/ClusterInfoDTO.md b/docs/ClusterInfoDTO.md
new file mode 100644
index 0000000..26275e5
--- /dev/null
+++ b/docs/ClusterInfoDTO.md
@@ -0,0 +1,11 @@
+# ClusterInfoDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cluster_alias** | **str** |  | [optional] 
+**status_page_link** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerClusterInfoDTO.md b/docs/ResponseContainerClusterInfoDTO.md
new file mode 100644
index 0000000..19ccfc7
--- /dev/null
+++ b/docs/ResponseContainerClusterInfoDTO.md
@@ -0,0 +1,11 @@
+# ResponseContainerClusterInfoDTO
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**ClusterInfoDTO**](ClusterInfoDTO.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/WavefrontApi.md b/docs/WavefrontApi.md
new file mode 100644
index 0000000..9fc496e
--- /dev/null
+++ b/docs/WavefrontApi.md
@@ -0,0 +1,59 @@
+# wavefront_api_client.WavefrontApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_cluster_info**](WavefrontApi.md#get_cluster_info) | **GET** /api/v2/cluster/info | API endpoint to get cluster info
+
+
+# **get_cluster_info**
+> ResponseContainerClusterInfoDTO get_cluster_info()
+
+API endpoint to get cluster info
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.WavefrontApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # API endpoint to get cluster info
+    api_response = api_instance.get_cluster_info()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling WavefrontApi->get_cluster_info: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerClusterInfoDTO**](ResponseContainerClusterInfoDTO.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/setup.py b/setup.py
index 3fdb06c..62bcbfc 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.170.1"
+VERSION = "2.171.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_cluster_info_dto.py b/test/test_cluster_info_dto.py
new file mode 100644
index 0000000..3bee875
--- /dev/null
+++ b/test/test_cluster_info_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.cluster_info_dto import ClusterInfoDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestClusterInfoDTO(unittest.TestCase):
+    """ClusterInfoDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testClusterInfoDTO(self):
+        """Test ClusterInfoDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.cluster_info_dto.ClusterInfoDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_cluster_info_dto.py b/test/test_response_container_cluster_info_dto.py
new file mode 100644
index 0000000..f750352
--- /dev/null
+++ b/test/test_response_container_cluster_info_dto.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_cluster_info_dto import ResponseContainerClusterInfoDTO  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerClusterInfoDTO(unittest.TestCase):
+    """ResponseContainerClusterInfoDTO unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerClusterInfoDTO(self):
+        """Test ResponseContainerClusterInfoDTO"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_cluster_info_dto.ResponseContainerClusterInfoDTO()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_wavefront_api.py b/test/test_wavefront_api.py
new file mode 100644
index 0000000..400a822
--- /dev/null
+++ b/test/test_wavefront_api.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.wavefront_api import WavefrontApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestWavefrontApi(unittest.TestCase):
+    """WavefrontApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.wavefront_api.WavefrontApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_cluster_info(self):
+        """Test case for get_cluster_info
+
+        API endpoint to get cluster info  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 42ed69b..c294ce3 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -52,6 +52,7 @@
 from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
 from wavefront_api_client.api.user_group_api import UserGroupApi
+from wavefront_api_client.api.wavefront_api import WavefrontApi
 from wavefront_api_client.api.webhook_api import WebhookApi
 
 # import ApiClient
@@ -88,6 +89,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.cluster_info_dto import ClusterInfoDTO
 from wavefront_api_client.models.conversion import Conversion
 from wavefront_api_client.models.conversion_object import ConversionObject
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
@@ -208,6 +210,7 @@
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
 from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
+from wavefront_api_client.models.response_container_cluster_info_dto import ResponseContainerClusterInfoDTO
 from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard
 from wavefront_api_client.models.response_container_default_saved_app_map_search import ResponseContainerDefaultSavedAppMapSearch
 from wavefront_api_client.models.response_container_default_saved_traces_search import ResponseContainerDefaultSavedTracesSearch
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index dd85422..2d5b76d 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -39,4 +39,5 @@
 from wavefront_api_client.api.usage_api import UsageApi
 from wavefront_api_client.api.user_api import UserApi
 from wavefront_api_client.api.user_group_api import UserGroupApi
+from wavefront_api_client.api.wavefront_api import WavefrontApi
 from wavefront_api_client.api.webhook_api import WebhookApi
diff --git a/wavefront_api_client/api/wavefront_api.py b/wavefront_api_client/api/wavefront_api.py
new file mode 100644
index 0000000..e99f68f
--- /dev/null
+++ b/wavefront_api_client/api/wavefront_api.py
@@ -0,0 +1,125 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class WavefrontApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_cluster_info(self, **kwargs):  # noqa: E501
+        """API endpoint to get cluster info  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cluster_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerClusterInfoDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_cluster_info_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_cluster_info_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_cluster_info_with_http_info(self, **kwargs):  # noqa: E501
+        """API endpoint to get cluster info  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_cluster_info_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerClusterInfoDTO
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_cluster_info" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/cluster/info', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerClusterInfoDTO',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 9d4d789..23443cc 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.170.1/python'
+        self.user_agent = 'Swagger-Codegen/2.171.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index fafbded..89c5b02 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.170.1".\
+               "SDK Package Version: 2.171.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 93785b3..e4b3d55 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -45,6 +45,7 @@
 from wavefront_api_client.models.cloud_integration import CloudIntegration
 from wavefront_api_client.models.cloud_trail_configuration import CloudTrailConfiguration
 from wavefront_api_client.models.cloud_watch_configuration import CloudWatchConfiguration
+from wavefront_api_client.models.cluster_info_dto import ClusterInfoDTO
 from wavefront_api_client.models.conversion import Conversion
 from wavefront_api_client.models.conversion_object import ConversionObject
 from wavefront_api_client.models.customer_facing_user_object import CustomerFacingUserObject
@@ -165,6 +166,7 @@
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
 from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
+from wavefront_api_client.models.response_container_cluster_info_dto import ResponseContainerClusterInfoDTO
 from wavefront_api_client.models.response_container_dashboard import ResponseContainerDashboard
 from wavefront_api_client.models.response_container_default_saved_app_map_search import ResponseContainerDefaultSavedAppMapSearch
 from wavefront_api_client.models.response_container_default_saved_traces_search import ResponseContainerDefaultSavedTracesSearch
diff --git a/wavefront_api_client/models/cluster_info_dto.py b/wavefront_api_client/models/cluster_info_dto.py
new file mode 100644
index 0000000..56ce5dc
--- /dev/null
+++ b/wavefront_api_client/models/cluster_info_dto.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ClusterInfoDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cluster_alias': 'str',
+        'status_page_link': 'str'
+    }
+
+    attribute_map = {
+        'cluster_alias': 'clusterAlias',
+        'status_page_link': 'statusPageLink'
+    }
+
+    def __init__(self, cluster_alias=None, status_page_link=None, _configuration=None):  # noqa: E501
+        """ClusterInfoDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cluster_alias = None
+        self._status_page_link = None
+        self.discriminator = None
+
+        if cluster_alias is not None:
+            self.cluster_alias = cluster_alias
+        if status_page_link is not None:
+            self.status_page_link = status_page_link
+
+    @property
+    def cluster_alias(self):
+        """Gets the cluster_alias of this ClusterInfoDTO.  # noqa: E501
+
+
+        :return: The cluster_alias of this ClusterInfoDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._cluster_alias
+
+    @cluster_alias.setter
+    def cluster_alias(self, cluster_alias):
+        """Sets the cluster_alias of this ClusterInfoDTO.
+
+
+        :param cluster_alias: The cluster_alias of this ClusterInfoDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._cluster_alias = cluster_alias
+
+    @property
+    def status_page_link(self):
+        """Gets the status_page_link of this ClusterInfoDTO.  # noqa: E501
+
+
+        :return: The status_page_link of this ClusterInfoDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._status_page_link
+
+    @status_page_link.setter
+    def status_page_link(self, status_page_link):
+        """Sets the status_page_link of this ClusterInfoDTO.
+
+
+        :param status_page_link: The status_page_link of this ClusterInfoDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._status_page_link = status_page_link
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ClusterInfoDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ClusterInfoDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ClusterInfoDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_cluster_info_dto.py b/wavefront_api_client/models/response_container_cluster_info_dto.py
new file mode 100644
index 0000000..1d5ed25
--- /dev/null
+++ b/wavefront_api_client/models/response_container_cluster_info_dto.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerClusterInfoDTO(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'ClusterInfoDTO',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerClusterInfoDTO - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerClusterInfoDTO.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerClusterInfoDTO.  # noqa: E501
+        :rtype: ClusterInfoDTO
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerClusterInfoDTO.
+
+
+        :param response: The response of this ResponseContainerClusterInfoDTO.  # noqa: E501
+        :type: ClusterInfoDTO
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerClusterInfoDTO.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerClusterInfoDTO.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerClusterInfoDTO.
+
+
+        :param status: The status of this ResponseContainerClusterInfoDTO.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerClusterInfoDTO, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerClusterInfoDTO):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerClusterInfoDTO):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 19fe22d..cf7760a 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From 25b06102214c16d1c1d5be3540b28b55b640855e Mon Sep 17 00:00:00 2001
From: wf-jenkins <tobs-sre@vmware.com>
Date: Tue, 21 Feb 2023 08:16:22 -0800
Subject: [PATCH 126/161] Autogenerated Update v2.172.0.

---
 .swagger-codegen/config.json                      |  2 +-
 .swagger-codegen/config.jsone                     |  2 +-
 README.md                                         |  3 +--
 docs/TupleResult.md                               |  2 +-
 docs/TupleValueResult.md                          |  2 +-
 setup.py                                          |  2 +-
 wavefront_api_client/__init__.py                  |  1 -
 wavefront_api_client/api_client.py                |  2 +-
 wavefront_api_client/configuration.py             |  2 +-
 wavefront_api_client/models/__init__.py           |  1 -
 wavefront_api_client/models/tuple_result.py       |  6 +++---
 wavefront_api_client/models/tuple_value_result.py | 10 +++++-----
 12 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 066fbc5..53e8b23 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.171.0"
+    "packageVersion": "2.172.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 8d27990..066fbc5 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.170.1"
+    "packageVersion": "2.171.0"
 }
diff --git a/README.md b/README.md
index 206f771..bd1fa02 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.171.0
+- Package version: 2.172.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -736,7 +736,6 @@ Class | Method | HTTP request | Description
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
  - [TriageDashboard](docs/TriageDashboard.md)
- - [Tuple](docs/Tuple.md)
  - [TupleResult](docs/TupleResult.md)
  - [TupleValueResult](docs/TupleValueResult.md)
  - [UserApiToken](docs/UserApiToken.md)
diff --git a/docs/TupleResult.md b/docs/TupleResult.md
index e47165b..3763298 100644
--- a/docs/TupleResult.md
+++ b/docs/TupleResult.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**key** | [**Tuple**](Tuple.md) | The keys used to surface the dimensions. | [optional] 
+**key** | **list[str]** | The keys used to surface the dimensions. | [optional] 
 **value_list** | [**list[TupleValueResult]**](TupleValueResult.md) | All the possible value combination satisfying the provided keys and their respective counts from the query keys. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/TupleValueResult.md b/docs/TupleValueResult.md
index f7db227..43d7dec 100644
--- a/docs/TupleValueResult.md
+++ b/docs/TupleValueResult.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **count** | **int** | The count of the values appearing in the query keys. | [optional] 
-**value** | [**Tuple**](Tuple.md) | The possible values for a given key tuple. | [optional] 
+**value** | **list[str]** | The possible values for a given key list. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index 62bcbfc..21f5695 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.171.0"
+VERSION = "2.172.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index c294ce3..009ee05 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -331,7 +331,6 @@
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
-from wavefront_api_client.models.tuple import Tuple
 from wavefront_api_client.models.tuple_result import TupleResult
 from wavefront_api_client.models.tuple_value_result import TupleValueResult
 from wavefront_api_client.models.user_api_token import UserApiToken
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 23443cc..c258401 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.171.0/python'
+        self.user_agent = 'Swagger-Codegen/2.172.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 89c5b02..3a49bfd 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.171.0".\
+               "SDK Package Version: 2.172.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index e4b3d55..1fc550f 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -287,7 +287,6 @@
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
-from wavefront_api_client.models.tuple import Tuple
 from wavefront_api_client.models.tuple_result import TupleResult
 from wavefront_api_client.models.tuple_value_result import TupleValueResult
 from wavefront_api_client.models.user_api_token import UserApiToken
diff --git a/wavefront_api_client/models/tuple_result.py b/wavefront_api_client/models/tuple_result.py
index 890165d..245c5b6 100644
--- a/wavefront_api_client/models/tuple_result.py
+++ b/wavefront_api_client/models/tuple_result.py
@@ -33,7 +33,7 @@ class TupleResult(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'key': 'Tuple',
+        'key': 'list[str]',
         'value_list': 'list[TupleValueResult]'
     }
 
@@ -64,7 +64,7 @@ def key(self):
         The keys used to surface the dimensions.  # noqa: E501
 
         :return: The key of this TupleResult.  # noqa: E501
-        :rtype: Tuple
+        :rtype: list[str]
         """
         return self._key
 
@@ -75,7 +75,7 @@ def key(self, key):
         The keys used to surface the dimensions.  # noqa: E501
 
         :param key: The key of this TupleResult.  # noqa: E501
-        :type: Tuple
+        :type: list[str]
         """
 
         self._key = key
diff --git a/wavefront_api_client/models/tuple_value_result.py b/wavefront_api_client/models/tuple_value_result.py
index ba8933a..102595e 100644
--- a/wavefront_api_client/models/tuple_value_result.py
+++ b/wavefront_api_client/models/tuple_value_result.py
@@ -34,7 +34,7 @@ class TupleValueResult(object):
     """
     swagger_types = {
         'count': 'int',
-        'value': 'Tuple'
+        'value': 'list[str]'
     }
 
     attribute_map = {
@@ -84,10 +84,10 @@ def count(self, count):
     def value(self):
         """Gets the value of this TupleValueResult.  # noqa: E501
 
-        The possible values for a given key tuple.  # noqa: E501
+        The possible values for a given key list.  # noqa: E501
 
         :return: The value of this TupleValueResult.  # noqa: E501
-        :rtype: Tuple
+        :rtype: list[str]
         """
         return self._value
 
@@ -95,10 +95,10 @@ def value(self):
     def value(self, value):
         """Sets the value of this TupleValueResult.
 
-        The possible values for a given key tuple.  # noqa: E501
+        The possible values for a given key list.  # noqa: E501
 
         :param value: The value of this TupleValueResult.  # noqa: E501
-        :type: Tuple
+        :type: list[str]
         """
 
         self._value = value

From 14d109dcd0dc64f67517d50c4380aad552306baa Mon Sep 17 00:00:00 2001
From: wf-jenkins <tobs-sre@vmware.com>
Date: Mon, 6 Mar 2023 08:16:19 -0800
Subject: [PATCH 127/161] Autogenerated Update v2.174.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   6 +-
 docs/ChartSettings.md                         |   1 +
 docs/LogsTable.md                             |  10 +
 docs/ProxyApi.md                              | 110 ++++++++++
 docs/ResponseContainerMap.md                  |  11 +
 setup.py                                      |   2 +-
 test/test_logs_table.py                       |  40 ++++
 test/test_response_container_map.py           |  40 ++++
 wavefront_api_client/__init__.py              |   2 +
 wavefront_api_client/api/proxy_api.py         | 190 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   2 +
 wavefront_api_client/models/chart_settings.py |  28 ++-
 wavefront_api_client/models/logs_table.py     | 123 ++++++++++++
 .../models/response_container_map.py          | 150 ++++++++++++++
 18 files changed, 716 insertions(+), 7 deletions(-)
 create mode 100644 docs/LogsTable.md
 create mode 100644 docs/ResponseContainerMap.md
 create mode 100644 test/test_logs_table.py
 create mode 100644 test/test_response_container_map.py
 create mode 100644 wavefront_api_client/models/logs_table.py
 create mode 100644 wavefront_api_client/models/response_container_map.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 53e8b23..e13fc10 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.172.0"
+    "packageVersion": "2.174.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 066fbc5..53e8b23 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.171.0"
+    "packageVersion": "2.172.0"
 }
diff --git a/README.md b/README.md
index bd1fa02..507cd39 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.172.0
+- Package version: 2.174.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -249,6 +249,8 @@ Class | Method | HTTP request | Description
 *ProxyApi* | [**delete_proxy**](docs/ProxyApi.md#delete_proxy) | **DELETE** /api/v2/proxy/{id} | Delete a specific proxy
 *ProxyApi* | [**get_all_proxy**](docs/ProxyApi.md#get_all_proxy) | **GET** /api/v2/proxy | Get all proxies for a customer
 *ProxyApi* | [**get_proxy**](docs/ProxyApi.md#get_proxy) | **GET** /api/v2/proxy/{id} | Get a specific proxy
+*ProxyApi* | [**get_proxy_config**](docs/ProxyApi.md#get_proxy_config) | **GET** /api/v2/proxy/{id}/config | Get a specific proxy config
+*ProxyApi* | [**get_proxy_preprocessor_rules**](docs/ProxyApi.md#get_proxy_preprocessor_rules) | **GET** /api/v2/proxy/{id}/preprocessorRules | Get a specific proxy preprocessor rules
 *ProxyApi* | [**undelete_proxy**](docs/ProxyApi.md#undelete_proxy) | **POST** /api/v2/proxy/{id}/undelete | Undelete a specific proxy
 *ProxyApi* | [**update_proxy**](docs/ProxyApi.md#update_proxy) | **PUT** /api/v2/proxy/{id} | Update the name of a specific proxy
 *QueryApi* | [**query_api**](docs/QueryApi.md#query_api) | **GET** /api/v2/chart/api | Perform a charting query against Wavefront servers that returns the appropriate points in the specified time window and granularity
@@ -539,6 +541,7 @@ Class | Method | HTTP request | Description
  - [KubernetesComponent](docs/KubernetesComponent.md)
  - [KubernetesComponentStatus](docs/KubernetesComponentStatus.md)
  - [LogicalType](docs/LogicalType.md)
+ - [LogsTable](docs/LogsTable.md)
  - [MaintenanceWindow](docs/MaintenanceWindow.md)
  - [Message](docs/Message.md)
  - [MetricDetails](docs/MetricDetails.md)
@@ -639,6 +642,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerListUserApiToken](docs/ResponseContainerListUserApiToken.md)
  - [ResponseContainerListUserDTO](docs/ResponseContainerListUserDTO.md)
  - [ResponseContainerMaintenanceWindow](docs/ResponseContainerMaintenanceWindow.md)
+ - [ResponseContainerMap](docs/ResponseContainerMap.md)
  - [ResponseContainerMapStringInteger](docs/ResponseContainerMapStringInteger.md)
  - [ResponseContainerMapStringIntegrationStatus](docs/ResponseContainerMapStringIntegrationStatus.md)
  - [ResponseContainerMessage](docs/ResponseContainerMessage.md)
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index 2865cc3..c7b36cf 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -22,6 +22,7 @@ Name | Type | Description | Notes
 **group_by_source** | **bool** | For the tabular view, whether to group multi metrics into a single row by a common source.  If false, each metric for each source is displayed in its own row.  If true, multiple metrics for the same host will be displayed as different columns in the same row | [optional] 
 **invert_dynamic_legend_hover_control** | **bool** | Whether to disable the display of the floating legend (but reenable it when the ctrl-key is pressed) | [optional] 
 **line_type** | **str** | Plot interpolation type.  linear is default | [optional] 
+**logs_table** | [**LogsTable**](LogsTable.md) |  | [optional] 
 **max** | **float** | Max value of Y-axis.  Set to null or leave blank for auto | [optional] 
 **min** | **float** | Min value of Y-axis.  Set to null or leave blank for auto | [optional] 
 **num_tags** | **int** | For the tabular view, how many point tags to display | [optional] 
diff --git a/docs/LogsTable.md b/docs/LogsTable.md
new file mode 100644
index 0000000..06d51c1
--- /dev/null
+++ b/docs/LogsTable.md
@@ -0,0 +1,10 @@
+# LogsTable
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**columns** | **list[str]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ProxyApi.md b/docs/ProxyApi.md
index 5063e1e..6674d85 100644
--- a/docs/ProxyApi.md
+++ b/docs/ProxyApi.md
@@ -7,6 +7,8 @@ Method | HTTP request | Description
 [**delete_proxy**](ProxyApi.md#delete_proxy) | **DELETE** /api/v2/proxy/{id} | Delete a specific proxy
 [**get_all_proxy**](ProxyApi.md#get_all_proxy) | **GET** /api/v2/proxy | Get all proxies for a customer
 [**get_proxy**](ProxyApi.md#get_proxy) | **GET** /api/v2/proxy/{id} | Get a specific proxy
+[**get_proxy_config**](ProxyApi.md#get_proxy_config) | **GET** /api/v2/proxy/{id}/config | Get a specific proxy config
+[**get_proxy_preprocessor_rules**](ProxyApi.md#get_proxy_preprocessor_rules) | **GET** /api/v2/proxy/{id}/preprocessorRules | Get a specific proxy preprocessor rules
 [**undelete_proxy**](ProxyApi.md#undelete_proxy) | **POST** /api/v2/proxy/{id}/undelete | Undelete a specific proxy
 [**update_proxy**](ProxyApi.md#update_proxy) | **PUT** /api/v2/proxy/{id} | Update the name of a specific proxy
 
@@ -177,6 +179,114 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_proxy_config**
+> ResponseContainerMap get_proxy_config(id)
+
+Get a specific proxy config
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ProxyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific proxy config
+    api_response = api_instance.get_proxy_config(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ProxyApi->get_proxy_config: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMap**](ResponseContainerMap.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_proxy_preprocessor_rules**
+> ResponseContainerMap get_proxy_preprocessor_rules(id)
+
+Get a specific proxy preprocessor rules
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.ProxyApi(wavefront_api_client.ApiClient(configuration))
+id = 'id_example' # str | 
+
+try:
+    # Get a specific proxy preprocessor rules
+    api_response = api_instance.get_proxy_preprocessor_rules(id)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling ProxyApi->get_proxy_preprocessor_rules: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **id** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMap**](ResponseContainerMap.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **undelete_proxy**
 > ResponseContainerProxy undelete_proxy(id)
 
diff --git a/docs/ResponseContainerMap.md b/docs/ResponseContainerMap.md
new file mode 100644
index 0000000..950a2f6
--- /dev/null
+++ b/docs/ResponseContainerMap.md
@@ -0,0 +1,11 @@
+# ResponseContainerMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | **dict(str, object)** |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index 21f5695..7aa649f 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.172.0"
+VERSION = "2.174.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_logs_table.py b/test/test_logs_table.py
new file mode 100644
index 0000000..963b931
--- /dev/null
+++ b/test/test_logs_table.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.logs_table import LogsTable  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestLogsTable(unittest.TestCase):
+    """LogsTable unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testLogsTable(self):
+        """Test LogsTable"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.logs_table.LogsTable()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_map.py b/test/test_response_container_map.py
new file mode 100644
index 0000000..8056b96
--- /dev/null
+++ b/test/test_response_container_map.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_map import ResponseContainerMap  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerMap(unittest.TestCase):
+    """ResponseContainerMap unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerMap(self):
+        """Test ResponseContainerMap"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_map.ResponseContainerMap()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 009ee05..1dadc76 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -134,6 +134,7 @@
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus
 from wavefront_api_client.models.logical_type import LogicalType
+from wavefront_api_client.models.logs_table import LogsTable
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
 from wavefront_api_client.models.metric_details import MetricDetails
@@ -234,6 +235,7 @@
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
 from wavefront_api_client.models.response_container_list_user_dto import ResponseContainerListUserDTO
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
+from wavefront_api_client.models.response_container_map import ResponseContainerMap
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 5b7acaa..71c10ed 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -322,6 +322,196 @@ def get_proxy_with_http_info(self, id, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_proxy_config(self, id, **kwargs):  # noqa: E501
+        """Get a specific proxy config  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_proxy_config(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMap
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_proxy_config_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_proxy_config_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_proxy_config_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific proxy config  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_proxy_config_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMap
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_proxy_config" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_proxy_config`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/proxy/{id}/config', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMap',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_proxy_preprocessor_rules(self, id, **kwargs):  # noqa: E501
+        """Get a specific proxy preprocessor rules  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_proxy_preprocessor_rules(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMap
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_proxy_preprocessor_rules_with_http_info(id, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_proxy_preprocessor_rules_with_http_info(id, **kwargs)  # noqa: E501
+            return data
+
+    def get_proxy_preprocessor_rules_with_http_info(self, id, **kwargs):  # noqa: E501
+        """Get a specific proxy preprocessor rules  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_proxy_preprocessor_rules_with_http_info(id, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str id: (required)
+        :return: ResponseContainerMap
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['id']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_proxy_preprocessor_rules" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'id' is set
+        if self.api_client.client_side_validation and ('id' not in params or
+                                                       params['id'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `id` when calling `get_proxy_preprocessor_rules`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'id' in params:
+            path_params['id'] = params['id']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/proxy/{id}/preprocessorRules', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMap',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def undelete_proxy(self, id, **kwargs):  # noqa: E501
         """Undelete a specific proxy  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index c258401..0e4cebe 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.172.0/python'
+        self.user_agent = 'Swagger-Codegen/2.174.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 3a49bfd..65f366b 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.172.0".\
+               "SDK Package Version: 2.174.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 1fc550f..e1ed610 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -90,6 +90,7 @@
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus
 from wavefront_api_client.models.logical_type import LogicalType
+from wavefront_api_client.models.logs_table import LogsTable
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
 from wavefront_api_client.models.metric_details import MetricDetails
@@ -190,6 +191,7 @@
 from wavefront_api_client.models.response_container_list_user_api_token import ResponseContainerListUserApiToken
 from wavefront_api_client.models.response_container_list_user_dto import ResponseContainerListUserDTO
 from wavefront_api_client.models.response_container_maintenance_window import ResponseContainerMaintenanceWindow
+from wavefront_api_client.models.response_container_map import ResponseContainerMap
 from wavefront_api_client.models.response_container_map_string_integer import ResponseContainerMapStringInteger
 from wavefront_api_client.models.response_container_map_string_integration_status import ResponseContainerMapStringIntegrationStatus
 from wavefront_api_client.models.response_container_message import ResponseContainerMessage
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index f987f94..9a24515 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -52,6 +52,7 @@ class ChartSettings(object):
         'group_by_source': 'bool',
         'invert_dynamic_legend_hover_control': 'bool',
         'line_type': 'str',
+        'logs_table': 'LogsTable',
         'max': 'float',
         'min': 'float',
         'num_tags': 'int',
@@ -117,6 +118,7 @@ class ChartSettings(object):
         'group_by_source': 'groupBySource',
         'invert_dynamic_legend_hover_control': 'invertDynamicLegendHoverControl',
         'line_type': 'lineType',
+        'logs_table': 'logsTable',
         'max': 'max',
         'min': 'min',
         'num_tags': 'numTags',
@@ -162,7 +164,7 @@ class ChartSettings(object):
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, show_value_column=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, logs_table=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, show_value_column=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -187,6 +189,7 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
         self._group_by_source = None
         self._invert_dynamic_legend_hover_control = None
         self._line_type = None
+        self._logs_table = None
         self._max = None
         self._min = None
         self._num_tags = None
@@ -270,6 +273,8 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
             self.invert_dynamic_legend_hover_control = invert_dynamic_legend_hover_control
         if line_type is not None:
             self.line_type = line_type
+        if logs_table is not None:
+            self.logs_table = logs_table
         if max is not None:
             self.max = max
         if min is not None:
@@ -821,6 +826,27 @@ def line_type(self, line_type):
 
         self._line_type = line_type
 
+    @property
+    def logs_table(self):
+        """Gets the logs_table of this ChartSettings.  # noqa: E501
+
+
+        :return: The logs_table of this ChartSettings.  # noqa: E501
+        :rtype: LogsTable
+        """
+        return self._logs_table
+
+    @logs_table.setter
+    def logs_table(self, logs_table):
+        """Sets the logs_table of this ChartSettings.
+
+
+        :param logs_table: The logs_table of this ChartSettings.  # noqa: E501
+        :type: LogsTable
+        """
+
+        self._logs_table = logs_table
+
     @property
     def max(self):
         """Gets the max of this ChartSettings.  # noqa: E501
diff --git a/wavefront_api_client/models/logs_table.py b/wavefront_api_client/models/logs_table.py
new file mode 100644
index 0000000..5b8a010
--- /dev/null
+++ b/wavefront_api_client/models/logs_table.py
@@ -0,0 +1,123 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class LogsTable(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'columns': 'list[str]'
+    }
+
+    attribute_map = {
+        'columns': 'columns'
+    }
+
+    def __init__(self, columns=None, _configuration=None):  # noqa: E501
+        """LogsTable - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._columns = None
+        self.discriminator = None
+
+        if columns is not None:
+            self.columns = columns
+
+    @property
+    def columns(self):
+        """Gets the columns of this LogsTable.  # noqa: E501
+
+
+        :return: The columns of this LogsTable.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._columns
+
+    @columns.setter
+    def columns(self, columns):
+        """Sets the columns of this LogsTable.
+
+
+        :param columns: The columns of this LogsTable.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._columns = columns
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(LogsTable, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, LogsTable):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, LogsTable):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_map.py b/wavefront_api_client/models/response_container_map.py
new file mode 100644
index 0000000..75c3bd5
--- /dev/null
+++ b/wavefront_api_client/models/response_container_map.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerMap(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'dict(str, object)',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerMap - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerMap.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerMap.  # noqa: E501
+        :rtype: dict(str, object)
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerMap.
+
+
+        :param response: The response of this ResponseContainerMap.  # noqa: E501
+        :type: dict(str, object)
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerMap.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerMap.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerMap.
+
+
+        :param status: The status of this ResponseContainerMap.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerMap, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerMap):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerMap):
+            return True
+
+        return self.to_dict() != other.to_dict()

From 9f19fe89d31e8042e659402b24f32661200aa6c3 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Fri, 17 Mar 2023 08:16:25 -0700
Subject: [PATCH 128/161] Autogenerated Update v2.175.2.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  3 +-
 docs/CloudIntegration.md                      |  1 -
 setup.py                                      |  2 +-
 wavefront_api_client/__init__.py              |  1 -
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 wavefront_api_client/models/__init__.py       |  1 -
 .../models/cloud_integration.py               | 30 ++-----------------
 10 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index e13fc10..99c84f9 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.174.0"
+    "packageVersion": "2.175.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 53e8b23..e13fc10 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.172.0"
+    "packageVersion": "2.174.0"
 }
diff --git a/README.md b/README.md
index 507cd39..7a2476b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.174.0
+- Package version: 2.175.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -736,7 +736,6 @@ Class | Method | HTTP request | Description
  - [Stripe](docs/Stripe.md)
  - [TagsResponse](docs/TagsResponse.md)
  - [TargetInfo](docs/TargetInfo.md)
- - [TeslaConfiguration](docs/TeslaConfiguration.md)
  - [Timeseries](docs/Timeseries.md)
  - [Trace](docs/Trace.md)
  - [TriageDashboard](docs/TriageDashboard.md)
diff --git a/docs/CloudIntegration.md b/docs/CloudIntegration.md
index 60041e8..ef3e10f 100644
--- a/docs/CloudIntegration.md
+++ b/docs/CloudIntegration.md
@@ -33,7 +33,6 @@ Name | Type | Description | Notes
 **service** | **str** | A value denoting which cloud service this integration integrates with | 
 **service_refresh_rate_in_mins** | **int** | Service refresh rate in minutes. | [optional] 
 **snowflake** | [**SnowflakeConfiguration**](SnowflakeConfiguration.md) |  | [optional] 
-**tesla** | [**TeslaConfiguration**](TeslaConfiguration.md) |  | [optional] 
 **updated_epoch_millis** | **int** |  | [optional] 
 **updater_id** | **str** |  | [optional] 
 **vrops** | [**VropsConfiguration**](VropsConfiguration.md) |  | [optional] 
diff --git a/setup.py b/setup.py
index 7aa649f..71c3c50 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.174.0"
+VERSION = "2.175.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 1dadc76..19b4d90 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -329,7 +329,6 @@
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
-from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 0e4cebe..86637de 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.174.0/python'
+        self.user_agent = 'Swagger-Codegen/2.175.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 65f366b..02fe3c2 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.174.0".\
+               "SDK Package Version: 2.175.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index e1ed610..df412de 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -285,7 +285,6 @@
 from wavefront_api_client.models.stripe import Stripe
 from wavefront_api_client.models.tags_response import TagsResponse
 from wavefront_api_client.models.target_info import TargetInfo
-from wavefront_api_client.models.tesla_configuration import TeslaConfiguration
 from wavefront_api_client.models.timeseries import Timeseries
 from wavefront_api_client.models.trace import Trace
 from wavefront_api_client.models.triage_dashboard import TriageDashboard
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index f38f878..86b8d8e 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -63,7 +63,6 @@ class CloudIntegration(object):
         'service': 'str',
         'service_refresh_rate_in_mins': 'int',
         'snowflake': 'SnowflakeConfiguration',
-        'tesla': 'TeslaConfiguration',
         'updated_epoch_millis': 'int',
         'updater_id': 'str',
         'vrops': 'VropsConfiguration'
@@ -100,13 +99,12 @@ class CloudIntegration(object):
         'service': 'service',
         'service_refresh_rate_in_mins': 'serviceRefreshRateInMins',
         'snowflake': 'snowflake',
-        'tesla': 'tesla',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId',
         'vrops': 'vrops'
     }
 
-    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, tesla=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
+    def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_activity_log=None, cloud_trail=None, cloud_watch=None, created_epoch_millis=None, creator_id=None, deleted=None, disabled=None, dynatrace=None, ec2=None, force_save=None, gcp=None, gcp_billing=None, id=None, in_trash=None, last_error=None, last_error_event=None, last_error_ms=None, last_metric_count=None, last_processing_timestamp=None, last_processor_id=None, last_received_data_point_ms=None, name=None, new_relic=None, reuse_external_id_credential=None, service=None, service_refresh_rate_in_mins=None, snowflake=None, updated_epoch_millis=None, updater_id=None, vrops=None, _configuration=None):  # noqa: E501
         """CloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -142,7 +140,6 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
         self._service = None
         self._service_refresh_rate_in_mins = None
         self._snowflake = None
-        self._tesla = None
         self._updated_epoch_millis = None
         self._updater_id = None
         self._vrops = None
@@ -206,8 +203,6 @@ def __init__(self, additional_tags=None, app_dynamics=None, azure=None, azure_ac
             self.service_refresh_rate_in_mins = service_refresh_rate_in_mins
         if snowflake is not None:
             self.snowflake = snowflake
-        if tesla is not None:
-            self.tesla = tesla
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
@@ -824,7 +819,7 @@ def service(self, service):
         """
         if self._configuration.client_side_validation and service is None:
             raise ValueError("Invalid value for `service`, must not be `None`")  # noqa: E501
-        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "TESLA", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
+        allowed_values = ["CLOUDWATCH", "CLOUDTRAIL", "EC2", "GCP", "GCPBILLING", "AZURE", "AZUREACTIVITYLOG", "NEWRELIC", "APPDYNAMICS", "VROPS", "SNOWFLAKE", "DYNATRACE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 service not in allowed_values):
             raise ValueError(
@@ -878,27 +873,6 @@ def snowflake(self, snowflake):
 
         self._snowflake = snowflake
 
-    @property
-    def tesla(self):
-        """Gets the tesla of this CloudIntegration.  # noqa: E501
-
-
-        :return: The tesla of this CloudIntegration.  # noqa: E501
-        :rtype: TeslaConfiguration
-        """
-        return self._tesla
-
-    @tesla.setter
-    def tesla(self, tesla):
-        """Sets the tesla of this CloudIntegration.
-
-
-        :param tesla: The tesla of this CloudIntegration.  # noqa: E501
-        :type: TeslaConfiguration
-        """
-
-        self._tesla = tesla
-
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this CloudIntegration.  # noqa: E501

From 5802db5a6547a68cb6b25c52638b09c05327263b Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 21 Mar 2023 11:30:48 -0700
Subject: [PATCH 129/161] Regenerated Update v2.176.0 (#64)

* Autogenerated Update v2.176.0.
* Ignore Temp Files.
* Update GitHub Actions
* Install Package in Editable Mode
* Update Workflow Structure
* Fix Typo
---
 .github/workflows/build.yml                   |  28 +
 .github/workflows/package.yml                 |  21 +
 .github/workflows/publish_on_merge.yml        |  18 +
 .github/workflows/publish_on_release.yml      |  18 +
 .github/workflows/python-build.yml            |  27 -
 .github/workflows/python-release.yml          |  34 -
 .gitignore                                    |   4 +
 .swagger-codegen/VERSION                      |   2 +-
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   2 +-
 docs/ACL.md                                   |  12 -
 docs/AccountServiceAccountApi.md              | 336 --------
 docs/AnomalyApi.md                            | 390 ----------
 docs/AvroBackedStandardizedDTO.md             |  15 -
 docs/BusinessActionGroupBasicDTO.md           |  13 -
 docs/ChartSettings.md                         |   4 +-
 docs/ComponentStatus.md                       |  12 -
 docs/CustomerPreferences.md                   |  25 -
 docs/CustomerPreferencesUpdating.md           |  16 -
 docs/IngestionPolicy.md                       |  27 -
 docs/IngestionPolicyMapping.md                |  12 -
 docs/Iterable.md                              |   9 -
 docs/IteratorEntryStringJsonNode.md           |   9 -
 docs/IteratorJsonNode.md                      |   9 -
 docs/IteratorString.md                        |   9 -
 docs/MonitoredClusterApi.md                   | 570 --------------
 docs/Number.md                                |   9 -
 docs/PagedIngestionPolicy.md                  |  16 -
 docs/PagedUserGroup.md                        |  16 -
 docs/ResponseContainerIngestionPolicy.md      |  11 -
 docs/ResponseContainerListACL.md              |  11 -
 docs/ResponseContainerListUserGroup.md        |  11 -
 docs/ResponseContainerListUserGroupModel.md   |  11 -
 docs/ResponseContainerPagedIngestionPolicy.md |  11 -
 docs/ResponseContainerPagedUserGroup.md       |  11 -
 docs/ResponseContainerUserGroup.md            |  11 -
 docs/ResponseContainerUserHardDelete.md       |  11 -
 docs/SettingsApi.md                           | 220 ------
 docs/StatsModel.md                            |  24 -
 docs/TeslaConfiguration.md                    |  10 -
 docs/Tuple.md                                 |  10 -
 docs/User.md                                  |  32 -
 docs/UserGroupWrite.md                        |   2 +-
 docs/UserHardDelete.md                        |  12 -
 docs/UserSettings.md                          |  21 -
 generate_client                               |   2 +-
 requirements.txt                              |   5 -
 setup.py                                      |   2 +-
 test/test_access_control_element.py           |   4 +-
 test/test_access_control_list_read_dto.py     |   4 +-
 test/test_access_control_list_simple.py       |   4 +-
 test/test_access_control_list_write_dto.py    |   4 +-
 test/test_access_policy.py                    |   4 +-
 test/test_access_policy_api.py                |   4 +-
 test/test_access_policy_rule_dto.py           |   4 +-
 test/test_account.py                          |   4 +-
 ...t_account__user_and_service_account_api.py |  35 +-
 test/test_alert.py                            |   4 +-
 test/test_alert_analytics_api.py              |   2 +-
 test/test_alert_api.py                        |  18 +-
 test/test_alert_dashboard.py                  |   4 +-
 test/test_alert_min.py                        |   4 +-
 test/test_alert_route.py                      |   4 +-
 test/test_alert_source.py                     |   4 +-
 test/test_annotation.py                       |   4 +-
 test/test_anomaly.py                          |   4 +-
 test/test_anomaly_api.py                      |  76 --
 test/test_api_token_api.py                    |  25 +-
 test/test_api_token_model.py                  |   2 +-
 test/test_app_dynamics_configuration.py       |   4 +-
 test/test_app_search_filter.py                |   2 +-
 test/test_app_search_filter_value.py          |   2 +-
 test/test_app_search_filters.py               |   2 +-
 test/test_avro_backed_standardized_dto.py     |  40 -
 test/test_aws_base_credentials.py             |   4 +-
 test/test_azure_activity_log_configuration.py |   4 +-
 test/test_azure_base_credentials.py           |   4 +-
 test/test_azure_configuration.py              |   4 +-
 test/test_chart.py                            |   4 +-
 test/test_chart_settings.py                   |   4 +-
 test/test_chart_source_query.py               |   4 +-
 test/test_class_loader.py                     |   4 +-
 test/test_cloud_integration.py                |   4 +-
 test/test_cloud_integration_api.py            |   4 +-
 test/test_cloud_trail_configuration.py        |   4 +-
 test/test_cloud_watch_configuration.py        |   4 +-
 test/test_conversion.py                       |   4 +-
 test/test_conversion_object.py                |   4 +-
 test/test_customer_facing_user_object.py      |   4 +-
 test/test_dashboard.py                        |   4 +-
 test/test_dashboard_api.py                    |   4 +-
 test/test_dashboard_min.py                    |   4 +-
 test/test_dashboard_parameter_value.py        |   4 +-
 test/test_dashboard_section.py                |   4 +-
 test/test_dashboard_section_row.py            |   4 +-
 test/test_default_saved_app_map_search.py     |   2 +-
 test/test_default_saved_traces_search.py      |   2 +-
 test/test_derived_metric_api.py               |   4 +-
 test/test_derived_metric_definition.py        |   4 +-
 test/test_direct_ingestion_api.py             |   4 +-
 test/test_dynatrace_configuration.py          |   4 +-
 test/test_ec2_configuration.py                |   4 +-
 test/test_event.py                            |   4 +-
 test/test_event_api.py                        |  20 +-
 test/test_event_search_request.py             |   4 +-
 test/test_event_time_range.py                 |   4 +-
 test/test_external_link.py                    |   4 +-
 test/test_external_link_api.py                |   4 +-
 test/test_facet_response.py                   |   4 +-
 test/test_facet_search_request_container.py   |   4 +-
 test/test_facets_response_container.py        |   4 +-
 test/test_facets_search_request_container.py  |   4 +-
 test/test_fast_reader_builder.py              |   4 +-
 test/test_field.py                            |   4 +-
 test/test_gcp_billing_configuration.py        |   4 +-
 test/test_gcp_configuration.py                |   4 +-
 test/test_global_alert_analytic.py            |   2 +-
 test/test_history_entry.py                    |   4 +-
 test/test_history_response.py                 |   4 +-
 test/test_ingestion_policy.py                 |  40 -
 test/test_ingestion_policy_mapping.py         |  40 -
 test/test_ingestion_policy_metadata.py        |   2 +-
 test/test_ingestion_policy_read_model.py      |   2 +-
 test/test_ingestion_policy_write_model.py     |   2 +-
 test/test_ingestion_spy_api.py                |   4 +-
 test/test_install_alerts.py                   |   4 +-
 test/test_integration.py                      |   4 +-
 test/test_integration_alert.py                |   4 +-
 test/test_integration_alias.py                |   4 +-
 test/test_integration_api.py                  |   4 +-
 test/test_integration_dashboard.py            |   4 +-
 test/test_integration_manifest_group.py       |   4 +-
 test/test_integration_metrics.py              |   4 +-
 test/test_integration_status.py               |   4 +-
 test/test_json_node.py                        |   4 +-
 test/test_kubernetes_component.py             |   4 +-
 test/test_kubernetes_component_status.py      |   4 +-
 test/test_logical_type.py                     |   4 +-
 test/test_maintenance_window.py               |   4 +-
 test/test_maintenance_window_api.py           |   4 +-
 test/test_message.py                          |   4 +-
 test/test_message_api.py                      |   4 +-
 test/test_metric_api.py                       |   4 +-
 test/test_metric_details.py                   |   4 +-
 test/test_metric_details_response.py          |   4 +-
 test/test_metric_status.py                    |   4 +-
 test/test_metrics_policy_api.py               |   4 +-
 test/test_metrics_policy_read_model.py        |   4 +-
 test/test_metrics_policy_write_model.py       |   4 +-
 test/test_module.py                           |   4 +-
 test/test_module_descriptor.py                |   4 +-
 test/test_module_layer.py                     |   4 +-
 test/test_monitored_application_api.py        |   4 +-
 test/test_monitored_application_dto.py        |   4 +-
 test/test_monitored_cluster.py                |   4 +-
 test/test_monitored_service_api.py            |  25 +-
 test/test_monitored_service_dto.py            |   4 +-
 test/test_new_relic_configuration.py          |   4 +-
 test/test_new_relic_metric_filters.py         |   4 +-
 test/test_notificant.py                       |   4 +-
 test/test_notificant_api.py                   |   4 +-
 test/test_notification_messages.py            |   4 +-
 test/test_package.py                          |   4 +-
 test/test_paged.py                            |   4 +-
 test/test_paged_account.py                    |   4 +-
 test/test_paged_alert.py                      |   4 +-
 test/test_paged_alert_with_stats.py           |   4 +-
 test/test_paged_anomaly.py                    |   4 +-
 test/test_paged_api_token_model.py            |   2 +-
 test/test_paged_cloud_integration.py          |   4 +-
 .../test_paged_customer_facing_user_object.py |   4 +-
 test/test_paged_dashboard.py                  |   4 +-
 test/test_paged_derived_metric_definition.py  |   4 +-
 ...ed_derived_metric_definition_with_stats.py |   4 +-
 test/test_paged_event.py                      |   4 +-
 test/test_paged_external_link.py              |   4 +-
 test/test_paged_ingestion_policy.py           |  40 -
 .../test_paged_ingestion_policy_read_model.py |   2 +-
 test/test_paged_integration.py                |   4 +-
 test/test_paged_maintenance_window.py         |   4 +-
 test/test_paged_message.py                    |   4 +-
 test/test_paged_monitored_application_dto.py  |   4 +-
 test/test_paged_monitored_cluster.py          |   4 +-
 test/test_paged_monitored_service_dto.py      |   4 +-
 test/test_paged_notificant.py                 |   4 +-
 test/test_paged_proxy.py                      |   4 +-
 test/test_paged_recent_app_map_search.py      |   2 +-
 test/test_paged_recent_traces_search.py       |   2 +-
 test/test_paged_related_event.py              |   4 +-
 test/test_paged_report_event_anomaly_dto.py   |   4 +-
 test/test_paged_role_dto.py                   |   4 +-
 test/test_paged_saved_app_map_search.py       |   2 +-
 test/test_paged_saved_app_map_search_group.py |   2 +-
 test/test_paged_saved_search.py               |   4 +-
 test/test_paged_saved_traces_search.py        |   2 +-
 test/test_paged_saved_traces_search_group.py  |   2 +-
 test/test_paged_service_account.py            |   4 +-
 test/test_paged_source.py                     |   4 +-
 test/test_paged_span_sampling_policy.py       |   4 +-
 test/test_paged_user_group_model.py           |   4 +-
 test/test_point.py                            |   4 +-
 test/test_policy_rule_read_model.py           |   4 +-
 test/test_policy_rule_write_model.py          |   4 +-
 test/test_proxy.py                            |   4 +-
 test/test_proxy_api.py                        |  18 +-
 test/test_query_api.py                        |   4 +-
 test/test_query_event.py                      |   4 +-
 test/test_query_result.py                     |   4 +-
 test/test_query_type_dto.py                   |   4 +-
 test/test_raw_timeseries.py                   |   4 +-
 test/test_recent_app_map_search.py            |   2 +-
 test/test_recent_app_map_search_api.py        |   2 +-
 test/test_recent_traces_search.py             |   2 +-
 test/test_recent_traces_search_api.py         |   2 +-
 test/test_related_anomaly.py                  |   4 +-
 test/test_related_data.py                     |   4 +-
 test/test_related_event.py                    |   4 +-
 test/test_related_event_time_range.py         |   4 +-
 test/test_report_event_anomaly_dto.py         |   4 +-
 test/test_response_container.py               |   4 +-
 test/test_response_container_access_policy.py |   4 +-
 ...response_container_access_policy_action.py |   4 +-
 test/test_response_container_account.py       |   4 +-
 test/test_response_container_alert.py         |   4 +-
 ...test_response_container_api_token_model.py |   2 +-
 ...st_response_container_cloud_integration.py |   4 +-
 test/test_response_container_dashboard.py     |   4 +-
 ..._container_default_saved_app_map_search.py |   2 +-
 ...e_container_default_saved_traces_search.py |   2 +-
 ...nse_container_derived_metric_definition.py |   4 +-
 test/test_response_container_event.py         |   4 +-
 test/test_response_container_external_link.py |   4 +-
 .../test_response_container_facet_response.py |   4 +-
 ...nse_container_facets_response_container.py |   4 +-
 ...esponse_container_global_alert_analytic.py |   2 +-
 ...est_response_container_history_response.py |   4 +-
 ...est_response_container_ingestion_policy.py |  40 -
 ...e_container_ingestion_policy_read_model.py |   2 +-
 test/test_response_container_integration.py   |   4 +-
 ...t_response_container_integration_status.py |   4 +-
 ...ainer_list_access_control_list_read_dto.py |   4 +-
 ...response_container_list_api_token_model.py |   2 +-
 ...est_response_container_list_integration.py |   4 +-
 ...ntainer_list_integration_manifest_group.py |   4 +-
 ...se_container_list_notification_messages.py |   4 +-
 ...response_container_list_service_account.py |   4 +-
 test/test_response_container_list_string.py   |   4 +-
 ..._response_container_list_user_api_token.py |   4 +-
 test/test_response_container_list_user_dto.py |   2 +-
 ...t_response_container_maintenance_window.py |   4 +-
 ...t_response_container_map_string_integer.py |   4 +-
 ...container_map_string_integration_status.py |   4 +-
 test/test_response_container_message.py       |   4 +-
 ...nse_container_metrics_policy_read_model.py |   4 +-
 ...nse_container_monitored_application_dto.py |   4 +-
 ...st_response_container_monitored_cluster.py |   4 +-
 ...esponse_container_monitored_service_dto.py |   4 +-
 test/test_response_container_notificant.py    |   4 +-
 test/test_response_container_paged_account.py |   4 +-
 test/test_response_container_paged_alert.py   |   4 +-
 ...sponse_container_paged_alert_with_stats.py |   4 +-
 test/test_response_container_paged_anomaly.py |   4 +-
 ...esponse_container_paged_api_token_model.py |   2 +-
 ...ponse_container_paged_cloud_integration.py |   4 +-
 ...ainer_paged_customer_facing_user_object.py |   4 +-
 ...test_response_container_paged_dashboard.py |   4 +-
 ...ntainer_paged_derived_metric_definition.py |   4 +-
 ...ed_derived_metric_definition_with_stats.py |   4 +-
 test/test_response_container_paged_event.py   |   4 +-
 ..._response_container_paged_external_link.py |   4 +-
 ...sponse_container_paged_ingestion_policy.py |  40 -
 ...ainer_paged_ingestion_policy_read_model.py |   2 +-
 ...st_response_container_paged_integration.py |   4 +-
 ...onse_container_paged_maintenance_window.py |   4 +-
 test/test_response_container_paged_message.py |   4 +-
 ...ntainer_paged_monitored_application_dto.py |   4 +-
 ...ponse_container_paged_monitored_cluster.py |   4 +-
 ...e_container_paged_monitored_service_dto.py |   4 +-
 ...est_response_container_paged_notificant.py |   4 +-
 test/test_response_container_paged_proxy.py   |   4 +-
 ...e_container_paged_recent_app_map_search.py |   2 +-
 ...se_container_paged_recent_traces_search.py |   2 +-
 ..._response_container_paged_related_event.py |   4 +-
 ...ontainer_paged_report_event_anomaly_dto.py |   4 +-
 .../test_response_container_paged_role_dto.py |   4 +-
 ...se_container_paged_saved_app_map_search.py |   2 +-
 ...tainer_paged_saved_app_map_search_group.py |   2 +-
 ...t_response_container_paged_saved_search.py |   4 +-
 ...nse_container_paged_saved_traces_search.py |   2 +-
 ...ntainer_paged_saved_traces_search_group.py |   2 +-
 ...esponse_container_paged_service_account.py |   4 +-
 test/test_response_container_paged_source.py  |   4 +-
 ...se_container_paged_span_sampling_policy.py |   4 +-
 ...sponse_container_paged_user_group_model.py |   4 +-
 test/test_response_container_proxy.py         |   4 +-
 .../test_response_container_query_type_dto.py |   4 +-
 ...esponse_container_recent_app_map_search.py |   2 +-
 ...response_container_recent_traces_search.py |   2 +-
 test/test_response_container_role_dto.py      |   4 +-
 ...response_container_saved_app_map_search.py |   2 +-
 ...se_container_saved_app_map_search_group.py |   2 +-
 test/test_response_container_saved_search.py  |   4 +-
 ..._response_container_saved_traces_search.py |   2 +-
 ...nse_container_saved_traces_search_group.py |   2 +-
 ...test_response_container_service_account.py |   4 +-
 ...esponse_container_set_business_function.py |   4 +-
 ...esponse_container_set_source_label_pair.py |   4 +-
 test/test_response_container_source.py        |   4 +-
 ...response_container_span_sampling_policy.py |   4 +-
 test/test_response_container_string.py        |   4 +-
 test/test_response_container_tags_response.py |   4 +-
 .../test_response_container_user_api_token.py |   4 +-
 test/test_response_container_user_dto.py      |   4 +-
 ...est_response_container_user_group_model.py |   4 +-
 ..._response_container_validated_users_dto.py |   4 +-
 test/test_response_container_void.py          |   4 +-
 test/test_response_status.py                  |   4 +-
 test/test_role_api.py                         |  22 +-
 test/test_role_dto.py                         |   4 +-
 test/test_role_properties_dto.py              |   2 +-
 test/test_saved_app_map_search.py             |   2 +-
 test/test_saved_app_map_search_api.py         |  23 +-
 test/test_saved_app_map_search_group.py       |   2 +-
 test/test_saved_app_map_search_group_api.py   |   2 +-
 test/test_saved_search.py                     |   4 +-
 test/test_saved_search_api.py                 |   4 +-
 test/test_saved_traces_search.py              |   2 +-
 test/test_saved_traces_search_api.py          |  23 +-
 test/test_saved_traces_search_group.py        |   2 +-
 test/test_saved_traces_search_group_api.py    |   2 +-
 test/test_schema.py                           |   4 +-
 test/test_search_api.py                       | 109 ++-
 test/test_search_query.py                     |   4 +-
 test/test_service_account.py                  |   4 +-
 test/test_service_account_write.py            |   4 +-
 test/test_setup.py                            |   2 +-
 test/test_snowflake_configuration.py          |   4 +-
 test/test_sortable_search_request.py          |   4 +-
 test/test_sorting.py                          |   4 +-
 test/test_source.py                           |   4 +-
 test/test_source_api.py                       |   4 +-
 test/test_source_label_pair.py                |   4 +-
 test/test_source_search_request_container.py  |   4 +-
 test/test_span.py                             |   4 +-
 test/test_span_sampling_policy.py             |   4 +-
 test/test_span_sampling_policy_api.py         |   4 +-
 test/test_specific_data.py                    |   4 +-
 test/test_stats_model_internal_use.py         |   4 +-
 test/test_stripe.py                           |   4 +-
 test/test_tags_response.py                    |   4 +-
 test/test_target_info.py                      |   4 +-
 test/test_tesla_configuration.py              |  40 -
 test/test_timeseries.py                       |   4 +-
 test/test_trace.py                            |   4 +-
 test/test_triage_dashboard.py                 |   4 +-
 test/test_tuple.py                            |  40 -
 test/test_tuple_result.py                     |   4 +-
 test/test_tuple_value_result.py               |   4 +-
 test/test_usage_api.py                        |  25 +-
 test/test_user_api.py                         |  14 +-
 test/test_user_api_token.py                   |   4 +-
 test/test_user_dto.py                         |   4 +-
 test/test_user_group.py                       |   4 +-
 test/test_user_group_api.py                   |   4 +-
 test/test_user_group_model.py                 |   4 +-
 test/test_user_group_properties_dto.py        |   4 +-
 test/test_user_group_write.py                 |   4 +-
 test/test_user_model.py                       |   4 +-
 test/test_user_request_dto.py                 |   4 +-
 test/test_user_to_create.py                   |   4 +-
 test/test_validated_users_dto.py              |   4 +-
 test/test_void.py                             |   4 +-
 test/test_vrops_configuration.py              |   4 +-
 test/test_webhook_api.py                      |   4 +-
 test/test_wf_tags.py                          |   4 +-
 wavefront_api_client/api/anomaly_api.py       | 720 ------------------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 .../models/avro_backed_standardized_dto.py    | 245 ------
 wavefront_api_client/models/chart_settings.py |  58 +-
 .../models/ingestion_policy.py                | 608 ---------------
 .../models/ingestion_policy_mapping.py        | 182 -----
 .../models/paged_ingestion_policy.py          | 287 -------
 .../response_container_ingestion_policy.py    | 150 ----
 ...sponse_container_paged_ingestion_policy.py | 150 ----
 .../models/tesla_configuration.py             | 126 ---
 wavefront_api_client/models/tuple.py          | 123 ---
 .../models/user_group_write.py                |  32 +-
 389 files changed, 999 insertions(+), 5654 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/package.yml
 create mode 100644 .github/workflows/publish_on_merge.yml
 create mode 100644 .github/workflows/publish_on_release.yml
 delete mode 100644 .github/workflows/python-build.yml
 delete mode 100644 .github/workflows/python-release.yml
 delete mode 100644 docs/ACL.md
 delete mode 100644 docs/AccountServiceAccountApi.md
 delete mode 100644 docs/AnomalyApi.md
 delete mode 100644 docs/AvroBackedStandardizedDTO.md
 delete mode 100644 docs/BusinessActionGroupBasicDTO.md
 delete mode 100644 docs/ComponentStatus.md
 delete mode 100644 docs/CustomerPreferences.md
 delete mode 100644 docs/CustomerPreferencesUpdating.md
 delete mode 100644 docs/IngestionPolicy.md
 delete mode 100644 docs/IngestionPolicyMapping.md
 delete mode 100644 docs/Iterable.md
 delete mode 100644 docs/IteratorEntryStringJsonNode.md
 delete mode 100644 docs/IteratorJsonNode.md
 delete mode 100644 docs/IteratorString.md
 delete mode 100644 docs/MonitoredClusterApi.md
 delete mode 100644 docs/Number.md
 delete mode 100644 docs/PagedIngestionPolicy.md
 delete mode 100644 docs/PagedUserGroup.md
 delete mode 100644 docs/ResponseContainerIngestionPolicy.md
 delete mode 100644 docs/ResponseContainerListACL.md
 delete mode 100644 docs/ResponseContainerListUserGroup.md
 delete mode 100644 docs/ResponseContainerListUserGroupModel.md
 delete mode 100644 docs/ResponseContainerPagedIngestionPolicy.md
 delete mode 100644 docs/ResponseContainerPagedUserGroup.md
 delete mode 100644 docs/ResponseContainerUserGroup.md
 delete mode 100644 docs/ResponseContainerUserHardDelete.md
 delete mode 100644 docs/SettingsApi.md
 delete mode 100644 docs/StatsModel.md
 delete mode 100644 docs/TeslaConfiguration.md
 delete mode 100644 docs/Tuple.md
 delete mode 100644 docs/User.md
 delete mode 100644 docs/UserHardDelete.md
 delete mode 100644 docs/UserSettings.md
 delete mode 100644 requirements.txt
 delete mode 100644 test/test_anomaly_api.py
 delete mode 100644 test/test_avro_backed_standardized_dto.py
 delete mode 100644 test/test_ingestion_policy.py
 delete mode 100644 test/test_ingestion_policy_mapping.py
 delete mode 100644 test/test_paged_ingestion_policy.py
 delete mode 100644 test/test_response_container_ingestion_policy.py
 delete mode 100644 test/test_response_container_paged_ingestion_policy.py
 delete mode 100644 test/test_tesla_configuration.py
 delete mode 100644 test/test_tuple.py
 delete mode 100644 wavefront_api_client/api/anomaly_api.py
 delete mode 100644 wavefront_api_client/models/avro_backed_standardized_dto.py
 delete mode 100644 wavefront_api_client/models/ingestion_policy.py
 delete mode 100644 wavefront_api_client/models/ingestion_policy_mapping.py
 delete mode 100644 wavefront_api_client/models/paged_ingestion_policy.py
 delete mode 100644 wavefront_api_client/models/response_container_ingestion_policy.py
 delete mode 100644 wavefront_api_client/models/response_container_paged_ingestion_policy.py
 delete mode 100644 wavefront_api_client/models/tesla_configuration.py
 delete mode 100644 wavefront_api_client/models/tuple.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..ee6280f
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,28 @@
+name: Build and Run Unit Tests.
+
+on:
+  push:
+  pull_request:
+    branches: 
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          check-latest: true
+          python-version: ${{ matrix.python-version }}
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          python -m pip install --upgrade --editable .
+      - name: Test
+        run: python -m unittest discover
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
new file mode 100644
index 0000000..8532b30
--- /dev/null
+++ b/.github/workflows/package.yml
@@ -0,0 +1,21 @@
+name: Prepare Package for Publishing on PyPI
+
+on:
+  workflow_call:
+
+jobs:
+  package:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          check-latest: true
+          python-version: '3.x'
+      - name: Install Dependencies
+        run: |
+          python -m pip install -U pip setuptools wheel
+          python -m pip install -U build
+      - name: Build Package
+        run: python -m build
diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
new file mode 100644
index 0000000..8a294bc
--- /dev/null
+++ b/.github/workflows/publish_on_merge.yml
@@ -0,0 +1,18 @@
+name: Publish to Test PyPI
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Prepare the Package
+        uses: ./.github/workflows/package.yml
+      - name: Publish the Package on TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          repository-url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
new file mode 100644
index 0000000..0797f94
--- /dev/null
+++ b/.github/workflows/publish_on_release.yml
@@ -0,0 +1,18 @@
+name: Publish to PyPI
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Prepare the Package
+        uses: ./.github/workflows/package.yml
+      - name: Publish the Package
+        if: startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml
deleted file mode 100644
index 7f0a2e8..0000000
--- a/.github/workflows/python-build.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Build and Run Unit Tests.
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools wheel
-        python -m pip install -r requirements.txt
-    - name: Test 
-      run: python -m unittest discover
diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml
deleted file mode 100644
index ed8f6f2..0000000
--- a/.github/workflows/python-release.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Build and Publish to PyPI
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.10'
-    - name: Install Dependencies
-      run: |
-        python -m pip install -U pip setuptools wheel
-        python -m pip install -U build
-    - name: Build Package
-      run: python -m build
-
-    - name: Publish Package to TestPypi
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
-
-    - name: Publish package
-      if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.gitignore b/.gitignore
index a655050..1cd84f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,7 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# Other
+.DS_Store
+*.swp
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index d32233f..96ab4a5 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.27
\ No newline at end of file
+2.4.30
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 99c84f9..33272c6 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.175.2"
+    "packageVersion": "2.176.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index e13fc10..99c84f9 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.174.0"
+    "packageVersion": "2.175.2"
 }
diff --git a/README.md b/README.md
index 7a2476b..0a07146 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.175.2
+- Package version: 2.176.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/ACL.md b/docs/ACL.md
deleted file mode 100644
index f3bbcce..0000000
--- a/docs/ACL.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# ACL
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**entity_id** | **str** | The entity Id | 
-**modify_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user groups ids that have modify permission | 
-**view_acl** | [**list[AccessControlElement]**](AccessControlElement.md) | List of users and user group ids that have view permission | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/AccountServiceAccountApi.md b/docs/AccountServiceAccountApi.md
deleted file mode 100644
index 9e93175..0000000
--- a/docs/AccountServiceAccountApi.md
+++ /dev/null
@@ -1,336 +0,0 @@
-# wavefront_api_client.AccountServiceAccountApi
-
-All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**activate_account**](AccountServiceAccountApi.md#activate_account) | **POST** /api/v2/account/serviceaccount/{id}/activate | Activates the given service account
-[**create_service_account**](AccountServiceAccountApi.md#create_service_account) | **POST** /api/v2/account/serviceaccount | Creates a service account
-[**deactivate_account**](AccountServiceAccountApi.md#deactivate_account) | **POST** /api/v2/account/serviceaccount/{id}/deactivate | Deactivates the given service account
-[**get_all_service_accounts**](AccountServiceAccountApi.md#get_all_service_accounts) | **GET** /api/v2/account/serviceaccount | Get all service accounts
-[**get_service_account**](AccountServiceAccountApi.md#get_service_account) | **GET** /api/v2/account/serviceaccount/{id} | Retrieves a service account by identifier
-[**update_service_account**](AccountServiceAccountApi.md#update_service_account) | **PUT** /api/v2/account/serviceaccount/{id} | Updates the service account
-
-
-# **activate_account**
-> ResponseContainerServiceAccount activate_account(id)
-
-Activates the given service account
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Activates the given service account
-    api_response = api_instance.activate_account(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->activate_account: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **create_service_account**
-> ResponseContainerServiceAccount create_service_account(body=body)
-
-Creates a service account
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.ServiceAccountWrite() # ServiceAccountWrite |  (optional)
-
-try:
-    # Creates a service account
-    api_response = api_instance.create_service_account(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->create_service_account: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**ServiceAccountWrite**](ServiceAccountWrite.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **deactivate_account**
-> ResponseContainerServiceAccount deactivate_account(id)
-
-Deactivates the given service account
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Deactivates the given service account
-    api_response = api_instance.deactivate_account(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->deactivate_account: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_all_service_accounts**
-> ResponseContainerListServiceAccount get_all_service_accounts()
-
-Get all service accounts
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-
-try:
-    # Get all service accounts
-    api_response = api_instance.get_all_service_accounts()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->get_all_service_accounts: %s\n" % e)
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**ResponseContainerListServiceAccount**](ResponseContainerListServiceAccount.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_service_account**
-> ResponseContainerServiceAccount get_service_account(id)
-
-Retrieves a service account by identifier
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Retrieves a service account by identifier
-    api_response = api_instance.get_service_account(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->get_service_account: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **update_service_account**
-> ResponseContainerServiceAccount update_service_account(id, body=body)
-
-Updates the service account
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AccountServiceAccountApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = wavefront_api_client.ServiceAccountWrite() # ServiceAccountWrite |  (optional)
-
-try:
-    # Updates the service account
-    api_response = api_instance.update_service_account(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AccountServiceAccountApi->update_service_account: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | [**ServiceAccountWrite**](ServiceAccountWrite.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerServiceAccount**](ResponseContainerServiceAccount.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/AnomalyApi.md b/docs/AnomalyApi.md
deleted file mode 100644
index 9c5652e..0000000
--- a/docs/AnomalyApi.md
+++ /dev/null
@@ -1,390 +0,0 @@
-# wavefront_api_client.AnomalyApi
-
-All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**get_all_anomalies**](AnomalyApi.md#get_all_anomalies) | **GET** /api/v2/anomaly | Get all anomalies for a customer during a time interval
-[**get_anomalies_for_chart_and_param_hash**](AnomalyApi.md#get_anomalies_for_chart_and_param_hash) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash} | Get all anomalies for a chart with a set of dashboard parameters during a time interval
-[**get_chart_anomalies_for_chart**](AnomalyApi.md#get_chart_anomalies_for_chart) | **GET** /api/v2/anomaly/{dashboardId}/chart/{chartHash} | Get all anomalies for a chart during a time interval
-[**get_chart_anomalies_of_one_dashboard**](AnomalyApi.md#get_chart_anomalies_of_one_dashboard) | **GET** /api/v2/anomaly/{dashboardId} | Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-[**get_dashboard_anomalies**](AnomalyApi.md#get_dashboard_anomalies) | **GET** /api/v2/anomaly/{dashboardId}/{paramHash} | Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
-[**get_related_anomalies**](AnomalyApi.md#get_related_anomalies) | **GET** /api/v2/anomaly/{eventId}/anomalies | Get all related anomalies for a firing event with a time span
-
-
-# **get_all_anomalies**
-> ResponseContainerPagedAnomaly get_all_anomalies(start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-
-Get all anomalies for a customer during a time interval
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
-start_ms = 789 # int |  (optional)
-end_ms = 789 # int |  (optional)
-offset = 0 # int |  (optional) (default to 0)
-limit = 1000 # int |  (optional) (default to 1000)
-
-try:
-    # Get all anomalies for a customer during a time interval
-    api_response = api_instance.get_all_anomalies(start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AnomalyApi->get_all_anomalies: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **start_ms** | **int**|  | [optional] 
- **end_ms** | **int**|  | [optional] 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 1000]
-
-### Return type
-
-[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_anomalies_for_chart_and_param_hash**
-> ResponseContainerPagedAnomaly get_anomalies_for_chart_and_param_hash(dashboard_id, chart_hash, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-
-Get all anomalies for a chart with a set of dashboard parameters during a time interval
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
-dashboard_id = 'dashboard_id_example' # str | 
-chart_hash = 'chart_hash_example' # str | 
-param_hash = 'param_hash_example' # str | 
-start_ms = 789 # int |  (optional)
-end_ms = 789 # int |  (optional)
-offset = 0 # int |  (optional) (default to 0)
-limit = 1000 # int |  (optional) (default to 1000)
-
-try:
-    # Get all anomalies for a chart with a set of dashboard parameters during a time interval
-    api_response = api_instance.get_anomalies_for_chart_and_param_hash(dashboard_id, chart_hash, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AnomalyApi->get_anomalies_for_chart_and_param_hash: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **dashboard_id** | **str**|  | 
- **chart_hash** | **str**|  | 
- **param_hash** | **str**|  | 
- **start_ms** | **int**|  | [optional] 
- **end_ms** | **int**|  | [optional] 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 1000]
-
-### Return type
-
-[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_chart_anomalies_for_chart**
-> ResponseContainerPagedAnomaly get_chart_anomalies_for_chart(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-
-Get all anomalies for a chart during a time interval
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
-dashboard_id = 'dashboard_id_example' # str | 
-chart_hash = 'chart_hash_example' # str | 
-start_ms = 789 # int |  (optional)
-end_ms = 789 # int |  (optional)
-offset = 0 # int |  (optional) (default to 0)
-limit = 1000 # int |  (optional) (default to 1000)
-
-try:
-    # Get all anomalies for a chart during a time interval
-    api_response = api_instance.get_chart_anomalies_for_chart(dashboard_id, chart_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AnomalyApi->get_chart_anomalies_for_chart: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **dashboard_id** | **str**|  | 
- **chart_hash** | **str**|  | 
- **start_ms** | **int**|  | [optional] 
- **end_ms** | **int**|  | [optional] 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 1000]
-
-### Return type
-
-[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_chart_anomalies_of_one_dashboard**
-> ResponseContainerPagedAnomaly get_chart_anomalies_of_one_dashboard(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-
-Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
-dashboard_id = 'dashboard_id_example' # str | 
-start_ms = 789 # int |  (optional)
-end_ms = 789 # int |  (optional)
-offset = 0 # int |  (optional) (default to 0)
-limit = 1000 # int |  (optional) (default to 1000)
-
-try:
-    # Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval
-    api_response = api_instance.get_chart_anomalies_of_one_dashboard(dashboard_id, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AnomalyApi->get_chart_anomalies_of_one_dashboard: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **dashboard_id** | **str**|  | 
- **start_ms** | **int**|  | [optional] 
- **end_ms** | **int**|  | [optional] 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 1000]
-
-### Return type
-
-[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_dashboard_anomalies**
-> ResponseContainerPagedAnomaly get_dashboard_anomalies(dashboard_id, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-
-Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
-dashboard_id = 'dashboard_id_example' # str | 
-param_hash = 'param_hash_example' # str | 
-start_ms = 789 # int |  (optional)
-end_ms = 789 # int |  (optional)
-offset = 0 # int |  (optional) (default to 0)
-limit = 1000 # int |  (optional) (default to 1000)
-
-try:
-    # Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval
-    api_response = api_instance.get_dashboard_anomalies(dashboard_id, param_hash, start_ms=start_ms, end_ms=end_ms, offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AnomalyApi->get_dashboard_anomalies: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **dashboard_id** | **str**|  | 
- **param_hash** | **str**|  | 
- **start_ms** | **int**|  | [optional] 
- **end_ms** | **int**|  | [optional] 
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 1000]
-
-### Return type
-
-[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_related_anomalies**
-> ResponseContainerPagedAnomaly get_related_anomalies(event_id, rendering_method=rendering_method, is_overlapped=is_overlapped, limit=limit)
-
-Get all related anomalies for a firing event with a time span
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AnomalyApi(wavefront_api_client.ApiClient(configuration))
-event_id = 'event_id_example' # str | 
-rendering_method = 'rendering_method_example' # str |  (optional)
-is_overlapped = false # bool |  (optional) (default to false)
-limit = 100 # int |  (optional) (default to 100)
-
-try:
-    # Get all related anomalies for a firing event with a time span
-    api_response = api_instance.get_related_anomalies(event_id, rendering_method=rendering_method, is_overlapped=is_overlapped, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AnomalyApi->get_related_anomalies: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **event_id** | **str**|  | 
- **rendering_method** | **str**|  | [optional] 
- **is_overlapped** | **bool**|  | [optional] [default to false]
- **limit** | **int**|  | [optional] [default to 100]
-
-### Return type
-
-[**ResponseContainerPagedAnomaly**](ResponseContainerPagedAnomaly.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/AvroBackedStandardizedDTO.md b/docs/AvroBackedStandardizedDTO.md
deleted file mode 100644
index d4eb92a..0000000
--- a/docs/AvroBackedStandardizedDTO.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# AvroBackedStandardizedDTO
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**created_epoch_millis** | **int** |  | [optional] 
-**creator_id** | **str** |  | [optional] 
-**deleted** | **bool** |  | [optional] 
-**id** | **str** |  | [optional] 
-**updated_epoch_millis** | **int** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/BusinessActionGroupBasicDTO.md b/docs/BusinessActionGroupBasicDTO.md
deleted file mode 100644
index 0ac2419..0000000
--- a/docs/BusinessActionGroupBasicDTO.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# BusinessActionGroupBasicDTO
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**description** | **str** |  | [optional] 
-**display_name** | **str** |  | [optional] 
-**group_name** | **str** |  | [optional] 
-**required_default** | **bool** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ChartSettings.md b/docs/ChartSettings.md
index c7b36cf..ea53864 100644
--- a/docs/ChartSettings.md
+++ b/docs/ChartSettings.md
@@ -57,11 +57,11 @@ Name | Type | Description | Notes
 **windowing** | **str** | For the tabular view, whether to use the full time window for the query or the last X minutes | [optional] 
 **xmax** | **float** | For x-y scatterplots, max value for X-axis.  Set null for auto | [optional] 
 **xmin** | **float** | For x-y scatterplots, min value for X-axis.  Set null for auto | [optional] 
-**y0_scale_si_by1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
+**y0_scale_siby1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
 **y0_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the left Y-axis to favor smaller magnitudes and larger units | [optional] 
 **y1_max** | **float** | For plots with multiple Y-axes, max value for right-side Y-axis.  Set null for auto | [optional] 
 **y1_min** | **float** | For plots with multiple Y-axes, min value for right-side Y-axis.  Set null for auto | [optional] 
-**y1_scale_si_by1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
+**y1_scale_siby1024** | **bool** | Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI) | [optional] 
 **y1_unit_autoscaling** | **bool** | Default: false. Whether to automatically adjust magnitude labels and units for the right Y-axis to favor smaller magnitudes and larger units | [optional] 
 **y1_units** | **str** | For plots with multiple Y-axes, units for right-side Y-axis | [optional] 
 **ymax** | **float** | For x-y scatterplots, max value for Y-axis.  Set null for auto | [optional] 
diff --git a/docs/ComponentStatus.md b/docs/ComponentStatus.md
deleted file mode 100644
index c2bdd28..0000000
--- a/docs/ComponentStatus.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# ComponentStatus
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**description** | **str** |  | [optional] 
-**name** | **str** |  | [optional] 
-**status** | **bool** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/CustomerPreferences.md b/docs/CustomerPreferences.md
deleted file mode 100644
index 6e29533..0000000
--- a/docs/CustomerPreferences.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# CustomerPreferences
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**blacklisted_emails** | **dict(str, int)** | List of blacklisted emails of the customer | [optional] 
-**created_epoch_millis** | **int** |  | [optional] 
-**creator_id** | **str** |  | [optional] 
-**customer_id** | **str** | The id of the customer preferences are attached to | 
-**default_user_groups** | [**list[UserGroupModel]**](UserGroupModel.md) | List of default user groups of the customer | [optional] 
-**deleted** | **bool** |  | [optional] 
-**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
-**hidden_metric_prefixes** | **dict(str, int)** | Metric prefixes which should be hidden from user | [optional] 
-**hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
-**id** | **str** |  | [optional] 
-**invite_permissions** | **list[str]** | List of permissions that are assigned to newly invited users | [optional] 
-**landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
-**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
-**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
-**updated_epoch_millis** | **int** |  | [optional] 
-**updater_id** | **str** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/CustomerPreferencesUpdating.md b/docs/CustomerPreferencesUpdating.md
deleted file mode 100644
index 9aea265..0000000
--- a/docs/CustomerPreferencesUpdating.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# CustomerPreferencesUpdating
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**default_user_groups** | **list[str]** | List of default user groups of the customer | [optional] 
-**grant_modify_access_to_everyone** | **bool** | Whether modify access of new entites is granted to Everyone or to the Creator | 
-**hide_ts_when_querybuilder_shown** | **bool** | Whether to hide TS source input when Querybuilder is shown | 
-**invite_permissions** | **list[str]** | List of invite permissions to apply for each new user | [optional] 
-**landing_dashboard_slug** | **str** | Dashboard where user will be redirected from landing page | [optional] 
-**show_onboarding** | **bool** | Whether to show onboarding for any new user without an override | 
-**show_querybuilder_by_default** | **bool** | Whether the Querybuilder is shown by default | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/IngestionPolicy.md b/docs/IngestionPolicy.md
deleted file mode 100644
index 415f197..0000000
--- a/docs/IngestionPolicy.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# IngestionPolicy
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**account_count** | **int** | Total number of accounts that are linked to the ingestion policy | [optional] 
-**alert_id** | **str** | The ingestion policy alert Id | [optional] 
-**customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
-**description** | **str** | The description of the ingestion policy | [optional] 
-**group_count** | **int** | Total number of groups that are linked to the ingestion policy | [optional] 
-**id** | **str** | The unique ID for the ingestion policy | [optional] 
-**is_limited** | **bool** | Whether the ingestion policy is limited | [optional] 
-**last_updated_account_id** | **str** | The account that updated this ingestion policy last time | [optional] 
-**last_updated_ms** | **int** | The last time when the ingestion policy is updated, in epoch milliseconds | [optional] 
-**limit_pps** | **int** | The PPS limit of the ingestion policy | [optional] 
-**name** | **str** | The name of the ingestion policy | [optional] 
-**sampled_accounts** | **list[str]** | A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy | [optional] 
-**sampled_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy | [optional] 
-**sampled_service_accounts** | **list[str]** | A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy | [optional] 
-**sampled_user_accounts** | **list[str]** | A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy | [optional] 
-**scope** | **str** | The scope of the ingestion policy | [optional] 
-**service_account_count** | **int** | Total number of service accounts that are linked to the ingestion policy | [optional] 
-**user_account_count** | **int** | Total number of user accounts that are linked to the ingestion policy | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/IngestionPolicyMapping.md b/docs/IngestionPolicyMapping.md
deleted file mode 100644
index 24f5aff..0000000
--- a/docs/IngestionPolicyMapping.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# IngestionPolicyMapping
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**accounts** | **list[str]** | The list of accounts that should be linked/unlinked to/from the ingestion policy | [optional] 
-**groups** | **list[str]** | The list of groups that should be linked/unlinked to/from the ingestion policy | [optional] 
-**ingestion_policy_id** | **str** | The unique identifier of the ingestion policy | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/Iterable.md b/docs/Iterable.md
deleted file mode 100644
index 80c9ae1..0000000
--- a/docs/Iterable.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Iterable
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/IteratorEntryStringJsonNode.md b/docs/IteratorEntryStringJsonNode.md
deleted file mode 100644
index df72987..0000000
--- a/docs/IteratorEntryStringJsonNode.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IteratorEntryStringJsonNode
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/IteratorJsonNode.md b/docs/IteratorJsonNode.md
deleted file mode 100644
index f7a4115..0000000
--- a/docs/IteratorJsonNode.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IteratorJsonNode
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/IteratorString.md b/docs/IteratorString.md
deleted file mode 100644
index 7e5bc24..0000000
--- a/docs/IteratorString.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IteratorString
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/MonitoredClusterApi.md b/docs/MonitoredClusterApi.md
deleted file mode 100644
index 5674f12..0000000
--- a/docs/MonitoredClusterApi.md
+++ /dev/null
@@ -1,570 +0,0 @@
-# wavefront_api_client.MonitoredClusterApi
-
-All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**add_cluster_tag**](MonitoredClusterApi.md#add_cluster_tag) | **PUT** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Add a tag to a specific cluster
-[**create_cluster**](MonitoredClusterApi.md#create_cluster) | **POST** /api/v2/monitoredcluster | Create a specific cluster
-[**delete_cluster**](MonitoredClusterApi.md#delete_cluster) | **DELETE** /api/v2/monitoredcluster/{id} | Delete a specific cluster
-[**get_all_cluster**](MonitoredClusterApi.md#get_all_cluster) | **GET** /api/v2/monitoredcluster | Get all monitored clusters
-[**get_cluster**](MonitoredClusterApi.md#get_cluster) | **GET** /api/v2/monitoredcluster/{id} | Get a specific cluster
-[**get_cluster_tags**](MonitoredClusterApi.md#get_cluster_tags) | **GET** /api/v2/monitoredcluster/{id}/tag | Get all tags associated with a specific cluster
-[**merge_clusters**](MonitoredClusterApi.md#merge_clusters) | **PUT** /api/v2/monitoredcluster/merge/{id1}/{id2} | Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
-[**remove_cluster_tag**](MonitoredClusterApi.md#remove_cluster_tag) | **DELETE** /api/v2/monitoredcluster/{id}/tag/{tagValue} | Remove a tag from a specific cluster
-[**set_cluster_tags**](MonitoredClusterApi.md#set_cluster_tags) | **POST** /api/v2/monitoredcluster/{id}/tag | Set all tags associated with a specific cluster
-[**update_cluster**](MonitoredClusterApi.md#update_cluster) | **PUT** /api/v2/monitoredcluster/{id} | Update a specific cluster
-
-
-# **add_cluster_tag**
-> ResponseContainer add_cluster_tag(id, tag_value)
-
-Add a tag to a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
-
-try:
-    # Add a tag to a specific cluster
-    api_response = api_instance.add_cluster_tag(id, tag_value)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->add_cluster_tag: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **tag_value** | **str**|  | 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **create_cluster**
-> ResponseContainerMonitoredCluster create_cluster(body=body)
-
-Create a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.MonitoredCluster() # MonitoredCluster | Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre> (optional)
-
-try:
-    # Create a specific cluster
-    api_response = api_instance.create_cluster(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->create_cluster: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**MonitoredCluster**](MonitoredCluster.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;k8s-sample\&quot;,   \&quot;name\&quot;: \&quot;Sample cluster\&quot;,   \&quot;platform\&quot;: \&quot;EKS\&quot;,   \&quot;version\&quot;: \&quot;1.2\&quot;,   \&quot;additionalTags\&quot;: {      \&quot;region\&quot; : \&quot;us-west-2\&quot;,      \&quot;az\&quot; : \&quot;testing\&quot;    },   \&quot;tags\&quot;: [      \&quot;alertTag1\&quot;    ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **delete_cluster**
-> ResponseContainerMonitoredCluster delete_cluster(id)
-
-Delete a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Delete a specific cluster
-    api_response = api_instance.delete_cluster(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->delete_cluster: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_all_cluster**
-> ResponseContainerPagedMonitoredCluster get_all_cluster(offset=offset, limit=limit)
-
-Get all monitored clusters
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
-
-try:
-    # Get all monitored clusters
-    api_response = api_instance.get_all_cluster(offset=offset, limit=limit)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->get_all_cluster: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
-
-### Return type
-
-[**ResponseContainerPagedMonitoredCluster**](ResponseContainerPagedMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_cluster**
-> ResponseContainerMonitoredCluster get_cluster(id)
-
-Get a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Get a specific cluster
-    api_response = api_instance.get_cluster(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->get_cluster: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_cluster_tags**
-> ResponseContainerTagsResponse get_cluster_tags(id)
-
-Get all tags associated with a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-
-try:
-    # Get all tags associated with a specific cluster
-    api_response = api_instance.get_cluster_tags(id)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->get_cluster_tags: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
-
-### Return type
-
-[**ResponseContainerTagsResponse**](ResponseContainerTagsResponse.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **merge_clusters**
-> ResponseContainer merge_clusters(id1, id2)
-
-Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id1 = 'id1_example' # str | 
-id2 = 'id2_example' # str | 
-
-try:
-    # Merge two monitored clusters.  The first cluster will remain and the second cluster will be deleted, with its id added as an alias to the first cluster.
-    api_response = api_instance.merge_clusters(id1, id2)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->merge_clusters: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id1** | **str**|  | 
- **id2** | **str**|  | 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **remove_cluster_tag**
-> ResponseContainer remove_cluster_tag(id, tag_value)
-
-Remove a tag from a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-tag_value = 'tag_value_example' # str | 
-
-try:
-    # Remove a tag from a specific cluster
-    api_response = api_instance.remove_cluster_tag(id, tag_value)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->remove_cluster_tag: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **tag_value** | **str**|  | 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **set_cluster_tags**
-> ResponseContainer set_cluster_tags(id, body=body)
-
-Set all tags associated with a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = [wavefront_api_client.list[str]()] # list[str] |  (optional)
-
-try:
-    # Set all tags associated with a specific cluster
-    api_response = api_instance.set_cluster_tags(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->set_cluster_tags: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | **list[str]**|  | [optional] 
-
-### Return type
-
-[**ResponseContainer**](ResponseContainer.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **update_cluster**
-> ResponseContainerMonitoredCluster update_cluster(id, body=body)
-
-Update a specific cluster
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.MonitoredClusterApi(wavefront_api_client.ApiClient(configuration))
-id = 'id_example' # str | 
-body = wavefront_api_client.MonitoredCluster() # MonitoredCluster | Example Body:  <pre>{   \"id\": \"k8s-sample\",   \"name\": \"Sample cluster\",   \"platform\": \"EKS\",   \"version\": \"1.2\",   \"additionalTags\": {      \"region\" : \"us-west-2\",      \"az\" : \"testing\"    },   \"tags\": [      \"alertTag1\"    ] }</pre> (optional)
-
-try:
-    # Update a specific cluster
-    api_response = api_instance.update_cluster(id, body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling MonitoredClusterApi->update_cluster: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **id** | **str**|  | 
- **body** | [**MonitoredCluster**](MonitoredCluster.md)| Example Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;k8s-sample\&quot;,   \&quot;name\&quot;: \&quot;Sample cluster\&quot;,   \&quot;platform\&quot;: \&quot;EKS\&quot;,   \&quot;version\&quot;: \&quot;1.2\&quot;,   \&quot;additionalTags\&quot;: {      \&quot;region\&quot; : \&quot;us-west-2\&quot;,      \&quot;az\&quot; : \&quot;testing\&quot;    },   \&quot;tags\&quot;: [      \&quot;alertTag1\&quot;    ] }&lt;/pre&gt; | [optional] 
-
-### Return type
-
-[**ResponseContainerMonitoredCluster**](ResponseContainerMonitoredCluster.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/Number.md b/docs/Number.md
deleted file mode 100644
index ec2bc8a..0000000
--- a/docs/Number.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Number
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/PagedIngestionPolicy.md b/docs/PagedIngestionPolicy.md
deleted file mode 100644
index 7ca12ef..0000000
--- a/docs/PagedIngestionPolicy.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# PagedIngestionPolicy
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**items** | [**list[IngestionPolicy]**](IngestionPolicy.md) | List of requested items | [optional] 
-**limit** | **int** |  | [optional] 
-**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
-**offset** | **int** |  | [optional] 
-**sort** | [**Sorting**](Sorting.md) |  | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/PagedUserGroup.md b/docs/PagedUserGroup.md
deleted file mode 100644
index e50d851..0000000
--- a/docs/PagedUserGroup.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# PagedUserGroup
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
-**items** | [**list[UserGroup]**](UserGroup.md) | List of requested items | [optional] 
-**limit** | **int** |  | [optional] 
-**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
-**offset** | **int** |  | [optional] 
-**sort** | [**Sorting**](Sorting.md) |  | [optional] 
-**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerIngestionPolicy.md b/docs/ResponseContainerIngestionPolicy.md
deleted file mode 100644
index 985820f..0000000
--- a/docs/ResponseContainerIngestionPolicy.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerIngestionPolicy
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**IngestionPolicy**](IngestionPolicy.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerListACL.md b/docs/ResponseContainerListACL.md
deleted file mode 100644
index 63cc285..0000000
--- a/docs/ResponseContainerListACL.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerListACL
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**list[ACL]**](ACL.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerListUserGroup.md b/docs/ResponseContainerListUserGroup.md
deleted file mode 100644
index f89e7b9..0000000
--- a/docs/ResponseContainerListUserGroup.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerListUserGroup
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**list[UserGroup]**](UserGroup.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerListUserGroupModel.md b/docs/ResponseContainerListUserGroupModel.md
deleted file mode 100644
index 49fdbe3..0000000
--- a/docs/ResponseContainerListUserGroupModel.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerListUserGroupModel
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**list[UserGroupModel]**](UserGroupModel.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerPagedIngestionPolicy.md b/docs/ResponseContainerPagedIngestionPolicy.md
deleted file mode 100644
index e1afff8..0000000
--- a/docs/ResponseContainerPagedIngestionPolicy.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerPagedIngestionPolicy
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**PagedIngestionPolicy**](PagedIngestionPolicy.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerPagedUserGroup.md b/docs/ResponseContainerPagedUserGroup.md
deleted file mode 100644
index 8fc02d2..0000000
--- a/docs/ResponseContainerPagedUserGroup.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerPagedUserGroup
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**PagedUserGroup**](PagedUserGroup.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerUserGroup.md b/docs/ResponseContainerUserGroup.md
deleted file mode 100644
index 973f2eb..0000000
--- a/docs/ResponseContainerUserGroup.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerUserGroup
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**UserGroup**](UserGroup.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerUserHardDelete.md b/docs/ResponseContainerUserHardDelete.md
deleted file mode 100644
index a46a090..0000000
--- a/docs/ResponseContainerUserHardDelete.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerUserHardDelete
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**UserHardDelete**](UserHardDelete.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/SettingsApi.md b/docs/SettingsApi.md
deleted file mode 100644
index 07f0001..0000000
--- a/docs/SettingsApi.md
+++ /dev/null
@@ -1,220 +0,0 @@
-# wavefront_api_client.SettingsApi
-
-All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**get_all_permissions**](SettingsApi.md#get_all_permissions) | **GET** /api/v2/customer/permissions | Get all permissions
-[**get_customer_preferences**](SettingsApi.md#get_customer_preferences) | **GET** /api/v2/customer/preferences | Get customer preferences
-[**get_default_user_groups**](SettingsApi.md#get_default_user_groups) | **GET** /api/v2/customer/preferences/defaultUserGroups | Get default user groups customer preferences
-[**post_customer_preferences**](SettingsApi.md#post_customer_preferences) | **POST** /api/v2/customer/preferences | Update selected fields of customer preferences
-
-
-# **get_all_permissions**
-> list[BusinessActionGroupBasicDTO] get_all_permissions()
-
-Get all permissions
-
-Returns all permissions' info data
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
-
-try:
-    # Get all permissions
-    api_response = api_instance.get_all_permissions()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SettingsApi->get_all_permissions: %s\n" % e)
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**list[BusinessActionGroupBasicDTO]**](BusinessActionGroupBasicDTO.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_customer_preferences**
-> CustomerPreferences get_customer_preferences()
-
-Get customer preferences
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
-
-try:
-    # Get customer preferences
-    api_response = api_instance.get_customer_preferences()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SettingsApi->get_customer_preferences: %s\n" % e)
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**CustomerPreferences**](CustomerPreferences.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_default_user_groups**
-> ResponseContainerListUserGroupModel get_default_user_groups(body=body)
-
-Get default user groups customer preferences
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.User() # User |  (optional)
-
-try:
-    # Get default user groups customer preferences
-    api_response = api_instance.get_default_user_groups(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SettingsApi->get_default_user_groups: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)|  | [optional] 
-
-### Return type
-
-[**ResponseContainerListUserGroupModel**](ResponseContainerListUserGroupModel.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **post_customer_preferences**
-> CustomerPreferences post_customer_preferences(body=body)
-
-Update selected fields of customer preferences
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.SettingsApi(wavefront_api_client.ApiClient(configuration))
-body = wavefront_api_client.CustomerPreferencesUpdating() # CustomerPreferencesUpdating |  (optional)
-
-try:
-    # Update selected fields of customer preferences
-    api_response = api_instance.post_customer_preferences(body=body)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling SettingsApi->post_customer_preferences: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | [**CustomerPreferencesUpdating**](CustomerPreferencesUpdating.md)|  | [optional] 
-
-### Return type
-
-[**CustomerPreferences**](CustomerPreferences.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/StatsModel.md b/docs/StatsModel.md
deleted file mode 100644
index e992ac6..0000000
--- a/docs/StatsModel.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# StatsModel
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**buffer_keys** | **int** |  | [optional] 
-**cached_compacted_keys** | **int** |  | [optional] 
-**compacted_keys** | **int** |  | [optional] 
-**compacted_points** | **int** |  | [optional] 
-**cpu_ns** | **int** |  | [optional] 
-**hosts_used** | **int** |  | [optional] 
-**keys** | **int** |  | [optional] 
-**latency** | **int** |  | [optional] 
-**metrics_used** | **int** |  | [optional] 
-**points** | **int** |  | [optional] 
-**queries** | **int** |  | [optional] 
-**query_tasks** | **int** |  | [optional] 
-**s3_keys** | **int** |  | [optional] 
-**skipped_compacted_keys** | **int** |  | [optional] 
-**summaries** | **int** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/TeslaConfiguration.md b/docs/TeslaConfiguration.md
deleted file mode 100644
index 6fe5642..0000000
--- a/docs/TeslaConfiguration.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# TeslaConfiguration
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**email** | **str** | Email address for Tesla account login | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/Tuple.md b/docs/Tuple.md
deleted file mode 100644
index ea986c7..0000000
--- a/docs/Tuple.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Tuple
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**elements** | **list[str]** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/User.md b/docs/User.md
deleted file mode 100644
index c2ad860..0000000
--- a/docs/User.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# User
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**account_type** | **str** |  | [optional] 
-**api_token** | **str** |  | [optional] 
-**api_token2** | **str** |  | [optional] 
-**credential** | **str** |  | [optional] 
-**customer** | **str** |  | [optional] 
-**description** | **str** |  | [optional] 
-**extra_api_tokens** | **list[str]** |  | [optional] 
-**groups** | **list[str]** |  | [optional] 
-**identifier** | **str** |  | [optional] 
-**ingestion_policy_id** | **str** |  | [optional] 
-**invalid_password_attempts** | **int** |  | [optional] 
-**last_logout** | **int** |  | [optional] 
-**last_successful_login** | **int** |  | [optional] 
-**last_used** | **int** |  | [optional] 
-**old_passwords** | **list[str]** |  | [optional] 
-**onboarding_state** | **str** |  | [optional] 
-**provider** | **str** |  | [optional] 
-**reset_token** | **str** |  | [optional] 
-**reset_token_creation_millis** | **int** |  | [optional] 
-**settings** | [**UserSettings**](UserSettings.md) |  | [optional] 
-**sso_id** | **str** |  | [optional] 
-**super_admin** | **bool** |  | [optional] 
-**user_groups** | **list[str]** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/UserGroupWrite.md b/docs/UserGroupWrite.md
index 125285e..e73e902 100644
--- a/docs/UserGroupWrite.md
+++ b/docs/UserGroupWrite.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **description** | **str** | The description of the user group | [optional] 
 **id** | **str** | The unique identifier of the user group | [optional] 
 **name** | **str** | The name of the user group | 
-**role_i_ds** | **list[str]** | List of role IDs the user group has been linked to. | 
+**role_ids** | **list[str]** | List of role IDs the user group has been linked to. | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserHardDelete.md b/docs/UserHardDelete.md
deleted file mode 100644
index 826a472..0000000
--- a/docs/UserHardDelete.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# UserHardDelete
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**customer_id** | **str** |  | [optional] 
-**existing** | [**dict(str, Iterable)**](Iterable.md) |  | [optional] 
-**user_id** | **str** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/UserSettings.md b/docs/UserSettings.md
deleted file mode 100644
index 148c1df..0000000
--- a/docs/UserSettings.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# UserSettings
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**always_hide_querybuilder** | **bool** |  | [optional] 
-**chart_title_scalar** | **int** |  | [optional] 
-**favorite_qb_functions** | **list[str]** |  | [optional] 
-**hide_ts_when_querybuilder_shown** | **bool** |  | [optional] 
-**landing_dashboard_slug** | **str** |  | [optional] 
-**preferred_time_zone** | **str** |  | [optional] 
-**sample_query_results_by_default** | **bool** |  | [optional] 
-**show_onboarding** | **bool** |  | [optional] 
-**show_querybuilder_by_default** | **bool** |  | [optional] 
-**ui_default** | **str** |  | [optional] 
-**use24_hour_time** | **bool** |  | [optional] 
-**use_dark_theme** | **bool** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/generate_client b/generate_client
index 37ad6c8..a266065 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.27"  # For 3.x use CGEN_VER="3.0.34"
+CGEN_VER="2.4.30"  # For 3.x use CGEN_VER="3.0.42"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index a4b284b..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-certifi>=2017.4.17
-python-dateutil>=2.1
-setuptools>=21.0.0
-six>=1.10
-urllib3>=1.23
diff --git a/setup.py b/setup.py
index 71c3c50..8259e1f 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.175.2"
+VERSION = "2.176.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_access_control_element.py b/test/test_access_control_element.py
index b15b306..e1a56d0 100644
--- a/test/test_access_control_element.py
+++ b/test/test_access_control_element.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_access_control_list_read_dto.py b/test/test_access_control_list_read_dto.py
index b52b0ef..2912a97 100644
--- a/test/test_access_control_list_read_dto.py
+++ b/test/test_access_control_list_read_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_access_control_list_simple.py b/test/test_access_control_list_simple.py
index d863359..28aabf2 100644
--- a/test/test_access_control_list_simple.py
+++ b/test/test_access_control_list_simple.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_access_control_list_write_dto.py b/test/test_access_control_list_write_dto.py
index d5ea6aa..7a74064 100644
--- a/test/test_access_control_list_write_dto.py
+++ b/test/test_access_control_list_write_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_access_policy.py b/test/test_access_policy.py
index d9d1ef2..b2ba293 100644
--- a/test/test_access_policy.py
+++ b/test/test_access_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_access_policy_api.py b/test/test_access_policy_api.py
index daf36c6..be77cce 100644
--- a/test/test_access_policy_api.py
+++ b/test/test_access_policy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_access_policy_rule_dto.py b/test/test_access_policy_rule_dto.py
index f75802a..f0ef1ad 100644
--- a/test/test_access_policy_rule_dto.py
+++ b/test/test_access_policy_rule_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_account.py b/test/test_account.py
index 4c0a369..f5e2de6 100644
--- a/test/test_account.py
+++ b/test/test_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_account__user_and_service_account_api.py b/test/test_account__user_and_service_account_api.py
index 2e07139..cc03652 100644
--- a/test/test_account__user_and_service_account_api.py
+++ b/test/test_account__user_and_service_account_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -46,14 +46,7 @@ def test_add_account_to_roles(self):
     def test_add_account_to_user_groups(self):
         """Test case for add_account_to_user_groups
 
-        Adds specific user groups to the account (user or service account)  # noqa: E501
-        """
-        pass
-
-    def test_add_ingestion_policy(self):
-        """Test case for add_ingestion_policy
-
-        Add a specific ingestion policy to multiple accounts  # noqa: E501
+        Adds specific groups to the account (user or service account)  # noqa: E501
         """
         pass
 
@@ -141,6 +134,13 @@ def test_get_user_account(self):
         """
         pass
 
+    def test_get_users_with_accounts_permission(self):
+        """Test case for get_users_with_accounts_permission
+
+        Get all users with Accounts permission  # noqa: E501
+        """
+        pass
+
     def test_grant_account_permission(self):
         """Test case for grant_account_permission
 
@@ -151,7 +151,7 @@ def test_grant_account_permission(self):
     def test_grant_permission_to_accounts(self):
         """Test case for grant_permission_to_accounts
 
-        Grants a specific permission to multiple accounts (users or service accounts)  # noqa: E501
+        Grant a permission to accounts (users or service accounts)  # noqa: E501
         """
         pass
 
@@ -172,14 +172,7 @@ def test_remove_account_from_roles(self):
     def test_remove_account_from_user_groups(self):
         """Test case for remove_account_from_user_groups
 
-        Removes specific user groups from the account (user or service account)  # noqa: E501
-        """
-        pass
-
-    def test_remove_ingestion_policies(self):
-        """Test case for remove_ingestion_policies
-
-        Removes ingestion policies from multiple accounts  # noqa: E501
+        Removes specific groups from the account (user or service account)  # noqa: E501
         """
         pass
 
@@ -193,7 +186,7 @@ def test_revoke_account_permission(self):
     def test_revoke_permission_from_accounts(self):
         """Test case for revoke_permission_from_accounts
 
-        Revokes a specific permission from multiple accounts (users or service accounts)  # noqa: E501
+        Revoke a permission from accounts (users or service accounts)  # noqa: E501
         """
         pass
 
@@ -207,7 +200,7 @@ def test_update_service_account(self):
     def test_update_user_account(self):
         """Test case for update_user_account
 
-        Update user with given user groups, permissions and ingestion policy.  # noqa: E501
+        Update user with given user groups and permissions.  # noqa: E501
         """
         pass
 
diff --git a/test/test_alert.py b/test/test_alert.py
index ca44980..ac01333 100644
--- a/test/test_alert.py
+++ b/test/test_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_alert_analytics_api.py b/test/test_alert_analytics_api.py
index c09bf3c..9510bb8 100644
--- a/test/test_alert_analytics_api.py
+++ b/test/test_alert_analytics_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_alert_api.py b/test/test_alert_api.py
index 74e4232..1ae0d95 100644
--- a/test/test_alert_api.py
+++ b/test/test_alert_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -43,6 +43,13 @@ def test_add_alert_tag(self):
         """
         pass
 
+    def test_check_query_type(self):
+        """Test case for check_query_type
+
+        Return the type of provided query.  # noqa: E501
+        """
+        pass
+
     def test_clone_alert(self):
         """Test case for clone_alert
 
@@ -120,6 +127,13 @@ def test_hide_alert(self):
         """
         pass
 
+    def test_preview_alert_notification(self):
+        """Test case for preview_alert_notification
+
+        Get all the notification preview for a specific alert  # noqa: E501
+        """
+        pass
+
     def test_remove_alert_access(self):
         """Test case for remove_alert_access
 
diff --git a/test/test_alert_dashboard.py b/test/test_alert_dashboard.py
index 49ef3b2..ddb248f 100644
--- a/test/test_alert_dashboard.py
+++ b/test/test_alert_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_alert_min.py b/test/test_alert_min.py
index 9b768d3..8ddd0ce 100644
--- a/test/test_alert_min.py
+++ b/test/test_alert_min.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_alert_route.py b/test/test_alert_route.py
index 14d75ac..0f820df 100644
--- a/test/test_alert_route.py
+++ b/test/test_alert_route.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_alert_source.py b/test/test_alert_source.py
index 0ddd7e2..44f7a1e 100644
--- a/test/test_alert_source.py
+++ b/test/test_alert_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_annotation.py b/test/test_annotation.py
index 0f2d58b..7f45a46 100644
--- a/test/test_annotation.py
+++ b/test/test_annotation.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_anomaly.py b/test/test_anomaly.py
index 305a957..6a79174 100644
--- a/test/test_anomaly.py
+++ b/test/test_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_anomaly_api.py b/test/test_anomaly_api.py
deleted file mode 100644
index 30577bc..0000000
--- a/test/test_anomaly_api.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.api.anomaly_api import AnomalyApi  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestAnomalyApi(unittest.TestCase):
-    """AnomalyApi unit test stubs"""
-
-    def setUp(self):
-        self.api = wavefront_api_client.api.anomaly_api.AnomalyApi()  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    def test_get_all_anomalies(self):
-        """Test case for get_all_anomalies
-
-        Get all anomalies for a customer during a time interval  # noqa: E501
-        """
-        pass
-
-    def test_get_anomalies_for_chart_and_param_hash(self):
-        """Test case for get_anomalies_for_chart_and_param_hash
-
-        Get all anomalies for a chart with a set of dashboard parameters during a time interval  # noqa: E501
-        """
-        pass
-
-    def test_get_chart_anomalies_for_chart(self):
-        """Test case for get_chart_anomalies_for_chart
-
-        Get all anomalies for a chart during a time interval  # noqa: E501
-        """
-        pass
-
-    def test_get_chart_anomalies_of_one_dashboard(self):
-        """Test case for get_chart_anomalies_of_one_dashboard
-
-        Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
-        """
-        pass
-
-    def test_get_dashboard_anomalies(self):
-        """Test case for get_dashboard_anomalies
-
-        Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval  # noqa: E501
-        """
-        pass
-
-    def test_get_related_anomalies(self):
-        """Test case for get_related_anomalies
-
-        Get all related anomalies for a firing event with a time span  # noqa: E501
-        """
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_api_token_api.py b/test/test_api_token_api.py
index 25a342e..e2c560d 100644
--- a/test/test_api_token_api.py
+++ b/test/test_api_token_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,6 +36,13 @@ def test_create_token(self):
         """
         pass
 
+    def test_delete_customer_token(self):
+        """Test case for delete_customer_token
+
+        Delete the specified api token for a customer  # noqa: E501
+        """
+        pass
+
     def test_delete_token(self):
         """Test case for delete_token
 
@@ -64,6 +71,20 @@ def test_get_all_tokens(self):
         """
         pass
 
+    def test_get_customer_token(self):
+        """Test case for get_customer_token
+
+        Get the specified api token for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_customer_tokens(self):
+        """Test case for get_customer_tokens
+
+        Get all api tokens for a customer  # noqa: E501
+        """
+        pass
+
     def test_get_tokens_service_account(self):
         """Test case for get_tokens_service_account
 
diff --git a/test/test_api_token_model.py b/test/test_api_token_model.py
index 0551214..ef553dd 100644
--- a/test/test_api_token_model.py
+++ b/test/test_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_app_dynamics_configuration.py b/test/test_app_dynamics_configuration.py
index 1e29740..9efcd55 100644
--- a/test/test_app_dynamics_configuration.py
+++ b/test/test_app_dynamics_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_app_search_filter.py b/test/test_app_search_filter.py
index c37b136..53f3d13 100644
--- a/test/test_app_search_filter.py
+++ b/test/test_app_search_filter.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_app_search_filter_value.py b/test/test_app_search_filter_value.py
index 00562b3..f95da99 100644
--- a/test/test_app_search_filter_value.py
+++ b/test/test_app_search_filter_value.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_app_search_filters.py b/test/test_app_search_filters.py
index 6d43409..bd6de6a 100644
--- a/test/test_app_search_filters.py
+++ b/test/test_app_search_filters.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_avro_backed_standardized_dto.py b/test/test_avro_backed_standardized_dto.py
deleted file mode 100644
index 13dd18a..0000000
--- a/test/test_avro_backed_standardized_dto.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.avro_backed_standardized_dto import AvroBackedStandardizedDTO  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestAvroBackedStandardizedDTO(unittest.TestCase):
-    """AvroBackedStandardizedDTO unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testAvroBackedStandardizedDTO(self):
-        """Test AvroBackedStandardizedDTO"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.avro_backed_standardized_dto.AvroBackedStandardizedDTO()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_aws_base_credentials.py b/test/test_aws_base_credentials.py
index d87cf75..989a381 100644
--- a/test/test_aws_base_credentials.py
+++ b/test/test_aws_base_credentials.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_azure_activity_log_configuration.py b/test/test_azure_activity_log_configuration.py
index d6bf655..7943008 100644
--- a/test/test_azure_activity_log_configuration.py
+++ b/test/test_azure_activity_log_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_azure_base_credentials.py b/test/test_azure_base_credentials.py
index 79397d1..601e7c0 100644
--- a/test/test_azure_base_credentials.py
+++ b/test/test_azure_base_credentials.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_azure_configuration.py b/test/test_azure_configuration.py
index efc0aa5..6ee110f 100644
--- a/test/test_azure_configuration.py
+++ b/test/test_azure_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_chart.py b/test/test_chart.py
index 09faf83..6295987 100644
--- a/test/test_chart.py
+++ b/test/test_chart.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_chart_settings.py b/test/test_chart_settings.py
index dadff10..28e7420 100644
--- a/test/test_chart_settings.py
+++ b/test/test_chart_settings.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_chart_source_query.py b/test/test_chart_source_query.py
index fd83f17..dd550c0 100644
--- a/test/test_chart_source_query.py
+++ b/test/test_chart_source_query.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_class_loader.py b/test/test_class_loader.py
index 7e94468..b918e35 100644
--- a/test/test_class_loader.py
+++ b/test/test_class_loader.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_cloud_integration.py b/test/test_cloud_integration.py
index 7f5761a..552a9ad 100644
--- a/test/test_cloud_integration.py
+++ b/test/test_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_cloud_integration_api.py b/test/test_cloud_integration_api.py
index 09bf5d2..9f77988 100644
--- a/test/test_cloud_integration_api.py
+++ b/test/test_cloud_integration_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_cloud_trail_configuration.py b/test/test_cloud_trail_configuration.py
index a340cbc..d363a2b 100644
--- a/test/test_cloud_trail_configuration.py
+++ b/test/test_cloud_trail_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_cloud_watch_configuration.py b/test/test_cloud_watch_configuration.py
index 5045785..0dd330b 100644
--- a/test/test_cloud_watch_configuration.py
+++ b/test/test_cloud_watch_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_conversion.py b/test/test_conversion.py
index 2f8fc76..4b7b8b9 100644
--- a/test/test_conversion.py
+++ b/test/test_conversion.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_conversion_object.py b/test/test_conversion_object.py
index 3e401c0..d8db056 100644
--- a/test/test_conversion_object.py
+++ b/test/test_conversion_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_customer_facing_user_object.py b/test/test_customer_facing_user_object.py
index 11651af..47848fe 100644
--- a/test/test_customer_facing_user_object.py
+++ b/test/test_customer_facing_user_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dashboard.py b/test/test_dashboard.py
index 7900c2d..b9bb275 100644
--- a/test/test_dashboard.py
+++ b/test/test_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dashboard_api.py b/test/test_dashboard_api.py
index 4e676f5..070b560 100644
--- a/test/test_dashboard_api.py
+++ b/test/test_dashboard_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dashboard_min.py b/test/test_dashboard_min.py
index 9e01403..8086861 100644
--- a/test/test_dashboard_min.py
+++ b/test/test_dashboard_min.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dashboard_parameter_value.py b/test/test_dashboard_parameter_value.py
index 7299c58..48cbf64 100644
--- a/test/test_dashboard_parameter_value.py
+++ b/test/test_dashboard_parameter_value.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dashboard_section.py b/test/test_dashboard_section.py
index 42786a4..91768c3 100644
--- a/test/test_dashboard_section.py
+++ b/test/test_dashboard_section.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dashboard_section_row.py b/test/test_dashboard_section_row.py
index 6458c61..340d8a4 100644
--- a/test/test_dashboard_section_row.py
+++ b/test/test_dashboard_section_row.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_default_saved_app_map_search.py b/test/test_default_saved_app_map_search.py
index 9683c29..2d1f348 100644
--- a/test/test_default_saved_app_map_search.py
+++ b/test/test_default_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_default_saved_traces_search.py b/test/test_default_saved_traces_search.py
index 879c8bf..cf64716 100644
--- a/test/test_default_saved_traces_search.py
+++ b/test/test_default_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_derived_metric_api.py b/test/test_derived_metric_api.py
index 9224f77..d601fc0 100644
--- a/test/test_derived_metric_api.py
+++ b/test/test_derived_metric_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_derived_metric_definition.py b/test/test_derived_metric_definition.py
index 8efcf71..a5eaffe 100644
--- a/test/test_derived_metric_definition.py
+++ b/test/test_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_direct_ingestion_api.py b/test/test_direct_ingestion_api.py
index 15df2a7..01807b9 100644
--- a/test/test_direct_ingestion_api.py
+++ b/test/test_direct_ingestion_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_dynatrace_configuration.py b/test/test_dynatrace_configuration.py
index 7802ebc..22f3391 100644
--- a/test/test_dynatrace_configuration.py
+++ b/test/test_dynatrace_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_ec2_configuration.py b/test/test_ec2_configuration.py
index 259a8b8..aaf7397 100644
--- a/test/test_ec2_configuration.py
+++ b/test/test_ec2_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_event.py b/test/test_event.py
index 7e12230..f622b7c 100644
--- a/test/test_event.py
+++ b/test/test_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_event_api.py b/test/test_event_api.py
index fec472f..f40cfa0 100644
--- a/test/test_event_api.py
+++ b/test/test_event_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,8 +36,8 @@ def test_add_event_tag(self):
         """
         pass
 
-    def test_close_event(self):
-        """Test case for close_event
+    def test_close_user_event(self):
+        """Test case for close_user_event
 
         Close a specific event  # noqa: E501
         """
@@ -50,10 +50,10 @@ def test_create_event(self):
         """
         pass
 
-    def test_delete_event(self):
-        """Test case for delete_event
+    def test_delete_user_event(self):
+        """Test case for delete_user_event
 
-        Delete a specific event  # noqa: E501
+        Delete a specific user event  # noqa: E501
         """
         pass
 
@@ -120,10 +120,10 @@ def test_set_event_tags(self):
         """
         pass
 
-    def test_update_event(self):
-        """Test case for update_event
+    def test_update_user_event(self):
+        """Test case for update_user_event
 
-        Update a specific event  # noqa: E501
+        Update a specific user event.  # noqa: E501
         """
         pass
 
diff --git a/test/test_event_search_request.py b/test/test_event_search_request.py
index d37d9fa..c9ff1f6 100644
--- a/test/test_event_search_request.py
+++ b/test/test_event_search_request.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_event_time_range.py b/test/test_event_time_range.py
index 2e41f54..62f54c7 100644
--- a/test/test_event_time_range.py
+++ b/test/test_event_time_range.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_external_link.py b/test/test_external_link.py
index d91f66d..8a6a853 100644
--- a/test/test_external_link.py
+++ b/test/test_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_external_link_api.py b/test/test_external_link_api.py
index fdfa08b..21d256b 100644
--- a/test/test_external_link_api.py
+++ b/test/test_external_link_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_facet_response.py b/test/test_facet_response.py
index 3de393a..ccd12ae 100644
--- a/test/test_facet_response.py
+++ b/test/test_facet_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_facet_search_request_container.py b/test/test_facet_search_request_container.py
index fc0f0e5..4b70d60 100644
--- a/test/test_facet_search_request_container.py
+++ b/test/test_facet_search_request_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_facets_response_container.py b/test/test_facets_response_container.py
index 1c07e6d..eea5448 100644
--- a/test/test_facets_response_container.py
+++ b/test/test_facets_response_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_facets_search_request_container.py b/test/test_facets_search_request_container.py
index f2fcd40..da82b90 100644
--- a/test/test_facets_search_request_container.py
+++ b/test/test_facets_search_request_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_fast_reader_builder.py b/test/test_fast_reader_builder.py
index b3b56e7..505b385 100644
--- a/test/test_fast_reader_builder.py
+++ b/test/test_fast_reader_builder.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_field.py b/test/test_field.py
index 84ed8dd..2e0bcbe 100644
--- a/test/test_field.py
+++ b/test/test_field.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_gcp_billing_configuration.py b/test/test_gcp_billing_configuration.py
index ce4fcbd..5a02817 100644
--- a/test/test_gcp_billing_configuration.py
+++ b/test/test_gcp_billing_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_gcp_configuration.py b/test/test_gcp_configuration.py
index f7c0449..84f304d 100644
--- a/test/test_gcp_configuration.py
+++ b/test/test_gcp_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_global_alert_analytic.py b/test/test_global_alert_analytic.py
index 24fb367..fe8b33d 100644
--- a/test/test_global_alert_analytic.py
+++ b/test/test_global_alert_analytic.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_history_entry.py b/test/test_history_entry.py
index 2eb7c49..78ebe58 100644
--- a/test/test_history_entry.py
+++ b/test/test_history_entry.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_history_response.py b/test/test_history_response.py
index 929c314..869fdc2 100644
--- a/test/test_history_response.py
+++ b/test/test_history_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_ingestion_policy.py b/test/test_ingestion_policy.py
deleted file mode 100644
index 0f80ee3..0000000
--- a/test/test_ingestion_policy.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.ingestion_policy import IngestionPolicy  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestIngestionPolicy(unittest.TestCase):
-    """IngestionPolicy unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testIngestionPolicy(self):
-        """Test IngestionPolicy"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.ingestion_policy.IngestionPolicy()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_ingestion_policy_mapping.py b/test/test_ingestion_policy_mapping.py
deleted file mode 100644
index 013b6b3..0000000
--- a/test/test_ingestion_policy_mapping.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.ingestion_policy_mapping import IngestionPolicyMapping  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestIngestionPolicyMapping(unittest.TestCase):
-    """IngestionPolicyMapping unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testIngestionPolicyMapping(self):
-        """Test IngestionPolicyMapping"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.ingestion_policy_mapping.IngestionPolicyMapping()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_ingestion_policy_metadata.py b/test/test_ingestion_policy_metadata.py
index 9f5a6af..494453e 100644
--- a/test/test_ingestion_policy_metadata.py
+++ b/test/test_ingestion_policy_metadata.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_ingestion_policy_read_model.py b/test/test_ingestion_policy_read_model.py
index 5ee4656..b167646 100644
--- a/test/test_ingestion_policy_read_model.py
+++ b/test/test_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_ingestion_policy_write_model.py b/test/test_ingestion_policy_write_model.py
index 3938f55..6addcb2 100644
--- a/test/test_ingestion_policy_write_model.py
+++ b/test/test_ingestion_policy_write_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_ingestion_spy_api.py b/test/test_ingestion_spy_api.py
index f4d914e..e71b292 100644
--- a/test/test_ingestion_spy_api.py
+++ b/test/test_ingestion_spy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_install_alerts.py b/test/test_install_alerts.py
index b378a0c..453eeb7 100644
--- a/test/test_install_alerts.py
+++ b/test/test_install_alerts.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration.py b/test/test_integration.py
index 1b45188..caa0ade 100644
--- a/test/test_integration.py
+++ b/test/test_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_alert.py b/test/test_integration_alert.py
index f4c80c6..dc06171 100644
--- a/test/test_integration_alert.py
+++ b/test/test_integration_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_alias.py b/test/test_integration_alias.py
index 1964054..f4bdd8c 100644
--- a/test/test_integration_alias.py
+++ b/test/test_integration_alias.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_api.py b/test/test_integration_api.py
index 4ec9330..974fa41 100644
--- a/test/test_integration_api.py
+++ b/test/test_integration_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_dashboard.py b/test/test_integration_dashboard.py
index 6bd5d9c..f0c21bc 100644
--- a/test/test_integration_dashboard.py
+++ b/test/test_integration_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_manifest_group.py b/test/test_integration_manifest_group.py
index 0ea52e2..6a38395 100644
--- a/test/test_integration_manifest_group.py
+++ b/test/test_integration_manifest_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_metrics.py b/test/test_integration_metrics.py
index 13f0ed0..10bc898 100644
--- a/test/test_integration_metrics.py
+++ b/test/test_integration_metrics.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_integration_status.py b/test/test_integration_status.py
index c17eafc..01f93a5 100644
--- a/test/test_integration_status.py
+++ b/test/test_integration_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_json_node.py b/test/test_json_node.py
index a04c65f..57bf976 100644
--- a/test/test_json_node.py
+++ b/test/test_json_node.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_kubernetes_component.py b/test/test_kubernetes_component.py
index d12bc85..0e09f54 100644
--- a/test/test_kubernetes_component.py
+++ b/test/test_kubernetes_component.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_kubernetes_component_status.py b/test/test_kubernetes_component_status.py
index 267e277..3880eb0 100644
--- a/test/test_kubernetes_component_status.py
+++ b/test/test_kubernetes_component_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_logical_type.py b/test/test_logical_type.py
index 36e9b3c..9efb074 100644
--- a/test/test_logical_type.py
+++ b/test/test_logical_type.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_maintenance_window.py b/test/test_maintenance_window.py
index 49e0a4c..e37af15 100644
--- a/test/test_maintenance_window.py
+++ b/test/test_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_maintenance_window_api.py b/test/test_maintenance_window_api.py
index 61d9463..1ecc46d 100644
--- a/test/test_maintenance_window_api.py
+++ b/test/test_maintenance_window_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_message.py b/test/test_message.py
index 9d39d14..5bc5898 100644
--- a/test/test_message.py
+++ b/test/test_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_message_api.py b/test/test_message_api.py
index b08053d..8a7078e 100644
--- a/test/test_message_api.py
+++ b/test/test_message_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metric_api.py b/test/test_metric_api.py
index 71e03d6..60812ef 100644
--- a/test/test_metric_api.py
+++ b/test/test_metric_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metric_details.py b/test/test_metric_details.py
index 1c7a82a..da398bf 100644
--- a/test/test_metric_details.py
+++ b/test/test_metric_details.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metric_details_response.py b/test/test_metric_details_response.py
index e4ea0c3..46c78f9 100644
--- a/test/test_metric_details_response.py
+++ b/test/test_metric_details_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metric_status.py b/test/test_metric_status.py
index d6baf4a..4c8f743 100644
--- a/test/test_metric_status.py
+++ b/test/test_metric_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metrics_policy_api.py b/test/test_metrics_policy_api.py
index fa1f0a3..0180c88 100644
--- a/test/test_metrics_policy_api.py
+++ b/test/test_metrics_policy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metrics_policy_read_model.py b/test/test_metrics_policy_read_model.py
index 705d854..708b516 100644
--- a/test/test_metrics_policy_read_model.py
+++ b/test/test_metrics_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_metrics_policy_write_model.py b/test/test_metrics_policy_write_model.py
index 69b19b5..8281c36 100644
--- a/test/test_metrics_policy_write_model.py
+++ b/test/test_metrics_policy_write_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_module.py b/test/test_module.py
index 41ceace..707a6fe 100644
--- a/test/test_module.py
+++ b/test/test_module.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_module_descriptor.py b/test/test_module_descriptor.py
index 34b9e6c..d1f7ecd 100644
--- a/test/test_module_descriptor.py
+++ b/test/test_module_descriptor.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_module_layer.py b/test/test_module_layer.py
index 45b5d1f..9590c0b 100644
--- a/test/test_module_layer.py
+++ b/test/test_module_layer.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_monitored_application_api.py b/test/test_monitored_application_api.py
index a1a7085..ddfef54 100644
--- a/test/test_monitored_application_api.py
+++ b/test/test_monitored_application_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_monitored_application_dto.py b/test/test_monitored_application_dto.py
index 34c0189..fe5346f 100644
--- a/test/test_monitored_application_dto.py
+++ b/test/test_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_monitored_cluster.py b/test/test_monitored_cluster.py
index b444177..c1c2f41 100644
--- a/test/test_monitored_cluster.py
+++ b/test/test_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_monitored_service_api.py b/test/test_monitored_service_api.py
index 4410247..3ed0e00 100644
--- a/test/test_monitored_service_api.py
+++ b/test/test_monitored_service_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -29,6 +29,20 @@ def setUp(self):
     def tearDown(self):
         pass
 
+    def test_batch_update(self):
+        """Test case for batch_update
+
+        Update multiple applications and services in a batch. Batch size is limited to 100.  # noqa: E501
+        """
+        pass
+
+    def test_get_all_components(self):
+        """Test case for get_all_components
+
+        Get all monitored services with components  # noqa: E501
+        """
+        pass
+
     def test_get_all_services(self):
         """Test case for get_all_services
 
@@ -36,6 +50,13 @@ def test_get_all_services(self):
         """
         pass
 
+    def test_get_component(self):
+        """Test case for get_component
+
+        Get a specific application  # noqa: E501
+        """
+        pass
+
     def test_get_service(self):
         """Test case for get_service
 
diff --git a/test/test_monitored_service_dto.py b/test/test_monitored_service_dto.py
index 166323e..e87d41c 100644
--- a/test/test_monitored_service_dto.py
+++ b/test/test_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_new_relic_configuration.py b/test/test_new_relic_configuration.py
index 64620bb..02e8e02 100644
--- a/test/test_new_relic_configuration.py
+++ b/test/test_new_relic_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_new_relic_metric_filters.py b/test/test_new_relic_metric_filters.py
index eb1b073..d03fa11 100644
--- a/test/test_new_relic_metric_filters.py
+++ b/test/test_new_relic_metric_filters.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_notificant.py b/test/test_notificant.py
index bcaf706..980980d 100644
--- a/test/test_notificant.py
+++ b/test/test_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_notificant_api.py b/test/test_notificant_api.py
index 5d997de..32eb446 100644
--- a/test/test_notificant_api.py
+++ b/test/test_notificant_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_notification_messages.py b/test/test_notification_messages.py
index bf0ad4f..accd2dd 100644
--- a/test/test_notification_messages.py
+++ b/test/test_notification_messages.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_package.py b/test/test_package.py
index d01c9e0..a27ab42 100644
--- a/test/test_package.py
+++ b/test/test_package.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged.py b/test/test_paged.py
index ad6960c..2ec754b 100644
--- a/test/test_paged.py
+++ b/test/test_paged.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_account.py b/test/test_paged_account.py
index 4666781..d9d68b3 100644
--- a/test/test_paged_account.py
+++ b/test/test_paged_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_alert.py b/test/test_paged_alert.py
index e901155..e1dd260 100644
--- a/test/test_paged_alert.py
+++ b/test/test_paged_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_alert_with_stats.py b/test/test_paged_alert_with_stats.py
index 8d3bc66..96593be 100644
--- a/test/test_paged_alert_with_stats.py
+++ b/test/test_paged_alert_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_anomaly.py b/test/test_paged_anomaly.py
index 96fab40..8651711 100644
--- a/test/test_paged_anomaly.py
+++ b/test/test_paged_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_api_token_model.py b/test/test_paged_api_token_model.py
index 52ed536..079b427 100644
--- a/test/test_paged_api_token_model.py
+++ b/test/test_paged_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_cloud_integration.py b/test/test_paged_cloud_integration.py
index 3c00d3a..5b6bca5 100644
--- a/test/test_paged_cloud_integration.py
+++ b/test/test_paged_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_customer_facing_user_object.py b/test/test_paged_customer_facing_user_object.py
index 1b8c7df..c7363fa 100644
--- a/test/test_paged_customer_facing_user_object.py
+++ b/test/test_paged_customer_facing_user_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_dashboard.py b/test/test_paged_dashboard.py
index 5f04bbf..cfd0341 100644
--- a/test/test_paged_dashboard.py
+++ b/test/test_paged_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_derived_metric_definition.py b/test/test_paged_derived_metric_definition.py
index 444dff6..999fc7d 100644
--- a/test/test_paged_derived_metric_definition.py
+++ b/test/test_paged_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_derived_metric_definition_with_stats.py b/test/test_paged_derived_metric_definition_with_stats.py
index 6bd4e8c..a204825 100644
--- a/test/test_paged_derived_metric_definition_with_stats.py
+++ b/test/test_paged_derived_metric_definition_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_event.py b/test/test_paged_event.py
index 891b319..2fc9b5f 100644
--- a/test/test_paged_event.py
+++ b/test/test_paged_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_external_link.py b/test/test_paged_external_link.py
index 6413d48..8373311 100644
--- a/test/test_paged_external_link.py
+++ b/test/test_paged_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_ingestion_policy.py b/test/test_paged_ingestion_policy.py
deleted file mode 100644
index 1e3bcda..0000000
--- a/test/test_paged_ingestion_policy.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.paged_ingestion_policy import PagedIngestionPolicy  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestPagedIngestionPolicy(unittest.TestCase):
-    """PagedIngestionPolicy unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testPagedIngestionPolicy(self):
-        """Test PagedIngestionPolicy"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.paged_ingestion_policy.PagedIngestionPolicy()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_paged_ingestion_policy_read_model.py b/test/test_paged_ingestion_policy_read_model.py
index b47b1bc..afeb137 100644
--- a/test/test_paged_ingestion_policy_read_model.py
+++ b/test/test_paged_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_integration.py b/test/test_paged_integration.py
index 4bf6870..3f137ba 100644
--- a/test/test_paged_integration.py
+++ b/test/test_paged_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_maintenance_window.py b/test/test_paged_maintenance_window.py
index 41368e5..eca7991 100644
--- a/test/test_paged_maintenance_window.py
+++ b/test/test_paged_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_message.py b/test/test_paged_message.py
index 2c9aec7..401a00f 100644
--- a/test/test_paged_message.py
+++ b/test/test_paged_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_monitored_application_dto.py b/test/test_paged_monitored_application_dto.py
index 313ec09..7222cf2 100644
--- a/test/test_paged_monitored_application_dto.py
+++ b/test/test_paged_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_monitored_cluster.py b/test/test_paged_monitored_cluster.py
index 22b717e..b2e5a8d 100644
--- a/test/test_paged_monitored_cluster.py
+++ b/test/test_paged_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_monitored_service_dto.py b/test/test_paged_monitored_service_dto.py
index 1e11694..fb68f5a 100644
--- a/test/test_paged_monitored_service_dto.py
+++ b/test/test_paged_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_notificant.py b/test/test_paged_notificant.py
index 11424e0..f134cac 100644
--- a/test/test_paged_notificant.py
+++ b/test/test_paged_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_proxy.py b/test/test_paged_proxy.py
index 9cf734d..9aae393 100644
--- a/test/test_paged_proxy.py
+++ b/test/test_paged_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_recent_app_map_search.py b/test/test_paged_recent_app_map_search.py
index 67e4d1f..cae45ad 100644
--- a/test/test_paged_recent_app_map_search.py
+++ b/test/test_paged_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_recent_traces_search.py b/test/test_paged_recent_traces_search.py
index c684234..5eb3d73 100644
--- a/test/test_paged_recent_traces_search.py
+++ b/test/test_paged_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_related_event.py b/test/test_paged_related_event.py
index 32373f5..978085e 100644
--- a/test/test_paged_related_event.py
+++ b/test/test_paged_related_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_report_event_anomaly_dto.py b/test/test_paged_report_event_anomaly_dto.py
index a0b36b1..ca17a06 100644
--- a/test/test_paged_report_event_anomaly_dto.py
+++ b/test/test_paged_report_event_anomaly_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_role_dto.py b/test/test_paged_role_dto.py
index ea8263f..064f312 100644
--- a/test/test_paged_role_dto.py
+++ b/test/test_paged_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_saved_app_map_search.py b/test/test_paged_saved_app_map_search.py
index 44c357a..ba0a534 100644
--- a/test/test_paged_saved_app_map_search.py
+++ b/test/test_paged_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_saved_app_map_search_group.py b/test/test_paged_saved_app_map_search_group.py
index 2a38104..24aedc1 100644
--- a/test/test_paged_saved_app_map_search_group.py
+++ b/test/test_paged_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_saved_search.py b/test/test_paged_saved_search.py
index 26cbf1f..dcae872 100644
--- a/test/test_paged_saved_search.py
+++ b/test/test_paged_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_saved_traces_search.py b/test/test_paged_saved_traces_search.py
index 346f9fc..27b2bd9 100644
--- a/test/test_paged_saved_traces_search.py
+++ b/test/test_paged_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_saved_traces_search_group.py b/test/test_paged_saved_traces_search_group.py
index 1531c18..3c12148 100644
--- a/test/test_paged_saved_traces_search_group.py
+++ b/test/test_paged_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_service_account.py b/test/test_paged_service_account.py
index 5f8e243..3cc5f0b 100644
--- a/test/test_paged_service_account.py
+++ b/test/test_paged_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_source.py b/test/test_paged_source.py
index 764df62..4b52faa 100644
--- a/test/test_paged_source.py
+++ b/test/test_paged_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_span_sampling_policy.py b/test/test_paged_span_sampling_policy.py
index 45a974b..fb323e4 100644
--- a/test/test_paged_span_sampling_policy.py
+++ b/test/test_paged_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_paged_user_group_model.py b/test/test_paged_user_group_model.py
index 0bcfdd9..aa3f9a5 100644
--- a/test/test_paged_user_group_model.py
+++ b/test/test_paged_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_point.py b/test/test_point.py
index c9cef34..4158032 100644
--- a/test/test_point.py
+++ b/test/test_point.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_policy_rule_read_model.py b/test/test_policy_rule_read_model.py
index ce079f1..fa68418 100644
--- a/test/test_policy_rule_read_model.py
+++ b/test/test_policy_rule_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_policy_rule_write_model.py b/test/test_policy_rule_write_model.py
index 67ec424..9f99dbc 100644
--- a/test/test_policy_rule_write_model.py
+++ b/test/test_policy_rule_write_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_proxy.py b/test/test_proxy.py
index 03ad9c3..8adf10f 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_proxy_api.py b/test/test_proxy_api.py
index 6cdb7a4..43c9b17 100644
--- a/test/test_proxy_api.py
+++ b/test/test_proxy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -50,6 +50,20 @@ def test_get_proxy(self):
         """
         pass
 
+    def test_get_proxy_config(self):
+        """Test case for get_proxy_config
+
+        Get a specific proxy config  # noqa: E501
+        """
+        pass
+
+    def test_get_proxy_preprocessor_rules(self):
+        """Test case for get_proxy_preprocessor_rules
+
+        Get a specific proxy preprocessor rules  # noqa: E501
+        """
+        pass
+
     def test_undelete_proxy(self):
         """Test case for undelete_proxy
 
diff --git a/test/test_query_api.py b/test/test_query_api.py
index b013fcc..6ffae6c 100644
--- a/test/test_query_api.py
+++ b/test/test_query_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_query_event.py b/test/test_query_event.py
index 96297c9..1105948 100644
--- a/test/test_query_event.py
+++ b/test/test_query_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_query_result.py b/test/test_query_result.py
index 20dd7ef..d57f1bd 100644
--- a/test/test_query_result.py
+++ b/test/test_query_result.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_query_type_dto.py b/test/test_query_type_dto.py
index 68e4ce1..756d4e4 100644
--- a/test/test_query_type_dto.py
+++ b/test/test_query_type_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_raw_timeseries.py b/test/test_raw_timeseries.py
index adfc98e..15212e0 100644
--- a/test/test_raw_timeseries.py
+++ b/test/test_raw_timeseries.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_recent_app_map_search.py b/test/test_recent_app_map_search.py
index 11c8ab9..7b7f74f 100644
--- a/test/test_recent_app_map_search.py
+++ b/test/test_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_recent_app_map_search_api.py b/test/test_recent_app_map_search_api.py
index 259b70d..687edfa 100644
--- a/test/test_recent_app_map_search_api.py
+++ b/test/test_recent_app_map_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_recent_traces_search.py b/test/test_recent_traces_search.py
index b226f17..80e2273 100644
--- a/test/test_recent_traces_search.py
+++ b/test/test_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_recent_traces_search_api.py b/test/test_recent_traces_search_api.py
index 546412a..b9e3ad4 100644
--- a/test/test_recent_traces_search_api.py
+++ b/test/test_recent_traces_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_related_anomaly.py b/test/test_related_anomaly.py
index c63f9cb..5fb15ea 100644
--- a/test/test_related_anomaly.py
+++ b/test/test_related_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_related_data.py b/test/test_related_data.py
index fd1dc9c..296d354 100644
--- a/test/test_related_data.py
+++ b/test/test_related_data.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_related_event.py b/test/test_related_event.py
index 02903d9..7628794 100644
--- a/test/test_related_event.py
+++ b/test/test_related_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_related_event_time_range.py b/test/test_related_event_time_range.py
index 88b17f9..a9d7033 100644
--- a/test/test_related_event_time_range.py
+++ b/test/test_related_event_time_range.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_report_event_anomaly_dto.py b/test/test_report_event_anomaly_dto.py
index 289cfdb..bd3d542 100644
--- a/test/test_report_event_anomaly_dto.py
+++ b/test/test_report_event_anomaly_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container.py b/test/test_response_container.py
index c570f82..71ce4ed 100644
--- a/test/test_response_container.py
+++ b/test/test_response_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_access_policy.py b/test/test_response_container_access_policy.py
index b71acee..1bb9da4 100644
--- a/test/test_response_container_access_policy.py
+++ b/test/test_response_container_access_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_access_policy_action.py b/test/test_response_container_access_policy_action.py
index febcda7..854d4c6 100644
--- a/test/test_response_container_access_policy_action.py
+++ b/test/test_response_container_access_policy_action.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_account.py b/test/test_response_container_account.py
index 5995139..7cfbab8 100644
--- a/test/test_response_container_account.py
+++ b/test/test_response_container_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_alert.py b/test/test_response_container_alert.py
index 6380bb0..e99a407 100644
--- a/test/test_response_container_alert.py
+++ b/test/test_response_container_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_api_token_model.py b/test/test_response_container_api_token_model.py
index 7e405ea..8d93526 100644
--- a/test/test_response_container_api_token_model.py
+++ b/test/test_response_container_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_cloud_integration.py b/test/test_response_container_cloud_integration.py
index 90f6d17..ac96e0e 100644
--- a/test/test_response_container_cloud_integration.py
+++ b/test/test_response_container_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_dashboard.py b/test/test_response_container_dashboard.py
index bd56f84..6a3f267 100644
--- a/test/test_response_container_dashboard.py
+++ b/test/test_response_container_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_default_saved_app_map_search.py b/test/test_response_container_default_saved_app_map_search.py
index c78960c..80a6ef7 100644
--- a/test/test_response_container_default_saved_app_map_search.py
+++ b/test/test_response_container_default_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_default_saved_traces_search.py b/test/test_response_container_default_saved_traces_search.py
index fe0690d..cdb7175 100644
--- a/test/test_response_container_default_saved_traces_search.py
+++ b/test/test_response_container_default_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_derived_metric_definition.py b/test/test_response_container_derived_metric_definition.py
index b4026d6..3f8f0a8 100644
--- a/test/test_response_container_derived_metric_definition.py
+++ b/test/test_response_container_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_event.py b/test/test_response_container_event.py
index 7d6ac63..4ff7617 100644
--- a/test/test_response_container_event.py
+++ b/test/test_response_container_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_external_link.py b/test/test_response_container_external_link.py
index 3102d90..d574e4f 100644
--- a/test/test_response_container_external_link.py
+++ b/test/test_response_container_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_facet_response.py b/test/test_response_container_facet_response.py
index 79c8a31..6dd35b7 100644
--- a/test/test_response_container_facet_response.py
+++ b/test/test_response_container_facet_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_facets_response_container.py b/test/test_response_container_facets_response_container.py
index c10ad78..4dd475b 100644
--- a/test/test_response_container_facets_response_container.py
+++ b/test/test_response_container_facets_response_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_global_alert_analytic.py b/test/test_response_container_global_alert_analytic.py
index b7dc5cc..bbcbae7 100644
--- a/test/test_response_container_global_alert_analytic.py
+++ b/test/test_response_container_global_alert_analytic.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_history_response.py b/test/test_response_container_history_response.py
index e6b9c8f..7d31421 100644
--- a/test/test_response_container_history_response.py
+++ b/test/test_response_container_history_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_ingestion_policy.py b/test/test_response_container_ingestion_policy.py
deleted file mode 100644
index 70f79f8..0000000
--- a/test/test_response_container_ingestion_policy.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_ingestion_policy import ResponseContainerIngestionPolicy  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerIngestionPolicy(unittest.TestCase):
-    """ResponseContainerIngestionPolicy unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerIngestionPolicy(self):
-        """Test ResponseContainerIngestionPolicy"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_ingestion_policy.ResponseContainerIngestionPolicy()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_ingestion_policy_read_model.py b/test/test_response_container_ingestion_policy_read_model.py
index c85b703..0201a64 100644
--- a/test/test_response_container_ingestion_policy_read_model.py
+++ b/test/test_response_container_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_integration.py b/test/test_response_container_integration.py
index e27a342..559aa78 100644
--- a/test/test_response_container_integration.py
+++ b/test/test_response_container_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_integration_status.py b/test/test_response_container_integration_status.py
index 087a59a..2b96f09 100644
--- a/test/test_response_container_integration_status.py
+++ b/test/test_response_container_integration_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_access_control_list_read_dto.py b/test/test_response_container_list_access_control_list_read_dto.py
index 3475dbb..e9fcf33 100644
--- a/test/test_response_container_list_access_control_list_read_dto.py
+++ b/test/test_response_container_list_access_control_list_read_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_api_token_model.py b/test/test_response_container_list_api_token_model.py
index 5ea5170..fa2137e 100644
--- a/test/test_response_container_list_api_token_model.py
+++ b/test/test_response_container_list_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_integration.py b/test/test_response_container_list_integration.py
index 3938780..9f54fed 100644
--- a/test/test_response_container_list_integration.py
+++ b/test/test_response_container_list_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_integration_manifest_group.py b/test/test_response_container_list_integration_manifest_group.py
index ce0962a..a2e70d8 100644
--- a/test/test_response_container_list_integration_manifest_group.py
+++ b/test/test_response_container_list_integration_manifest_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_notification_messages.py b/test/test_response_container_list_notification_messages.py
index baa473f..6c81f18 100644
--- a/test/test_response_container_list_notification_messages.py
+++ b/test/test_response_container_list_notification_messages.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_service_account.py b/test/test_response_container_list_service_account.py
index f6e2c13..a5a65af 100644
--- a/test/test_response_container_list_service_account.py
+++ b/test/test_response_container_list_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_string.py b/test/test_response_container_list_string.py
index 43aacaf..ace0852 100644
--- a/test/test_response_container_list_string.py
+++ b/test/test_response_container_list_string.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_user_api_token.py b/test/test_response_container_list_user_api_token.py
index 5507d1f..b8554ca 100644
--- a/test/test_response_container_list_user_api_token.py
+++ b/test/test_response_container_list_user_api_token.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_list_user_dto.py b/test/test_response_container_list_user_dto.py
index 1f85dc0..e64c466 100644
--- a/test/test_response_container_list_user_dto.py
+++ b/test/test_response_container_list_user_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_maintenance_window.py b/test/test_response_container_maintenance_window.py
index 5a1373a..12b3092 100644
--- a/test/test_response_container_maintenance_window.py
+++ b/test/test_response_container_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_map_string_integer.py b/test/test_response_container_map_string_integer.py
index 3e4222f..3b0862c 100644
--- a/test/test_response_container_map_string_integer.py
+++ b/test/test_response_container_map_string_integer.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_map_string_integration_status.py b/test/test_response_container_map_string_integration_status.py
index 0b3dfa4..cc38bd8 100644
--- a/test/test_response_container_map_string_integration_status.py
+++ b/test/test_response_container_map_string_integration_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_message.py b/test/test_response_container_message.py
index 2b37dd5..d4ddbd2 100644
--- a/test/test_response_container_message.py
+++ b/test/test_response_container_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_metrics_policy_read_model.py b/test/test_response_container_metrics_policy_read_model.py
index 0160391..c8503e1 100644
--- a/test/test_response_container_metrics_policy_read_model.py
+++ b/test/test_response_container_metrics_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_monitored_application_dto.py b/test/test_response_container_monitored_application_dto.py
index dea7145..2bed96c 100644
--- a/test/test_response_container_monitored_application_dto.py
+++ b/test/test_response_container_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_monitored_cluster.py b/test/test_response_container_monitored_cluster.py
index 6d47181..3d9ddb1 100644
--- a/test/test_response_container_monitored_cluster.py
+++ b/test/test_response_container_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_monitored_service_dto.py b/test/test_response_container_monitored_service_dto.py
index 017c0c4..1bca88b 100644
--- a/test/test_response_container_monitored_service_dto.py
+++ b/test/test_response_container_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_notificant.py b/test/test_response_container_notificant.py
index 7891ccd..954f07a 100644
--- a/test/test_response_container_notificant.py
+++ b/test/test_response_container_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_account.py b/test/test_response_container_paged_account.py
index bfdff3e..ec99eda 100644
--- a/test/test_response_container_paged_account.py
+++ b/test/test_response_container_paged_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_alert.py b/test/test_response_container_paged_alert.py
index 9fd71a0..37587f0 100644
--- a/test/test_response_container_paged_alert.py
+++ b/test/test_response_container_paged_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_alert_with_stats.py b/test/test_response_container_paged_alert_with_stats.py
index 4e76e01..f9c8bea 100644
--- a/test/test_response_container_paged_alert_with_stats.py
+++ b/test/test_response_container_paged_alert_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_anomaly.py b/test/test_response_container_paged_anomaly.py
index 8dfa9ac..9b81a3f 100644
--- a/test/test_response_container_paged_anomaly.py
+++ b/test/test_response_container_paged_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_api_token_model.py b/test/test_response_container_paged_api_token_model.py
index 5be0bfc..32a7af6 100644
--- a/test/test_response_container_paged_api_token_model.py
+++ b/test/test_response_container_paged_api_token_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_cloud_integration.py b/test/test_response_container_paged_cloud_integration.py
index 11a32bc..daf0f46 100644
--- a/test/test_response_container_paged_cloud_integration.py
+++ b/test/test_response_container_paged_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_customer_facing_user_object.py b/test/test_response_container_paged_customer_facing_user_object.py
index af8512b..afeb2aa 100644
--- a/test/test_response_container_paged_customer_facing_user_object.py
+++ b/test/test_response_container_paged_customer_facing_user_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_dashboard.py b/test/test_response_container_paged_dashboard.py
index f67e65e..2956c02 100644
--- a/test/test_response_container_paged_dashboard.py
+++ b/test/test_response_container_paged_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_derived_metric_definition.py b/test/test_response_container_paged_derived_metric_definition.py
index 2953550..c3602fd 100644
--- a/test/test_response_container_paged_derived_metric_definition.py
+++ b/test/test_response_container_paged_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_derived_metric_definition_with_stats.py b/test/test_response_container_paged_derived_metric_definition_with_stats.py
index 18f6fcb..faad57a 100644
--- a/test/test_response_container_paged_derived_metric_definition_with_stats.py
+++ b/test/test_response_container_paged_derived_metric_definition_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_event.py b/test/test_response_container_paged_event.py
index 18222aa..94c45ac 100644
--- a/test/test_response_container_paged_event.py
+++ b/test/test_response_container_paged_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_external_link.py b/test/test_response_container_paged_external_link.py
index 35d7d21..a521291 100644
--- a/test/test_response_container_paged_external_link.py
+++ b/test/test_response_container_paged_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_ingestion_policy.py b/test/test_response_container_paged_ingestion_policy.py
deleted file mode 100644
index b58f66d..0000000
--- a/test/test_response_container_paged_ingestion_policy.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_paged_ingestion_policy import ResponseContainerPagedIngestionPolicy  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerPagedIngestionPolicy(unittest.TestCase):
-    """ResponseContainerPagedIngestionPolicy unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerPagedIngestionPolicy(self):
-        """Test ResponseContainerPagedIngestionPolicy"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_paged_ingestion_policy.ResponseContainerPagedIngestionPolicy()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_paged_ingestion_policy_read_model.py b/test/test_response_container_paged_ingestion_policy_read_model.py
index 9d0f0fc..d48a863 100644
--- a/test/test_response_container_paged_ingestion_policy_read_model.py
+++ b/test/test_response_container_paged_ingestion_policy_read_model.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_integration.py b/test/test_response_container_paged_integration.py
index 51cff95..59bec7c 100644
--- a/test/test_response_container_paged_integration.py
+++ b/test/test_response_container_paged_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_maintenance_window.py b/test/test_response_container_paged_maintenance_window.py
index 0065d0e..16163fd 100644
--- a/test/test_response_container_paged_maintenance_window.py
+++ b/test/test_response_container_paged_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_message.py b/test/test_response_container_paged_message.py
index 072c8dc..25d51fd 100644
--- a/test/test_response_container_paged_message.py
+++ b/test/test_response_container_paged_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_monitored_application_dto.py b/test/test_response_container_paged_monitored_application_dto.py
index 5a37974..db8404d 100644
--- a/test/test_response_container_paged_monitored_application_dto.py
+++ b/test/test_response_container_paged_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_monitored_cluster.py b/test/test_response_container_paged_monitored_cluster.py
index f47645b..e9561bf 100644
--- a/test/test_response_container_paged_monitored_cluster.py
+++ b/test/test_response_container_paged_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_monitored_service_dto.py b/test/test_response_container_paged_monitored_service_dto.py
index bd17bca..49834bb 100644
--- a/test/test_response_container_paged_monitored_service_dto.py
+++ b/test/test_response_container_paged_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_notificant.py b/test/test_response_container_paged_notificant.py
index 08d7e1d..873e91c 100644
--- a/test/test_response_container_paged_notificant.py
+++ b/test/test_response_container_paged_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_proxy.py b/test/test_response_container_paged_proxy.py
index ae99a1d..d9447b9 100644
--- a/test/test_response_container_paged_proxy.py
+++ b/test/test_response_container_paged_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_recent_app_map_search.py b/test/test_response_container_paged_recent_app_map_search.py
index caeb4f2..320cd2c 100644
--- a/test/test_response_container_paged_recent_app_map_search.py
+++ b/test/test_response_container_paged_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_recent_traces_search.py b/test/test_response_container_paged_recent_traces_search.py
index 1ff0efc..3df9b7e 100644
--- a/test/test_response_container_paged_recent_traces_search.py
+++ b/test/test_response_container_paged_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_related_event.py b/test/test_response_container_paged_related_event.py
index 508484e..3623c4a 100644
--- a/test/test_response_container_paged_related_event.py
+++ b/test/test_response_container_paged_related_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_report_event_anomaly_dto.py b/test/test_response_container_paged_report_event_anomaly_dto.py
index 2ca1132..b081e9f 100644
--- a/test/test_response_container_paged_report_event_anomaly_dto.py
+++ b/test/test_response_container_paged_report_event_anomaly_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_role_dto.py b/test/test_response_container_paged_role_dto.py
index 3c1c353..5479561 100644
--- a/test/test_response_container_paged_role_dto.py
+++ b/test/test_response_container_paged_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_saved_app_map_search.py b/test/test_response_container_paged_saved_app_map_search.py
index 12794b6..375c87d 100644
--- a/test/test_response_container_paged_saved_app_map_search.py
+++ b/test/test_response_container_paged_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_saved_app_map_search_group.py b/test/test_response_container_paged_saved_app_map_search_group.py
index ae1e382..9a84248 100644
--- a/test/test_response_container_paged_saved_app_map_search_group.py
+++ b/test/test_response_container_paged_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_saved_search.py b/test/test_response_container_paged_saved_search.py
index 00f209a..40d28ce 100644
--- a/test/test_response_container_paged_saved_search.py
+++ b/test/test_response_container_paged_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_saved_traces_search.py b/test/test_response_container_paged_saved_traces_search.py
index 1901880..2f738ef 100644
--- a/test/test_response_container_paged_saved_traces_search.py
+++ b/test/test_response_container_paged_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_saved_traces_search_group.py b/test/test_response_container_paged_saved_traces_search_group.py
index 917c90c..eb4541f 100644
--- a/test/test_response_container_paged_saved_traces_search_group.py
+++ b/test/test_response_container_paged_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_service_account.py b/test/test_response_container_paged_service_account.py
index 5eef6e9..7dab928 100644
--- a/test/test_response_container_paged_service_account.py
+++ b/test/test_response_container_paged_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_source.py b/test/test_response_container_paged_source.py
index a96290a..b2db896 100644
--- a/test/test_response_container_paged_source.py
+++ b/test/test_response_container_paged_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_span_sampling_policy.py b/test/test_response_container_paged_span_sampling_policy.py
index c2cec7b..883771b 100644
--- a/test/test_response_container_paged_span_sampling_policy.py
+++ b/test/test_response_container_paged_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_paged_user_group_model.py b/test/test_response_container_paged_user_group_model.py
index c1d30d4..bcfcb01 100644
--- a/test/test_response_container_paged_user_group_model.py
+++ b/test/test_response_container_paged_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_proxy.py b/test/test_response_container_proxy.py
index 4ebd001..5b16ad0 100644
--- a/test/test_response_container_proxy.py
+++ b/test/test_response_container_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_query_type_dto.py b/test/test_response_container_query_type_dto.py
index 9b940e0..32a2ec6 100644
--- a/test/test_response_container_query_type_dto.py
+++ b/test/test_response_container_query_type_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_recent_app_map_search.py b/test/test_response_container_recent_app_map_search.py
index c76f269..2dd0cea 100644
--- a/test/test_response_container_recent_app_map_search.py
+++ b/test/test_response_container_recent_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_recent_traces_search.py b/test/test_response_container_recent_traces_search.py
index 130e605..ea0f4c8 100644
--- a/test/test_response_container_recent_traces_search.py
+++ b/test/test_response_container_recent_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_role_dto.py b/test/test_response_container_role_dto.py
index e5f2b8c..2e5a862 100644
--- a/test/test_response_container_role_dto.py
+++ b/test/test_response_container_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_saved_app_map_search.py b/test/test_response_container_saved_app_map_search.py
index 2e62f59..b65764a 100644
--- a/test/test_response_container_saved_app_map_search.py
+++ b/test/test_response_container_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_saved_app_map_search_group.py b/test/test_response_container_saved_app_map_search_group.py
index f05d58f..14aff98 100644
--- a/test/test_response_container_saved_app_map_search_group.py
+++ b/test/test_response_container_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_saved_search.py b/test/test_response_container_saved_search.py
index e0d8008..18b54c7 100644
--- a/test/test_response_container_saved_search.py
+++ b/test/test_response_container_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_saved_traces_search.py b/test/test_response_container_saved_traces_search.py
index 5195bd4..f377d35 100644
--- a/test/test_response_container_saved_traces_search.py
+++ b/test/test_response_container_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_saved_traces_search_group.py b/test/test_response_container_saved_traces_search_group.py
index 84f1a9a..63a79fb 100644
--- a/test/test_response_container_saved_traces_search_group.py
+++ b/test/test_response_container_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_service_account.py b/test/test_response_container_service_account.py
index 9960b2e..b74959f 100644
--- a/test/test_response_container_service_account.py
+++ b/test/test_response_container_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_set_business_function.py b/test/test_response_container_set_business_function.py
index 1fd806e..5158a68 100644
--- a/test/test_response_container_set_business_function.py
+++ b/test/test_response_container_set_business_function.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_set_source_label_pair.py b/test/test_response_container_set_source_label_pair.py
index 3ac9092..3710de1 100644
--- a/test/test_response_container_set_source_label_pair.py
+++ b/test/test_response_container_set_source_label_pair.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_source.py b/test/test_response_container_source.py
index 0552b9b..29bab65 100644
--- a/test/test_response_container_source.py
+++ b/test/test_response_container_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_span_sampling_policy.py b/test/test_response_container_span_sampling_policy.py
index ebe08ed..d3f7624 100644
--- a/test/test_response_container_span_sampling_policy.py
+++ b/test/test_response_container_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_string.py b/test/test_response_container_string.py
index ae0e25a..a51513d 100644
--- a/test/test_response_container_string.py
+++ b/test/test_response_container_string.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_tags_response.py b/test/test_response_container_tags_response.py
index 9aeb7a2..cbb01eb 100644
--- a/test/test_response_container_tags_response.py
+++ b/test/test_response_container_tags_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_user_api_token.py b/test/test_response_container_user_api_token.py
index 9bd8d13..3a7d116 100644
--- a/test/test_response_container_user_api_token.py
+++ b/test/test_response_container_user_api_token.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_user_dto.py b/test/test_response_container_user_dto.py
index f40e58a..7f39c59 100644
--- a/test/test_response_container_user_dto.py
+++ b/test/test_response_container_user_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_user_group_model.py b/test/test_response_container_user_group_model.py
index 543e56e..1a463fc 100644
--- a/test/test_response_container_user_group_model.py
+++ b/test/test_response_container_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_validated_users_dto.py b/test/test_response_container_validated_users_dto.py
index c41d410..96f8f2c 100644
--- a/test/test_response_container_validated_users_dto.py
+++ b/test/test_response_container_validated_users_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_container_void.py b/test/test_response_container_void.py
index f56f6a4..14accf3 100644
--- a/test/test_response_container_void.py
+++ b/test/test_response_container_void.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_response_status.py b/test/test_response_status.py
index 2481efa..eb747d0 100644
--- a/test/test_response_status.py
+++ b/test/test_response_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_role_api.py b/test/test_role_api.py
index 6091f15..dd22f1a 100644
--- a/test/test_role_api.py
+++ b/test/test_role_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -32,63 +32,63 @@ def tearDown(self):
     def test_add_assignees(self):
         """Test case for add_assignees
 
-        Add multiple users and user groups to a specific role  # noqa: E501
+        Add accounts and groups to a role  # noqa: E501
         """
         pass
 
     def test_create_role(self):
         """Test case for create_role
 
-        Create a specific role  # noqa: E501
+        Create a role  # noqa: E501
         """
         pass
 
     def test_delete_role(self):
         """Test case for delete_role
 
-        Delete a specific role  # noqa: E501
+        Delete a role by ID  # noqa: E501
         """
         pass
 
     def test_get_all_roles(self):
         """Test case for get_all_roles
 
-        Get all roles for a customer  # noqa: E501
+        Get all roles  # noqa: E501
         """
         pass
 
     def test_get_role(self):
         """Test case for get_role
 
-        Get a specific role  # noqa: E501
+        Get a role by ID  # noqa: E501
         """
         pass
 
     def test_grant_permission_to_roles(self):
         """Test case for grant_permission_to_roles
 
-        Grants a single permission to role(s)  # noqa: E501
+        Grant a permission to roles  # noqa: E501
         """
         pass
 
     def test_remove_assignees(self):
         """Test case for remove_assignees
 
-        Remove multiple users and user groups from a specific role  # noqa: E501
+        Remove accounts and groups from a role  # noqa: E501
         """
         pass
 
     def test_revoke_permission_from_roles(self):
         """Test case for revoke_permission_from_roles
 
-        Revokes a single permission from role(s)  # noqa: E501
+        Revoke a permission from roles  # noqa: E501
         """
         pass
 
     def test_update_role(self):
         """Test case for update_role
 
-        Update a specific role  # noqa: E501
+        Update a role by ID  # noqa: E501
         """
         pass
 
diff --git a/test/test_role_dto.py b/test/test_role_dto.py
index 7f705ad..1bb0ac0 100644
--- a/test/test_role_dto.py
+++ b/test/test_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_role_properties_dto.py b/test/test_role_properties_dto.py
index 0819263..5d610ca 100644
--- a/test/test_role_properties_dto.py
+++ b/test/test_role_properties_dto.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_app_map_search.py b/test/test_saved_app_map_search.py
index 923edd2..06fbb43 100644
--- a/test/test_saved_app_map_search.py
+++ b/test/test_saved_app_map_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_app_map_search_api.py b/test/test_saved_app_map_search_api.py
index b2e0540..7ef637d 100644
--- a/test/test_saved_app_map_search_api.py
+++ b/test/test_saved_app_map_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,6 +36,27 @@ def test_create_saved_app_map_search(self):
         """
         pass
 
+    def test_default_app_map_search(self):
+        """Test case for default_app_map_search
+
+        Get default app map search for a user  # noqa: E501
+        """
+        pass
+
+    def test_default_app_map_search_0(self):
+        """Test case for default_app_map_search_0
+
+        Set default app map search at user level  # noqa: E501
+        """
+        pass
+
+    def test_default_customer_app_map_search(self):
+        """Test case for default_customer_app_map_search
+
+        Set default app map search at customer level  # noqa: E501
+        """
+        pass
+
     def test_delete_saved_app_map_search(self):
         """Test case for delete_saved_app_map_search
 
diff --git a/test/test_saved_app_map_search_group.py b/test/test_saved_app_map_search_group.py
index 8a7a882..a9b08ed 100644
--- a/test/test_saved_app_map_search_group.py
+++ b/test/test_saved_app_map_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_app_map_search_group_api.py b/test/test_saved_app_map_search_group_api.py
index b1a69c3..0546756 100644
--- a/test/test_saved_app_map_search_group_api.py
+++ b/test/test_saved_app_map_search_group_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_search.py b/test/test_saved_search.py
index b950255..efa7940 100644
--- a/test/test_saved_search.py
+++ b/test/test_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_search_api.py b/test/test_saved_search_api.py
index dd83835..b586332 100644
--- a/test/test_saved_search_api.py
+++ b/test/test_saved_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_traces_search.py b/test/test_saved_traces_search.py
index 12bb055..5b1aee2 100644
--- a/test/test_saved_traces_search.py
+++ b/test/test_saved_traces_search.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_traces_search_api.py b/test/test_saved_traces_search_api.py
index a5589cd..c3c6655 100644
--- a/test/test_saved_traces_search_api.py
+++ b/test/test_saved_traces_search_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,6 +36,27 @@ def test_create_saved_traces_search(self):
         """
         pass
 
+    def test_default_app_map_search(self):
+        """Test case for default_app_map_search
+
+        Set default traces search at user level  # noqa: E501
+        """
+        pass
+
+    def test_default_customer_traces_search(self):
+        """Test case for default_customer_traces_search
+
+        Set default traces search at customer level  # noqa: E501
+        """
+        pass
+
+    def test_default_traces_search(self):
+        """Test case for default_traces_search
+
+        Get default traces search for a user  # noqa: E501
+        """
+        pass
+
     def test_delete_saved_traces_search(self):
         """Test case for delete_saved_traces_search
 
diff --git a/test/test_saved_traces_search_group.py b/test/test_saved_traces_search_group.py
index d8c81b2..707f976 100644
--- a/test/test_saved_traces_search_group.py
+++ b/test/test_saved_traces_search_group.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_saved_traces_search_group_api.py b/test/test_saved_traces_search_group_api.py
index 99e1f30..9fd9eff 100644
--- a/test/test_saved_traces_search_group_api.py
+++ b/test/test_saved_traces_search_group_api.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_schema.py b/test/test_schema.py
index 58202d5..8fc6174 100644
--- a/test/test_schema.py
+++ b/test/test_schema.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_search_api.py b/test/test_search_api.py
index 4f403b0..1fa3525 100644
--- a/test/test_search_api.py
+++ b/test/test_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -442,6 +442,34 @@ def test_search_role_for_facets(self):
         """
         pass
 
+    def test_search_saved_app_map_entities(self):
+        """Test case for search_saved_app_map_entities
+
+        Search over all the customer's non-deleted saved app map searches  # noqa: E501
+        """
+        pass
+
+    def test_search_saved_app_map_for_facet(self):
+        """Test case for search_saved_app_map_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted app map searches  # noqa: E501
+        """
+        pass
+
+    def test_search_saved_app_map_for_facets(self):
+        """Test case for search_saved_app_map_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted app map searches  # noqa: E501
+        """
+        pass
+
+    def test_search_saved_traces_entities(self):
+        """Test case for search_saved_traces_entities
+
+        Search over all the customer's non-deleted saved traces searches  # noqa: E501
+        """
+        pass
+
     def test_search_service_account_entities(self):
         """Test case for search_service_account_entities
 
@@ -463,6 +491,48 @@ def test_search_service_account_for_facets(self):
         """
         pass
 
+    def test_search_span_sampling_policy_deleted_entities(self):
+        """Test case for search_span_sampling_policy_deleted_entities
+
+        Search over a customer's deleted span sampling policies  # noqa: E501
+        """
+        pass
+
+    def test_search_span_sampling_policy_deleted_for_facet(self):
+        """Test case for search_span_sampling_policy_deleted_for_facet
+
+        Lists the values of a specific facet over the customer's deleted span sampling policies  # noqa: E501
+        """
+        pass
+
+    def test_search_span_sampling_policy_deleted_for_facets(self):
+        """Test case for search_span_sampling_policy_deleted_for_facets
+
+        Lists the values of one or more facets over the customer's deleted span sampling policies  # noqa: E501
+        """
+        pass
+
+    def test_search_span_sampling_policy_entities(self):
+        """Test case for search_span_sampling_policy_entities
+
+        Search over a customer's non-deleted span sampling policies  # noqa: E501
+        """
+        pass
+
+    def test_search_span_sampling_policy_for_facet(self):
+        """Test case for search_span_sampling_policy_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted span sampling policies  # noqa: E501
+        """
+        pass
+
+    def test_search_span_sampling_policy_for_facets(self):
+        """Test case for search_span_sampling_policy_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted span sampling policies  # noqa: E501
+        """
+        pass
+
     def test_search_tagged_source_entities(self):
         """Test case for search_tagged_source_entities
 
@@ -484,6 +554,41 @@ def test_search_tagged_source_for_facets(self):
         """
         pass
 
+    def test_search_token_entities(self):
+        """Test case for search_token_entities
+
+        Search over a customer's api tokens  # noqa: E501
+        """
+        pass
+
+    def test_search_token_for_facet(self):
+        """Test case for search_token_for_facet
+
+        Lists the values of a specific facet over the customer's api tokens  # noqa: E501
+        """
+        pass
+
+    def test_search_token_for_facets(self):
+        """Test case for search_token_for_facets
+
+        Lists the values of one or more facets over the customer's api tokens  # noqa: E501
+        """
+        pass
+
+    def test_search_traces_map_for_facet(self):
+        """Test case for search_traces_map_for_facet
+
+        Lists the values of a specific facet over the customer's non-deleted traces searches  # noqa: E501
+        """
+        pass
+
+    def test_search_traces_map_for_facets(self):
+        """Test case for search_traces_map_for_facets
+
+        Lists the values of one or more facets over the customer's non-deleted traces searches  # noqa: E501
+        """
+        pass
+
     def test_search_user_entities(self):
         """Test case for search_user_entities
 
diff --git a/test/test_search_query.py b/test/test_search_query.py
index 26b0cf5..dbe4ac3 100644
--- a/test/test_search_query.py
+++ b/test/test_search_query.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_service_account.py b/test/test_service_account.py
index 08e4ab8..678340d 100644
--- a/test/test_service_account.py
+++ b/test/test_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_service_account_write.py b/test/test_service_account_write.py
index 1e3c1c0..d64165b 100644
--- a/test/test_service_account_write.py
+++ b/test/test_service_account_write.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_setup.py b/test/test_setup.py
index ba8b692..6c8456b 100644
--- a/test/test_setup.py
+++ b/test/test_setup.py
@@ -3,7 +3,7 @@
 """
     Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_snowflake_configuration.py b/test/test_snowflake_configuration.py
index 526f5af..37e7372 100644
--- a/test/test_snowflake_configuration.py
+++ b/test/test_snowflake_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_sortable_search_request.py b/test/test_sortable_search_request.py
index d0c1dd9..c949787 100644
--- a/test/test_sortable_search_request.py
+++ b/test/test_sortable_search_request.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_sorting.py b/test/test_sorting.py
index 5e65782..ced650c 100644
--- a/test/test_sorting.py
+++ b/test/test_sorting.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_source.py b/test/test_source.py
index f4a68f6..394f476 100644
--- a/test/test_source.py
+++ b/test/test_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_source_api.py b/test/test_source_api.py
index 60bd4c3..3a2fa68 100644
--- a/test/test_source_api.py
+++ b/test/test_source_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_source_label_pair.py b/test/test_source_label_pair.py
index acadd0a..d6d2717 100644
--- a/test/test_source_label_pair.py
+++ b/test/test_source_label_pair.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_source_search_request_container.py b/test/test_source_search_request_container.py
index 35f6755..16f83c6 100644
--- a/test/test_source_search_request_container.py
+++ b/test/test_source_search_request_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_span.py b/test/test_span.py
index f5393e9..7f9ad14 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_span_sampling_policy.py b/test/test_span_sampling_policy.py
index 821205d..c772759 100644
--- a/test/test_span_sampling_policy.py
+++ b/test/test_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_span_sampling_policy_api.py b/test/test_span_sampling_policy_api.py
index e7d5843..28fa5d3 100644
--- a/test/test_span_sampling_policy_api.py
+++ b/test/test_span_sampling_policy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_specific_data.py b/test/test_specific_data.py
index 5bc99e6..51aa236 100644
--- a/test/test_specific_data.py
+++ b/test/test_specific_data.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_stats_model_internal_use.py b/test/test_stats_model_internal_use.py
index afe4ae1..0e2288e 100644
--- a/test/test_stats_model_internal_use.py
+++ b/test/test_stats_model_internal_use.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_stripe.py b/test/test_stripe.py
index ccf3e9b..be66d44 100644
--- a/test/test_stripe.py
+++ b/test/test_stripe.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_tags_response.py b/test/test_tags_response.py
index ee42efd..9ab9e10 100644
--- a/test/test_tags_response.py
+++ b/test/test_tags_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_target_info.py b/test/test_target_info.py
index 90ba865..da43e97 100644
--- a/test/test_target_info.py
+++ b/test/test_target_info.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_tesla_configuration.py b/test/test_tesla_configuration.py
deleted file mode 100644
index 2b54d64..0000000
--- a/test/test_tesla_configuration.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.tesla_configuration import TeslaConfiguration  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestTeslaConfiguration(unittest.TestCase):
-    """TeslaConfiguration unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testTeslaConfiguration(self):
-        """Test TeslaConfiguration"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.tesla_configuration.TeslaConfiguration()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_timeseries.py b/test/test_timeseries.py
index 7d2ea65..b6346c7 100644
--- a/test/test_timeseries.py
+++ b/test/test_timeseries.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_trace.py b/test/test_trace.py
index 0d1be98..32c5613 100644
--- a/test/test_trace.py
+++ b/test/test_trace.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_triage_dashboard.py b/test/test_triage_dashboard.py
index 7c67c15..bfedddc 100644
--- a/test/test_triage_dashboard.py
+++ b/test/test_triage_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_tuple.py b/test/test_tuple.py
deleted file mode 100644
index 8d8708c..0000000
--- a/test/test_tuple.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.tuple import Tuple  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestTuple(unittest.TestCase):
-    """Tuple unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testTuple(self):
-        """Test Tuple"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.tuple.Tuple()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_tuple_result.py b/test/test_tuple_result.py
index 4411a6d..64e31f9 100644
--- a/test/test_tuple_result.py
+++ b/test/test_tuple_result.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_tuple_value_result.py b/test/test_tuple_value_result.py
index c81617a..9625708 100644
--- a/test/test_tuple_value_result.py
+++ b/test/test_tuple_value_result.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_usage_api.py b/test/test_usage_api.py
index ae19aef..765c97a 100644
--- a/test/test_usage_api.py
+++ b/test/test_usage_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -64,6 +64,27 @@ def test_get_ingestion_policy(self):
         """
         pass
 
+    def test_get_ingestion_policy_by_version(self):
+        """Test case for get_ingestion_policy_by_version
+
+        Get a specific historical version of a ingestion policy  # noqa: E501
+        """
+        pass
+
+    def test_get_ingestion_policy_history(self):
+        """Test case for get_ingestion_policy_history
+
+        Get the version history of ingestion policy  # noqa: E501
+        """
+        pass
+
+    def test_revert_ingestion_policy_by_version(self):
+        """Test case for revert_ingestion_policy_by_version
+
+        Revert to a specific historical version of a ingestion policy  # noqa: E501
+        """
+        pass
+
     def test_update_ingestion_policy(self):
         """Test case for update_ingestion_policy
 
diff --git a/test/test_user_api.py b/test/test_user_api.py
index 0e9d07c..834904b 100644
--- a/test/test_user_api.py
+++ b/test/test_user_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -32,14 +32,14 @@ def tearDown(self):
     def test_add_user_to_user_groups(self):
         """Test case for add_user_to_user_groups
 
-        Adds specific user groups to the user or service account  # noqa: E501
+        Adds specific groups to the user or service account  # noqa: E501
         """
         pass
 
-    def test_create_or_update_user(self):
-        """Test case for create_or_update_user
+    def test_create_user(self):
+        """Test case for create_user
 
-        Creates or updates a user  # noqa: E501
+        Creates an user if the user doesn't already exist.  # noqa: E501
         """
         pass
 
@@ -102,7 +102,7 @@ def test_invite_users(self):
     def test_remove_user_from_user_groups(self):
         """Test case for remove_user_from_user_groups
 
-        Removes specific user groups from the user or service account  # noqa: E501
+        Removes specific groups from the user or service account  # noqa: E501
         """
         pass
 
diff --git a/test/test_user_api_token.py b/test/test_user_api_token.py
index 13dd86b..88cae3f 100644
--- a/test/test_user_api_token.py
+++ b/test/test_user_api_token.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_dto.py b/test/test_user_dto.py
index 5222fa8..84fad02 100644
--- a/test/test_user_dto.py
+++ b/test/test_user_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_group.py b/test/test_user_group.py
index 7e4ea3a..a0ca8cb 100644
--- a/test/test_user_group.py
+++ b/test/test_user_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_group_api.py b/test/test_user_group_api.py
index 9d643ce..48cfd87 100644
--- a/test/test_user_group_api.py
+++ b/test/test_user_group_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_group_model.py b/test/test_user_group_model.py
index c5bf731..667692c 100644
--- a/test/test_user_group_model.py
+++ b/test/test_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_group_properties_dto.py b/test/test_user_group_properties_dto.py
index d6ca2c1..209a26f 100644
--- a/test/test_user_group_properties_dto.py
+++ b/test/test_user_group_properties_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_group_write.py b/test/test_user_group_write.py
index 6d1d395..53db3f1 100644
--- a/test/test_user_group_write.py
+++ b/test/test_user_group_write.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_model.py b/test/test_user_model.py
index b93d190..12a6a7b 100644
--- a/test/test_user_model.py
+++ b/test/test_user_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_request_dto.py b/test/test_user_request_dto.py
index aa8054b..697649e 100644
--- a/test/test_user_request_dto.py
+++ b/test/test_user_request_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_user_to_create.py b/test/test_user_to_create.py
index 6c01aa4..157f44a 100644
--- a/test/test_user_to_create.py
+++ b/test/test_user_to_create.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_validated_users_dto.py b/test/test_validated_users_dto.py
index 6597873..caa9c76 100644
--- a/test/test_validated_users_dto.py
+++ b/test/test_validated_users_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_void.py b/test/test_void.py
index faa54e8..937d651 100644
--- a/test/test_void.py
+++ b/test/test_void.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_vrops_configuration.py b/test/test_vrops_configuration.py
index 4d10ca7..5247c0e 100644
--- a/test/test_vrops_configuration.py
+++ b/test/test_vrops_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_webhook_api.py b/test/test_webhook_api.py
index 85833f2..f9468f4 100644
--- a/test/test_webhook_api.py
+++ b/test/test_webhook_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/test/test_wf_tags.py b/test/test_wf_tags.py
index 859f1c5..d2f50b4 100644
--- a/test/test_wf_tags.py
+++ b/test/test_wf_tags.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API
+    Wavefront REST API Documentation
 
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/anomaly_api.py b/wavefront_api_client/api/anomaly_api.py
deleted file mode 100644
index 6427ce5..0000000
--- a/wavefront_api_client/api/anomaly_api.py
+++ /dev/null
@@ -1,720 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from wavefront_api_client.api_client import ApiClient
-
-
-class AnomalyApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def get_all_anomalies(self, **kwargs):  # noqa: E501
-        """Get all anomalies for a customer during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_anomalies(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_all_anomalies_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.get_all_anomalies_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def get_all_anomalies_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all anomalies for a customer during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_all_anomalies_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_all_anomalies" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-        if 'start_ms' in params:
-            query_params.append(('startMs', params['start_ms']))  # noqa: E501
-        if 'end_ms' in params:
-            query_params.append(('endMs', params['end_ms']))  # noqa: E501
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/anomaly', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_anomalies_for_chart_and_param_hash(self, dashboard_id, chart_hash, param_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a chart with a set of dashboard parameters during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_anomalies_for_chart_and_param_hash(dashboard_id, chart_hash, param_hash, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param str chart_hash: (required)
-        :param str param_hash: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_anomalies_for_chart_and_param_hash_with_http_info(dashboard_id, chart_hash, param_hash, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_anomalies_for_chart_and_param_hash_with_http_info(dashboard_id, chart_hash, param_hash, **kwargs)  # noqa: E501
-            return data
-
-    def get_anomalies_for_chart_and_param_hash_with_http_info(self, dashboard_id, chart_hash, param_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a chart with a set of dashboard parameters during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_anomalies_for_chart_and_param_hash_with_http_info(dashboard_id, chart_hash, param_hash, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param str chart_hash: (required)
-        :param str param_hash: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['dashboard_id', 'chart_hash', 'param_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_anomalies_for_chart_and_param_hash" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'dashboard_id' is set
-        if ('dashboard_id' not in params or
-                params['dashboard_id'] is None):
-            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_anomalies_for_chart_and_param_hash`")  # noqa: E501
-        # verify the required parameter 'chart_hash' is set
-        if ('chart_hash' not in params or
-                params['chart_hash'] is None):
-            raise ValueError("Missing the required parameter `chart_hash` when calling `get_anomalies_for_chart_and_param_hash`")  # noqa: E501
-        # verify the required parameter 'param_hash' is set
-        if ('param_hash' not in params or
-                params['param_hash'] is None):
-            raise ValueError("Missing the required parameter `param_hash` when calling `get_anomalies_for_chart_and_param_hash`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'dashboard_id' in params:
-            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
-        if 'chart_hash' in params:
-            path_params['chartHash'] = params['chart_hash']  # noqa: E501
-        if 'param_hash' in params:
-            path_params['paramHash'] = params['param_hash']  # noqa: E501
-
-        query_params = []
-        if 'start_ms' in params:
-            query_params.append(('startMs', params['start_ms']))  # noqa: E501
-        if 'end_ms' in params:
-            query_params.append(('endMs', params['end_ms']))  # noqa: E501
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/anomaly/{dashboardId}/chart/{chartHash}/{paramHash}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_chart_anomalies_for_chart(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a chart during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_for_chart(dashboard_id, chart_hash, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param str chart_hash: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_chart_anomalies_for_chart_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_chart_anomalies_for_chart_with_http_info(dashboard_id, chart_hash, **kwargs)  # noqa: E501
-            return data
-
-    def get_chart_anomalies_for_chart_with_http_info(self, dashboard_id, chart_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a chart during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_for_chart_with_http_info(dashboard_id, chart_hash, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param str chart_hash: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['dashboard_id', 'chart_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_chart_anomalies_for_chart" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'dashboard_id' is set
-        if ('dashboard_id' not in params or
-                params['dashboard_id'] is None):
-            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies_for_chart`")  # noqa: E501
-        # verify the required parameter 'chart_hash' is set
-        if ('chart_hash' not in params or
-                params['chart_hash'] is None):
-            raise ValueError("Missing the required parameter `chart_hash` when calling `get_chart_anomalies_for_chart`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'dashboard_id' in params:
-            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
-        if 'chart_hash' in params:
-            path_params['chartHash'] = params['chart_hash']  # noqa: E501
-
-        query_params = []
-        if 'start_ms' in params:
-            query_params.append(('startMs', params['start_ms']))  # noqa: E501
-        if 'end_ms' in params:
-            query_params.append(('endMs', params['end_ms']))  # noqa: E501
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/anomaly/{dashboardId}/chart/{chartHash}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_chart_anomalies_of_one_dashboard(self, dashboard_id, **kwargs):  # noqa: E501
-        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_of_one_dashboard(dashboard_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_chart_anomalies_of_one_dashboard_with_http_info(dashboard_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_chart_anomalies_of_one_dashboard_with_http_info(dashboard_id, **kwargs)  # noqa: E501
-            return data
-
-    def get_chart_anomalies_of_one_dashboard_with_http_info(self, dashboard_id, **kwargs):  # noqa: E501
-        """Get all anomalies for a dashboard that does not have any dashboard parameters during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_chart_anomalies_of_one_dashboard_with_http_info(dashboard_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['dashboard_id', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_chart_anomalies_of_one_dashboard" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'dashboard_id' is set
-        if ('dashboard_id' not in params or
-                params['dashboard_id'] is None):
-            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_chart_anomalies_of_one_dashboard`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'dashboard_id' in params:
-            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
-
-        query_params = []
-        if 'start_ms' in params:
-            query_params.append(('startMs', params['start_ms']))  # noqa: E501
-        if 'end_ms' in params:
-            query_params.append(('endMs', params['end_ms']))  # noqa: E501
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/anomaly/{dashboardId}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_dashboard_anomalies(self, dashboard_id, param_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_dashboard_anomalies(dashboard_id, param_hash, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param str param_hash: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_dashboard_anomalies_with_http_info(dashboard_id, param_hash, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_dashboard_anomalies_with_http_info(dashboard_id, param_hash, **kwargs)  # noqa: E501
-            return data
-
-    def get_dashboard_anomalies_with_http_info(self, dashboard_id, param_hash, **kwargs):  # noqa: E501
-        """Get all anomalies for a dashboard with a particular set of dashboard parameters as identified by paramHash, during a time interval  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_dashboard_anomalies_with_http_info(dashboard_id, param_hash, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str dashboard_id: (required)
-        :param str param_hash: (required)
-        :param int start_ms:
-        :param int end_ms:
-        :param int offset:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['dashboard_id', 'param_hash', 'start_ms', 'end_ms', 'offset', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_dashboard_anomalies" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'dashboard_id' is set
-        if ('dashboard_id' not in params or
-                params['dashboard_id'] is None):
-            raise ValueError("Missing the required parameter `dashboard_id` when calling `get_dashboard_anomalies`")  # noqa: E501
-        # verify the required parameter 'param_hash' is set
-        if ('param_hash' not in params or
-                params['param_hash'] is None):
-            raise ValueError("Missing the required parameter `param_hash` when calling `get_dashboard_anomalies`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'dashboard_id' in params:
-            path_params['dashboardId'] = params['dashboard_id']  # noqa: E501
-        if 'param_hash' in params:
-            path_params['paramHash'] = params['param_hash']  # noqa: E501
-
-        query_params = []
-        if 'start_ms' in params:
-            query_params.append(('startMs', params['start_ms']))  # noqa: E501
-        if 'end_ms' in params:
-            query_params.append(('endMs', params['end_ms']))  # noqa: E501
-        if 'offset' in params:
-            query_params.append(('offset', params['offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/anomaly/{dashboardId}/{paramHash}', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
-    def get_related_anomalies(self, event_id, **kwargs):  # noqa: E501
-        """Get all related anomalies for a firing event with a time span  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_related_anomalies(event_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str event_id: (required)
-        :param str rendering_method:
-        :param bool is_overlapped:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_related_anomalies_with_http_info(event_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_related_anomalies_with_http_info(event_id, **kwargs)  # noqa: E501
-            return data
-
-    def get_related_anomalies_with_http_info(self, event_id, **kwargs):  # noqa: E501
-        """Get all related anomalies for a firing event with a time span  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_related_anomalies_with_http_info(event_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str event_id: (required)
-        :param str rendering_method:
-        :param bool is_overlapped:
-        :param int limit:
-        :return: ResponseContainerPagedAnomaly
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['event_id', 'rendering_method', 'is_overlapped', 'limit']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_related_anomalies" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'event_id' is set
-        if ('event_id' not in params or
-                params['event_id'] is None):
-            raise ValueError("Missing the required parameter `event_id` when calling `get_related_anomalies`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'event_id' in params:
-            path_params['eventId'] = params['event_id']  # noqa: E501
-
-        query_params = []
-        if 'rendering_method' in params:
-            query_params.append(('renderingMethod', params['rendering_method']))  # noqa: E501
-        if 'is_overlapped' in params:
-            query_params.append(('isOverlapped', params['is_overlapped']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/anomaly/{eventId}/anomalies', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerPagedAnomaly',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 86637de..3eee4d4 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.175.2/python'
+        self.user_agent = 'Swagger-Codegen/2.176.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 02fe3c2..bb7a050 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.175.2".\
+               "SDK Package Version: 2.176.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/avro_backed_standardized_dto.py b/wavefront_api_client/models/avro_backed_standardized_dto.py
deleted file mode 100644
index a494d72..0000000
--- a/wavefront_api_client/models/avro_backed_standardized_dto.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-
-class AvroBackedStandardizedDTO(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'created_epoch_millis': 'int',
-        'creator_id': 'str',
-        'deleted': 'bool',
-        'id': 'str',
-        'updated_epoch_millis': 'int',
-        'updater_id': 'str'
-    }
-
-    attribute_map = {
-        'created_epoch_millis': 'createdEpochMillis',
-        'creator_id': 'creatorId',
-        'deleted': 'deleted',
-        'id': 'id',
-        'updated_epoch_millis': 'updatedEpochMillis',
-        'updater_id': 'updaterId'
-    }
-
-    def __init__(self, created_epoch_millis=None, creator_id=None, deleted=None, id=None, updated_epoch_millis=None, updater_id=None):  # noqa: E501
-        """AvroBackedStandardizedDTO - a model defined in Swagger"""  # noqa: E501
-
-        self._created_epoch_millis = None
-        self._creator_id = None
-        self._deleted = None
-        self._id = None
-        self._updated_epoch_millis = None
-        self._updater_id = None
-        self.discriminator = None
-
-        if created_epoch_millis is not None:
-            self.created_epoch_millis = created_epoch_millis
-        if creator_id is not None:
-            self.creator_id = creator_id
-        if deleted is not None:
-            self.deleted = deleted
-        if id is not None:
-            self.id = id
-        if updated_epoch_millis is not None:
-            self.updated_epoch_millis = updated_epoch_millis
-        if updater_id is not None:
-            self.updater_id = updater_id
-
-    @property
-    def created_epoch_millis(self):
-        """Gets the created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: int
-        """
-        return self._created_epoch_millis
-
-    @created_epoch_millis.setter
-    def created_epoch_millis(self, created_epoch_millis):
-        """Sets the created_epoch_millis of this AvroBackedStandardizedDTO.
-
-
-        :param created_epoch_millis: The created_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: int
-        """
-
-        self._created_epoch_millis = created_epoch_millis
-
-    @property
-    def creator_id(self):
-        """Gets the creator_id of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The creator_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._creator_id
-
-    @creator_id.setter
-    def creator_id(self, creator_id):
-        """Sets the creator_id of this AvroBackedStandardizedDTO.
-
-
-        :param creator_id: The creator_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._creator_id = creator_id
-
-    @property
-    def deleted(self):
-        """Gets the deleted of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The deleted of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, deleted):
-        """Sets the deleted of this AvroBackedStandardizedDTO.
-
-
-        :param deleted: The deleted of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._deleted = deleted
-
-    @property
-    def id(self):
-        """Gets the id of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this AvroBackedStandardizedDTO.
-
-
-        :param id: The id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
-    @property
-    def updated_epoch_millis(self):
-        """Gets the updated_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The updated_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: int
-        """
-        return self._updated_epoch_millis
-
-    @updated_epoch_millis.setter
-    def updated_epoch_millis(self, updated_epoch_millis):
-        """Sets the updated_epoch_millis of this AvroBackedStandardizedDTO.
-
-
-        :param updated_epoch_millis: The updated_epoch_millis of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: int
-        """
-
-        self._updated_epoch_millis = updated_epoch_millis
-
-    @property
-    def updater_id(self):
-        """Gets the updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-
-
-        :return: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :rtype: str
-        """
-        return self._updater_id
-
-    @updater_id.setter
-    def updater_id(self, updater_id):
-        """Sets the updater_id of this AvroBackedStandardizedDTO.
-
-
-        :param updater_id: The updater_id of this AvroBackedStandardizedDTO.  # noqa: E501
-        :type: str
-        """
-
-        self._updater_id = updater_id
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(AvroBackedStandardizedDTO, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, AvroBackedStandardizedDTO):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index 9a24515..f995f8f 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -87,11 +87,11 @@ class ChartSettings(object):
         'windowing': 'str',
         'xmax': 'float',
         'xmin': 'float',
-        'y0_scale_si_by1024': 'bool',
+        'y0_scale_siby1024': 'bool',
         'y0_unit_autoscaling': 'bool',
         'y1_max': 'float',
         'y1_min': 'float',
-        'y1_scale_si_by1024': 'bool',
+        'y1_scale_siby1024': 'bool',
         'y1_unit_autoscaling': 'bool',
         'y1_units': 'str',
         'ymax': 'float',
@@ -153,18 +153,18 @@ class ChartSettings(object):
         'windowing': 'windowing',
         'xmax': 'xmax',
         'xmin': 'xmin',
-        'y0_scale_si_by1024': 'y0ScaleSIBy1024',
+        'y0_scale_siby1024': 'y0ScaleSIBy1024',
         'y0_unit_autoscaling': 'y0UnitAutoscaling',
         'y1_max': 'y1Max',
         'y1_min': 'y1Min',
-        'y1_scale_si_by1024': 'y1ScaleSIBy1024',
+        'y1_scale_siby1024': 'y1ScaleSIBy1024',
         'y1_unit_autoscaling': 'y1UnitAutoscaling',
         'y1_units': 'y1Units',
         'ymax': 'ymax',
         'ymin': 'ymin'
     }
 
-    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, logs_table=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, show_value_column=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_si_by1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_si_by1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
+    def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=None, custom_tags=None, default_sort_column=None, expected_data_spacing=None, fixed_legend_display_stats=None, fixed_legend_enabled=None, fixed_legend_filter_field=None, fixed_legend_filter_limit=None, fixed_legend_filter_sort=None, fixed_legend_hide_label=None, fixed_legend_position=None, fixed_legend_show_metric_name=None, fixed_legend_show_source_name=None, fixed_legend_use_raw_stats=None, group_by_source=None, invert_dynamic_legend_hover_control=None, line_type=None, logs_table=None, max=None, min=None, num_tags=None, plain_markdown_content=None, show_hosts=None, show_labels=None, show_raw_values=None, show_value_column=None, sort_values_descending=None, sparkline_decimal_precision=None, sparkline_display_color=None, sparkline_display_font_size=None, sparkline_display_horizontal_position=None, sparkline_display_postfix=None, sparkline_display_prefix=None, sparkline_display_value_type=None, sparkline_display_vertical_position=None, sparkline_fill_color=None, sparkline_line_color=None, sparkline_size=None, sparkline_value_color_map_apply_to=None, sparkline_value_color_map_colors=None, sparkline_value_color_map_values=None, sparkline_value_color_map_values_v2=None, sparkline_value_text_map_text=None, sparkline_value_text_map_thresholds=None, stack_type=None, tag_mode=None, time_based_coloring=None, type=None, window_size=None, windowing=None, xmax=None, xmin=None, y0_scale_siby1024=None, y0_unit_autoscaling=None, y1_max=None, y1_min=None, y1_scale_siby1024=None, y1_unit_autoscaling=None, y1_units=None, ymax=None, ymin=None, _configuration=None):  # noqa: E501
         """ChartSettings - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -224,11 +224,11 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
         self._windowing = None
         self._xmax = None
         self._xmin = None
-        self._y0_scale_si_by1024 = None
+        self._y0_scale_siby1024 = None
         self._y0_unit_autoscaling = None
         self._y1_max = None
         self._y1_min = None
-        self._y1_scale_si_by1024 = None
+        self._y1_scale_siby1024 = None
         self._y1_unit_autoscaling = None
         self._y1_units = None
         self._ymax = None
@@ -342,16 +342,16 @@ def __init__(self, auto_column_tags=None, chart_default_color=None, column_tags=
             self.xmax = xmax
         if xmin is not None:
             self.xmin = xmin
-        if y0_scale_si_by1024 is not None:
-            self.y0_scale_si_by1024 = y0_scale_si_by1024
+        if y0_scale_siby1024 is not None:
+            self.y0_scale_siby1024 = y0_scale_siby1024
         if y0_unit_autoscaling is not None:
             self.y0_unit_autoscaling = y0_unit_autoscaling
         if y1_max is not None:
             self.y1_max = y1_max
         if y1_min is not None:
             self.y1_min = y1_min
-        if y1_scale_si_by1024 is not None:
-            self.y1_scale_si_by1024 = y1_scale_si_by1024
+        if y1_scale_siby1024 is not None:
+            self.y1_scale_siby1024 = y1_scale_siby1024
         if y1_unit_autoscaling is not None:
             self.y1_unit_autoscaling = y1_unit_autoscaling
         if y1_units is not None:
@@ -1688,27 +1688,27 @@ def xmin(self, xmin):
         self._xmin = xmin
 
     @property
-    def y0_scale_si_by1024(self):
-        """Gets the y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+    def y0_scale_siby1024(self):
+        """Gets the y0_scale_siby1024 of this ChartSettings.  # noqa: E501
 
         Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :return: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :return: The y0_scale_siby1024 of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._y0_scale_si_by1024
+        return self._y0_scale_siby1024
 
-    @y0_scale_si_by1024.setter
-    def y0_scale_si_by1024(self, y0_scale_si_by1024):
-        """Sets the y0_scale_si_by1024 of this ChartSettings.
+    @y0_scale_siby1024.setter
+    def y0_scale_siby1024(self, y0_scale_siby1024):
+        """Sets the y0_scale_siby1024 of this ChartSettings.
 
         Default: false. Whether to scale numerical magnitude labels for left Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :param y0_scale_si_by1024: The y0_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :param y0_scale_siby1024: The y0_scale_siby1024 of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._y0_scale_si_by1024 = y0_scale_si_by1024
+        self._y0_scale_siby1024 = y0_scale_siby1024
 
     @property
     def y0_unit_autoscaling(self):
@@ -1780,27 +1780,27 @@ def y1_min(self, y1_min):
         self._y1_min = y1_min
 
     @property
-    def y1_scale_si_by1024(self):
-        """Gets the y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+    def y1_scale_siby1024(self):
+        """Gets the y1_scale_siby1024 of this ChartSettings.  # noqa: E501
 
         Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :return: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :return: The y1_scale_siby1024 of this ChartSettings.  # noqa: E501
         :rtype: bool
         """
-        return self._y1_scale_si_by1024
+        return self._y1_scale_siby1024
 
-    @y1_scale_si_by1024.setter
-    def y1_scale_si_by1024(self, y1_scale_si_by1024):
-        """Sets the y1_scale_si_by1024 of this ChartSettings.
+    @y1_scale_siby1024.setter
+    def y1_scale_siby1024(self, y1_scale_siby1024):
+        """Sets the y1_scale_siby1024 of this ChartSettings.
 
         Default: false. Whether to scale numerical magnitude labels for right Y-axis by 1024 in the IEC/Binary manner (instead of by 1000 like SI)  # noqa: E501
 
-        :param y1_scale_si_by1024: The y1_scale_si_by1024 of this ChartSettings.  # noqa: E501
+        :param y1_scale_siby1024: The y1_scale_siby1024 of this ChartSettings.  # noqa: E501
         :type: bool
         """
 
-        self._y1_scale_si_by1024 = y1_scale_si_by1024
+        self._y1_scale_siby1024 = y1_scale_siby1024
 
     @property
     def y1_unit_autoscaling(self):
diff --git a/wavefront_api_client/models/ingestion_policy.py b/wavefront_api_client/models/ingestion_policy.py
deleted file mode 100644
index cc1158b..0000000
--- a/wavefront_api_client/models/ingestion_policy.py
+++ /dev/null
@@ -1,608 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class IngestionPolicy(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'account_count': 'int',
-        'alert_id': 'str',
-        'customer': 'str',
-        'description': 'str',
-        'group_count': 'int',
-        'id': 'str',
-        'is_limited': 'bool',
-        'last_updated_account_id': 'str',
-        'last_updated_ms': 'int',
-        'limit_pps': 'int',
-        'name': 'str',
-        'sampled_accounts': 'list[str]',
-        'sampled_groups': 'list[UserGroup]',
-        'sampled_service_accounts': 'list[str]',
-        'sampled_user_accounts': 'list[str]',
-        'scope': 'str',
-        'service_account_count': 'int',
-        'user_account_count': 'int'
-    }
-
-    attribute_map = {
-        'account_count': 'accountCount',
-        'alert_id': 'alertId',
-        'customer': 'customer',
-        'description': 'description',
-        'group_count': 'groupCount',
-        'id': 'id',
-        'is_limited': 'isLimited',
-        'last_updated_account_id': 'lastUpdatedAccountId',
-        'last_updated_ms': 'lastUpdatedMs',
-        'limit_pps': 'limitPPS',
-        'name': 'name',
-        'sampled_accounts': 'sampledAccounts',
-        'sampled_groups': 'sampledGroups',
-        'sampled_service_accounts': 'sampledServiceAccounts',
-        'sampled_user_accounts': 'sampledUserAccounts',
-        'scope': 'scope',
-        'service_account_count': 'serviceAccountCount',
-        'user_account_count': 'userAccountCount'
-    }
-
-    def __init__(self, account_count=None, alert_id=None, customer=None, description=None, group_count=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, sampled_accounts=None, sampled_groups=None, sampled_service_accounts=None, sampled_user_accounts=None, scope=None, service_account_count=None, user_account_count=None, _configuration=None):  # noqa: E501
-        """IngestionPolicy - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._account_count = None
-        self._alert_id = None
-        self._customer = None
-        self._description = None
-        self._group_count = None
-        self._id = None
-        self._is_limited = None
-        self._last_updated_account_id = None
-        self._last_updated_ms = None
-        self._limit_pps = None
-        self._name = None
-        self._sampled_accounts = None
-        self._sampled_groups = None
-        self._sampled_service_accounts = None
-        self._sampled_user_accounts = None
-        self._scope = None
-        self._service_account_count = None
-        self._user_account_count = None
-        self.discriminator = None
-
-        if account_count is not None:
-            self.account_count = account_count
-        if alert_id is not None:
-            self.alert_id = alert_id
-        if customer is not None:
-            self.customer = customer
-        if description is not None:
-            self.description = description
-        if group_count is not None:
-            self.group_count = group_count
-        if id is not None:
-            self.id = id
-        if is_limited is not None:
-            self.is_limited = is_limited
-        if last_updated_account_id is not None:
-            self.last_updated_account_id = last_updated_account_id
-        if last_updated_ms is not None:
-            self.last_updated_ms = last_updated_ms
-        if limit_pps is not None:
-            self.limit_pps = limit_pps
-        if name is not None:
-            self.name = name
-        if sampled_accounts is not None:
-            self.sampled_accounts = sampled_accounts
-        if sampled_groups is not None:
-            self.sampled_groups = sampled_groups
-        if sampled_service_accounts is not None:
-            self.sampled_service_accounts = sampled_service_accounts
-        if sampled_user_accounts is not None:
-            self.sampled_user_accounts = sampled_user_accounts
-        if scope is not None:
-            self.scope = scope
-        if service_account_count is not None:
-            self.service_account_count = service_account_count
-        if user_account_count is not None:
-            self.user_account_count = user_account_count
-
-    @property
-    def account_count(self):
-        """Gets the account_count of this IngestionPolicy.  # noqa: E501
-
-        Total number of accounts that are linked to the ingestion policy  # noqa: E501
-
-        :return: The account_count of this IngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._account_count
-
-    @account_count.setter
-    def account_count(self, account_count):
-        """Sets the account_count of this IngestionPolicy.
-
-        Total number of accounts that are linked to the ingestion policy  # noqa: E501
-
-        :param account_count: The account_count of this IngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._account_count = account_count
-
-    @property
-    def alert_id(self):
-        """Gets the alert_id of this IngestionPolicy.  # noqa: E501
-
-        The ingestion policy alert Id  # noqa: E501
-
-        :return: The alert_id of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._alert_id
-
-    @alert_id.setter
-    def alert_id(self, alert_id):
-        """Sets the alert_id of this IngestionPolicy.
-
-        The ingestion policy alert Id  # noqa: E501
-
-        :param alert_id: The alert_id of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._alert_id = alert_id
-
-    @property
-    def customer(self):
-        """Gets the customer of this IngestionPolicy.  # noqa: E501
-
-        ID of the customer to which the ingestion policy belongs  # noqa: E501
-
-        :return: The customer of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._customer
-
-    @customer.setter
-    def customer(self, customer):
-        """Sets the customer of this IngestionPolicy.
-
-        ID of the customer to which the ingestion policy belongs  # noqa: E501
-
-        :param customer: The customer of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._customer = customer
-
-    @property
-    def description(self):
-        """Gets the description of this IngestionPolicy.  # noqa: E501
-
-        The description of the ingestion policy  # noqa: E501
-
-        :return: The description of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this IngestionPolicy.
-
-        The description of the ingestion policy  # noqa: E501
-
-        :param description: The description of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._description = description
-
-    @property
-    def group_count(self):
-        """Gets the group_count of this IngestionPolicy.  # noqa: E501
-
-        Total number of groups that are linked to the ingestion policy  # noqa: E501
-
-        :return: The group_count of this IngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._group_count
-
-    @group_count.setter
-    def group_count(self, group_count):
-        """Sets the group_count of this IngestionPolicy.
-
-        Total number of groups that are linked to the ingestion policy  # noqa: E501
-
-        :param group_count: The group_count of this IngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._group_count = group_count
-
-    @property
-    def id(self):
-        """Gets the id of this IngestionPolicy.  # noqa: E501
-
-        The unique ID for the ingestion policy  # noqa: E501
-
-        :return: The id of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this IngestionPolicy.
-
-        The unique ID for the ingestion policy  # noqa: E501
-
-        :param id: The id of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._id = id
-
-    @property
-    def is_limited(self):
-        """Gets the is_limited of this IngestionPolicy.  # noqa: E501
-
-        Whether the ingestion policy is limited  # noqa: E501
-
-        :return: The is_limited of this IngestionPolicy.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_limited
-
-    @is_limited.setter
-    def is_limited(self, is_limited):
-        """Sets the is_limited of this IngestionPolicy.
-
-        Whether the ingestion policy is limited  # noqa: E501
-
-        :param is_limited: The is_limited of this IngestionPolicy.  # noqa: E501
-        :type: bool
-        """
-
-        self._is_limited = is_limited
-
-    @property
-    def last_updated_account_id(self):
-        """Gets the last_updated_account_id of this IngestionPolicy.  # noqa: E501
-
-        The account that updated this ingestion policy last time  # noqa: E501
-
-        :return: The last_updated_account_id of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._last_updated_account_id
-
-    @last_updated_account_id.setter
-    def last_updated_account_id(self, last_updated_account_id):
-        """Sets the last_updated_account_id of this IngestionPolicy.
-
-        The account that updated this ingestion policy last time  # noqa: E501
-
-        :param last_updated_account_id: The last_updated_account_id of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._last_updated_account_id = last_updated_account_id
-
-    @property
-    def last_updated_ms(self):
-        """Gets the last_updated_ms of this IngestionPolicy.  # noqa: E501
-
-        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
-
-        :return: The last_updated_ms of this IngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._last_updated_ms
-
-    @last_updated_ms.setter
-    def last_updated_ms(self, last_updated_ms):
-        """Sets the last_updated_ms of this IngestionPolicy.
-
-        The last time when the ingestion policy is updated, in epoch milliseconds  # noqa: E501
-
-        :param last_updated_ms: The last_updated_ms of this IngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._last_updated_ms = last_updated_ms
-
-    @property
-    def limit_pps(self):
-        """Gets the limit_pps of this IngestionPolicy.  # noqa: E501
-
-        The PPS limit of the ingestion policy  # noqa: E501
-
-        :return: The limit_pps of this IngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._limit_pps
-
-    @limit_pps.setter
-    def limit_pps(self, limit_pps):
-        """Sets the limit_pps of this IngestionPolicy.
-
-        The PPS limit of the ingestion policy  # noqa: E501
-
-        :param limit_pps: The limit_pps of this IngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._limit_pps = limit_pps
-
-    @property
-    def name(self):
-        """Gets the name of this IngestionPolicy.  # noqa: E501
-
-        The name of the ingestion policy  # noqa: E501
-
-        :return: The name of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this IngestionPolicy.
-
-        The name of the ingestion policy  # noqa: E501
-
-        :param name: The name of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._name = name
-
-    @property
-    def sampled_accounts(self):
-        """Gets the sampled_accounts of this IngestionPolicy.  # noqa: E501
-
-        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
-
-        :return: The sampled_accounts of this IngestionPolicy.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sampled_accounts
-
-    @sampled_accounts.setter
-    def sampled_accounts(self, sampled_accounts):
-        """Sets the sampled_accounts of this IngestionPolicy.
-
-        A sample of the accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of accounts for this policy  # noqa: E501
-
-        :param sampled_accounts: The sampled_accounts of this IngestionPolicy.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sampled_accounts = sampled_accounts
-
-    @property
-    def sampled_groups(self):
-        """Gets the sampled_groups of this IngestionPolicy.  # noqa: E501
-
-        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
-
-        :return: The sampled_groups of this IngestionPolicy.  # noqa: E501
-        :rtype: list[UserGroup]
-        """
-        return self._sampled_groups
-
-    @sampled_groups.setter
-    def sampled_groups(self, sampled_groups):
-        """Sets the sampled_groups of this IngestionPolicy.
-
-        A sample of the groups assigned to this ingestion policy. Please use the Ingestion Policy facet of the Group Search API to get the full list of groups for this policy  # noqa: E501
-
-        :param sampled_groups: The sampled_groups of this IngestionPolicy.  # noqa: E501
-        :type: list[UserGroup]
-        """
-
-        self._sampled_groups = sampled_groups
-
-    @property
-    def sampled_service_accounts(self):
-        """Gets the sampled_service_accounts of this IngestionPolicy.  # noqa: E501
-
-        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
-
-        :return: The sampled_service_accounts of this IngestionPolicy.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sampled_service_accounts
-
-    @sampled_service_accounts.setter
-    def sampled_service_accounts(self, sampled_service_accounts):
-        """Sets the sampled_service_accounts of this IngestionPolicy.
-
-        A sample of the service accounts accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of service accounts for this policy  # noqa: E501
-
-        :param sampled_service_accounts: The sampled_service_accounts of this IngestionPolicy.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sampled_service_accounts = sampled_service_accounts
-
-    @property
-    def sampled_user_accounts(self):
-        """Gets the sampled_user_accounts of this IngestionPolicy.  # noqa: E501
-
-        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
-
-        :return: The sampled_user_accounts of this IngestionPolicy.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._sampled_user_accounts
-
-    @sampled_user_accounts.setter
-    def sampled_user_accounts(self, sampled_user_accounts):
-        """Sets the sampled_user_accounts of this IngestionPolicy.
-
-        A sample of the user accounts assigned to this ingestion policy. Please use the Ingestion Policy facet of the Account Search API to get the full list of users for this policy  # noqa: E501
-
-        :param sampled_user_accounts: The sampled_user_accounts of this IngestionPolicy.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._sampled_user_accounts = sampled_user_accounts
-
-    @property
-    def scope(self):
-        """Gets the scope of this IngestionPolicy.  # noqa: E501
-
-        The scope of the ingestion policy  # noqa: E501
-
-        :return: The scope of this IngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._scope
-
-    @scope.setter
-    def scope(self, scope):
-        """Sets the scope of this IngestionPolicy.
-
-        The scope of the ingestion policy  # noqa: E501
-
-        :param scope: The scope of this IngestionPolicy.  # noqa: E501
-        :type: str
-        """
-        allowed_values = ["ACCOUNT", "GROUP"]  # noqa: E501
-        if (self._configuration.client_side_validation and
-                scope not in allowed_values):
-            raise ValueError(
-                "Invalid value for `scope` ({0}), must be one of {1}"  # noqa: E501
-                .format(scope, allowed_values)
-            )
-
-        self._scope = scope
-
-    @property
-    def service_account_count(self):
-        """Gets the service_account_count of this IngestionPolicy.  # noqa: E501
-
-        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
-
-        :return: The service_account_count of this IngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._service_account_count
-
-    @service_account_count.setter
-    def service_account_count(self, service_account_count):
-        """Sets the service_account_count of this IngestionPolicy.
-
-        Total number of service accounts that are linked to the ingestion policy  # noqa: E501
-
-        :param service_account_count: The service_account_count of this IngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._service_account_count = service_account_count
-
-    @property
-    def user_account_count(self):
-        """Gets the user_account_count of this IngestionPolicy.  # noqa: E501
-
-        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
-
-        :return: The user_account_count of this IngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._user_account_count
-
-    @user_account_count.setter
-    def user_account_count(self, user_account_count):
-        """Sets the user_account_count of this IngestionPolicy.
-
-        Total number of user accounts that are linked to the ingestion policy  # noqa: E501
-
-        :param user_account_count: The user_account_count of this IngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._user_account_count = user_account_count
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(IngestionPolicy, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, IngestionPolicy):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, IngestionPolicy):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/ingestion_policy_mapping.py b/wavefront_api_client/models/ingestion_policy_mapping.py
deleted file mode 100644
index c7ac160..0000000
--- a/wavefront_api_client/models/ingestion_policy_mapping.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class IngestionPolicyMapping(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'accounts': 'list[str]',
-        'groups': 'list[str]',
-        'ingestion_policy_id': 'str'
-    }
-
-    attribute_map = {
-        'accounts': 'accounts',
-        'groups': 'groups',
-        'ingestion_policy_id': 'ingestionPolicyId'
-    }
-
-    def __init__(self, accounts=None, groups=None, ingestion_policy_id=None, _configuration=None):  # noqa: E501
-        """IngestionPolicyMapping - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._accounts = None
-        self._groups = None
-        self._ingestion_policy_id = None
-        self.discriminator = None
-
-        if accounts is not None:
-            self.accounts = accounts
-        if groups is not None:
-            self.groups = groups
-        self.ingestion_policy_id = ingestion_policy_id
-
-    @property
-    def accounts(self):
-        """Gets the accounts of this IngestionPolicyMapping.  # noqa: E501
-
-        The list of accounts that should be linked/unlinked to/from the ingestion policy  # noqa: E501
-
-        :return: The accounts of this IngestionPolicyMapping.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._accounts
-
-    @accounts.setter
-    def accounts(self, accounts):
-        """Sets the accounts of this IngestionPolicyMapping.
-
-        The list of accounts that should be linked/unlinked to/from the ingestion policy  # noqa: E501
-
-        :param accounts: The accounts of this IngestionPolicyMapping.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._accounts = accounts
-
-    @property
-    def groups(self):
-        """Gets the groups of this IngestionPolicyMapping.  # noqa: E501
-
-        The list of groups that should be linked/unlinked to/from the ingestion policy  # noqa: E501
-
-        :return: The groups of this IngestionPolicyMapping.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._groups
-
-    @groups.setter
-    def groups(self, groups):
-        """Sets the groups of this IngestionPolicyMapping.
-
-        The list of groups that should be linked/unlinked to/from the ingestion policy  # noqa: E501
-
-        :param groups: The groups of this IngestionPolicyMapping.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._groups = groups
-
-    @property
-    def ingestion_policy_id(self):
-        """Gets the ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
-
-        The unique identifier of the ingestion policy  # noqa: E501
-
-        :return: The ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
-        :rtype: str
-        """
-        return self._ingestion_policy_id
-
-    @ingestion_policy_id.setter
-    def ingestion_policy_id(self, ingestion_policy_id):
-        """Sets the ingestion_policy_id of this IngestionPolicyMapping.
-
-        The unique identifier of the ingestion policy  # noqa: E501
-
-        :param ingestion_policy_id: The ingestion_policy_id of this IngestionPolicyMapping.  # noqa: E501
-        :type: str
-        """
-        if self._configuration.client_side_validation and ingestion_policy_id is None:
-            raise ValueError("Invalid value for `ingestion_policy_id`, must not be `None`")  # noqa: E501
-
-        self._ingestion_policy_id = ingestion_policy_id
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(IngestionPolicyMapping, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, IngestionPolicyMapping):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, IngestionPolicyMapping):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_ingestion_policy.py b/wavefront_api_client/models/paged_ingestion_policy.py
deleted file mode 100644
index 34581b2..0000000
--- a/wavefront_api_client/models/paged_ingestion_policy.py
+++ /dev/null
@@ -1,287 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class PagedIngestionPolicy(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'cursor': 'str',
-        'items': 'list[IngestionPolicy]',
-        'limit': 'int',
-        'more_items': 'bool',
-        'offset': 'int',
-        'sort': 'Sorting',
-        'total_items': 'int'
-    }
-
-    attribute_map = {
-        'cursor': 'cursor',
-        'items': 'items',
-        'limit': 'limit',
-        'more_items': 'moreItems',
-        'offset': 'offset',
-        'sort': 'sort',
-        'total_items': 'totalItems'
-    }
-
-    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
-        """PagedIngestionPolicy - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._cursor = None
-        self._items = None
-        self._limit = None
-        self._more_items = None
-        self._offset = None
-        self._sort = None
-        self._total_items = None
-        self.discriminator = None
-
-        if cursor is not None:
-            self.cursor = cursor
-        if items is not None:
-            self.items = items
-        if limit is not None:
-            self.limit = limit
-        if more_items is not None:
-            self.more_items = more_items
-        if offset is not None:
-            self.offset = offset
-        if sort is not None:
-            self.sort = sort
-        if total_items is not None:
-            self.total_items = total_items
-
-    @property
-    def cursor(self):
-        """Gets the cursor of this PagedIngestionPolicy.  # noqa: E501
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :return: The cursor of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: str
-        """
-        return self._cursor
-
-    @cursor.setter
-    def cursor(self, cursor):
-        """Sets the cursor of this PagedIngestionPolicy.
-
-        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
-
-        :param cursor: The cursor of this PagedIngestionPolicy.  # noqa: E501
-        :type: str
-        """
-
-        self._cursor = cursor
-
-    @property
-    def items(self):
-        """Gets the items of this PagedIngestionPolicy.  # noqa: E501
-
-        List of requested items  # noqa: E501
-
-        :return: The items of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: list[IngestionPolicy]
-        """
-        return self._items
-
-    @items.setter
-    def items(self, items):
-        """Sets the items of this PagedIngestionPolicy.
-
-        List of requested items  # noqa: E501
-
-        :param items: The items of this PagedIngestionPolicy.  # noqa: E501
-        :type: list[IngestionPolicy]
-        """
-
-        self._items = items
-
-    @property
-    def limit(self):
-        """Gets the limit of this PagedIngestionPolicy.  # noqa: E501
-
-
-        :return: The limit of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._limit
-
-    @limit.setter
-    def limit(self, limit):
-        """Sets the limit of this PagedIngestionPolicy.
-
-
-        :param limit: The limit of this PagedIngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._limit = limit
-
-    @property
-    def more_items(self):
-        """Gets the more_items of this PagedIngestionPolicy.  # noqa: E501
-
-        Whether more items are available for return by increment offset or cursor  # noqa: E501
-
-        :return: The more_items of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: bool
-        """
-        return self._more_items
-
-    @more_items.setter
-    def more_items(self, more_items):
-        """Sets the more_items of this PagedIngestionPolicy.
-
-        Whether more items are available for return by increment offset or cursor  # noqa: E501
-
-        :param more_items: The more_items of this PagedIngestionPolicy.  # noqa: E501
-        :type: bool
-        """
-
-        self._more_items = more_items
-
-    @property
-    def offset(self):
-        """Gets the offset of this PagedIngestionPolicy.  # noqa: E501
-
-
-        :return: The offset of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._offset
-
-    @offset.setter
-    def offset(self, offset):
-        """Sets the offset of this PagedIngestionPolicy.
-
-
-        :param offset: The offset of this PagedIngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._offset = offset
-
-    @property
-    def sort(self):
-        """Gets the sort of this PagedIngestionPolicy.  # noqa: E501
-
-
-        :return: The sort of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: Sorting
-        """
-        return self._sort
-
-    @sort.setter
-    def sort(self, sort):
-        """Sets the sort of this PagedIngestionPolicy.
-
-
-        :param sort: The sort of this PagedIngestionPolicy.  # noqa: E501
-        :type: Sorting
-        """
-
-        self._sort = sort
-
-    @property
-    def total_items(self):
-        """Gets the total_items of this PagedIngestionPolicy.  # noqa: E501
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :return: The total_items of this PagedIngestionPolicy.  # noqa: E501
-        :rtype: int
-        """
-        return self._total_items
-
-    @total_items.setter
-    def total_items(self, total_items):
-        """Sets the total_items of this PagedIngestionPolicy.
-
-        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
-
-        :param total_items: The total_items of this PagedIngestionPolicy.  # noqa: E501
-        :type: int
-        """
-
-        self._total_items = total_items
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(PagedIngestionPolicy, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, PagedIngestionPolicy):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, PagedIngestionPolicy):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_ingestion_policy.py b/wavefront_api_client/models/response_container_ingestion_policy.py
deleted file mode 100644
index cffdc28..0000000
--- a/wavefront_api_client/models/response_container_ingestion_policy.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class ResponseContainerIngestionPolicy(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'IngestionPolicy',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
-        """ResponseContainerIngestionPolicy - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerIngestionPolicy.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerIngestionPolicy.  # noqa: E501
-        :rtype: IngestionPolicy
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerIngestionPolicy.
-
-
-        :param response: The response of this ResponseContainerIngestionPolicy.  # noqa: E501
-        :type: IngestionPolicy
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerIngestionPolicy.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerIngestionPolicy.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerIngestionPolicy.
-
-
-        :param status: The status of this ResponseContainerIngestionPolicy.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if self._configuration.client_side_validation and status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerIngestionPolicy, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerIngestionPolicy):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, ResponseContainerIngestionPolicy):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy.py b/wavefront_api_client/models/response_container_paged_ingestion_policy.py
deleted file mode 100644
index dae8549..0000000
--- a/wavefront_api_client/models/response_container_paged_ingestion_policy.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The Wavefront REST API enables you to interact with Wavefront servers using standard REST API tools. You can use the REST API to automate commonly executed operations such as automatically tagging sources.</p><p>When you make REST API calls outside the Wavefront REST API documentation you must add the header \"Authorization: Bearer &lt;&lt;API-TOKEN&gt;&gt;\" to your HTTP requests.</p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class ResponseContainerPagedIngestionPolicy(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'PagedIngestionPolicy',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
-        """ResponseContainerPagedIngestionPolicy - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
-        :rtype: PagedIngestionPolicy
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerPagedIngestionPolicy.
-
-
-        :param response: The response of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
-        :type: PagedIngestionPolicy
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerPagedIngestionPolicy.
-
-
-        :param status: The status of this ResponseContainerPagedIngestionPolicy.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if self._configuration.client_side_validation and status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerPagedIngestionPolicy, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerPagedIngestionPolicy):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, ResponseContainerPagedIngestionPolicy):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tesla_configuration.py b/wavefront_api_client/models/tesla_configuration.py
deleted file mode 100644
index a0896ad..0000000
--- a/wavefront_api_client/models/tesla_configuration.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class TeslaConfiguration(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'email': 'str'
-    }
-
-    attribute_map = {
-        'email': 'email'
-    }
-
-    def __init__(self, email=None, _configuration=None):  # noqa: E501
-        """TeslaConfiguration - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._email = None
-        self.discriminator = None
-
-        self.email = email
-
-    @property
-    def email(self):
-        """Gets the email of this TeslaConfiguration.  # noqa: E501
-
-        Email address for Tesla account login  # noqa: E501
-
-        :return: The email of this TeslaConfiguration.  # noqa: E501
-        :rtype: str
-        """
-        return self._email
-
-    @email.setter
-    def email(self, email):
-        """Sets the email of this TeslaConfiguration.
-
-        Email address for Tesla account login  # noqa: E501
-
-        :param email: The email of this TeslaConfiguration.  # noqa: E501
-        :type: str
-        """
-        if self._configuration.client_side_validation and email is None:
-            raise ValueError("Invalid value for `email`, must not be `None`")  # noqa: E501
-
-        self._email = email
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(TeslaConfiguration, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, TeslaConfiguration):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, TeslaConfiguration):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/tuple.py b/wavefront_api_client/models/tuple.py
deleted file mode 100644
index ebc5ce2..0000000
--- a/wavefront_api_client/models/tuple.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class Tuple(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'elements': 'list[str]'
-    }
-
-    attribute_map = {
-        'elements': 'elements'
-    }
-
-    def __init__(self, elements=None, _configuration=None):  # noqa: E501
-        """Tuple - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._elements = None
-        self.discriminator = None
-
-        if elements is not None:
-            self.elements = elements
-
-    @property
-    def elements(self):
-        """Gets the elements of this Tuple.  # noqa: E501
-
-
-        :return: The elements of this Tuple.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._elements
-
-    @elements.setter
-    def elements(self, elements):
-        """Sets the elements of this Tuple.
-
-
-        :param elements: The elements of this Tuple.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._elements = elements
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(Tuple, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, Tuple):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, Tuple):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index b682e2c..c73137f 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -38,7 +38,7 @@ class UserGroupWrite(object):
         'description': 'str',
         'id': 'str',
         'name': 'str',
-        'role_i_ds': 'list[str]'
+        'role_ids': 'list[str]'
     }
 
     attribute_map = {
@@ -47,10 +47,10 @@ class UserGroupWrite(object):
         'description': 'description',
         'id': 'id',
         'name': 'name',
-        'role_i_ds': 'roleIDs'
+        'role_ids': 'roleIDs'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, role_i_ds=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, name=None, role_ids=None, _configuration=None):  # noqa: E501
         """UserGroupWrite - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -61,7 +61,7 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._description = None
         self._id = None
         self._name = None
-        self._role_i_ds = None
+        self._role_ids = None
         self.discriminator = None
 
         if created_epoch_millis is not None:
@@ -73,7 +73,7 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         if id is not None:
             self.id = id
         self.name = name
-        self.role_i_ds = role_i_ds
+        self.role_ids = role_ids
 
     @property
     def created_epoch_millis(self):
@@ -191,29 +191,29 @@ def name(self, name):
         self._name = name
 
     @property
-    def role_i_ds(self):
-        """Gets the role_i_ds of this UserGroupWrite.  # noqa: E501
+    def role_ids(self):
+        """Gets the role_ids of this UserGroupWrite.  # noqa: E501
 
         List of role IDs the user group has been linked to.  # noqa: E501
 
-        :return: The role_i_ds of this UserGroupWrite.  # noqa: E501
+        :return: The role_ids of this UserGroupWrite.  # noqa: E501
         :rtype: list[str]
         """
-        return self._role_i_ds
+        return self._role_ids
 
-    @role_i_ds.setter
-    def role_i_ds(self, role_i_ds):
-        """Sets the role_i_ds of this UserGroupWrite.
+    @role_ids.setter
+    def role_ids(self, role_ids):
+        """Sets the role_ids of this UserGroupWrite.
 
         List of role IDs the user group has been linked to.  # noqa: E501
 
-        :param role_i_ds: The role_i_ds of this UserGroupWrite.  # noqa: E501
+        :param role_ids: The role_ids of this UserGroupWrite.  # noqa: E501
         :type: list[str]
         """
-        if self._configuration.client_side_validation and role_i_ds is None:
-            raise ValueError("Invalid value for `role_i_ds`, must not be `None`")  # noqa: E501
+        if self._configuration.client_side_validation and role_ids is None:
+            raise ValueError("Invalid value for `role_ids`, must not be `None`")  # noqa: E501
 
-        self._role_i_ds = role_i_ds
+        self._role_ids = role_ids
 
     def to_dict(self):
         """Returns the model properties as a dict"""

From c8ab22a9a61d20c42d04ed10e797335e9faf937b Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 21 Mar 2023 11:44:45 -0700
Subject: [PATCH 130/161] Add Checkout Steps to Publish Actions (#65)

---
 .github/workflows/publish_on_merge.yml   | 1 +
 .github/workflows/publish_on_release.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
index 8a294bc..c40a6d2 100644
--- a/.github/workflows/publish_on_merge.yml
+++ b/.github/workflows/publish_on_merge.yml
@@ -9,6 +9,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
       - name: Prepare the Package
         uses: ./.github/workflows/package.yml
       - name: Publish the Package on TestPyPI
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
index 0797f94..8266183 100644
--- a/.github/workflows/publish_on_release.yml
+++ b/.github/workflows/publish_on_release.yml
@@ -9,6 +9,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
       - name: Prepare the Package
         uses: ./.github/workflows/package.yml
       - name: Publish the Package

From 0fe6bdc494970ce548317e7b755c3d826b4416ad Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 21 Mar 2023 12:05:35 -0700
Subject: [PATCH 131/161] Fix Packaging Workflow Call (#66)

* Fix Package Workflow Call
---
 .github/workflows/publish_on_merge.yml   | 5 ++---
 .github/workflows/publish_on_release.yml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
index c40a6d2..7772222 100644
--- a/.github/workflows/publish_on_merge.yml
+++ b/.github/workflows/publish_on_merge.yml
@@ -6,12 +6,11 @@ on:
       - master
 
 jobs:
+  prepare:
+    uses: ./.github/workflows/package.yml
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Prepare the Package
-        uses: ./.github/workflows/package.yml
       - name: Publish the Package on TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
index 8266183..38ce62b 100644
--- a/.github/workflows/publish_on_release.yml
+++ b/.github/workflows/publish_on_release.yml
@@ -6,12 +6,11 @@ on:
       - published
 
 jobs:
+  prepare:
+    uses: ./.github/workflows/package.yml
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Prepare the Package
-        uses: ./.github/workflows/package.yml
       - name: Publish the Package
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1

From 8b1a401ea62dc9c85d911771d18e7613ebeffe2c Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 21 Mar 2023 14:05:32 -0700
Subject: [PATCH 132/161] Store Artifacts to Share Between Jobs (#67)

* Store Artifacts to Share Between Jobs
---
 .github/workflows/package.yml            | 5 +++++
 .github/workflows/publish_on_merge.yml   | 4 ++++
 .github/workflows/publish_on_release.yml | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 8532b30..03b26e1 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -19,3 +19,8 @@ jobs:
           python -m pip install -U build
       - name: Build Package
         run: python -m build
+      - uses: actions/upload-artifact@v3
+        with:
+          name: dist_dir
+          path: dist
+          retention-days: 1
diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
index 7772222..9ed29ea 100644
--- a/.github/workflows/publish_on_merge.yml
+++ b/.github/workflows/publish_on_merge.yml
@@ -9,8 +9,12 @@ jobs:
   prepare:
     uses: ./.github/workflows/package.yml
   publish:
+    needs: prepare
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist_dir
       - name: Publish the Package on TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
index 38ce62b..d857ecf 100644
--- a/.github/workflows/publish_on_release.yml
+++ b/.github/workflows/publish_on_release.yml
@@ -9,8 +9,12 @@ jobs:
   prepare:
     uses: ./.github/workflows/package.yml
   publish:
+    needs: prepare
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist_dir
       - name: Publish the Package
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1

From 8d91da780e54a1281b6496d4d8d24c9c80a848b8 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 21 Mar 2023 14:25:57 -0700
Subject: [PATCH 133/161] Explicitly Use `dist` as Artifacts Path (#68)

* Explicitly Use `dist` for Artifacts Path
---
 .github/workflows/package.yml            | 1 -
 .github/workflows/publish_on_merge.yml   | 2 +-
 .github/workflows/publish_on_release.yml | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 03b26e1..e7a31a8 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -21,6 +21,5 @@ jobs:
         run: python -m build
       - uses: actions/upload-artifact@v3
         with:
-          name: dist_dir
           path: dist
           retention-days: 1
diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
index 9ed29ea..bdb6fef 100644
--- a/.github/workflows/publish_on_merge.yml
+++ b/.github/workflows/publish_on_merge.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: dist_dir
+          path: dist
       - name: Publish the Package on TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
index d857ecf..5a77f30 100644
--- a/.github/workflows/publish_on_release.yml
+++ b/.github/workflows/publish_on_release.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: dist_dir
+          path: dist
       - name: Publish the Package
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1

From 548ec9b5405d557346a34f3aa21ee18e1159917a Mon Sep 17 00:00:00 2001
From: Artem Ustinov <ustinov@users.noreply.github.com>
Date: Tue, 21 Mar 2023 15:00:27 -0700
Subject: [PATCH 134/161] Resolve Artifacts Upload/Download Issue (#69)

---
 .github/workflows/package.yml            | 1 +
 .github/workflows/publish_on_merge.yml   | 2 --
 .github/workflows/publish_on_release.yml | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index e7a31a8..fac7f55 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -21,5 +21,6 @@ jobs:
         run: python -m build
       - uses: actions/upload-artifact@v3
         with:
+          name: dist
           path: dist
           retention-days: 1
diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
index bdb6fef..2314d55 100644
--- a/.github/workflows/publish_on_merge.yml
+++ b/.github/workflows/publish_on_merge.yml
@@ -13,8 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
-        with:
-          path: dist
       - name: Publish the Package on TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
index 5a77f30..091c46e 100644
--- a/.github/workflows/publish_on_release.yml
+++ b/.github/workflows/publish_on_release.yml
@@ -13,8 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
-        with:
-          path: dist
       - name: Publish the Package
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1

From ee3200e62dd43b9490f7529800a87dd3a1ef79ff Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 29 Mar 2023 08:16:26 -0700
Subject: [PATCH 135/161] Autogenerated Update v2.177.0.

---
 .gitignore                                |   4 -
 .swagger-codegen/config.json              |   2 +-
 .swagger-codegen/config.jsone             |   2 +-
 README.md                                 |   3 +-
 docs/LogsSort.md                          |  11 ++
 docs/LogsTable.md                         |   3 +
 setup.py                                  |   2 +-
 test/test_logs_sort.py                    |  40 ++++++
 wavefront_api_client/__init__.py          |   1 +
 wavefront_api_client/api_client.py        |   2 +-
 wavefront_api_client/configuration.py     |   2 +-
 wavefront_api_client/models/__init__.py   |   1 +
 wavefront_api_client/models/logs_sort.py  | 149 ++++++++++++++++++++++
 wavefront_api_client/models/logs_table.py |  84 +++++++++++-
 14 files changed, 293 insertions(+), 13 deletions(-)
 create mode 100644 docs/LogsSort.md
 create mode 100644 test/test_logs_sort.py
 create mode 100644 wavefront_api_client/models/logs_sort.py

diff --git a/.gitignore b/.gitignore
index 1cd84f8..a655050 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,3 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
-
-# Other
-.DS_Store
-*.swp
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 33272c6..418a5bd 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.176.0"
+    "packageVersion": "2.177.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 99c84f9..33272c6 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.175.2"
+    "packageVersion": "2.176.0"
 }
diff --git a/README.md b/README.md
index 0a07146..38c06cf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.176.0
+- Package version: 2.177.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -541,6 +541,7 @@ Class | Method | HTTP request | Description
  - [KubernetesComponent](docs/KubernetesComponent.md)
  - [KubernetesComponentStatus](docs/KubernetesComponentStatus.md)
  - [LogicalType](docs/LogicalType.md)
+ - [LogsSort](docs/LogsSort.md)
  - [LogsTable](docs/LogsTable.md)
  - [MaintenanceWindow](docs/MaintenanceWindow.md)
  - [Message](docs/Message.md)
diff --git a/docs/LogsSort.md b/docs/LogsSort.md
new file mode 100644
index 0000000..0e99060
--- /dev/null
+++ b/docs/LogsSort.md
@@ -0,0 +1,11 @@
+# LogsSort
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**order** | **str** |  | [optional] 
+**sort** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/LogsTable.md b/docs/LogsTable.md
index 06d51c1..6fc7ea4 100644
--- a/docs/LogsTable.md
+++ b/docs/LogsTable.md
@@ -3,7 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**auto_load** | **bool** |  | [optional] 
 **columns** | **list[str]** |  | [optional] 
+**lines_to_show** | **str** |  | [optional] 
+**sort** | [**LogsSort**](LogsSort.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/setup.py b/setup.py
index 8259e1f..c46d8e9 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.176.0"
+VERSION = "2.177.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_logs_sort.py b/test/test_logs_sort.py
new file mode 100644
index 0000000..082fe19
--- /dev/null
+++ b/test/test_logs_sort.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.logs_sort import LogsSort  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestLogsSort(unittest.TestCase):
+    """LogsSort unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testLogsSort(self):
+        """Test LogsSort"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.logs_sort.LogsSort()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 19b4d90..26d78db 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -134,6 +134,7 @@
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus
 from wavefront_api_client.models.logical_type import LogicalType
+from wavefront_api_client.models.logs_sort import LogsSort
 from wavefront_api_client.models.logs_table import LogsTable
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3eee4d4..6de1b6f 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.176.0/python'
+        self.user_agent = 'Swagger-Codegen/2.177.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index bb7a050..717f4dc 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.176.0".\
+               "SDK Package Version: 2.177.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index df412de..8b3c86b 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -90,6 +90,7 @@
 from wavefront_api_client.models.kubernetes_component import KubernetesComponent
 from wavefront_api_client.models.kubernetes_component_status import KubernetesComponentStatus
 from wavefront_api_client.models.logical_type import LogicalType
+from wavefront_api_client.models.logs_sort import LogsSort
 from wavefront_api_client.models.logs_table import LogsTable
 from wavefront_api_client.models.maintenance_window import MaintenanceWindow
 from wavefront_api_client.models.message import Message
diff --git a/wavefront_api_client/models/logs_sort.py b/wavefront_api_client/models/logs_sort.py
new file mode 100644
index 0000000..b9abb02
--- /dev/null
+++ b/wavefront_api_client/models/logs_sort.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class LogsSort(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'order': 'str',
+        'sort': 'str'
+    }
+
+    attribute_map = {
+        'order': 'order',
+        'sort': 'sort'
+    }
+
+    def __init__(self, order=None, sort=None, _configuration=None):  # noqa: E501
+        """LogsSort - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._order = None
+        self._sort = None
+        self.discriminator = None
+
+        if order is not None:
+            self.order = order
+        if sort is not None:
+            self.sort = sort
+
+    @property
+    def order(self):
+        """Gets the order of this LogsSort.  # noqa: E501
+
+
+        :return: The order of this LogsSort.  # noqa: E501
+        :rtype: str
+        """
+        return self._order
+
+    @order.setter
+    def order(self, order):
+        """Sets the order of this LogsSort.
+
+
+        :param order: The order of this LogsSort.  # noqa: E501
+        :type: str
+        """
+
+        self._order = order
+
+    @property
+    def sort(self):
+        """Gets the sort of this LogsSort.  # noqa: E501
+
+
+        :return: The sort of this LogsSort.  # noqa: E501
+        :rtype: str
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this LogsSort.
+
+
+        :param sort: The sort of this LogsSort.  # noqa: E501
+        :type: str
+        """
+
+        self._sort = sort
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(LogsSort, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, LogsSort):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, LogsSort):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/logs_table.py b/wavefront_api_client/models/logs_table.py
index 5b8a010..867b3b9 100644
--- a/wavefront_api_client/models/logs_table.py
+++ b/wavefront_api_client/models/logs_table.py
@@ -33,24 +33,60 @@ class LogsTable(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'columns': 'list[str]'
+        'auto_load': 'bool',
+        'columns': 'list[str]',
+        'lines_to_show': 'str',
+        'sort': 'LogsSort'
     }
 
     attribute_map = {
-        'columns': 'columns'
+        'auto_load': 'autoLoad',
+        'columns': 'columns',
+        'lines_to_show': 'linesToShow',
+        'sort': 'sort'
     }
 
-    def __init__(self, columns=None, _configuration=None):  # noqa: E501
+    def __init__(self, auto_load=None, columns=None, lines_to_show=None, sort=None, _configuration=None):  # noqa: E501
         """LogsTable - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._auto_load = None
         self._columns = None
+        self._lines_to_show = None
+        self._sort = None
         self.discriminator = None
 
+        if auto_load is not None:
+            self.auto_load = auto_load
         if columns is not None:
             self.columns = columns
+        if lines_to_show is not None:
+            self.lines_to_show = lines_to_show
+        if sort is not None:
+            self.sort = sort
+
+    @property
+    def auto_load(self):
+        """Gets the auto_load of this LogsTable.  # noqa: E501
+
+
+        :return: The auto_load of this LogsTable.  # noqa: E501
+        :rtype: bool
+        """
+        return self._auto_load
+
+    @auto_load.setter
+    def auto_load(self, auto_load):
+        """Sets the auto_load of this LogsTable.
+
+
+        :param auto_load: The auto_load of this LogsTable.  # noqa: E501
+        :type: bool
+        """
+
+        self._auto_load = auto_load
 
     @property
     def columns(self):
@@ -73,6 +109,48 @@ def columns(self, columns):
 
         self._columns = columns
 
+    @property
+    def lines_to_show(self):
+        """Gets the lines_to_show of this LogsTable.  # noqa: E501
+
+
+        :return: The lines_to_show of this LogsTable.  # noqa: E501
+        :rtype: str
+        """
+        return self._lines_to_show
+
+    @lines_to_show.setter
+    def lines_to_show(self, lines_to_show):
+        """Sets the lines_to_show of this LogsTable.
+
+
+        :param lines_to_show: The lines_to_show of this LogsTable.  # noqa: E501
+        :type: str
+        """
+
+        self._lines_to_show = lines_to_show
+
+    @property
+    def sort(self):
+        """Gets the sort of this LogsTable.  # noqa: E501
+
+
+        :return: The sort of this LogsTable.  # noqa: E501
+        :rtype: LogsSort
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this LogsTable.
+
+
+        :param sort: The sort of this LogsTable.  # noqa: E501
+        :type: LogsSort
+        """
+
+        self._sort = sort
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

From 232fe50b556cc8f4ff1419eecd580f81dc82856d Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 11 Apr 2023 08:16:24 -0700
Subject: [PATCH 136/161] Autogenerated Update v2.179.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  14 +-
 docs/AlertAnalyticsSummary.md                 |  11 +
 docs/AlertAnalyticsSummaryDetail.md           |  22 +
 docs/AlertErrorGroupInfo.md                   |  13 +
 docs/AlertErrorGroupSummary.md                |  13 +
 docs/AlertErrorSummary.md                     |  14 +
 docs/PagedAlertAnalyticsSummaryDetail.md      |  16 +
 .../ResponseContainerAlertAnalyticsSummary.md |  11 +
 ...esponseContainerListAlertErrorGroupInfo.md |  11 +
 ...ntainerPagedAlertAnalyticsSummaryDetail.md |  11 +
 setup.py                                      |   2 +-
 test/test_alert_analytics_summary.py          |  40 ++
 test/test_alert_analytics_summary_detail.py   |  40 ++
 test/test_alert_error_group_info.py           |  40 ++
 test/test_alert_error_group_summary.py        |  40 ++
 test/test_alert_error_summary.py              |  40 ++
 ...st_paged_alert_analytics_summary_detail.py |  40 ++
 ...ponse_container_alert_analytics_summary.py |  40 ++
 ...e_container_list_alert_error_group_info.py |  40 ++
 ...er_paged_alert_analytics_summary_detail.py |  40 ++
 wavefront_api_client/__init__.py              |  12 +-
 wavefront_api_client/api/__init__.py          |   1 -
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |  11 +-
 .../models/alert_analytics_summary.py         | 149 ++++++
 .../models/alert_analytics_summary_detail.py  | 447 ++++++++++++++++++
 .../models/alert_error_group_info.py          | 201 ++++++++
 .../models/alert_error_group_summary.py       | 201 ++++++++
 .../models/alert_error_summary.py             | 227 +++++++++
 .../paged_alert_analytics_summary_detail.py   | 287 +++++++++++
 ...ponse_container_alert_analytics_summary.py | 150 ++++++
 ...e_container_list_alert_error_group_info.py | 150 ++++++
 ...er_paged_alert_analytics_summary_detail.py | 150 ++++++
 wavefront_api_client/models/saved_search.py   |   2 +-
 37 files changed, 2478 insertions(+), 16 deletions(-)
 create mode 100644 docs/AlertAnalyticsSummary.md
 create mode 100644 docs/AlertAnalyticsSummaryDetail.md
 create mode 100644 docs/AlertErrorGroupInfo.md
 create mode 100644 docs/AlertErrorGroupSummary.md
 create mode 100644 docs/AlertErrorSummary.md
 create mode 100644 docs/PagedAlertAnalyticsSummaryDetail.md
 create mode 100644 docs/ResponseContainerAlertAnalyticsSummary.md
 create mode 100644 docs/ResponseContainerListAlertErrorGroupInfo.md
 create mode 100644 docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md
 create mode 100644 test/test_alert_analytics_summary.py
 create mode 100644 test/test_alert_analytics_summary_detail.py
 create mode 100644 test/test_alert_error_group_info.py
 create mode 100644 test/test_alert_error_group_summary.py
 create mode 100644 test/test_alert_error_summary.py
 create mode 100644 test/test_paged_alert_analytics_summary_detail.py
 create mode 100644 test/test_response_container_alert_analytics_summary.py
 create mode 100644 test/test_response_container_list_alert_error_group_info.py
 create mode 100644 test/test_response_container_paged_alert_analytics_summary_detail.py
 create mode 100644 wavefront_api_client/models/alert_analytics_summary.py
 create mode 100644 wavefront_api_client/models/alert_analytics_summary_detail.py
 create mode 100644 wavefront_api_client/models/alert_error_group_info.py
 create mode 100644 wavefront_api_client/models/alert_error_group_summary.py
 create mode 100644 wavefront_api_client/models/alert_error_summary.py
 create mode 100644 wavefront_api_client/models/paged_alert_analytics_summary_detail.py
 create mode 100644 wavefront_api_client/models/response_container_alert_analytics_summary.py
 create mode 100644 wavefront_api_client/models/response_container_list_alert_error_group_info.py
 create mode 100644 wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 418a5bd..ec50555 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.177.0"
+    "packageVersion": "2.179.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 33272c6..418a5bd 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.176.0"
+    "packageVersion": "2.177.0"
 }
diff --git a/README.md b/README.md
index 38c06cf..ef8864f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.177.0
+- Package version: 2.179.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -128,7 +128,6 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
-*AlertAnalyticsApi* | [**get_global_alert_analytics**](docs/AlertAnalyticsApi.md#get_global_alert_analytics) | **GET** /api/v2/alert/analytics/global | Get Global Alert Analytics for a customer
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_customer_token**](docs/ApiTokenApi.md#delete_customer_token) | **PUT** /api/v2/apitoken/customertokens/revoke | Delete the specified api token for a customer
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
@@ -475,7 +474,12 @@ Class | Method | HTTP request | Description
  - [AccessPolicyRuleDTO](docs/AccessPolicyRuleDTO.md)
  - [Account](docs/Account.md)
  - [Alert](docs/Alert.md)
+ - [AlertAnalyticsSummary](docs/AlertAnalyticsSummary.md)
+ - [AlertAnalyticsSummaryDetail](docs/AlertAnalyticsSummaryDetail.md)
  - [AlertDashboard](docs/AlertDashboard.md)
+ - [AlertErrorGroupInfo](docs/AlertErrorGroupInfo.md)
+ - [AlertErrorGroupSummary](docs/AlertErrorGroupSummary.md)
+ - [AlertErrorSummary](docs/AlertErrorSummary.md)
  - [AlertMin](docs/AlertMin.md)
  - [AlertRoute](docs/AlertRoute.md)
  - [AlertSource](docs/AlertSource.md)
@@ -522,7 +526,6 @@ Class | Method | HTTP request | Description
  - [Field](docs/Field.md)
  - [GCPBillingConfiguration](docs/GCPBillingConfiguration.md)
  - [GCPConfiguration](docs/GCPConfiguration.md)
- - [GlobalAlertAnalytic](docs/GlobalAlertAnalytic.md)
  - [HistoryEntry](docs/HistoryEntry.md)
  - [HistoryResponse](docs/HistoryResponse.md)
  - [IngestionPolicyAlert](docs/IngestionPolicyAlert.md)
@@ -564,6 +567,7 @@ Class | Method | HTTP request | Description
  - [Paged](docs/Paged.md)
  - [PagedAccount](docs/PagedAccount.md)
  - [PagedAlert](docs/PagedAlert.md)
+ - [PagedAlertAnalyticsSummaryDetail](docs/PagedAlertAnalyticsSummaryDetail.md)
  - [PagedAlertWithStats](docs/PagedAlertWithStats.md)
  - [PagedAnomaly](docs/PagedAnomaly.md)
  - [PagedApiTokenModel](docs/PagedApiTokenModel.md)
@@ -617,6 +621,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerAccessPolicyAction](docs/ResponseContainerAccessPolicyAction.md)
  - [ResponseContainerAccount](docs/ResponseContainerAccount.md)
  - [ResponseContainerAlert](docs/ResponseContainerAlert.md)
+ - [ResponseContainerAlertAnalyticsSummary](docs/ResponseContainerAlertAnalyticsSummary.md)
  - [ResponseContainerApiTokenModel](docs/ResponseContainerApiTokenModel.md)
  - [ResponseContainerCloudIntegration](docs/ResponseContainerCloudIntegration.md)
  - [ResponseContainerClusterInfoDTO](docs/ResponseContainerClusterInfoDTO.md)
@@ -628,12 +633,12 @@ Class | Method | HTTP request | Description
  - [ResponseContainerExternalLink](docs/ResponseContainerExternalLink.md)
  - [ResponseContainerFacetResponse](docs/ResponseContainerFacetResponse.md)
  - [ResponseContainerFacetsResponseContainer](docs/ResponseContainerFacetsResponseContainer.md)
- - [ResponseContainerGlobalAlertAnalytic](docs/ResponseContainerGlobalAlertAnalytic.md)
  - [ResponseContainerHistoryResponse](docs/ResponseContainerHistoryResponse.md)
  - [ResponseContainerIngestionPolicyReadModel](docs/ResponseContainerIngestionPolicyReadModel.md)
  - [ResponseContainerIntegration](docs/ResponseContainerIntegration.md)
  - [ResponseContainerIntegrationStatus](docs/ResponseContainerIntegrationStatus.md)
  - [ResponseContainerListAccessControlListReadDTO](docs/ResponseContainerListAccessControlListReadDTO.md)
+ - [ResponseContainerListAlertErrorGroupInfo](docs/ResponseContainerListAlertErrorGroupInfo.md)
  - [ResponseContainerListApiTokenModel](docs/ResponseContainerListApiTokenModel.md)
  - [ResponseContainerListIntegration](docs/ResponseContainerListIntegration.md)
  - [ResponseContainerListIntegrationManifestGroup](docs/ResponseContainerListIntegrationManifestGroup.md)
@@ -654,6 +659,7 @@ Class | Method | HTTP request | Description
  - [ResponseContainerNotificant](docs/ResponseContainerNotificant.md)
  - [ResponseContainerPagedAccount](docs/ResponseContainerPagedAccount.md)
  - [ResponseContainerPagedAlert](docs/ResponseContainerPagedAlert.md)
+ - [ResponseContainerPagedAlertAnalyticsSummaryDetail](docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md)
  - [ResponseContainerPagedAlertWithStats](docs/ResponseContainerPagedAlertWithStats.md)
  - [ResponseContainerPagedAnomaly](docs/ResponseContainerPagedAnomaly.md)
  - [ResponseContainerPagedApiTokenModel](docs/ResponseContainerPagedApiTokenModel.md)
diff --git a/docs/AlertAnalyticsSummary.md b/docs/AlertAnalyticsSummary.md
new file mode 100644
index 0000000..9b1a633
--- /dev/null
+++ b/docs/AlertAnalyticsSummary.md
@@ -0,0 +1,11 @@
+# AlertAnalyticsSummary
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**total_evaluated** | **int** |  | [optional] 
+**total_failed** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AlertAnalyticsSummaryDetail.md b/docs/AlertAnalyticsSummaryDetail.md
new file mode 100644
index 0000000..4f94b54
--- /dev/null
+++ b/docs/AlertAnalyticsSummaryDetail.md
@@ -0,0 +1,22 @@
+# AlertAnalyticsSummaryDetail
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**alert_id** | **int** | The alert id | [optional] 
+**alert_name** | **str** | The alert name | [optional] 
+**avg_key_cardinality** | **int** | The average cardinality across all alert execution logs. | [optional] 
+**avg_latency** | **int** | The average latency across all alert execution logs. | [optional] 
+**avg_points** | **int** | The average points across all alert execution logs. | [optional] 
+**checking_frequency** | **int** | The checking frequency of the alert. | [optional] 
+**creator_id** | **str** |  | [optional] 
+**error_groups_summary** | [**list[AlertErrorGroupSummary]**](AlertErrorGroupSummary.md) |  | [optional] 
+**failure_percentage** | **float** |  | [optional] 
+**failure_percentage_range** | **str** |  | [optional] 
+**tags** | **list[str]** |  | [optional] 
+**total_evaluated** | **int** |  | [optional] 
+**total_failed** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AlertErrorGroupInfo.md b/docs/AlertErrorGroupInfo.md
new file mode 100644
index 0000000..84a692c
--- /dev/null
+++ b/docs/AlertErrorGroupInfo.md
@@ -0,0 +1,13 @@
+# AlertErrorGroupInfo
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**error_group_id** | **str** |  | [optional] 
+**error_group_name** | **str** |  | [optional] 
+**total_failed** | **int** |  | [optional] 
+**total_failed_per_group** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AlertErrorGroupSummary.md b/docs/AlertErrorGroupSummary.md
new file mode 100644
index 0000000..854dddb
--- /dev/null
+++ b/docs/AlertErrorGroupSummary.md
@@ -0,0 +1,13 @@
+# AlertErrorGroupSummary
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**error_group_id** | **str** |  | [optional] 
+**error_group_name** | **str** |  | [optional] 
+**errors_summary** | [**list[AlertErrorSummary]**](AlertErrorSummary.md) |  | [optional] 
+**total_failed_per_group** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/AlertErrorSummary.md b/docs/AlertErrorSummary.md
new file mode 100644
index 0000000..d91ba04
--- /dev/null
+++ b/docs/AlertErrorSummary.md
@@ -0,0 +1,14 @@
+# AlertErrorSummary
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**error_code** | **int** |  | [optional] 
+**error_group_id** | **str** |  | [optional] 
+**error_message** | **str** |  | [optional] 
+**recommendation_key** | **str** |  | [optional] 
+**total_matched** | **int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/PagedAlertAnalyticsSummaryDetail.md b/docs/PagedAlertAnalyticsSummaryDetail.md
new file mode 100644
index 0000000..95c4486
--- /dev/null
+++ b/docs/PagedAlertAnalyticsSummaryDetail.md
@@ -0,0 +1,16 @@
+# PagedAlertAnalyticsSummaryDetail
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cursor** | **str** | The id at which the current (limited) search can be continued to obtain more matching items | [optional] 
+**items** | [**list[AlertAnalyticsSummaryDetail]**](AlertAnalyticsSummaryDetail.md) | List of requested items | [optional] 
+**limit** | **int** |  | [optional] 
+**more_items** | **bool** | Whether more items are available for return by increment offset or cursor | [optional] 
+**offset** | **int** |  | [optional] 
+**sort** | [**Sorting**](Sorting.md) |  | [optional] 
+**total_items** | **int** | An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerAlertAnalyticsSummary.md b/docs/ResponseContainerAlertAnalyticsSummary.md
new file mode 100644
index 0000000..a832e57
--- /dev/null
+++ b/docs/ResponseContainerAlertAnalyticsSummary.md
@@ -0,0 +1,11 @@
+# ResponseContainerAlertAnalyticsSummary
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**AlertAnalyticsSummary**](AlertAnalyticsSummary.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerListAlertErrorGroupInfo.md b/docs/ResponseContainerListAlertErrorGroupInfo.md
new file mode 100644
index 0000000..f98620d
--- /dev/null
+++ b/docs/ResponseContainerListAlertErrorGroupInfo.md
@@ -0,0 +1,11 @@
+# ResponseContainerListAlertErrorGroupInfo
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**list[AlertErrorGroupInfo]**](AlertErrorGroupInfo.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md b/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md
new file mode 100644
index 0000000..131ea16
--- /dev/null
+++ b/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md
@@ -0,0 +1,11 @@
+# ResponseContainerPagedAlertAnalyticsSummaryDetail
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**response** | [**PagedAlertAnalyticsSummaryDetail**](PagedAlertAnalyticsSummaryDetail.md) |  | [optional] 
+**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/setup.py b/setup.py
index c46d8e9..e25c390 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.177.0"
+VERSION = "2.179.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_alert_analytics_summary.py b/test/test_alert_analytics_summary.py
new file mode 100644
index 0000000..feda536
--- /dev/null
+++ b/test/test_alert_analytics_summary.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_analytics_summary import AlertAnalyticsSummary  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertAnalyticsSummary(unittest.TestCase):
+    """AlertAnalyticsSummary unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertAnalyticsSummary(self):
+        """Test AlertAnalyticsSummary"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_analytics_summary.AlertAnalyticsSummary()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_analytics_summary_detail.py b/test/test_alert_analytics_summary_detail.py
new file mode 100644
index 0000000..33acce9
--- /dev/null
+++ b/test/test_alert_analytics_summary_detail.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_analytics_summary_detail import AlertAnalyticsSummaryDetail  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertAnalyticsSummaryDetail(unittest.TestCase):
+    """AlertAnalyticsSummaryDetail unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertAnalyticsSummaryDetail(self):
+        """Test AlertAnalyticsSummaryDetail"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_analytics_summary_detail.AlertAnalyticsSummaryDetail()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_error_group_info.py b/test/test_alert_error_group_info.py
new file mode 100644
index 0000000..9d9e75a
--- /dev/null
+++ b/test/test_alert_error_group_info.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_error_group_info import AlertErrorGroupInfo  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertErrorGroupInfo(unittest.TestCase):
+    """AlertErrorGroupInfo unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertErrorGroupInfo(self):
+        """Test AlertErrorGroupInfo"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_error_group_info.AlertErrorGroupInfo()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_error_group_summary.py b/test/test_alert_error_group_summary.py
new file mode 100644
index 0000000..c3eae5a
--- /dev/null
+++ b/test/test_alert_error_group_summary.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_error_group_summary import AlertErrorGroupSummary  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertErrorGroupSummary(unittest.TestCase):
+    """AlertErrorGroupSummary unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertErrorGroupSummary(self):
+        """Test AlertErrorGroupSummary"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_error_group_summary.AlertErrorGroupSummary()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_alert_error_summary.py b/test/test_alert_error_summary.py
new file mode 100644
index 0000000..0c90023
--- /dev/null
+++ b/test/test_alert_error_summary.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.alert_error_summary import AlertErrorSummary  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertErrorSummary(unittest.TestCase):
+    """AlertErrorSummary unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAlertErrorSummary(self):
+        """Test AlertErrorSummary"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.alert_error_summary.AlertErrorSummary()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_paged_alert_analytics_summary_detail.py b/test/test_paged_alert_analytics_summary_detail.py
new file mode 100644
index 0000000..b6808fc
--- /dev/null
+++ b/test/test_paged_alert_analytics_summary_detail.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.paged_alert_analytics_summary_detail import PagedAlertAnalyticsSummaryDetail  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestPagedAlertAnalyticsSummaryDetail(unittest.TestCase):
+    """PagedAlertAnalyticsSummaryDetail unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPagedAlertAnalyticsSummaryDetail(self):
+        """Test PagedAlertAnalyticsSummaryDetail"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.paged_alert_analytics_summary_detail.PagedAlertAnalyticsSummaryDetail()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_alert_analytics_summary.py b/test/test_response_container_alert_analytics_summary.py
new file mode 100644
index 0000000..3863a05
--- /dev/null
+++ b/test/test_response_container_alert_analytics_summary.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_alert_analytics_summary import ResponseContainerAlertAnalyticsSummary  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerAlertAnalyticsSummary(unittest.TestCase):
+    """ResponseContainerAlertAnalyticsSummary unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerAlertAnalyticsSummary(self):
+        """Test ResponseContainerAlertAnalyticsSummary"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_alert_analytics_summary.ResponseContainerAlertAnalyticsSummary()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_list_alert_error_group_info.py b/test/test_response_container_list_alert_error_group_info.py
new file mode 100644
index 0000000..4dcce52
--- /dev/null
+++ b/test/test_response_container_list_alert_error_group_info.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_list_alert_error_group_info import ResponseContainerListAlertErrorGroupInfo  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerListAlertErrorGroupInfo(unittest.TestCase):
+    """ResponseContainerListAlertErrorGroupInfo unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerListAlertErrorGroupInfo(self):
+        """Test ResponseContainerListAlertErrorGroupInfo"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_list_alert_error_group_info.ResponseContainerListAlertErrorGroupInfo()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_response_container_paged_alert_analytics_summary_detail.py b/test/test_response_container_paged_alert_analytics_summary_detail.py
new file mode 100644
index 0000000..a0c0378
--- /dev/null
+++ b/test/test_response_container_paged_alert_analytics_summary_detail.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.models.response_container_paged_alert_analytics_summary_detail import ResponseContainerPagedAlertAnalyticsSummaryDetail  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestResponseContainerPagedAlertAnalyticsSummaryDetail(unittest.TestCase):
+    """ResponseContainerPagedAlertAnalyticsSummaryDetail unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testResponseContainerPagedAlertAnalyticsSummaryDetail(self):
+        """Test ResponseContainerPagedAlertAnalyticsSummaryDetail"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = wavefront_api_client.models.response_container_paged_alert_analytics_summary_detail.ResponseContainerPagedAlertAnalyticsSummaryDetail()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 26d78db..0532089 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -19,7 +19,6 @@
 from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
-from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
@@ -68,7 +67,12 @@
 from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_analytics_summary import AlertAnalyticsSummary
+from wavefront_api_client.models.alert_analytics_summary_detail import AlertAnalyticsSummaryDetail
 from wavefront_api_client.models.alert_dashboard import AlertDashboard
+from wavefront_api_client.models.alert_error_group_info import AlertErrorGroupInfo
+from wavefront_api_client.models.alert_error_group_summary import AlertErrorGroupSummary
+from wavefront_api_client.models.alert_error_summary import AlertErrorSummary
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
 from wavefront_api_client.models.alert_source import AlertSource
@@ -115,7 +119,6 @@
 from wavefront_api_client.models.field import Field
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
-from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
 from wavefront_api_client.models.ingestion_policy_alert import IngestionPolicyAlert
@@ -157,6 +160,7 @@
 from wavefront_api_client.models.paged import Paged
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
+from wavefront_api_client.models.paged_alert_analytics_summary_detail import PagedAlertAnalyticsSummaryDetail
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_anomaly import PagedAnomaly
 from wavefront_api_client.models.paged_api_token_model import PagedApiTokenModel
@@ -210,6 +214,7 @@
 from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
+from wavefront_api_client.models.response_container_alert_analytics_summary import ResponseContainerAlertAnalyticsSummary
 from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
 from wavefront_api_client.models.response_container_cluster_info_dto import ResponseContainerClusterInfoDTO
@@ -221,12 +226,12 @@
 from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
-from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
 from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
+from wavefront_api_client.models.response_container_list_alert_error_group_info import ResponseContainerListAlertErrorGroupInfo
 from wavefront_api_client.models.response_container_list_api_token_model import ResponseContainerListApiTokenModel
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
@@ -247,6 +252,7 @@
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
+from wavefront_api_client.models.response_container_paged_alert_analytics_summary_detail import ResponseContainerPagedAlertAnalyticsSummaryDetail
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
 from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly
 from wavefront_api_client.models.response_container_paged_api_token_model import ResponseContainerPagedApiTokenModel
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 2d5b76d..f043315 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -6,7 +6,6 @@
 from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
-from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6de1b6f..b97c2ac 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.177.0/python'
+        self.user_agent = 'Swagger-Codegen/2.179.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 717f4dc..de2ca28 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.177.0".\
+               "SDK Package Version: 2.179.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 8b3c86b..0fab4cb 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -24,7 +24,12 @@
 from wavefront_api_client.models.access_policy_rule_dto import AccessPolicyRuleDTO
 from wavefront_api_client.models.account import Account
 from wavefront_api_client.models.alert import Alert
+from wavefront_api_client.models.alert_analytics_summary import AlertAnalyticsSummary
+from wavefront_api_client.models.alert_analytics_summary_detail import AlertAnalyticsSummaryDetail
 from wavefront_api_client.models.alert_dashboard import AlertDashboard
+from wavefront_api_client.models.alert_error_group_info import AlertErrorGroupInfo
+from wavefront_api_client.models.alert_error_group_summary import AlertErrorGroupSummary
+from wavefront_api_client.models.alert_error_summary import AlertErrorSummary
 from wavefront_api_client.models.alert_min import AlertMin
 from wavefront_api_client.models.alert_route import AlertRoute
 from wavefront_api_client.models.alert_source import AlertSource
@@ -71,7 +76,6 @@
 from wavefront_api_client.models.field import Field
 from wavefront_api_client.models.gcp_billing_configuration import GCPBillingConfiguration
 from wavefront_api_client.models.gcp_configuration import GCPConfiguration
-from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic
 from wavefront_api_client.models.history_entry import HistoryEntry
 from wavefront_api_client.models.history_response import HistoryResponse
 from wavefront_api_client.models.ingestion_policy_alert import IngestionPolicyAlert
@@ -113,6 +117,7 @@
 from wavefront_api_client.models.paged import Paged
 from wavefront_api_client.models.paged_account import PagedAccount
 from wavefront_api_client.models.paged_alert import PagedAlert
+from wavefront_api_client.models.paged_alert_analytics_summary_detail import PagedAlertAnalyticsSummaryDetail
 from wavefront_api_client.models.paged_alert_with_stats import PagedAlertWithStats
 from wavefront_api_client.models.paged_anomaly import PagedAnomaly
 from wavefront_api_client.models.paged_api_token_model import PagedApiTokenModel
@@ -166,6 +171,7 @@
 from wavefront_api_client.models.response_container_access_policy_action import ResponseContainerAccessPolicyAction
 from wavefront_api_client.models.response_container_account import ResponseContainerAccount
 from wavefront_api_client.models.response_container_alert import ResponseContainerAlert
+from wavefront_api_client.models.response_container_alert_analytics_summary import ResponseContainerAlertAnalyticsSummary
 from wavefront_api_client.models.response_container_api_token_model import ResponseContainerApiTokenModel
 from wavefront_api_client.models.response_container_cloud_integration import ResponseContainerCloudIntegration
 from wavefront_api_client.models.response_container_cluster_info_dto import ResponseContainerClusterInfoDTO
@@ -177,12 +183,12 @@
 from wavefront_api_client.models.response_container_external_link import ResponseContainerExternalLink
 from wavefront_api_client.models.response_container_facet_response import ResponseContainerFacetResponse
 from wavefront_api_client.models.response_container_facets_response_container import ResponseContainerFacetsResponseContainer
-from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic
 from wavefront_api_client.models.response_container_history_response import ResponseContainerHistoryResponse
 from wavefront_api_client.models.response_container_ingestion_policy_read_model import ResponseContainerIngestionPolicyReadModel
 from wavefront_api_client.models.response_container_integration import ResponseContainerIntegration
 from wavefront_api_client.models.response_container_integration_status import ResponseContainerIntegrationStatus
 from wavefront_api_client.models.response_container_list_access_control_list_read_dto import ResponseContainerListAccessControlListReadDTO
+from wavefront_api_client.models.response_container_list_alert_error_group_info import ResponseContainerListAlertErrorGroupInfo
 from wavefront_api_client.models.response_container_list_api_token_model import ResponseContainerListApiTokenModel
 from wavefront_api_client.models.response_container_list_integration import ResponseContainerListIntegration
 from wavefront_api_client.models.response_container_list_integration_manifest_group import ResponseContainerListIntegrationManifestGroup
@@ -203,6 +209,7 @@
 from wavefront_api_client.models.response_container_notificant import ResponseContainerNotificant
 from wavefront_api_client.models.response_container_paged_account import ResponseContainerPagedAccount
 from wavefront_api_client.models.response_container_paged_alert import ResponseContainerPagedAlert
+from wavefront_api_client.models.response_container_paged_alert_analytics_summary_detail import ResponseContainerPagedAlertAnalyticsSummaryDetail
 from wavefront_api_client.models.response_container_paged_alert_with_stats import ResponseContainerPagedAlertWithStats
 from wavefront_api_client.models.response_container_paged_anomaly import ResponseContainerPagedAnomaly
 from wavefront_api_client.models.response_container_paged_api_token_model import ResponseContainerPagedApiTokenModel
diff --git a/wavefront_api_client/models/alert_analytics_summary.py b/wavefront_api_client/models/alert_analytics_summary.py
new file mode 100644
index 0000000..2bdcce3
--- /dev/null
+++ b/wavefront_api_client/models/alert_analytics_summary.py
@@ -0,0 +1,149 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertAnalyticsSummary(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'total_evaluated': 'int',
+        'total_failed': 'int'
+    }
+
+    attribute_map = {
+        'total_evaluated': 'totalEvaluated',
+        'total_failed': 'totalFailed'
+    }
+
+    def __init__(self, total_evaluated=None, total_failed=None, _configuration=None):  # noqa: E501
+        """AlertAnalyticsSummary - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._total_evaluated = None
+        self._total_failed = None
+        self.discriminator = None
+
+        if total_evaluated is not None:
+            self.total_evaluated = total_evaluated
+        if total_failed is not None:
+            self.total_failed = total_failed
+
+    @property
+    def total_evaluated(self):
+        """Gets the total_evaluated of this AlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The total_evaluated of this AlertAnalyticsSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_evaluated
+
+    @total_evaluated.setter
+    def total_evaluated(self, total_evaluated):
+        """Sets the total_evaluated of this AlertAnalyticsSummary.
+
+
+        :param total_evaluated: The total_evaluated of this AlertAnalyticsSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._total_evaluated = total_evaluated
+
+    @property
+    def total_failed(self):
+        """Gets the total_failed of this AlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The total_failed of this AlertAnalyticsSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_failed
+
+    @total_failed.setter
+    def total_failed(self, total_failed):
+        """Sets the total_failed of this AlertAnalyticsSummary.
+
+
+        :param total_failed: The total_failed of this AlertAnalyticsSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._total_failed = total_failed
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertAnalyticsSummary, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertAnalyticsSummary):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertAnalyticsSummary):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_analytics_summary_detail.py b/wavefront_api_client/models/alert_analytics_summary_detail.py
new file mode 100644
index 0000000..002fdec
--- /dev/null
+++ b/wavefront_api_client/models/alert_analytics_summary_detail.py
@@ -0,0 +1,447 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertAnalyticsSummaryDetail(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'alert_id': 'int',
+        'alert_name': 'str',
+        'avg_key_cardinality': 'int',
+        'avg_latency': 'int',
+        'avg_points': 'int',
+        'checking_frequency': 'int',
+        'creator_id': 'str',
+        'error_groups_summary': 'list[AlertErrorGroupSummary]',
+        'failure_percentage': 'float',
+        'failure_percentage_range': 'str',
+        'tags': 'list[str]',
+        'total_evaluated': 'int',
+        'total_failed': 'int'
+    }
+
+    attribute_map = {
+        'alert_id': 'alertId',
+        'alert_name': 'alertName',
+        'avg_key_cardinality': 'avgKeyCardinality',
+        'avg_latency': 'avgLatency',
+        'avg_points': 'avgPoints',
+        'checking_frequency': 'checkingFrequency',
+        'creator_id': 'creatorId',
+        'error_groups_summary': 'errorGroupsSummary',
+        'failure_percentage': 'failurePercentage',
+        'failure_percentage_range': 'failurePercentageRange',
+        'tags': 'tags',
+        'total_evaluated': 'totalEvaluated',
+        'total_failed': 'totalFailed'
+    }
+
+    def __init__(self, alert_id=None, alert_name=None, avg_key_cardinality=None, avg_latency=None, avg_points=None, checking_frequency=None, creator_id=None, error_groups_summary=None, failure_percentage=None, failure_percentage_range=None, tags=None, total_evaluated=None, total_failed=None, _configuration=None):  # noqa: E501
+        """AlertAnalyticsSummaryDetail - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._alert_id = None
+        self._alert_name = None
+        self._avg_key_cardinality = None
+        self._avg_latency = None
+        self._avg_points = None
+        self._checking_frequency = None
+        self._creator_id = None
+        self._error_groups_summary = None
+        self._failure_percentage = None
+        self._failure_percentage_range = None
+        self._tags = None
+        self._total_evaluated = None
+        self._total_failed = None
+        self.discriminator = None
+
+        if alert_id is not None:
+            self.alert_id = alert_id
+        if alert_name is not None:
+            self.alert_name = alert_name
+        if avg_key_cardinality is not None:
+            self.avg_key_cardinality = avg_key_cardinality
+        if avg_latency is not None:
+            self.avg_latency = avg_latency
+        if avg_points is not None:
+            self.avg_points = avg_points
+        if checking_frequency is not None:
+            self.checking_frequency = checking_frequency
+        if creator_id is not None:
+            self.creator_id = creator_id
+        if error_groups_summary is not None:
+            self.error_groups_summary = error_groups_summary
+        if failure_percentage is not None:
+            self.failure_percentage = failure_percentage
+        if failure_percentage_range is not None:
+            self.failure_percentage_range = failure_percentage_range
+        if tags is not None:
+            self.tags = tags
+        if total_evaluated is not None:
+            self.total_evaluated = total_evaluated
+        if total_failed is not None:
+            self.total_failed = total_failed
+
+    @property
+    def alert_id(self):
+        """Gets the alert_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The alert id  # noqa: E501
+
+        :return: The alert_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._alert_id
+
+    @alert_id.setter
+    def alert_id(self, alert_id):
+        """Sets the alert_id of this AlertAnalyticsSummaryDetail.
+
+        The alert id  # noqa: E501
+
+        :param alert_id: The alert_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._alert_id = alert_id
+
+    @property
+    def alert_name(self):
+        """Gets the alert_name of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The alert name  # noqa: E501
+
+        :return: The alert_name of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._alert_name
+
+    @alert_name.setter
+    def alert_name(self, alert_name):
+        """Sets the alert_name of this AlertAnalyticsSummaryDetail.
+
+        The alert name  # noqa: E501
+
+        :param alert_name: The alert_name of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._alert_name = alert_name
+
+    @property
+    def avg_key_cardinality(self):
+        """Gets the avg_key_cardinality of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The average cardinality across all alert execution logs.  # noqa: E501
+
+        :return: The avg_key_cardinality of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._avg_key_cardinality
+
+    @avg_key_cardinality.setter
+    def avg_key_cardinality(self, avg_key_cardinality):
+        """Sets the avg_key_cardinality of this AlertAnalyticsSummaryDetail.
+
+        The average cardinality across all alert execution logs.  # noqa: E501
+
+        :param avg_key_cardinality: The avg_key_cardinality of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._avg_key_cardinality = avg_key_cardinality
+
+    @property
+    def avg_latency(self):
+        """Gets the avg_latency of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The average latency across all alert execution logs.  # noqa: E501
+
+        :return: The avg_latency of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._avg_latency
+
+    @avg_latency.setter
+    def avg_latency(self, avg_latency):
+        """Sets the avg_latency of this AlertAnalyticsSummaryDetail.
+
+        The average latency across all alert execution logs.  # noqa: E501
+
+        :param avg_latency: The avg_latency of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._avg_latency = avg_latency
+
+    @property
+    def avg_points(self):
+        """Gets the avg_points of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The average points across all alert execution logs.  # noqa: E501
+
+        :return: The avg_points of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._avg_points
+
+    @avg_points.setter
+    def avg_points(self, avg_points):
+        """Sets the avg_points of this AlertAnalyticsSummaryDetail.
+
+        The average points across all alert execution logs.  # noqa: E501
+
+        :param avg_points: The avg_points of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._avg_points = avg_points
+
+    @property
+    def checking_frequency(self):
+        """Gets the checking_frequency of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The checking frequency of the alert.  # noqa: E501
+
+        :return: The checking_frequency of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._checking_frequency
+
+    @checking_frequency.setter
+    def checking_frequency(self, checking_frequency):
+        """Sets the checking_frequency of this AlertAnalyticsSummaryDetail.
+
+        The checking frequency of the alert.  # noqa: E501
+
+        :param checking_frequency: The checking_frequency of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._checking_frequency = checking_frequency
+
+    @property
+    def creator_id(self):
+        """Gets the creator_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The creator_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._creator_id
+
+    @creator_id.setter
+    def creator_id(self, creator_id):
+        """Sets the creator_id of this AlertAnalyticsSummaryDetail.
+
+
+        :param creator_id: The creator_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._creator_id = creator_id
+
+    @property
+    def error_groups_summary(self):
+        """Gets the error_groups_summary of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The error_groups_summary of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: list[AlertErrorGroupSummary]
+        """
+        return self._error_groups_summary
+
+    @error_groups_summary.setter
+    def error_groups_summary(self, error_groups_summary):
+        """Sets the error_groups_summary of this AlertAnalyticsSummaryDetail.
+
+
+        :param error_groups_summary: The error_groups_summary of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: list[AlertErrorGroupSummary]
+        """
+
+        self._error_groups_summary = error_groups_summary
+
+    @property
+    def failure_percentage(self):
+        """Gets the failure_percentage of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The failure_percentage of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: float
+        """
+        return self._failure_percentage
+
+    @failure_percentage.setter
+    def failure_percentage(self, failure_percentage):
+        """Sets the failure_percentage of this AlertAnalyticsSummaryDetail.
+
+
+        :param failure_percentage: The failure_percentage of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: float
+        """
+
+        self._failure_percentage = failure_percentage
+
+    @property
+    def failure_percentage_range(self):
+        """Gets the failure_percentage_range of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The failure_percentage_range of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._failure_percentage_range
+
+    @failure_percentage_range.setter
+    def failure_percentage_range(self, failure_percentage_range):
+        """Sets the failure_percentage_range of this AlertAnalyticsSummaryDetail.
+
+
+        :param failure_percentage_range: The failure_percentage_range of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._failure_percentage_range = failure_percentage_range
+
+    @property
+    def tags(self):
+        """Gets the tags of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The tags of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """Sets the tags of this AlertAnalyticsSummaryDetail.
+
+
+        :param tags: The tags of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._tags = tags
+
+    @property
+    def total_evaluated(self):
+        """Gets the total_evaluated of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The total_evaluated of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_evaluated
+
+    @total_evaluated.setter
+    def total_evaluated(self, total_evaluated):
+        """Sets the total_evaluated of this AlertAnalyticsSummaryDetail.
+
+
+        :param total_evaluated: The total_evaluated of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._total_evaluated = total_evaluated
+
+    @property
+    def total_failed(self):
+        """Gets the total_failed of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The total_failed of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_failed
+
+    @total_failed.setter
+    def total_failed(self, total_failed):
+        """Sets the total_failed of this AlertAnalyticsSummaryDetail.
+
+
+        :param total_failed: The total_failed of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._total_failed = total_failed
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertAnalyticsSummaryDetail, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertAnalyticsSummaryDetail):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertAnalyticsSummaryDetail):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_error_group_info.py b/wavefront_api_client/models/alert_error_group_info.py
new file mode 100644
index 0000000..b0839a9
--- /dev/null
+++ b/wavefront_api_client/models/alert_error_group_info.py
@@ -0,0 +1,201 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertErrorGroupInfo(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'error_group_id': 'str',
+        'error_group_name': 'str',
+        'total_failed': 'int',
+        'total_failed_per_group': 'int'
+    }
+
+    attribute_map = {
+        'error_group_id': 'errorGroupId',
+        'error_group_name': 'errorGroupName',
+        'total_failed': 'totalFailed',
+        'total_failed_per_group': 'totalFailedPerGroup'
+    }
+
+    def __init__(self, error_group_id=None, error_group_name=None, total_failed=None, total_failed_per_group=None, _configuration=None):  # noqa: E501
+        """AlertErrorGroupInfo - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._error_group_id = None
+        self._error_group_name = None
+        self._total_failed = None
+        self._total_failed_per_group = None
+        self.discriminator = None
+
+        if error_group_id is not None:
+            self.error_group_id = error_group_id
+        if error_group_name is not None:
+            self.error_group_name = error_group_name
+        if total_failed is not None:
+            self.total_failed = total_failed
+        if total_failed_per_group is not None:
+            self.total_failed_per_group = total_failed_per_group
+
+    @property
+    def error_group_id(self):
+        """Gets the error_group_id of this AlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The error_group_id of this AlertErrorGroupInfo.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_group_id
+
+    @error_group_id.setter
+    def error_group_id(self, error_group_id):
+        """Sets the error_group_id of this AlertErrorGroupInfo.
+
+
+        :param error_group_id: The error_group_id of this AlertErrorGroupInfo.  # noqa: E501
+        :type: str
+        """
+
+        self._error_group_id = error_group_id
+
+    @property
+    def error_group_name(self):
+        """Gets the error_group_name of this AlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The error_group_name of this AlertErrorGroupInfo.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_group_name
+
+    @error_group_name.setter
+    def error_group_name(self, error_group_name):
+        """Sets the error_group_name of this AlertErrorGroupInfo.
+
+
+        :param error_group_name: The error_group_name of this AlertErrorGroupInfo.  # noqa: E501
+        :type: str
+        """
+
+        self._error_group_name = error_group_name
+
+    @property
+    def total_failed(self):
+        """Gets the total_failed of this AlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The total_failed of this AlertErrorGroupInfo.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_failed
+
+    @total_failed.setter
+    def total_failed(self, total_failed):
+        """Sets the total_failed of this AlertErrorGroupInfo.
+
+
+        :param total_failed: The total_failed of this AlertErrorGroupInfo.  # noqa: E501
+        :type: int
+        """
+
+        self._total_failed = total_failed
+
+    @property
+    def total_failed_per_group(self):
+        """Gets the total_failed_per_group of this AlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The total_failed_per_group of this AlertErrorGroupInfo.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_failed_per_group
+
+    @total_failed_per_group.setter
+    def total_failed_per_group(self, total_failed_per_group):
+        """Sets the total_failed_per_group of this AlertErrorGroupInfo.
+
+
+        :param total_failed_per_group: The total_failed_per_group of this AlertErrorGroupInfo.  # noqa: E501
+        :type: int
+        """
+
+        self._total_failed_per_group = total_failed_per_group
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertErrorGroupInfo, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertErrorGroupInfo):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertErrorGroupInfo):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_error_group_summary.py b/wavefront_api_client/models/alert_error_group_summary.py
new file mode 100644
index 0000000..12523b5
--- /dev/null
+++ b/wavefront_api_client/models/alert_error_group_summary.py
@@ -0,0 +1,201 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertErrorGroupSummary(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'error_group_id': 'str',
+        'error_group_name': 'str',
+        'errors_summary': 'list[AlertErrorSummary]',
+        'total_failed_per_group': 'int'
+    }
+
+    attribute_map = {
+        'error_group_id': 'errorGroupId',
+        'error_group_name': 'errorGroupName',
+        'errors_summary': 'errorsSummary',
+        'total_failed_per_group': 'totalFailedPerGroup'
+    }
+
+    def __init__(self, error_group_id=None, error_group_name=None, errors_summary=None, total_failed_per_group=None, _configuration=None):  # noqa: E501
+        """AlertErrorGroupSummary - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._error_group_id = None
+        self._error_group_name = None
+        self._errors_summary = None
+        self._total_failed_per_group = None
+        self.discriminator = None
+
+        if error_group_id is not None:
+            self.error_group_id = error_group_id
+        if error_group_name is not None:
+            self.error_group_name = error_group_name
+        if errors_summary is not None:
+            self.errors_summary = errors_summary
+        if total_failed_per_group is not None:
+            self.total_failed_per_group = total_failed_per_group
+
+    @property
+    def error_group_id(self):
+        """Gets the error_group_id of this AlertErrorGroupSummary.  # noqa: E501
+
+
+        :return: The error_group_id of this AlertErrorGroupSummary.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_group_id
+
+    @error_group_id.setter
+    def error_group_id(self, error_group_id):
+        """Sets the error_group_id of this AlertErrorGroupSummary.
+
+
+        :param error_group_id: The error_group_id of this AlertErrorGroupSummary.  # noqa: E501
+        :type: str
+        """
+
+        self._error_group_id = error_group_id
+
+    @property
+    def error_group_name(self):
+        """Gets the error_group_name of this AlertErrorGroupSummary.  # noqa: E501
+
+
+        :return: The error_group_name of this AlertErrorGroupSummary.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_group_name
+
+    @error_group_name.setter
+    def error_group_name(self, error_group_name):
+        """Sets the error_group_name of this AlertErrorGroupSummary.
+
+
+        :param error_group_name: The error_group_name of this AlertErrorGroupSummary.  # noqa: E501
+        :type: str
+        """
+
+        self._error_group_name = error_group_name
+
+    @property
+    def errors_summary(self):
+        """Gets the errors_summary of this AlertErrorGroupSummary.  # noqa: E501
+
+
+        :return: The errors_summary of this AlertErrorGroupSummary.  # noqa: E501
+        :rtype: list[AlertErrorSummary]
+        """
+        return self._errors_summary
+
+    @errors_summary.setter
+    def errors_summary(self, errors_summary):
+        """Sets the errors_summary of this AlertErrorGroupSummary.
+
+
+        :param errors_summary: The errors_summary of this AlertErrorGroupSummary.  # noqa: E501
+        :type: list[AlertErrorSummary]
+        """
+
+        self._errors_summary = errors_summary
+
+    @property
+    def total_failed_per_group(self):
+        """Gets the total_failed_per_group of this AlertErrorGroupSummary.  # noqa: E501
+
+
+        :return: The total_failed_per_group of this AlertErrorGroupSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_failed_per_group
+
+    @total_failed_per_group.setter
+    def total_failed_per_group(self, total_failed_per_group):
+        """Sets the total_failed_per_group of this AlertErrorGroupSummary.
+
+
+        :param total_failed_per_group: The total_failed_per_group of this AlertErrorGroupSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._total_failed_per_group = total_failed_per_group
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertErrorGroupSummary, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertErrorGroupSummary):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertErrorGroupSummary):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/alert_error_summary.py b/wavefront_api_client/models/alert_error_summary.py
new file mode 100644
index 0000000..35b83d5
--- /dev/null
+++ b/wavefront_api_client/models/alert_error_summary.py
@@ -0,0 +1,227 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class AlertErrorSummary(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'error_code': 'int',
+        'error_group_id': 'str',
+        'error_message': 'str',
+        'recommendation_key': 'str',
+        'total_matched': 'int'
+    }
+
+    attribute_map = {
+        'error_code': 'errorCode',
+        'error_group_id': 'errorGroupId',
+        'error_message': 'errorMessage',
+        'recommendation_key': 'recommendationKey',
+        'total_matched': 'totalMatched'
+    }
+
+    def __init__(self, error_code=None, error_group_id=None, error_message=None, recommendation_key=None, total_matched=None, _configuration=None):  # noqa: E501
+        """AlertErrorSummary - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._error_code = None
+        self._error_group_id = None
+        self._error_message = None
+        self._recommendation_key = None
+        self._total_matched = None
+        self.discriminator = None
+
+        if error_code is not None:
+            self.error_code = error_code
+        if error_group_id is not None:
+            self.error_group_id = error_group_id
+        if error_message is not None:
+            self.error_message = error_message
+        if recommendation_key is not None:
+            self.recommendation_key = recommendation_key
+        if total_matched is not None:
+            self.total_matched = total_matched
+
+    @property
+    def error_code(self):
+        """Gets the error_code of this AlertErrorSummary.  # noqa: E501
+
+
+        :return: The error_code of this AlertErrorSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._error_code
+
+    @error_code.setter
+    def error_code(self, error_code):
+        """Sets the error_code of this AlertErrorSummary.
+
+
+        :param error_code: The error_code of this AlertErrorSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._error_code = error_code
+
+    @property
+    def error_group_id(self):
+        """Gets the error_group_id of this AlertErrorSummary.  # noqa: E501
+
+
+        :return: The error_group_id of this AlertErrorSummary.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_group_id
+
+    @error_group_id.setter
+    def error_group_id(self, error_group_id):
+        """Sets the error_group_id of this AlertErrorSummary.
+
+
+        :param error_group_id: The error_group_id of this AlertErrorSummary.  # noqa: E501
+        :type: str
+        """
+
+        self._error_group_id = error_group_id
+
+    @property
+    def error_message(self):
+        """Gets the error_message of this AlertErrorSummary.  # noqa: E501
+
+
+        :return: The error_message of this AlertErrorSummary.  # noqa: E501
+        :rtype: str
+        """
+        return self._error_message
+
+    @error_message.setter
+    def error_message(self, error_message):
+        """Sets the error_message of this AlertErrorSummary.
+
+
+        :param error_message: The error_message of this AlertErrorSummary.  # noqa: E501
+        :type: str
+        """
+
+        self._error_message = error_message
+
+    @property
+    def recommendation_key(self):
+        """Gets the recommendation_key of this AlertErrorSummary.  # noqa: E501
+
+
+        :return: The recommendation_key of this AlertErrorSummary.  # noqa: E501
+        :rtype: str
+        """
+        return self._recommendation_key
+
+    @recommendation_key.setter
+    def recommendation_key(self, recommendation_key):
+        """Sets the recommendation_key of this AlertErrorSummary.
+
+
+        :param recommendation_key: The recommendation_key of this AlertErrorSummary.  # noqa: E501
+        :type: str
+        """
+
+        self._recommendation_key = recommendation_key
+
+    @property
+    def total_matched(self):
+        """Gets the total_matched of this AlertErrorSummary.  # noqa: E501
+
+
+        :return: The total_matched of this AlertErrorSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_matched
+
+    @total_matched.setter
+    def total_matched(self, total_matched):
+        """Sets the total_matched of this AlertErrorSummary.
+
+
+        :param total_matched: The total_matched of this AlertErrorSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._total_matched = total_matched
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(AlertErrorSummary, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, AlertErrorSummary):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, AlertErrorSummary):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/paged_alert_analytics_summary_detail.py b/wavefront_api_client/models/paged_alert_analytics_summary_detail.py
new file mode 100644
index 0000000..2f83e72
--- /dev/null
+++ b/wavefront_api_client/models/paged_alert_analytics_summary_detail.py
@@ -0,0 +1,287 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class PagedAlertAnalyticsSummaryDetail(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'cursor': 'str',
+        'items': 'list[AlertAnalyticsSummaryDetail]',
+        'limit': 'int',
+        'more_items': 'bool',
+        'offset': 'int',
+        'sort': 'Sorting',
+        'total_items': 'int'
+    }
+
+    attribute_map = {
+        'cursor': 'cursor',
+        'items': 'items',
+        'limit': 'limit',
+        'more_items': 'moreItems',
+        'offset': 'offset',
+        'sort': 'sort',
+        'total_items': 'totalItems'
+    }
+
+    def __init__(self, cursor=None, items=None, limit=None, more_items=None, offset=None, sort=None, total_items=None, _configuration=None):  # noqa: E501
+        """PagedAlertAnalyticsSummaryDetail - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._cursor = None
+        self._items = None
+        self._limit = None
+        self._more_items = None
+        self._offset = None
+        self._sort = None
+        self._total_items = None
+        self.discriminator = None
+
+        if cursor is not None:
+            self.cursor = cursor
+        if items is not None:
+            self.items = items
+        if limit is not None:
+            self.limit = limit
+        if more_items is not None:
+            self.more_items = more_items
+        if offset is not None:
+            self.offset = offset
+        if sort is not None:
+            self.sort = sort
+        if total_items is not None:
+            self.total_items = total_items
+
+    @property
+    def cursor(self):
+        """Gets the cursor of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :return: The cursor of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._cursor
+
+    @cursor.setter
+    def cursor(self, cursor):
+        """Sets the cursor of this PagedAlertAnalyticsSummaryDetail.
+
+        The id at which the current (limited) search can be continued to obtain more matching items  # noqa: E501
+
+        :param cursor: The cursor of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._cursor = cursor
+
+    @property
+    def items(self):
+        """Gets the items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+        List of requested items  # noqa: E501
+
+        :return: The items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: list[AlertAnalyticsSummaryDetail]
+        """
+        return self._items
+
+    @items.setter
+    def items(self, items):
+        """Sets the items of this PagedAlertAnalyticsSummaryDetail.
+
+        List of requested items  # noqa: E501
+
+        :param items: The items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: list[AlertAnalyticsSummaryDetail]
+        """
+
+        self._items = items
+
+    @property
+    def limit(self):
+        """Gets the limit of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The limit of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._limit
+
+    @limit.setter
+    def limit(self, limit):
+        """Sets the limit of this PagedAlertAnalyticsSummaryDetail.
+
+
+        :param limit: The limit of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._limit = limit
+
+    @property
+    def more_items(self):
+        """Gets the more_items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :return: The more_items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: bool
+        """
+        return self._more_items
+
+    @more_items.setter
+    def more_items(self, more_items):
+        """Sets the more_items of this PagedAlertAnalyticsSummaryDetail.
+
+        Whether more items are available for return by increment offset or cursor  # noqa: E501
+
+        :param more_items: The more_items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: bool
+        """
+
+        self._more_items = more_items
+
+    @property
+    def offset(self):
+        """Gets the offset of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The offset of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._offset
+
+    @offset.setter
+    def offset(self, offset):
+        """Sets the offset of this PagedAlertAnalyticsSummaryDetail.
+
+
+        :param offset: The offset of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._offset = offset
+
+    @property
+    def sort(self):
+        """Gets the sort of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The sort of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: Sorting
+        """
+        return self._sort
+
+    @sort.setter
+    def sort(self, sort):
+        """Sets the sort of this PagedAlertAnalyticsSummaryDetail.
+
+
+        :param sort: The sort of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: Sorting
+        """
+
+        self._sort = sort
+
+    @property
+    def total_items(self):
+        """Gets the total_items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :return: The total_items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_items
+
+    @total_items.setter
+    def total_items(self, total_items):
+        """Sets the total_items of this PagedAlertAnalyticsSummaryDetail.
+
+        An estimate (lower-bound) of the total number of items available for return.  May not be a tight estimate for facet queries  # noqa: E501
+
+        :param total_items: The total_items of this PagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: int
+        """
+
+        self._total_items = total_items
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(PagedAlertAnalyticsSummaryDetail, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, PagedAlertAnalyticsSummaryDetail):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, PagedAlertAnalyticsSummaryDetail):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_alert_analytics_summary.py b/wavefront_api_client/models/response_container_alert_analytics_summary.py
new file mode 100644
index 0000000..004e6b6
--- /dev/null
+++ b/wavefront_api_client/models/response_container_alert_analytics_summary.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerAlertAnalyticsSummary(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'AlertAnalyticsSummary',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerAlertAnalyticsSummary - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+        :rtype: AlertAnalyticsSummary
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerAlertAnalyticsSummary.
+
+
+        :param response: The response of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+        :type: AlertAnalyticsSummary
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerAlertAnalyticsSummary.
+
+
+        :param status: The status of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerAlertAnalyticsSummary, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerAlertAnalyticsSummary):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerAlertAnalyticsSummary):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_list_alert_error_group_info.py b/wavefront_api_client/models/response_container_list_alert_error_group_info.py
new file mode 100644
index 0000000..df8be06
--- /dev/null
+++ b/wavefront_api_client/models/response_container_list_alert_error_group_info.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerListAlertErrorGroupInfo(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'list[AlertErrorGroupInfo]',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerListAlertErrorGroupInfo - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+        :rtype: list[AlertErrorGroupInfo]
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerListAlertErrorGroupInfo.
+
+
+        :param response: The response of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+        :type: list[AlertErrorGroupInfo]
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerListAlertErrorGroupInfo.
+
+
+        :param status: The status of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerListAlertErrorGroupInfo, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerListAlertErrorGroupInfo):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerListAlertErrorGroupInfo):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py b/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
new file mode 100644
index 0000000..5f65bde
--- /dev/null
+++ b/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
@@ -0,0 +1,150 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+from wavefront_api_client.configuration import Configuration
+
+
+class ResponseContainerPagedAlertAnalyticsSummaryDetail(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      swagger_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    swagger_types = {
+        'response': 'PagedAlertAnalyticsSummaryDetail',
+        'status': 'ResponseStatus'
+    }
+
+    attribute_map = {
+        'response': 'response',
+        'status': 'status'
+    }
+
+    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+        """ResponseContainerPagedAlertAnalyticsSummaryDetail - a model defined in Swagger"""  # noqa: E501
+        if _configuration is None:
+            _configuration = Configuration()
+        self._configuration = _configuration
+
+        self._response = None
+        self._status = None
+        self.discriminator = None
+
+        if response is not None:
+            self.response = response
+        self.status = status
+
+    @property
+    def response(self):
+        """Gets the response of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The response of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: PagedAlertAnalyticsSummaryDetail
+        """
+        return self._response
+
+    @response.setter
+    def response(self, response):
+        """Sets the response of this ResponseContainerPagedAlertAnalyticsSummaryDetail.
+
+
+        :param response: The response of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: PagedAlertAnalyticsSummaryDetail
+        """
+
+        self._response = response
+
+    @property
+    def status(self):
+        """Gets the status of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The status of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: ResponseStatus
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ResponseContainerPagedAlertAnalyticsSummaryDetail.
+
+
+        :param status: The status of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: ResponseStatus
+        """
+        if self._configuration.client_side_validation and status is None:
+            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
+
+        self._status = status
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+        if issubclass(ResponseContainerPagedAlertAnalyticsSummaryDetail, dict):
+            for key, value in self.items():
+                result[key] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, ResponseContainerPagedAlertAnalyticsSummaryDetail):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, ResponseContainerPagedAlertAnalyticsSummaryDetail):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 24b2dc4..cab536a 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -149,7 +149,7 @@ def entity_type(self, entity_type):
         """
         if self._configuration.client_side_validation and entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN", "ALERT_ANALYTICS"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 entity_type not in allowed_values):
             raise ValueError(

From b64310b28098055675d329502a4b84303c17850c Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 14 Jun 2023 20:24:28 -0700
Subject: [PATCH 137/161] Autogenerated Update v2.188.0.

---
 .swagger-codegen/config.json          | 2 +-
 .swagger-codegen/config.jsone         | 2 +-
 README.md                             | 2 +-
 docs/AlertApi.md                      | 8 ++++----
 setup.py                              | 2 +-
 wavefront_api_client/api/alert_api.py | 8 ++++----
 wavefront_api_client/api_client.py    | 2 +-
 wavefront_api_client/configuration.py | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ec50555..0cb26c0 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.179.0"
+    "packageVersion": "2.188.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 418a5bd..ec50555 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.177.0"
+    "packageVersion": "2.179.0"
 }
diff --git a/README.md b/README.md
index ef8864f..a5b1dc9 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.179.0
+- Package version: 2.188.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index bdca394..b687e91 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -275,7 +275,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 use_multi_query = false # bool | A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources  (optional) (default to false)
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"targets\": {         \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",          \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"      },      \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"targets\": {       \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",        \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"     },    \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> Supported Alert Target formats:  <pre>Classic Alerts - \"target\": \"{email},pd:{pd_key},target:{alert target ID}\"  Threshold Alerts - \"targets\": {\"info\":\"{email},pd:{pd_key},target:{alert target ID}\", \"warn\":\"{email},pd:{pd_key},target:{alert target ID}\"}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.</pre>  (optional)
 
 try:
     # Create a specific alert
@@ -290,7 +290,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **use_multi_query** | **bool**| A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.&lt;br/&gt; When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.&lt;br/&gt; When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources  | [optional] [default to false]
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;alertTriageDashboards\&quot;: [{     \&quot;dashboardId\&quot;: \&quot;dashboard-name\&quot;,     \&quot;parameters\&quot;: {       \&quot;constants\&quot;: {         \&quot;key\&quot;: \&quot;value\&quot;         }       },    \&quot;description\&quot;: \&quot;dashboard description\&quot;     }   ],   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Classic Body with multi queries:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;CLASSIC\&quot;,     \&quot;alertSources\&quot;: [        {             \&quot;name\&quot;: \&quot;A\&quot;,             \&quot;query\&quot;: \&quot;${B} &gt; 2\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]         },         {             \&quot;name\&quot;: \&quot;B\&quot;,             \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]         }     ],     \&quot;severity\&quot;: \&quot;WARN\&quot;,     \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Example Threshold Body with multi queries:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,   \&quot;alertSources\&quot;: [     {       \&quot;name\&quot;: \&quot;A\&quot;,       \&quot;query\&quot;: \&quot;${B}\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]     },     {       \&quot;name\&quot;: \&quot;B\&quot;,       \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]     }   ],   \&quot;conditions\&quot;: {     \&quot;info\&quot;: \&quot;${B} &gt; bool 0\&quot;,     \&quot;warn\&quot;: \&quot;${B} &gt; bool 2\&quot;   },   \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;alertTriageDashboards\&quot;: [{     \&quot;dashboardId\&quot;: \&quot;dashboard-name\&quot;,     \&quot;parameters\&quot;: {       \&quot;constants\&quot;: {         \&quot;key\&quot;: \&quot;value\&quot;         }       },    \&quot;description\&quot;: \&quot;dashboard description\&quot;     }   ],   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Classic Body with multi queries:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;CLASSIC\&quot;,     \&quot;target\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,     \&quot;alertSources\&quot;: [        {             \&quot;name\&quot;: \&quot;A\&quot;,             \&quot;query\&quot;: \&quot;${B} &gt; 2\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]         },         {             \&quot;name\&quot;: \&quot;B\&quot;,             \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]         }     ],     \&quot;severity\&quot;: \&quot;WARN\&quot;,     \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;targets\&quot;: {         \&quot;info\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,          \&quot;warn\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;      },      \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 2\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Example Threshold Body with multi queries:  &lt;pre&gt;{   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,   \&quot;targets\&quot;: {       \&quot;info\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,        \&quot;warn\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;     },    \&quot;alertSources\&quot;: [     {       \&quot;name\&quot;: \&quot;A\&quot;,       \&quot;query\&quot;: \&quot;${B}\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]     },     {       \&quot;name\&quot;: \&quot;B\&quot;,       \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]     }   ],   \&quot;conditions\&quot;: {     \&quot;info\&quot;: \&quot;${B} &gt; bool 0\&quot;,     \&quot;warn\&quot;: \&quot;${B} &gt; bool 2\&quot;   },   \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt; Supported Alert Target formats:  &lt;pre&gt;Classic Alerts - \&quot;target\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;  Threshold Alerts - \&quot;targets\&quot;: {\&quot;info\&quot;:\&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;, \&quot;warn\&quot;:\&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
@@ -1314,7 +1314,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
 id = 'id_example' # str | 
 use_multi_query = false # bool | A flag indicates whether to use the new multi-query alert structures when the feature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources  (optional) (default to false)
-body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre>  (optional)
+body = wavefront_api_client.Alert() # Alert | Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"targets\": {         \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",          \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"      },      \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"targets\": {       \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",        \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"    },    \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> Supported Alert Target formats:  <pre>Classic Alerts - \"target\": \"{email},pd:{pd_key},target:{alert target ID}\"  Threshold Alerts - \"targets\": {\"info\":\"{email},pd:{pd_key},target:{alert target ID}\", \"warn\":\"{email},pd:{pd_key},target:{alert target ID}\"}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.</pre>  (optional)
 
 try:
     # Update a specific alert
@@ -1330,7 +1330,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **id** | **str**|  | 
  **use_multi_query** | **bool**| A flag indicates whether to use the new multi-query alert structures when the feature is enabled.&lt;br/&gt; When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.&lt;br/&gt; When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources  | [optional] [default to false]
- **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;target:alert-target-id\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Classic Body with multi queries:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;CLASSIC\&quot;,     \&quot;alertSources\&quot;: [        {             \&quot;name\&quot;: \&quot;A\&quot;,             \&quot;query\&quot;: \&quot;${B} &gt; 2\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]         },         {             \&quot;name\&quot;: \&quot;B\&quot;,             \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]         }     ],     \&quot;severity\&quot;: \&quot;WARN\&quot;,     \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;id\&quot;: \&quot;1459375928550\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 5\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;resolveAfterMinutes\&quot;: 2,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Example Threshold Body with multi queries:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,   \&quot;alertSources\&quot;: [     {       \&quot;name\&quot;: \&quot;A\&quot;,       \&quot;query\&quot;: \&quot;${B}\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]     },     {       \&quot;name\&quot;: \&quot;B\&quot;,       \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]     }   ],   \&quot;conditions\&quot;: {     \&quot;info\&quot;: \&quot;${B} &gt; bool 0\&quot;,     \&quot;warn\&quot;: \&quot;${B} &gt; bool 2\&quot;   },   \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt;  | [optional] 
+ **body** | [**Alert**](Alert.md)| Example Classic Body:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;target\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,   \&quot;condition\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 1\&quot;,   \&quot;conditionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,   \&quot;displayExpressionQueryType\&quot;: \&quot;WQL\&quot;,   \&quot;minutes\&quot;: 5,   \&quot;resolveAfterMinutes\&quot;: 2,   \&quot;severity\&quot;: \&quot;INFO\&quot;,   \&quot;additionalInformation\&quot;: \&quot;Additional Info\&quot;,   \&quot;tags\&quot;: {     \&quot;customerTags\&quot;: [       \&quot;alertTag1\&quot;     ]   } }&lt;/pre&gt; Example Classic Body with multi queries:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;CLASSIC\&quot;,     \&quot;target\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,     \&quot;alertSources\&quot;: [        {             \&quot;name\&quot;: \&quot;A\&quot;,             \&quot;query\&quot;: \&quot;${B} &gt; 2\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]         },         {             \&quot;name\&quot;: \&quot;B\&quot;,             \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,             \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,             \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]         }     ],     \&quot;severity\&quot;: \&quot;WARN\&quot;,     \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Example Threshold Body:  &lt;pre&gt;{     \&quot;id\&quot;: \&quot;1459375928550\&quot;,     \&quot;name\&quot;: \&quot;Alert Name\&quot;,     \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,     \&quot;targets\&quot;: {         \&quot;info\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,          \&quot;warn\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;      },      \&quot;conditions\&quot;: {         \&quot;info\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 0\&quot;,         \&quot;warn\&quot;: \&quot;ts(~sample.cpu.loadavg.1m) &gt; 5\&quot;     },     \&quot;displayExpression\&quot;: \&quot;ts(~sample.cpu.loadavg.1m)\&quot;,     \&quot;minutes\&quot;: 5,     \&quot;resolveAfterMinutes\&quot;: 2,     \&quot;additionalInformation\&quot;: \&quot;conditions value entry needs to be of the form: displayExpression operator threshold\&quot; }&lt;/pre&gt; Example Threshold Body with multi queries:  &lt;pre&gt;{   \&quot;id\&quot;: \&quot;1459375928549\&quot;,   \&quot;name\&quot;: \&quot;Alert Name\&quot;,   \&quot;alertType\&quot;: \&quot;THRESHOLD\&quot;,   \&quot;targets\&quot;: {       \&quot;info\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;,        \&quot;warn\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;    },    \&quot;alertSources\&quot;: [     {       \&quot;name\&quot;: \&quot;A\&quot;,       \&quot;query\&quot;: \&quot;${B}\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;CONDITION\&quot;]     },     {       \&quot;name\&quot;: \&quot;B\&quot;,       \&quot;query\&quot;: \&quot;sum_over_time(~sample.network.bytes.recv[1m])\&quot;,       \&quot;queryType\&quot;: \&quot;PROMQL\&quot;,       \&quot;alertSourceType\&quot;: [\&quot;AUDIT\&quot;]     }   ],   \&quot;conditions\&quot;: {     \&quot;info\&quot;: \&quot;${B} &gt; bool 0\&quot;,     \&quot;warn\&quot;: \&quot;${B} &gt; bool 2\&quot;   },   \&quot;minutes\&quot;: 5 }&lt;/pre&gt; Supported Characters of Tags:  &lt;pre&gt;Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.&lt;/pre&gt; Supported Alert Target formats:  &lt;pre&gt;Classic Alerts - \&quot;target\&quot;: \&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;  Threshold Alerts - \&quot;targets\&quot;: {\&quot;info\&quot;:\&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;, \&quot;warn\&quot;:\&quot;{email},pd:{pd_key},target:{alert target ID}\&quot;}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.&lt;/pre&gt;  | [optional] 
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index e25c390..c5d8544 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.179.0"
+VERSION = "2.188.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index dc09763..ae3f3f0 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -448,7 +448,7 @@ def create_alert(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources 
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"targets\": {         \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",          \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"      },      \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"targets\": {       \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",        \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"     },    \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> Supported Alert Target formats:  <pre>Classic Alerts - \"target\": \"{email},pd:{pd_key},target:{alert target ID}\"  Threshold Alerts - \"targets\": {\"info\":\"{email},pd:{pd_key},target:{alert target ID}\", \"warn\":\"{email},pd:{pd_key},target:{alert target ID}\"}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -471,7 +471,7 @@ def create_alert_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when thefeature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-create $.alertSources 
-        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"name\": \"Alert Name\",   \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"alertTriageDashboards\": [{     \"dashboardId\": \"dashboard-name\",     \"parameters\": {       \"constants\": {         \"key\": \"value\"         }       },    \"description\": \"dashboard description\"     }   ],   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"targets\": {         \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",          \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"      },      \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 2\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"targets\": {       \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",        \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"     },    \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> Supported Alert Target formats:  <pre>Classic Alerts - \"target\": \"{email},pd:{pd_key},target:{alert target ID}\"  Threshold Alerts - \"targets\": {\"info\":\"{email},pd:{pd_key},target:{alert target ID}\", \"warn\":\"{email},pd:{pd_key},target:{alert target ID}\"}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2283,7 +2283,7 @@ def update_alert(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when the feature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources 
-        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"targets\": {         \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",          \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"      },      \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"targets\": {       \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",        \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"    },    \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> Supported Alert Target formats:  <pre>Classic Alerts - \"target\": \"{email},pd:{pd_key},target:{alert target ID}\"  Threshold Alerts - \"targets\": {\"info\":\"{email},pd:{pd_key},target:{alert target ID}\", \"warn\":\"{email},pd:{pd_key},target:{alert target ID}\"}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
@@ -2307,7 +2307,7 @@ def update_alert_with_http_info(self, id, **kwargs):  # noqa: E501
         :param async_req bool
         :param str id: (required)
         :param bool use_multi_query: A flag indicates whether to use the new multi-query alert structures when the feature is enabled.<br/> When the flag is true, the $.alertSources is the source of truth and will update $.condition and $.displayExpression with the corresponding expanded queries.<br/> When the flag is false, it goes through the old way and the $.condition and$.displayExpression is the source of truth and will auto-update $.alertSources 
-        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"target:alert-target-id\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> 
+        :param Alert body: Example Classic Body:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",   \"condition\": \"ts(~sample.cpu.loadavg.1m) > 1\",   \"conditionQueryType\": \"WQL\",   \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",   \"displayExpressionQueryType\": \"WQL\",   \"minutes\": 5,   \"resolveAfterMinutes\": 2,   \"severity\": \"INFO\",   \"additionalInformation\": \"Additional Info\",   \"tags\": {     \"customerTags\": [       \"alertTag1\"     ]   } }</pre> Example Classic Body with multi queries:  <pre>{   \"id\": \"1459375928549\",     \"name\": \"Alert Name\",     \"alertType\": \"CLASSIC\",     \"target\": \"{email},pd:{pd_key},target:{alert target ID}\",     \"alertSources\": [        {             \"name\": \"A\",             \"query\": \"${B} > 2\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"CONDITION\"]         },         {             \"name\": \"B\",             \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",             \"queryType\": \"PROMQL\",             \"alertSourceType\": [\"AUDIT\"]         }     ],     \"severity\": \"WARN\",     \"minutes\": 5 }</pre> Example Threshold Body:  <pre>{     \"id\": \"1459375928550\",     \"name\": \"Alert Name\",     \"alertType\": \"THRESHOLD\",     \"targets\": {         \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",          \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"      },      \"conditions\": {         \"info\": \"ts(~sample.cpu.loadavg.1m) > 0\",         \"warn\": \"ts(~sample.cpu.loadavg.1m) > 5\"     },     \"displayExpression\": \"ts(~sample.cpu.loadavg.1m)\",     \"minutes\": 5,     \"resolveAfterMinutes\": 2,     \"additionalInformation\": \"conditions value entry needs to be of the form: displayExpression operator threshold\" }</pre> Example Threshold Body with multi queries:  <pre>{   \"id\": \"1459375928549\",   \"name\": \"Alert Name\",   \"alertType\": \"THRESHOLD\",   \"targets\": {       \"info\": \"{email},pd:{pd_key},target:{alert target ID}\",        \"warn\": \"{email},pd:{pd_key},target:{alert target ID}\"    },    \"alertSources\": [     {       \"name\": \"A\",       \"query\": \"${B}\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"CONDITION\"]     },     {       \"name\": \"B\",       \"query\": \"sum_over_time(~sample.network.bytes.recv[1m])\",       \"queryType\": \"PROMQL\",       \"alertSourceType\": [\"AUDIT\"]     }   ],   \"conditions\": {     \"info\": \"${B} > bool 0\",     \"warn\": \"${B} > bool 2\"   },   \"minutes\": 5 }</pre> Supported Characters of Tags:  <pre>Tag names can contain alphanumeric (a-z, A-Z, 0-9),  dash (-), underscore (_), and colon (:) characters. The space character is not supported.</pre> Supported Alert Target formats:  <pre>Classic Alerts - \"target\": \"{email},pd:{pd_key},target:{alert target ID}\"  Threshold Alerts - \"targets\": {\"info\":\"{email},pd:{pd_key},target:{alert target ID}\", \"warn\":\"{email},pd:{pd_key},target:{alert target ID}\"}  Note that only target(s) can be used for creating/updating alert targets. targetEndpoints, targetInfo are for informational purpose only.</pre> 
         :return: ResponseContainerAlert
                  If the method is called asynchronously,
                  returns the request thread.
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b97c2ac..3ec59a0 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.179.0/python'
+        self.user_agent = 'Swagger-Codegen/2.188.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index de2ca28..ea4d85f 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.179.0".\
+               "SDK Package Version: 2.188.0".\
                format(env=sys.platform, pyversion=sys.version)

From f958f811d1645145f9b02be983482c19bb9c8c00 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 21 Jun 2023 08:17:16 -0700
Subject: [PATCH 138/161] Autogenerated Update v2.189.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/AccountUserAndServiceAccountApi.md       |  52 ++++-----
 docs/ApiTokenApi.md                           |  22 ++--
 docs/RoleApi.md                               |  18 +--
 docs/RoleDTO.md                               |   2 -
 docs/SearchApi.md                             |  30 ++---
 docs/UserApi.md                               |  28 ++---
 docs/UserGroupApi.md                          |  18 +--
 setup.py                                      |   2 +-
 wavefront_api_client/__init__.py              |   1 -
 .../account__user_and_service_account_api.py  | 104 +++++++++---------
 wavefront_api_client/api/api_token_api.py     |  44 ++++----
 wavefront_api_client/api/role_api.py          |  36 +++---
 wavefront_api_client/api/search_api.py        |  60 +++++-----
 wavefront_api_client/api/user_api.py          |  56 +++++-----
 wavefront_api_client/api/user_group_api.py    |  36 +++---
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 wavefront_api_client/models/__init__.py       |   1 -
 .../models/api_token_model.py                 |   2 +-
 ...esponse_container_set_business_function.py |   2 +-
 wavefront_api_client/models/role_dto.py       |  58 +---------
 wavefront_api_client/models/user_api_token.py |   2 +-
 25 files changed, 262 insertions(+), 323 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 0cb26c0..9ad6aaa 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.188.0"
+    "packageVersion": "2.189.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ec50555..0cb26c0 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.179.0"
+    "packageVersion": "2.188.0"
 }
diff --git a/README.md b/README.md
index a5b1dc9..5fe8b15 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.188.0
+- Package version: 2.189.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -718,7 +718,6 @@ Class | Method | HTTP request | Description
  - [ResponseStatus](docs/ResponseStatus.md)
  - [RoleCreateDTO](docs/RoleCreateDTO.md)
  - [RoleDTO](docs/RoleDTO.md)
- - [RolePropertiesDTO](docs/RolePropertiesDTO.md)
  - [RoleUpdateDTO](docs/RoleUpdateDTO.md)
  - [SavedAppMapSearch](docs/SavedAppMapSearch.md)
  - [SavedAppMapSearchGroup](docs/SavedAppMapSearchGroup.md)
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index 792e284..604cac1 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -37,7 +37,7 @@ Method | HTTP request | Description
 
 Activates the given service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -91,7 +91,7 @@ Name | Type | Description  | Notes
 
 Adds specific roles to the account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -147,7 +147,7 @@ Name | Type | Description  | Notes
 
 Adds specific groups to the account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -203,7 +203,7 @@ Name | Type | Description  | Notes
 
 Creates or updates a user account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -259,7 +259,7 @@ Name | Type | Description  | Notes
 
 Creates a service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -313,7 +313,7 @@ Name | Type | Description  | Notes
 
 Deactivates the given service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -367,7 +367,7 @@ Name | Type | Description  | Notes
 
 Deletes an account (user or service account) identified by id
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -421,7 +421,7 @@ Name | Type | Description  | Notes
 
 Deletes multiple accounts (users or service accounts)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -475,7 +475,7 @@ Name | Type | Description  | Notes
 
 Get a specific account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -529,7 +529,7 @@ Name | Type | Description  | Notes
 
 Returns business functions of a specific account (user or service account).
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -583,7 +583,7 @@ Name | Type | Description  | Notes
 
 Get all accounts (users and service accounts) of a customer
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -639,7 +639,7 @@ Name | Type | Description  | Notes
 
 Get all service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -689,7 +689,7 @@ This endpoint does not need any parameter.
 
 Get all user accounts
 
-Returns all user accounts
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -739,7 +739,7 @@ This endpoint does not need any parameter.
 
 Retrieves a service account by identifier
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -793,7 +793,7 @@ Name | Type | Description  | Notes
 
 Retrieves a user by identifier (email address)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -847,7 +847,7 @@ Name | Type | Description  | Notes
 
 Get all users with Accounts permission
 
-Returns all users with Accounts permission
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -897,7 +897,7 @@ This endpoint does not need any parameter.
 
 Grants a specific permission to account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -953,7 +953,7 @@ Name | Type | Description  | Notes
 
 Grant a permission to accounts (users or service accounts)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1009,7 +1009,7 @@ Name | Type | Description  | Notes
 
 Invite user accounts with given user groups and permissions.
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1063,7 +1063,7 @@ Name | Type | Description  | Notes
 
 Removes specific roles from the account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1119,7 +1119,7 @@ Name | Type | Description  | Notes
 
 Removes specific groups from the account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1175,7 +1175,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from account (user or service account)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1231,7 +1231,7 @@ Name | Type | Description  | Notes
 
 Revoke a permission from accounts (users or service accounts)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1287,7 +1287,7 @@ Name | Type | Description  | Notes
 
 Updates the service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1343,7 +1343,7 @@ Name | Type | Description  | Notes
 
 Update user with given user groups and permissions.
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1399,7 +1399,7 @@ Name | Type | Description  | Notes
 
 Returns valid accounts (users and service accounts), also invalid identifiers from the given list
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
index 7be2189..c2457e5 100644
--- a/docs/ApiTokenApi.md
+++ b/docs/ApiTokenApi.md
@@ -22,7 +22,7 @@ Method | HTTP request | Description
 
 Create new api token
 
-Returns the list of all api tokens for a user. The newly created api token is the last element of returned list.
+Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -72,7 +72,7 @@ This endpoint does not need any parameter.
 
 Delete the specified api token for a customer
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -126,7 +126,7 @@ Name | Type | Description  | Notes
 
 Delete the specified api token
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -180,7 +180,7 @@ Name | Type | Description  | Notes
 
 Delete the specified api token of the given service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -236,7 +236,7 @@ Name | Type | Description  | Notes
 
 Create a new api token for the service account
 
-Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.
+Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -292,7 +292,7 @@ Name | Type | Description  | Notes
 
 Get all api tokens for a user
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -342,7 +342,7 @@ This endpoint does not need any parameter.
 
 Get the specified api token for a customer
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -396,7 +396,7 @@ Name | Type | Description  | Notes
 
 Get all api tokens for a customer
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -446,7 +446,7 @@ This endpoint does not need any parameter.
 
 Get all api tokens for the given service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -500,7 +500,7 @@ Name | Type | Description  | Notes
 
 Update the name of the specified api token
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -556,7 +556,7 @@ Name | Type | Description  | Notes
 
 Update the name of the specified api token for the given service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/RoleApi.md b/docs/RoleApi.md
index 8699adf..3b7db42 100644
--- a/docs/RoleApi.md
+++ b/docs/RoleApi.md
@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 Add accounts and groups to a role
 
-Assigns a role with a given ID to a list of user and service accounts and groups.
+Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 
 Create a role
 
-Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role.
+Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -130,7 +130,7 @@ Name | Type | Description  | Notes
 
 Delete a role by ID
 
-Deletes a role with a given ID.
+Deletes a role with a given ID. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -184,7 +184,7 @@ Name | Type | Description  | Notes
 
 Get all roles
 
-Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it.
+Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -240,7 +240,7 @@ Name | Type | Description  | Notes
 
 Get a role by ID
 
-Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it.
+Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -294,7 +294,7 @@ Name | Type | Description  | Notes
 
 Grant a permission to roles
 
-Grants a given permission to a list of roles.
+Grants a given permission to a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -350,7 +350,7 @@ Name | Type | Description  | Notes
 
 Remove accounts and groups from a role
 
-Revokes a role with a given ID from a list of user and service accounts and groups.
+Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -406,7 +406,7 @@ Name | Type | Description  | Notes
 
 Revoke a permission from roles
 
-Revokes a given permission from a list of roles.
+Revokes a given permission from a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -462,7 +462,7 @@ Name | Type | Description  | Notes
 
 Update a role by ID
 
-Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description.
+Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/RoleDTO.md b/docs/RoleDTO.md
index 108c1e8..3d52ac8 100644
--- a/docs/RoleDTO.md
+++ b/docs/RoleDTO.md
@@ -13,8 +13,6 @@ Name | Type | Description | Notes
 **linked_groups_count** | **int** | Total number of groups that are linked to the role | [optional] 
 **name** | **str** | The name of the role | [optional] 
 **permissions** | **list[str]** | List of permissions the role has been granted access to | [optional] 
-**properties** | [**RolePropertiesDTO**](RolePropertiesDTO.md) | The properties of the role | [optional] 
-**restricted_permissions** | **list[str]** | The list of permissions that are restricted with the role. Currently only CSP roles have restrictions. | [optional] 
 **sample_linked_accounts** | **list[str]** | A sample of the accounts assigned to this role. Please use the Role facet of the Account Search API to get the full list of accounts for this role | [optional] 
 **sample_linked_groups** | [**list[UserGroup]**](UserGroup.md) | A sample of the groups assigned to this role. Please use the Role facet of the Group Search API to get the full list of groups for this role | [optional] 
 
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 1d575e3..bf47b2b 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -100,7 +100,7 @@ Method | HTTP request | Description
 
 Search over a customer's accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -154,7 +154,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -210,7 +210,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3164,7 +3164,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's roles
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3218,7 +3218,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's roles
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3274,7 +3274,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's roles
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3546,7 +3546,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3600,7 +3600,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3656,7 +3656,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4202,7 +4202,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's api tokens
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4256,7 +4256,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's api tokens
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4312,7 +4312,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's api tokens
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4476,7 +4476,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's users
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4530,7 +4530,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's users
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4586,7 +4586,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's users
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 16b2101..752c195 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -26,7 +26,7 @@ Method | HTTP request | Description
 
 Adds specific groups to the user or service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -82,7 +82,7 @@ Name | Type | Description  | Notes
 
 Creates an user if the user doesn't already exist.
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -138,7 +138,7 @@ Name | Type | Description  | Notes
 
 Deletes multiple users or service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -192,7 +192,7 @@ Name | Type | Description  | Notes
 
 Deletes a user or service account identified by id
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -245,7 +245,7 @@ void (empty response body)
 
 Get all users
 
-Returns all users
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -295,7 +295,7 @@ This endpoint does not need any parameter.
 
 Retrieves a user by identifier (email address)
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -403,7 +403,7 @@ Name | Type | Description  | Notes
 
 Grants a specific permission to multiple users or service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -459,7 +459,7 @@ Name | Type | Description  | Notes
 
 Grants a specific permission to user or service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -515,7 +515,7 @@ Name | Type | Description  | Notes
 
 Invite users with given user groups and permissions.
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -569,7 +569,7 @@ Name | Type | Description  | Notes
 
 Removes specific groups from the user or service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -625,7 +625,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from multiple users or service accounts
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -681,7 +681,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from user or service account
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -737,7 +737,7 @@ Name | Type | Description  | Notes
 
 Update user with given user groups, permissions and ingestion policy.
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -793,7 +793,7 @@ Name | Type | Description  | Notes
 
 Returns valid users and service accounts, also invalid identifiers from the given list
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 2c73a32..5afb77a 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 Add multiple roles to a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 
 Add multiple users to a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -132,7 +132,7 @@ Name | Type | Description  | Notes
 
 Create a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -186,7 +186,7 @@ Name | Type | Description  | Notes
 
 Delete a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -240,7 +240,7 @@ Name | Type | Description  | Notes
 
 Get all user groups for a customer
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -296,7 +296,7 @@ Name | Type | Description  | Notes
 
 Get a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -350,7 +350,7 @@ Name | Type | Description  | Notes
 
 Remove multiple roles from a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -406,7 +406,7 @@ Name | Type | Description  | Notes
 
 Remove multiple users from a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -462,7 +462,7 @@ Name | Type | Description  | Notes
 
 Update a specific user group
 
-
+<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/setup.py b/setup.py
index c5d8544..5d7b5f1 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.188.0"
+VERSION = "2.189.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 0532089..13e0c43 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -311,7 +311,6 @@
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_create_dto import RoleCreateDTO
 from wavefront_api_client.models.role_dto import RoleDTO
-from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO
 from wavefront_api_client.models.role_update_dto import RoleUpdateDTO
 from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
 from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 7a24c38..3202bd5 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def activate_account(self, id, **kwargs):  # noqa: E501
         """Activates the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.activate_account(id, async_req=True)
@@ -58,7 +58,7 @@ def activate_account(self, id, **kwargs):  # noqa: E501
     def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Activates the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.activate_account_with_http_info(id, async_req=True)
@@ -135,7 +135,7 @@ def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_account_to_roles(self, id, **kwargs):  # noqa: E501
         """Adds specific roles to the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_roles(id, async_req=True)
@@ -158,7 +158,7 @@ def add_account_to_roles(self, id, **kwargs):  # noqa: E501
     def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific roles to the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_roles_with_http_info(id, async_req=True)
@@ -238,7 +238,7 @@ def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_user_groups(id, async_req=True)
@@ -261,7 +261,7 @@ def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
     def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_user_groups_with_http_info(id, async_req=True)
@@ -341,7 +341,7 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_or_update_user_account(async_req=True)
@@ -364,7 +364,7 @@ def create_or_update_user_account(self, **kwargs):  # noqa: E501
     def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_or_update_user_account_with_http_info(async_req=True)
@@ -440,7 +440,7 @@ def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
     def create_service_account(self, **kwargs):  # noqa: E501
         """Creates a service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_service_account(async_req=True)
@@ -462,7 +462,7 @@ def create_service_account(self, **kwargs):  # noqa: E501
     def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
         """Creates a service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_service_account_with_http_info(async_req=True)
@@ -535,7 +535,7 @@ def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
     def deactivate_account(self, id, **kwargs):  # noqa: E501
         """Deactivates the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.deactivate_account(id, async_req=True)
@@ -557,7 +557,7 @@ def deactivate_account(self, id, **kwargs):  # noqa: E501
     def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deactivates the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.deactivate_account_with_http_info(id, async_req=True)
@@ -634,7 +634,7 @@ def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_account(self, id, **kwargs):  # noqa: E501
         """Deletes an account (user or service account) identified by id  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_account(id, async_req=True)
@@ -656,7 +656,7 @@ def delete_account(self, id, **kwargs):  # noqa: E501
     def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deletes an account (user or service account) identified by id  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_account_with_http_info(id, async_req=True)
@@ -729,7 +729,7 @@ def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_multiple_accounts(self, **kwargs):  # noqa: E501
         """Deletes multiple accounts (users or service accounts)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_accounts(async_req=True)
@@ -751,7 +751,7 @@ def delete_multiple_accounts(self, **kwargs):  # noqa: E501
     def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Deletes multiple accounts (users or service accounts)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_accounts_with_http_info(async_req=True)
@@ -824,7 +824,7 @@ def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_account(self, id, **kwargs):  # noqa: E501
         """Get a specific account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account(id, async_req=True)
@@ -846,7 +846,7 @@ def get_account(self, id, **kwargs):  # noqa: E501
     def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a specific account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_with_http_info(id, async_req=True)
@@ -919,7 +919,7 @@ def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_account_business_functions(self, id, **kwargs):  # noqa: E501
         """Returns business functions of a specific account (user or service account).  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_business_functions(id, async_req=True)
@@ -941,7 +941,7 @@ def get_account_business_functions(self, id, **kwargs):  # noqa: E501
     def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa: E501
         """Returns business functions of a specific account (user or service account).  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_business_functions_with_http_info(id, async_req=True)
@@ -1014,7 +1014,7 @@ def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa:
     def get_all_accounts(self, **kwargs):  # noqa: E501
         """Get all accounts (users and service accounts) of a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_accounts(async_req=True)
@@ -1037,7 +1037,7 @@ def get_all_accounts(self, **kwargs):  # noqa: E501
     def get_all_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all accounts (users and service accounts) of a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_accounts_with_http_info(async_req=True)
@@ -1109,7 +1109,7 @@ def get_all_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_all_service_accounts(self, **kwargs):  # noqa: E501
         """Get all service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_service_accounts(async_req=True)
@@ -1130,7 +1130,7 @@ def get_all_service_accounts(self, **kwargs):  # noqa: E501
     def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_service_accounts_with_http_info(async_req=True)
@@ -1196,7 +1196,7 @@ def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_all_user_accounts(self, **kwargs):  # noqa: E501
         """Get all user accounts  # noqa: E501
 
-        Returns all user accounts  # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_accounts(async_req=True)
@@ -1217,7 +1217,7 @@ def get_all_user_accounts(self, **kwargs):  # noqa: E501
     def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all user accounts  # noqa: E501
 
-        Returns all user accounts  # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_accounts_with_http_info(async_req=True)
@@ -1283,7 +1283,7 @@ def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_service_account(self, id, **kwargs):  # noqa: E501
         """Retrieves a service account by identifier  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_service_account(id, async_req=True)
@@ -1305,7 +1305,7 @@ def get_service_account(self, id, **kwargs):  # noqa: E501
     def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a service account by identifier  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_service_account_with_http_info(id, async_req=True)
@@ -1378,7 +1378,7 @@ def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_user_account(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_account(id, async_req=True)
@@ -1400,7 +1400,7 @@ def get_user_account(self, id, **kwargs):  # noqa: E501
     def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_account_with_http_info(id, async_req=True)
@@ -1473,7 +1473,7 @@ def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
         """Get all users with Accounts permission  # noqa: E501
 
-        Returns all users with Accounts permission  # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_users_with_accounts_permission(async_req=True)
@@ -1494,7 +1494,7 @@ def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
     def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users with Accounts permission  # noqa: E501
 
-        Returns all users with Accounts permission  # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_users_with_accounts_permission_with_http_info(async_req=True)
@@ -1560,7 +1560,7 @@ def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa:
     def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_account_permission(id, permission, async_req=True)
@@ -1583,7 +1583,7 @@ def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
     def grant_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_account_permission_with_http_info(id, permission, async_req=True)
@@ -1667,7 +1667,7 @@ def grant_account_permission_with_http_info(self, id, permission, **kwargs):  #
     def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
         """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_accounts(permission, async_req=True)
@@ -1690,7 +1690,7 @@ def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
     def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_accounts_with_http_info(permission, async_req=True)
@@ -1770,7 +1770,7 @@ def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  #
     def invite_user_accounts(self, **kwargs):  # noqa: E501
         """Invite user accounts with given user groups and permissions.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_user_accounts(async_req=True)
@@ -1792,7 +1792,7 @@ def invite_user_accounts(self, **kwargs):  # noqa: E501
     def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Invite user accounts with given user groups and permissions.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_user_accounts_with_http_info(async_req=True)
@@ -1865,7 +1865,7 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
         """Removes specific roles from the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_roles(id, async_req=True)
@@ -1888,7 +1888,7 @@ def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
     def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific roles from the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_roles_with_http_info(id, async_req=True)
@@ -1968,7 +1968,7 @@ def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
     def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_user_groups(id, async_req=True)
@@ -1991,7 +1991,7 @@ def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
     def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_user_groups_with_http_info(id, async_req=True)
@@ -2071,7 +2071,7 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_account_permission(id, permission, async_req=True)
@@ -2094,7 +2094,7 @@ def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
     def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_account_permission_with_http_info(id, permission, async_req=True)
@@ -2178,7 +2178,7 @@ def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  #
     def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
         """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_accounts(permission, async_req=True)
@@ -2201,7 +2201,7 @@ def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
     def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_accounts_with_http_info(permission, async_req=True)
@@ -2281,7 +2281,7 @@ def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):
     def update_service_account(self, id, **kwargs):  # noqa: E501
         """Updates the service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_service_account(id, async_req=True)
@@ -2304,7 +2304,7 @@ def update_service_account(self, id, **kwargs):  # noqa: E501
     def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Updates the service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_service_account_with_http_info(id, async_req=True)
@@ -2384,7 +2384,7 @@ def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_user_account(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups and permissions.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_account(id, async_req=True)
@@ -2407,7 +2407,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
     def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups and permissions.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_account_with_http_info(id, async_req=True)
@@ -2487,7 +2487,7 @@ def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def validate_accounts(self, **kwargs):  # noqa: E501
         """Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_accounts(async_req=True)
@@ -2509,7 +2509,7 @@ def validate_accounts(self, **kwargs):  # noqa: E501
     def validate_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_accounts_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index bcd87cd..6e23295 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def create_token(self, **kwargs):  # noqa: E501
         """Create new api token  # noqa: E501
 
-        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list.  # noqa: E501
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_token(async_req=True)
@@ -57,7 +57,7 @@ def create_token(self, **kwargs):  # noqa: E501
     def create_token_with_http_info(self, **kwargs):  # noqa: E501
         """Create new api token  # noqa: E501
 
-        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list.  # noqa: E501
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_token_with_http_info(async_req=True)
@@ -123,7 +123,7 @@ def create_token_with_http_info(self, **kwargs):  # noqa: E501
     def delete_customer_token(self, **kwargs):  # noqa: E501
         """Delete the specified api token for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_customer_token(async_req=True)
@@ -145,7 +145,7 @@ def delete_customer_token(self, **kwargs):  # noqa: E501
     def delete_customer_token_with_http_info(self, **kwargs):  # noqa: E501
         """Delete the specified api token for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_customer_token_with_http_info(async_req=True)
@@ -218,7 +218,7 @@ def delete_customer_token_with_http_info(self, **kwargs):  # noqa: E501
     def delete_token(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token(id, async_req=True)
@@ -240,7 +240,7 @@ def delete_token(self, id, **kwargs):  # noqa: E501
     def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_with_http_info(id, async_req=True)
@@ -313,7 +313,7 @@ def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_token_service_account(self, id, token, **kwargs):  # noqa: E501
         """Delete the specified api token of the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_service_account(id, token, async_req=True)
@@ -336,7 +336,7 @@ def delete_token_service_account(self, id, token, **kwargs):  # noqa: E501
     def delete_token_service_account_with_http_info(self, id, token, **kwargs):  # noqa: E501
         """Delete the specified api token of the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_service_account_with_http_info(id, token, async_req=True)
@@ -416,7 +416,7 @@ def delete_token_service_account_with_http_info(self, id, token, **kwargs):  # n
     def generate_token_service_account(self, id, **kwargs):  # noqa: E501
         """Create a new api token for the service account  # noqa: E501
 
-        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.  # noqa: E501
+        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.generate_token_service_account(id, async_req=True)
@@ -439,7 +439,7 @@ def generate_token_service_account(self, id, **kwargs):  # noqa: E501
     def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Create a new api token for the service account  # noqa: E501
 
-        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.  # noqa: E501
+        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.generate_token_service_account_with_http_info(id, async_req=True)
@@ -515,7 +515,7 @@ def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa:
     def get_all_tokens(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_tokens(async_req=True)
@@ -536,7 +536,7 @@ def get_all_tokens(self, **kwargs):  # noqa: E501
     def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_tokens_with_http_info(async_req=True)
@@ -602,7 +602,7 @@ def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
     def get_customer_token(self, id, **kwargs):  # noqa: E501
         """Get the specified api token for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_token(id, async_req=True)
@@ -624,7 +624,7 @@ def get_customer_token(self, id, **kwargs):  # noqa: E501
     def get_customer_token_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get the specified api token for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_token_with_http_info(id, async_req=True)
@@ -697,7 +697,7 @@ def get_customer_token_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_customer_tokens(self, **kwargs):  # noqa: E501
         """Get all api tokens for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_tokens(async_req=True)
@@ -718,7 +718,7 @@ def get_customer_tokens(self, **kwargs):  # noqa: E501
     def get_customer_tokens_with_http_info(self, **kwargs):  # noqa: E501
         """Get all api tokens for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_tokens_with_http_info(async_req=True)
@@ -784,7 +784,7 @@ def get_customer_tokens_with_http_info(self, **kwargs):  # noqa: E501
     def get_tokens_service_account(self, id, **kwargs):  # noqa: E501
         """Get all api tokens for the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_tokens_service_account(id, async_req=True)
@@ -806,7 +806,7 @@ def get_tokens_service_account(self, id, **kwargs):  # noqa: E501
     def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get all api tokens for the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_tokens_service_account_with_http_info(id, async_req=True)
@@ -879,7 +879,7 @@ def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_token_name(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name(id, async_req=True)
@@ -902,7 +902,7 @@ def update_token_name(self, id, **kwargs):  # noqa: E501
     def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_with_http_info(id, async_req=True)
@@ -982,7 +982,7 @@ def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_token_name_service_account(self, id, token, **kwargs):  # noqa: E501
         """Update the name of the specified api token for the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_service_account(id, token, async_req=True)
@@ -1006,7 +1006,7 @@ def update_token_name_service_account(self, id, token, **kwargs):  # noqa: E501
     def update_token_name_service_account_with_http_info(self, id, token, **kwargs):  # noqa: E501
         """Update the name of the specified api token for the given service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_service_account_with_http_info(id, token, async_req=True)
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index 4ae86eb..cc35c27 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_assignees(self, id, body, **kwargs):  # noqa: E501
         """Add accounts and groups to a role  # noqa: E501
 
-        Assigns a role with a given ID to a list of user and service accounts and groups.  # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_assignees(id, body, async_req=True)
@@ -59,7 +59,7 @@ def add_assignees(self, id, body, **kwargs):  # noqa: E501
     def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Add accounts and groups to a role  # noqa: E501
 
-        Assigns a role with a given ID to a list of user and service accounts and groups.  # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_assignees_with_http_info(id, body, async_req=True)
@@ -143,7 +143,7 @@ def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
     def create_role(self, body, **kwargs):  # noqa: E501
         """Create a role  # noqa: E501
 
-        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role.  # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_role(body, async_req=True)
@@ -165,7 +165,7 @@ def create_role(self, body, **kwargs):  # noqa: E501
     def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
         """Create a role  # noqa: E501
 
-        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role.  # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_role_with_http_info(body, async_req=True)
@@ -242,7 +242,7 @@ def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
     def delete_role(self, id, **kwargs):  # noqa: E501
         """Delete a role by ID  # noqa: E501
 
-        Deletes a role with a given ID.  # noqa: E501
+        Deletes a role with a given ID. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role(id, async_req=True)
@@ -264,7 +264,7 @@ def delete_role(self, id, **kwargs):  # noqa: E501
     def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete a role by ID  # noqa: E501
 
-        Deletes a role with a given ID.  # noqa: E501
+        Deletes a role with a given ID. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role_with_http_info(id, async_req=True)
@@ -341,7 +341,7 @@ def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_roles(self, **kwargs):  # noqa: E501
         """Get all roles  # noqa: E501
 
-        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it.  # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles(async_req=True)
@@ -364,7 +364,7 @@ def get_all_roles(self, **kwargs):  # noqa: E501
     def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
         """Get all roles  # noqa: E501
 
-        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it.  # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles_with_http_info(async_req=True)
@@ -440,7 +440,7 @@ def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
     def get_role(self, id, **kwargs):  # noqa: E501
         """Get a role by ID  # noqa: E501
 
-        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it.  # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role(id, async_req=True)
@@ -462,7 +462,7 @@ def get_role(self, id, **kwargs):  # noqa: E501
     def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a role by ID  # noqa: E501
 
-        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it.  # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role_with_http_info(id, async_req=True)
@@ -539,7 +539,7 @@ def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
     def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
         """Grant a permission to roles  # noqa: E501
 
-        Grants a given permission to a list of roles.  # noqa: E501
+        Grants a given permission to a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_roles(permission, body, async_req=True)
@@ -562,7 +562,7 @@ def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
     def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
         """Grant a permission to roles  # noqa: E501
 
-        Grants a given permission to a list of roles.  # noqa: E501
+        Grants a given permission to a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_roles_with_http_info(permission, body, async_req=True)
@@ -646,7 +646,7 @@ def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):
     def remove_assignees(self, id, body, **kwargs):  # noqa: E501
         """Remove accounts and groups from a role  # noqa: E501
 
-        Revokes a role with a given ID from a list of user and service accounts and groups.  # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_assignees(id, body, async_req=True)
@@ -669,7 +669,7 @@ def remove_assignees(self, id, body, **kwargs):  # noqa: E501
     def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Remove accounts and groups from a role  # noqa: E501
 
-        Revokes a role with a given ID from a list of user and service accounts and groups.  # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_assignees_with_http_info(id, body, async_req=True)
@@ -753,7 +753,7 @@ def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
     def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E501
         """Revoke a permission from roles  # noqa: E501
 
-        Revokes a given permission from a list of roles.  # noqa: E501
+        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_roles(permission, body, async_req=True)
@@ -776,7 +776,7 @@ def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E50
     def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
         """Revoke a permission from roles  # noqa: E501
 
-        Revokes a given permission from a list of roles.  # noqa: E501
+        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_roles_with_http_info(permission, body, async_req=True)
@@ -860,7 +860,7 @@ def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs
     def update_role(self, id, body, **kwargs):  # noqa: E501
         """Update a role by ID  # noqa: E501
 
-        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description.  # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_role(id, body, async_req=True)
@@ -883,7 +883,7 @@ def update_role(self, id, body, **kwargs):  # noqa: E501
     def update_role_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Update a role by ID  # noqa: E501
 
-        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description.  # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_role_with_http_info(id, body, async_req=True)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index cbbb356..63bc143 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def search_account_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_entities(async_req=True)
@@ -58,7 +58,7 @@ def search_account_entities(self, **kwargs):  # noqa: E501
     def search_account_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_entities_with_http_info(async_req=True)
@@ -131,7 +131,7 @@ def search_account_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_account_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facet(facet, async_req=True)
@@ -154,7 +154,7 @@ def search_account_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facet_with_http_info(facet, async_req=True)
@@ -234,7 +234,7 @@ def search_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E50
     def search_account_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facets(async_req=True)
@@ -256,7 +256,7 @@ def search_account_for_facets(self, **kwargs):  # noqa: E501
     def search_account_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facets_with_http_info(async_req=True)
@@ -5516,7 +5516,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
     def search_role_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's roles  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_entities(async_req=True)
@@ -5538,7 +5538,7 @@ def search_role_entities(self, **kwargs):  # noqa: E501
     def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's roles  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_entities_with_http_info(async_req=True)
@@ -5611,7 +5611,7 @@ def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facet(facet, async_req=True)
@@ -5634,7 +5634,7 @@ def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facet_with_http_info(facet, async_req=True)
@@ -5714,7 +5714,7 @@ def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_role_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facets(async_req=True)
@@ -5736,7 +5736,7 @@ def search_role_for_facets(self, **kwargs):  # noqa: E501
     def search_role_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facets_with_http_info(async_req=True)
@@ -6197,7 +6197,7 @@ def search_saved_traces_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_service_account_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_entities(async_req=True)
@@ -6219,7 +6219,7 @@ def search_service_account_entities(self, **kwargs):  # noqa: E501
     def search_service_account_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_entities_with_http_info(async_req=True)
@@ -6292,7 +6292,7 @@ def search_service_account_entities_with_http_info(self, **kwargs):  # noqa: E50
     def search_service_account_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facet(facet, async_req=True)
@@ -6315,7 +6315,7 @@ def search_service_account_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_service_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facet_with_http_info(facet, async_req=True)
@@ -6395,7 +6395,7 @@ def search_service_account_for_facet_with_http_info(self, facet, **kwargs):  # n
     def search_service_account_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facets(async_req=True)
@@ -6417,7 +6417,7 @@ def search_service_account_for_facets(self, **kwargs):  # noqa: E501
     def search_service_account_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facets_with_http_info(async_req=True)
@@ -7369,7 +7369,7 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
     def search_token_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's api tokens  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_entities(async_req=True)
@@ -7391,7 +7391,7 @@ def search_token_entities(self, **kwargs):  # noqa: E501
     def search_token_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's api tokens  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_entities_with_http_info(async_req=True)
@@ -7464,7 +7464,7 @@ def search_token_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_token_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's api tokens  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facet(facet, async_req=True)
@@ -7487,7 +7487,7 @@ def search_token_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_token_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's api tokens  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facet_with_http_info(facet, async_req=True)
@@ -7567,7 +7567,7 @@ def search_token_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_token_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's api tokens  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facets(async_req=True)
@@ -7589,7 +7589,7 @@ def search_token_for_facets(self, **kwargs):  # noqa: E501
     def search_token_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's api tokens  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facets_with_http_info(async_req=True)
@@ -7860,7 +7860,7 @@ def search_traces_map_for_facets_with_http_info(self, **kwargs):  # noqa: E501
     def search_user_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_entities(async_req=True)
@@ -7882,7 +7882,7 @@ def search_user_entities(self, **kwargs):  # noqa: E501
     def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_entities_with_http_info(async_req=True)
@@ -7955,7 +7955,7 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's users  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facet(facet, async_req=True)
@@ -7978,7 +7978,7 @@ def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's users  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facet_with_http_info(facet, async_req=True)
@@ -8058,7 +8058,7 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_user_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's users  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facets(async_req=True)
@@ -8080,7 +8080,7 @@ def search_user_for_facets(self, **kwargs):  # noqa: E501
     def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's users  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facets_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index afe17f1..668a814 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_user_to_user_groups(id, async_req=True)
@@ -59,7 +59,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
     def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_user_to_user_groups_with_http_info(id, async_req=True)
@@ -139,7 +139,7 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_user(self, **kwargs):  # noqa: E501
         """Creates an user if the user doesn't already exist.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user(async_req=True)
@@ -162,7 +162,7 @@ def create_user(self, **kwargs):  # noqa: E501
     def create_user_with_http_info(self, **kwargs):  # noqa: E501
         """Creates an user if the user doesn't already exist.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_with_http_info(async_req=True)
@@ -238,7 +238,7 @@ def create_user_with_http_info(self, **kwargs):  # noqa: E501
     def delete_multiple_users(self, **kwargs):  # noqa: E501
         """Deletes multiple users or service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_users(async_req=True)
@@ -260,7 +260,7 @@ def delete_multiple_users(self, **kwargs):  # noqa: E501
     def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
         """Deletes multiple users or service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_users_with_http_info(async_req=True)
@@ -333,7 +333,7 @@ def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
     def delete_user(self, id, **kwargs):  # noqa: E501
         """Deletes a user or service account identified by id  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user(id, async_req=True)
@@ -355,7 +355,7 @@ def delete_user(self, id, **kwargs):  # noqa: E501
     def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deletes a user or service account identified by id  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_with_http_info(id, async_req=True)
@@ -428,7 +428,7 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_users(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
-        Returns all users  # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_users(async_req=True)
@@ -449,7 +449,7 @@ def get_all_users(self, **kwargs):  # noqa: E501
     def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
-        Returns all users  # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_users_with_http_info(async_req=True)
@@ -515,7 +515,7 @@ def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
     def get_user(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user(id, async_req=True)
@@ -537,7 +537,7 @@ def get_user(self, id, **kwargs):  # noqa: E501
     def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_with_http_info(id, async_req=True)
@@ -705,7 +705,7 @@ def get_user_business_functions_with_http_info(self, id, **kwargs):  # noqa: E50
     def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_users(permission, async_req=True)
@@ -728,7 +728,7 @@ def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
     def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_users_with_http_info(permission, async_req=True)
@@ -808,7 +808,7 @@ def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noq
     def grant_user_permission(self, id, **kwargs):  # noqa: E501
         """Grants a specific permission to user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_user_permission(id, async_req=True)
@@ -831,7 +831,7 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
     def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """Grants a specific permission to user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_user_permission_with_http_info(id, async_req=True)
@@ -911,7 +911,7 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
     def invite_users(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_users(async_req=True)
@@ -933,7 +933,7 @@ def invite_users(self, **kwargs):  # noqa: E501
     def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_users_with_http_info(async_req=True)
@@ -1006,7 +1006,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
     def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_user_from_user_groups(id, async_req=True)
@@ -1029,7 +1029,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
     def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_user_from_user_groups_with_http_info(id, async_req=True)
@@ -1109,7 +1109,7 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
     def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_users(permission, async_req=True)
@@ -1132,7 +1132,7 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
     def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_users_with_http_info(permission, async_req=True)
@@ -1212,7 +1212,7 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
     def revoke_user_permission(self, id, **kwargs):  # noqa: E501
         """Revokes a specific permission from user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_user_permission(id, async_req=True)
@@ -1235,7 +1235,7 @@ def revoke_user_permission(self, id, **kwargs):  # noqa: E501
     def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """Revokes a specific permission from user or service account  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_user_permission_with_http_info(id, async_req=True)
@@ -1315,7 +1315,7 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_user(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user(id, async_req=True)
@@ -1338,7 +1338,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
     def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_with_http_info(id, async_req=True)
@@ -1418,7 +1418,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
     def validate_users(self, **kwargs):  # noqa: E501
         """Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_users(async_req=True)
@@ -1440,7 +1440,7 @@ def validate_users(self, **kwargs):  # noqa: E501
     def validate_users_with_http_info(self, **kwargs):  # noqa: E501
         """Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_users_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index 45e6bd5..dd9048b 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_roles_to_user_group(id, async_req=True)
@@ -59,7 +59,7 @@ def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
     def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_roles_to_user_group_with_http_info(id, async_req=True)
@@ -139,7 +139,7 @@ def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_users_to_user_group(id, async_req=True)
@@ -162,7 +162,7 @@ def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
     def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_users_to_user_group_with_http_info(id, async_req=True)
@@ -242,7 +242,7 @@ def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_user_group(self, **kwargs):  # noqa: E501
         """Create a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_group(async_req=True)
@@ -264,7 +264,7 @@ def create_user_group(self, **kwargs):  # noqa: E501
     def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
         """Create a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_group_with_http_info(async_req=True)
@@ -337,7 +337,7 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
     def delete_user_group(self, id, **kwargs):  # noqa: E501
         """Delete a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_group(id, async_req=True)
@@ -359,7 +359,7 @@ def delete_user_group(self, id, **kwargs):  # noqa: E501
     def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_group_with_http_info(id, async_req=True)
@@ -432,7 +432,7 @@ def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_user_groups(self, **kwargs):  # noqa: E501
         """Get all user groups for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_groups(async_req=True)
@@ -455,7 +455,7 @@ def get_all_user_groups(self, **kwargs):  # noqa: E501
     def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
         """Get all user groups for a customer  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_groups_with_http_info(async_req=True)
@@ -527,7 +527,7 @@ def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
     def get_user_group(self, id, **kwargs):  # noqa: E501
         """Get a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_group(id, async_req=True)
@@ -549,7 +549,7 @@ def get_user_group(self, id, **kwargs):  # noqa: E501
     def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_group_with_http_info(id, async_req=True)
@@ -622,7 +622,7 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_roles_from_user_group(id, async_req=True)
@@ -645,7 +645,7 @@ def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
     def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_roles_from_user_group_with_http_info(id, async_req=True)
@@ -725,7 +725,7 @@ def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
     def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple users from a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_users_from_user_group(id, async_req=True)
@@ -748,7 +748,7 @@ def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
     def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Remove multiple users from a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_users_from_user_group_with_http_info(id, async_req=True)
@@ -828,7 +828,7 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
     def update_user_group(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_group(id, async_req=True)
@@ -851,7 +851,7 @@ def update_user_group(self, id, **kwargs):  # noqa: E501
     def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
-          # noqa: E501
+        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_group_with_http_info(id, async_req=True)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3ec59a0..b2a24f5 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.188.0/python'
+        self.user_agent = 'Swagger-Codegen/2.189.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index ea4d85f..4c5fc50 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.188.0".\
+               "SDK Package Version: 2.189.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 0fab4cb..90415ef 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -268,7 +268,6 @@
 from wavefront_api_client.models.response_status import ResponseStatus
 from wavefront_api_client.models.role_create_dto import RoleCreateDTO
 from wavefront_api_client.models.role_dto import RoleDTO
-from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO
 from wavefront_api_client.models.role_update_dto import RoleUpdateDTO
 from wavefront_api_client.models.saved_app_map_search import SavedAppMapSearch
 from wavefront_api_client.models.saved_app_map_search_group import SavedAppMapSearchGroup
diff --git a/wavefront_api_client/models/api_token_model.py b/wavefront_api_client/models/api_token_model.py
index 98dd390..4d4ee83 100644
--- a/wavefront_api_client/models/api_token_model.py
+++ b/wavefront_api_client/models/api_token_model.py
@@ -130,7 +130,7 @@ def account_type(self, account_type):
         :param account_type: The account_type of this ApiTokenModel.  # noqa: E501
         :type: str
         """
-        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT"]  # noqa: E501
+        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT", "CSP_USER_ACCOUNT", "CSP_AUTHORIZED_USER_ACCOUNT", "CSP_SERVICE_ACCOUNT", "CSP_AUTHORIZED_SERVICE_ACCOUNT"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 account_type not in allowed_values):
             raise ValueError(
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index cf7760a..c29b909 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -74,7 +74,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
index 968b6be..0150bd9 100644
--- a/wavefront_api_client/models/role_dto.py
+++ b/wavefront_api_client/models/role_dto.py
@@ -43,8 +43,6 @@ class RoleDTO(object):
         'linked_groups_count': 'int',
         'name': 'str',
         'permissions': 'list[str]',
-        'properties': 'RolePropertiesDTO',
-        'restricted_permissions': 'list[str]',
         'sample_linked_accounts': 'list[str]',
         'sample_linked_groups': 'list[UserGroup]'
     }
@@ -60,13 +58,11 @@ class RoleDTO(object):
         'linked_groups_count': 'linkedGroupsCount',
         'name': 'name',
         'permissions': 'permissions',
-        'properties': 'properties',
-        'restricted_permissions': 'restrictedPermissions',
         'sample_linked_accounts': 'sampleLinkedAccounts',
         'sample_linked_groups': 'sampleLinkedGroups'
     }
 
-    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, properties=None, restricted_permissions=None, sample_linked_accounts=None, sample_linked_groups=None, _configuration=None):  # noqa: E501
+    def __init__(self, created_epoch_millis=None, customer=None, description=None, id=None, last_updated_account_id=None, last_updated_ms=None, linked_accounts_count=None, linked_groups_count=None, name=None, permissions=None, sample_linked_accounts=None, sample_linked_groups=None, _configuration=None):  # noqa: E501
         """RoleDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -82,8 +78,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
         self._linked_groups_count = None
         self._name = None
         self._permissions = None
-        self._properties = None
-        self._restricted_permissions = None
         self._sample_linked_accounts = None
         self._sample_linked_groups = None
         self.discriminator = None
@@ -108,10 +102,6 @@ def __init__(self, created_epoch_millis=None, customer=None, description=None, i
             self.name = name
         if permissions is not None:
             self.permissions = permissions
-        if properties is not None:
-            self.properties = properties
-        if restricted_permissions is not None:
-            self.restricted_permissions = restricted_permissions
         if sample_linked_accounts is not None:
             self.sample_linked_accounts = sample_linked_accounts
         if sample_linked_groups is not None:
@@ -345,52 +335,6 @@ def permissions(self, permissions):
 
         self._permissions = permissions
 
-    @property
-    def properties(self):
-        """Gets the properties of this RoleDTO.  # noqa: E501
-
-        The properties of the role  # noqa: E501
-
-        :return: The properties of this RoleDTO.  # noqa: E501
-        :rtype: RolePropertiesDTO
-        """
-        return self._properties
-
-    @properties.setter
-    def properties(self, properties):
-        """Sets the properties of this RoleDTO.
-
-        The properties of the role  # noqa: E501
-
-        :param properties: The properties of this RoleDTO.  # noqa: E501
-        :type: RolePropertiesDTO
-        """
-
-        self._properties = properties
-
-    @property
-    def restricted_permissions(self):
-        """Gets the restricted_permissions of this RoleDTO.  # noqa: E501
-
-        The list of permissions that are restricted with the role. Currently only CSP roles have restrictions.  # noqa: E501
-
-        :return: The restricted_permissions of this RoleDTO.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._restricted_permissions
-
-    @restricted_permissions.setter
-    def restricted_permissions(self, restricted_permissions):
-        """Sets the restricted_permissions of this RoleDTO.
-
-        The list of permissions that are restricted with the role. Currently only CSP roles have restrictions.  # noqa: E501
-
-        :param restricted_permissions: The restricted_permissions of this RoleDTO.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._restricted_permissions = restricted_permissions
-
     @property
     def sample_linked_accounts(self):
         """Gets the sample_linked_accounts of this RoleDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index cfd5a4e..4ce02d2 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -119,7 +119,7 @@ def account_type(self, account_type):
         :param account_type: The account_type of this UserApiToken.  # noqa: E501
         :type: str
         """
-        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT"]  # noqa: E501
+        allowed_values = ["USER_ACCOUNT", "SERVICE_ACCOUNT", "INACTIVE_SERVICE_ACCOUNT", "CSP_USER_ACCOUNT", "CSP_AUTHORIZED_USER_ACCOUNT", "CSP_SERVICE_ACCOUNT", "CSP_AUTHORIZED_SERVICE_ACCOUNT"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 account_type not in allowed_values):
             raise ValueError(

From 2167cb0adde7a5eafc2cc4d3ade4ec59806b5854 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Mon, 10 Jul 2023 08:16:19 -0700
Subject: [PATCH 139/161] Autogenerated Update v2.192.0.

---
 .swagger-codegen/config.json                     | 2 +-
 .swagger-codegen/config.jsone                    | 2 +-
 README.md                                        | 2 +-
 setup.py                                         | 2 +-
 wavefront_api_client/api_client.py               | 2 +-
 wavefront_api_client/configuration.py            | 2 +-
 wavefront_api_client/models/gcp_configuration.py | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 9ad6aaa..f218173 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.189.2"
+    "packageVersion": "2.192.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 0cb26c0..9ad6aaa 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.188.0"
+    "packageVersion": "2.189.2"
 }
diff --git a/README.md b/README.md
index 5fe8b15..0718ef5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.189.2
+- Package version: 2.192.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 5d7b5f1..4c24a29 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.189.2"
+VERSION = "2.192.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b2a24f5..ab52759 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.189.2/python'
+        self.user_agent = 'Swagger-Codegen/2.192.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 4c5fc50..94b8dac 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.189.2".\
+               "SDK Package Version: 2.192.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index b317a51..b910296 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -100,7 +100,7 @@ def categories_to_fetch(self, categories_to_fetch):
         :param categories_to_fetch: The categories_to_fetch of this GCPConfiguration.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "KUBERNETES", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN", "APIGEE"]  # noqa: E501
+        allowed_values = ["APPENGINE", "BIGQUERY", "BIGTABLE", "CLOUDFUNCTIONS", "CLOUDIOT", "CLOUDSQL", "CLOUDTASKS", "COMPUTE", "CONTAINER", "DATAFLOW", "DATAPROC", "DATASTORE", "FIREBASEDATABASE", "FIREBASEHOSTING", "FIRESTORE", "INTERCONNECT", "KUBERNETES", "LOADBALANCING", "LOGGING", "ML", "MONITORING", "PUBSUB", "REDIS", "ROUTER", "RUN", "SERVICERUNTIME", "SPANNER", "STORAGE", "TPU", "VPN", "APIGEE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(categories_to_fetch).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From 435780b722cba6e60f1ab9750ddc0b61781af847 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 26 Jul 2023 08:16:22 -0700
Subject: [PATCH 140/161] Autogenerated Update v2.194.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/GCPConfiguration.md                      |  2 +
 docs/IntegrationApi.md                        | 10 ++--
 setup.py                                      |  2 +-
 wavefront_api_client/api/integration_api.py   | 10 +++-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/gcp_configuration.py               | 58 ++++++++++++++++++-
 10 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index f218173..2bc8881 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.192.0"
+    "packageVersion": "2.194.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9ad6aaa..f218173 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.189.2"
+    "packageVersion": "2.192.0"
 }
diff --git a/README.md b/README.md
index 0718ef5..cccbb54 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.192.0
+- Package version: 2.194.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/GCPConfiguration.md b/docs/GCPConfiguration.md
index 22346f1..ef7bfe3 100644
--- a/docs/GCPConfiguration.md
+++ b/docs/GCPConfiguration.md
@@ -6,8 +6,10 @@ Name | Type | Description | Notes
 **categories_to_fetch** | **list[str]** | A list of Google Cloud Platform (GCP) services (such as ComputeEngine, PubSub, etc) from which to pull metrics.  Allowable values are APPENGINE, BIGQUERY, BIGTABLE, CLOUDFUNCTIONS, CLOUDIOT, CLOUDSQL, CLOUDTASKS, COMPUTE, CONTAINER, DATAFLOW, DATAPROC, DATASTORE, FIREBASEDATABASE, FIREBASEHOSTING, FIRESTORE, INTERCONNECT, KUBERNETES, LOADBALANCING, LOGGING, ML, MONITORING, PUBSUB, REDIS, ROUTER, SERVICERUNTIME, SPANNER, STORAGE, TPU, VPN | [optional] 
 **custom_metric_prefix** | **list[str]** | List of custom metric prefix to fetch the data from | [optional] 
 **disable_delta_counts** | **bool** | Whether to disable the ingestion of counts for GCP delta metrics. Ingestion is enabled by default. | [optional] 
+**disable_histogram** | **bool** | Whether to disable the ingestion of histograms. Ingestion is enabled by default. | [optional] 
 **disable_histogram_to_metric_conversion** | **bool** | Whether to disable the ingestion of bucket data for GCP distributions. Ingestion is enabled by default. | [optional] 
 **gcp_json_key** | **str** | Private key for a Google Cloud Platform (GCP) service account within your project.  The account must at least be granted Monitoring Viewer permissions.  This key must be in the JSON format generated by GCP. Use &#39;{\&quot;project_id\&quot;: \&quot;%s\&quot;}&#39; to retain the existing key when updating. | 
+**histogram_grouping_function** | **list[str]** | List of histogram grouping function to fetch data from | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
 **project_id** | **str** | The Google Cloud Platform (GCP) project id. | 
 
diff --git a/docs/IntegrationApi.md b/docs/IntegrationApi.md
index 6b2c12b..82d9aa6 100644
--- a/docs/IntegrationApi.md
+++ b/docs/IntegrationApi.md
@@ -18,7 +18,7 @@ Method | HTTP request | Description
 
 
 # **get_all_integration**
-> ResponseContainerPagedIntegration get_all_integration(offset=offset, limit=limit)
+> ResponseContainerPagedIntegration get_all_integration(offset=offset, limit=limit, exclude_dashboard=exclude_dashboard)
 
 Gets a flat list of all Wavefront integrations available, along with their status
 
@@ -41,11 +41,12 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 # create an instance of the API class
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
 offset = 0 # int |  (optional) (default to 0)
-limit = 100 # int |  (optional) (default to 100)
+limit = 100 # int | Limit the number of queried integrations to reduce the response size (optional) (default to 100)
+exclude_dashboard = false # bool | Whether to exclude information on dashboards, default is set to false (optional) (default to false)
 
 try:
     # Gets a flat list of all Wavefront integrations available, along with their status
-    api_response = api_instance.get_all_integration(offset=offset, limit=limit)
+    api_response = api_instance.get_all_integration(offset=offset, limit=limit, exclude_dashboard=exclude_dashboard)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling IntegrationApi->get_all_integration: %s\n" % e)
@@ -56,7 +57,8 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **offset** | **int**|  | [optional] [default to 0]
- **limit** | **int**|  | [optional] [default to 100]
+ **limit** | **int**| Limit the number of queried integrations to reduce the response size | [optional] [default to 100]
+ **exclude_dashboard** | **bool**| Whether to exclude information on dashboards, default is set to false | [optional] [default to false]
 
 ### Return type
 
diff --git a/setup.py b/setup.py
index 4c24a29..098b0f7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.192.0"
+VERSION = "2.194.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index e098e6b..a082588 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -44,7 +44,8 @@ def get_all_integration(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param int offset:
-        :param int limit:
+        :param int limit: Limit the number of queried integrations to reduce the response size
+        :param bool exclude_dashboard: Whether to exclude information on dashboards, default is set to false
         :return: ResponseContainerPagedIntegration
                  If the method is called asynchronously,
                  returns the request thread.
@@ -67,13 +68,14 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
 
         :param async_req bool
         :param int offset:
-        :param int limit:
+        :param int limit: Limit the number of queried integrations to reduce the response size
+        :param bool exclude_dashboard: Whether to exclude information on dashboards, default is set to false
         :return: ResponseContainerPagedIntegration
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['offset', 'limit']  # noqa: E501
+        all_params = ['offset', 'limit', 'exclude_dashboard']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -98,6 +100,8 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
             query_params.append(('offset', params['offset']))  # noqa: E501
         if 'limit' in params:
             query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'exclude_dashboard' in params:
+            query_params.append(('excludeDashboard', params['exclude_dashboard']))  # noqa: E501
 
         header_params = {}
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index ab52759..8cd3228 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.192.0/python'
+        self.user_agent = 'Swagger-Codegen/2.194.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 94b8dac..0643586 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.192.0".\
+               "SDK Package Version: 2.194.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index b910296..2162445 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -36,8 +36,10 @@ class GCPConfiguration(object):
         'categories_to_fetch': 'list[str]',
         'custom_metric_prefix': 'list[str]',
         'disable_delta_counts': 'bool',
+        'disable_histogram': 'bool',
         'disable_histogram_to_metric_conversion': 'bool',
         'gcp_json_key': 'str',
+        'histogram_grouping_function': 'list[str]',
         'metric_filter_regex': 'str',
         'project_id': 'str'
     }
@@ -46,13 +48,15 @@ class GCPConfiguration(object):
         'categories_to_fetch': 'categoriesToFetch',
         'custom_metric_prefix': 'customMetricPrefix',
         'disable_delta_counts': 'disableDeltaCounts',
+        'disable_histogram': 'disableHistogram',
         'disable_histogram_to_metric_conversion': 'disableHistogramToMetricConversion',
         'gcp_json_key': 'gcpJsonKey',
+        'histogram_grouping_function': 'histogramGroupingFunction',
         'metric_filter_regex': 'metricFilterRegex',
         'project_id': 'projectId'
     }
 
-    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_delta_counts=None, disable_histogram_to_metric_conversion=None, gcp_json_key=None, metric_filter_regex=None, project_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_delta_counts=None, disable_histogram=None, disable_histogram_to_metric_conversion=None, gcp_json_key=None, histogram_grouping_function=None, metric_filter_regex=None, project_id=None, _configuration=None):  # noqa: E501
         """GCPConfiguration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -61,8 +65,10 @@ def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_
         self._categories_to_fetch = None
         self._custom_metric_prefix = None
         self._disable_delta_counts = None
+        self._disable_histogram = None
         self._disable_histogram_to_metric_conversion = None
         self._gcp_json_key = None
+        self._histogram_grouping_function = None
         self._metric_filter_regex = None
         self._project_id = None
         self.discriminator = None
@@ -73,9 +79,13 @@ def __init__(self, categories_to_fetch=None, custom_metric_prefix=None, disable_
             self.custom_metric_prefix = custom_metric_prefix
         if disable_delta_counts is not None:
             self.disable_delta_counts = disable_delta_counts
+        if disable_histogram is not None:
+            self.disable_histogram = disable_histogram
         if disable_histogram_to_metric_conversion is not None:
             self.disable_histogram_to_metric_conversion = disable_histogram_to_metric_conversion
         self.gcp_json_key = gcp_json_key
+        if histogram_grouping_function is not None:
+            self.histogram_grouping_function = histogram_grouping_function
         if metric_filter_regex is not None:
             self.metric_filter_regex = metric_filter_regex
         self.project_id = project_id
@@ -157,6 +167,29 @@ def disable_delta_counts(self, disable_delta_counts):
 
         self._disable_delta_counts = disable_delta_counts
 
+    @property
+    def disable_histogram(self):
+        """Gets the disable_histogram of this GCPConfiguration.  # noqa: E501
+
+        Whether to disable the ingestion of histograms. Ingestion is enabled by default.  # noqa: E501
+
+        :return: The disable_histogram of this GCPConfiguration.  # noqa: E501
+        :rtype: bool
+        """
+        return self._disable_histogram
+
+    @disable_histogram.setter
+    def disable_histogram(self, disable_histogram):
+        """Sets the disable_histogram of this GCPConfiguration.
+
+        Whether to disable the ingestion of histograms. Ingestion is enabled by default.  # noqa: E501
+
+        :param disable_histogram: The disable_histogram of this GCPConfiguration.  # noqa: E501
+        :type: bool
+        """
+
+        self._disable_histogram = disable_histogram
+
     @property
     def disable_histogram_to_metric_conversion(self):
         """Gets the disable_histogram_to_metric_conversion of this GCPConfiguration.  # noqa: E501
@@ -205,6 +238,29 @@ def gcp_json_key(self, gcp_json_key):
 
         self._gcp_json_key = gcp_json_key
 
+    @property
+    def histogram_grouping_function(self):
+        """Gets the histogram_grouping_function of this GCPConfiguration.  # noqa: E501
+
+        List of histogram grouping function to fetch data from  # noqa: E501
+
+        :return: The histogram_grouping_function of this GCPConfiguration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._histogram_grouping_function
+
+    @histogram_grouping_function.setter
+    def histogram_grouping_function(self, histogram_grouping_function):
+        """Sets the histogram_grouping_function of this GCPConfiguration.
+
+        List of histogram grouping function to fetch data from  # noqa: E501
+
+        :param histogram_grouping_function: The histogram_grouping_function of this GCPConfiguration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._histogram_grouping_function = histogram_grouping_function
+
     @property
     def metric_filter_regex(self):
         """Gets the metric_filter_regex of this GCPConfiguration.  # noqa: E501

From 2e9beb1a1dc6a305b0dceac57d5b5ef14fbddaff Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Fri, 4 Aug 2023 08:16:42 -0700
Subject: [PATCH 141/161] Autogenerated Update v2.196.2.

---
 .swagger-codegen/config.json                | 2 +-
 .swagger-codegen/config.jsone               | 2 +-
 README.md                                   | 2 +-
 setup.py                                    | 2 +-
 wavefront_api_client/api_client.py          | 2 +-
 wavefront_api_client/configuration.py       | 2 +-
 wavefront_api_client/models/saved_search.py | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 2bc8881..adc445e 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.194.1"
+    "packageVersion": "2.196.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index f218173..2bc8881 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.192.0"
+    "packageVersion": "2.194.1"
 }
diff --git a/README.md b/README.md
index cccbb54..bf2a176 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.194.1
+- Package version: 2.196.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 098b0f7..791f905 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.194.1"
+VERSION = "2.196.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 8cd3228..5da409c 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.194.1/python'
+        self.user_agent = 'Swagger-Codegen/2.196.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 0643586..0316f3a 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.194.1".\
+               "SDK Package Version: 2.196.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index cab536a..58c40a5 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -149,7 +149,7 @@ def entity_type(self, entity_type):
         """
         if self._configuration.client_side_validation and entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN", "ALERT_ANALYTICS"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN", "ALERT_ANALYTICS", "LOG_ALERT"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 entity_type not in allowed_values):
             raise ValueError(

From f06954a899620c6b9c26ce8874306e9f4453c57a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 16 Aug 2023 08:16:24 -0700
Subject: [PATCH 142/161] Autogenerated Update v2.197.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/IngestionPolicyReadModel.md              |  1 -
 docs/IngestionPolicyWriteModel.md             |  1 -
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/ingestion_policy_read_model.py     | 30 +------------------
 .../models/ingestion_policy_write_model.py    | 30 +------------------
 10 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index adc445e..de0eb6b 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.196.2"
+    "packageVersion": "2.197.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 2bc8881..adc445e 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.194.1"
+    "packageVersion": "2.196.2"
 }
diff --git a/README.md b/README.md
index bf2a176..e49bbf4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.196.2
+- Package version: 2.197.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/IngestionPolicyReadModel.md b/docs/IngestionPolicyReadModel.md
index 873dfd8..18a8213 100644
--- a/docs/IngestionPolicyReadModel.md
+++ b/docs/IngestionPolicyReadModel.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **accounts** | [**list[AccessControlElement]**](AccessControlElement.md) | The accounts associated with the ingestion policy | [optional] 
 **alert** | [**Alert**](Alert.md) | The alert object connected with the ingestion policy. | [optional] 
-**alert_id** | **str** | The ingestion policy alert Id | [optional] 
 **customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
 **description** | **str** | The description of the ingestion policy | [optional] 
 **groups** | [**list[AccessControlElement]**](AccessControlElement.md) | The groups associated with the ingestion policy | [optional] 
diff --git a/docs/IngestionPolicyWriteModel.md b/docs/IngestionPolicyWriteModel.md
index 0dbabaa..caeb09e 100644
--- a/docs/IngestionPolicyWriteModel.md
+++ b/docs/IngestionPolicyWriteModel.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **accounts** | **list[str]** | The accounts associated with the ingestion policy | [optional] 
 **alert** | [**IngestionPolicyAlert**](IngestionPolicyAlert.md) | The alert DTO object associated with the ingestion policy. | [optional] 
-**alert_id** | **str** | The ingestion policy alert Id | [optional] 
 **customer** | **str** | ID of the customer to which the ingestion policy belongs | [optional] 
 **description** | **str** | The description of the ingestion policy | [optional] 
 **groups** | **list[str]** | The groups associated with the ingestion policy | [optional] 
diff --git a/setup.py b/setup.py
index 791f905..14a2fc1 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.196.2"
+VERSION = "2.197.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 5da409c..b1a4e4b 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.196.2/python'
+        self.user_agent = 'Swagger-Codegen/2.197.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 0316f3a..bf0b663 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.196.2".\
+               "SDK Package Version: 2.197.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/ingestion_policy_read_model.py b/wavefront_api_client/models/ingestion_policy_read_model.py
index 3b7aa24..3f77894 100644
--- a/wavefront_api_client/models/ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/ingestion_policy_read_model.py
@@ -35,7 +35,6 @@ class IngestionPolicyReadModel(object):
     swagger_types = {
         'accounts': 'list[AccessControlElement]',
         'alert': 'Alert',
-        'alert_id': 'str',
         'customer': 'str',
         'description': 'str',
         'groups': 'list[AccessControlElement]',
@@ -56,7 +55,6 @@ class IngestionPolicyReadModel(object):
     attribute_map = {
         'accounts': 'accounts',
         'alert': 'alert',
-        'alert_id': 'alertId',
         'customer': 'customer',
         'description': 'description',
         'groups': 'groups',
@@ -74,7 +72,7 @@ class IngestionPolicyReadModel(object):
         'tags_anded': 'tagsAnded'
     }
 
-    def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, metadata=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
+    def __init__(self, accounts=None, alert=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, metadata=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
         """IngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -82,7 +80,6 @@ def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, desc
 
         self._accounts = None
         self._alert = None
-        self._alert_id = None
         self._customer = None
         self._description = None
         self._groups = None
@@ -104,8 +101,6 @@ def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, desc
             self.accounts = accounts
         if alert is not None:
             self.alert = alert
-        if alert_id is not None:
-            self.alert_id = alert_id
         if customer is not None:
             self.customer = customer
         if description is not None:
@@ -183,29 +178,6 @@ def alert(self, alert):
 
         self._alert = alert
 
-    @property
-    def alert_id(self):
-        """Gets the alert_id of this IngestionPolicyReadModel.  # noqa: E501
-
-        The ingestion policy alert Id  # noqa: E501
-
-        :return: The alert_id of this IngestionPolicyReadModel.  # noqa: E501
-        :rtype: str
-        """
-        return self._alert_id
-
-    @alert_id.setter
-    def alert_id(self, alert_id):
-        """Sets the alert_id of this IngestionPolicyReadModel.
-
-        The ingestion policy alert Id  # noqa: E501
-
-        :param alert_id: The alert_id of this IngestionPolicyReadModel.  # noqa: E501
-        :type: str
-        """
-
-        self._alert_id = alert_id
-
     @property
     def customer(self):
         """Gets the customer of this IngestionPolicyReadModel.  # noqa: E501
diff --git a/wavefront_api_client/models/ingestion_policy_write_model.py b/wavefront_api_client/models/ingestion_policy_write_model.py
index 0ef61ef..5d4c4b9 100644
--- a/wavefront_api_client/models/ingestion_policy_write_model.py
+++ b/wavefront_api_client/models/ingestion_policy_write_model.py
@@ -35,7 +35,6 @@ class IngestionPolicyWriteModel(object):
     swagger_types = {
         'accounts': 'list[str]',
         'alert': 'IngestionPolicyAlert',
-        'alert_id': 'str',
         'customer': 'str',
         'description': 'str',
         'groups': 'list[str]',
@@ -55,7 +54,6 @@ class IngestionPolicyWriteModel(object):
     attribute_map = {
         'accounts': 'accounts',
         'alert': 'alert',
-        'alert_id': 'alertId',
         'customer': 'customer',
         'description': 'description',
         'groups': 'groups',
@@ -72,7 +70,7 @@ class IngestionPolicyWriteModel(object):
         'tags_anded': 'tagsAnded'
     }
 
-    def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
+    def __init__(self, accounts=None, alert=None, customer=None, description=None, groups=None, id=None, is_limited=None, last_updated_account_id=None, last_updated_ms=None, limit_pps=None, name=None, namespaces=None, point_tags=None, scope=None, sources=None, tags_anded=None, _configuration=None):  # noqa: E501
         """IngestionPolicyWriteModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -80,7 +78,6 @@ def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, desc
 
         self._accounts = None
         self._alert = None
-        self._alert_id = None
         self._customer = None
         self._description = None
         self._groups = None
@@ -101,8 +98,6 @@ def __init__(self, accounts=None, alert=None, alert_id=None, customer=None, desc
             self.accounts = accounts
         if alert is not None:
             self.alert = alert
-        if alert_id is not None:
-            self.alert_id = alert_id
         if customer is not None:
             self.customer = customer
         if description is not None:
@@ -178,29 +173,6 @@ def alert(self, alert):
 
         self._alert = alert
 
-    @property
-    def alert_id(self):
-        """Gets the alert_id of this IngestionPolicyWriteModel.  # noqa: E501
-
-        The ingestion policy alert Id  # noqa: E501
-
-        :return: The alert_id of this IngestionPolicyWriteModel.  # noqa: E501
-        :rtype: str
-        """
-        return self._alert_id
-
-    @alert_id.setter
-    def alert_id(self, alert_id):
-        """Sets the alert_id of this IngestionPolicyWriteModel.
-
-        The ingestion policy alert Id  # noqa: E501
-
-        :param alert_id: The alert_id of this IngestionPolicyWriteModel.  # noqa: E501
-        :type: str
-        """
-
-        self._alert_id = alert_id
-
     @property
     def customer(self):
         """Gets the customer of this IngestionPolicyWriteModel.  # noqa: E501

From c80cbc7e168b3f1461c4e012dde7310ee0f26aac Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Mon, 28 Aug 2023 07:06:02 -0700
Subject: [PATCH 143/161] Autogenerated Update v2.199.1.

---
 .swagger-codegen/config.json                             | 2 +-
 .swagger-codegen/config.jsone                            | 2 +-
 README.md                                                | 2 +-
 docs/Alert.md                                            | 2 +-
 docs/DerivedMetricDefinition.md                          | 2 +-
 docs/IngestionPolicyAlert.md                             | 2 +-
 setup.py                                                 | 2 +-
 wavefront_api_client/api_client.py                       | 2 +-
 wavefront_api_client/configuration.py                    | 2 +-
 wavefront_api_client/models/alert.py                     | 4 ++--
 wavefront_api_client/models/derived_metric_definition.py | 4 ++--
 wavefront_api_client/models/ingestion_policy_alert.py    | 4 ++--
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index de0eb6b..1f0b9a8 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.197.1"
+    "packageVersion": "2.199.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index adc445e..de0eb6b 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.196.2"
+    "packageVersion": "2.197.1"
 }
diff --git a/README.md b/README.md
index e49bbf4..1dc5bc1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.197.1
+- Package version: 2.199.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Alert.md b/docs/Alert.md
index 779bd42..88e5467 100644
--- a/docs/Alert.md
+++ b/docs/Alert.md
@@ -61,7 +61,7 @@ Name | Type | Description | Notes
 **orphan** | **bool** |  | [optional] 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
 **prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
-**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 5 minutes | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
 **query_syntax_error** | **bool** | Whether there was an query syntax exception when the alert condition last ran | [optional] 
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
diff --git a/docs/DerivedMetricDefinition.md b/docs/DerivedMetricDefinition.md
index d7bee97..5ba5507 100644
--- a/docs/DerivedMetricDefinition.md
+++ b/docs/DerivedMetricDefinition.md
@@ -21,7 +21,7 @@ Name | Type | Description | Notes
 **minutes** | **int** | Number of minutes to query for the derived metric | 
 **name** | **str** |  | 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed the query | [optional] 
-**process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 1 minute | [optional] 
+**process_rate_minutes** | **int** | The interval between executing the query, in minutes.  Defaults to 5 minutes | [optional] 
 **query** | **str** | A Wavefront query that is evaluated at regular intervals (default 1m). | 
 **query_failing** | **bool** | Whether there was an exception when the query last ran | [optional] 
 **query_qb_enabled** | **bool** | Whether the query was created using the Query Builder. Default false | [optional] 
diff --git a/docs/IngestionPolicyAlert.md b/docs/IngestionPolicyAlert.md
index 488b456..dba435a 100644
--- a/docs/IngestionPolicyAlert.md
+++ b/docs/IngestionPolicyAlert.md
@@ -63,7 +63,7 @@ Name | Type | Description | Notes
 **orphan** | **bool** |  | [optional] 
 **points_scanned_at_last_query** | **int** | A derived field recording the number of data points scanned when the system last computed this alert&#39;s condition | [optional] 
 **prefiring_host_label_pairs** | [**list[SourceLabelPair]**](SourceLabelPair.md) | Lists the series that are starting to fail, defined as failing for greater than 50% of the checks in the window determined by the \&quot;minutes\&quot; parameter | [optional] 
-**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 1 minute | [optional] 
+**process_rate_minutes** | **int** | The interval between checks for this alert, in minutes.  Defaults to 5 minutes | [optional] 
 **query_failing** | **bool** | Whether there was an exception when the alert condition last ran | [optional] 
 **query_syntax_error** | **bool** | Whether there was an query syntax exception when the alert condition last ran | [optional] 
 **resolve_after_minutes** | **int** | The number of consecutive minutes that a firing series matching the condition query must evaluate to \&quot;false\&quot; (zero value) before the alert resolves.  When unset, this defaults to the same value as \&quot;minutes\&quot; | [optional] 
diff --git a/setup.py b/setup.py
index 14a2fc1..36ca0e4 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.197.1"
+VERSION = "2.199.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b1a4e4b..08e0e6d 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.197.1/python'
+        self.user_agent = 'Swagger-Codegen/2.199.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index bf0b663..5c772d3 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.197.1".\
+               "SDK Package Version: 2.199.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index b566490..7d20839 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -1790,7 +1790,7 @@ def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
     def process_rate_minutes(self):
         """Gets the process_rate_minutes of this Alert.  # noqa: E501
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 5 minutes  # noqa: E501
 
         :return: The process_rate_minutes of this Alert.  # noqa: E501
         :rtype: int
@@ -1801,7 +1801,7 @@ def process_rate_minutes(self):
     def process_rate_minutes(self, process_rate_minutes):
         """Sets the process_rate_minutes of this Alert.
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 5 minutes  # noqa: E501
 
         :param process_rate_minutes: The process_rate_minutes of this Alert.  # noqa: E501
         :type: int
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index 4f66b9c..b81da20 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -602,7 +602,7 @@ def points_scanned_at_last_query(self, points_scanned_at_last_query):
     def process_rate_minutes(self):
         """Gets the process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
 
-        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
+        The interval between executing the query, in minutes.  Defaults to 5 minutes  # noqa: E501
 
         :return: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
         :rtype: int
@@ -613,7 +613,7 @@ def process_rate_minutes(self):
     def process_rate_minutes(self, process_rate_minutes):
         """Sets the process_rate_minutes of this DerivedMetricDefinition.
 
-        The interval between executing the query, in minutes.  Defaults to 1 minute  # noqa: E501
+        The interval between executing the query, in minutes.  Defaults to 5 minutes  # noqa: E501
 
         :param process_rate_minutes: The process_rate_minutes of this DerivedMetricDefinition.  # noqa: E501
         :type: int
diff --git a/wavefront_api_client/models/ingestion_policy_alert.py b/wavefront_api_client/models/ingestion_policy_alert.py
index 2e75ab7..0210d62 100644
--- a/wavefront_api_client/models/ingestion_policy_alert.py
+++ b/wavefront_api_client/models/ingestion_policy_alert.py
@@ -1845,7 +1845,7 @@ def prefiring_host_label_pairs(self, prefiring_host_label_pairs):
     def process_rate_minutes(self):
         """Gets the process_rate_minutes of this IngestionPolicyAlert.  # noqa: E501
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 5 minutes  # noqa: E501
 
         :return: The process_rate_minutes of this IngestionPolicyAlert.  # noqa: E501
         :rtype: int
@@ -1856,7 +1856,7 @@ def process_rate_minutes(self):
     def process_rate_minutes(self, process_rate_minutes):
         """Sets the process_rate_minutes of this IngestionPolicyAlert.
 
-        The interval between checks for this alert, in minutes.  Defaults to 1 minute  # noqa: E501
+        The interval between checks for this alert, in minutes.  Defaults to 5 minutes  # noqa: E501
 
         :param process_rate_minutes: The process_rate_minutes of this IngestionPolicyAlert.  # noqa: E501
         :type: int

From 3fbde5c93cbe9064a8b23e07d18e3a098d95b3e4 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 13 Sep 2023 08:16:21 -0700
Subject: [PATCH 144/161] Autogenerated Update v2.201.1.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   2 +-
 docs/MonitoredServiceDTO.md                   |   4 +
 setup.py                                      |   2 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 .../models/monitored_service_dto.py           | 114 +++++++++++++++++-
 wavefront_api_client/models/saved_search.py   |   2 +-
 9 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 1f0b9a8..9d1014b 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.199.1"
+    "packageVersion": "2.201.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index de0eb6b..1f0b9a8 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.197.1"
+    "packageVersion": "2.199.1"
 }
diff --git a/README.md b/README.md
index 1dc5bc1..fbdc3a5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.199.1
+- Package version: 2.201.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/MonitoredServiceDTO.md b/docs/MonitoredServiceDTO.md
index 748b07a..0314755 100644
--- a/docs/MonitoredServiceDTO.md
+++ b/docs/MonitoredServiceDTO.md
@@ -4,12 +4,16 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **application** | **str** | Application Name of the monitored service | 
+**cluster** | **str** | Cluster of monitored service | [optional] 
 **component** | **str** | Component Name of the monitored service | 
 **created** | **int** | Created epoch of monitored service | [optional] 
 **custom_dashboard_link** | **str** | Customer dashboard link | [optional] 
+**favorite** | **bool** | favorite status of monitored service | [optional] 
 **hidden** | **bool** | Monitored service is hidden or not | [optional] 
+**id** | **str** | unique ID of monitored service | [optional] 
 **last_reported** | **int** | Last reported epoch of monitored service | [optional] 
 **last_updated** | **int** | Last update epoch of monitored service | [optional] 
+**origin** | **str** | origin of monitored service | [optional] 
 **satisfied_latency_millis** | **int** | Satisfied latency of monitored service | [optional] 
 **service** | **str** | Service Name of the monitored service | 
 **service_instance_count** | **int** | Service Instance count of the monitored service | 
diff --git a/setup.py b/setup.py
index 36ca0e4..6680e2a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.199.1"
+VERSION = "2.201.1"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 08e0e6d..2092b70 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.199.1/python'
+        self.user_agent = 'Swagger-Codegen/2.201.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 5c772d3..b1f7b05 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.199.1".\
+               "SDK Package Version: 2.201.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
index 528f1a1..1fe2586 100644
--- a/wavefront_api_client/models/monitored_service_dto.py
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -34,12 +34,16 @@ class MonitoredServiceDTO(object):
     """
     swagger_types = {
         'application': 'str',
+        'cluster': 'str',
         'component': 'str',
         'created': 'int',
         'custom_dashboard_link': 'str',
+        'favorite': 'bool',
         'hidden': 'bool',
+        'id': 'str',
         'last_reported': 'int',
         'last_updated': 'int',
+        'origin': 'str',
         'satisfied_latency_millis': 'int',
         'service': 'str',
         'service_instance_count': 'int',
@@ -50,12 +54,16 @@ class MonitoredServiceDTO(object):
 
     attribute_map = {
         'application': 'application',
+        'cluster': 'cluster',
         'component': 'component',
         'created': 'created',
         'custom_dashboard_link': 'customDashboardLink',
+        'favorite': 'favorite',
         'hidden': 'hidden',
+        'id': 'id',
         'last_reported': 'lastReported',
         'last_updated': 'lastUpdated',
+        'origin': 'origin',
         'satisfied_latency_millis': 'satisfiedLatencyMillis',
         'service': 'service',
         'service_instance_count': 'serviceInstanceCount',
@@ -64,19 +72,23 @@ class MonitoredServiceDTO(object):
         'update_user_id': 'updateUserId'
     }
 
-    def __init__(self, application=None, component=None, created=None, custom_dashboard_link=None, hidden=None, last_reported=None, last_updated=None, satisfied_latency_millis=None, service=None, service_instance_count=None, source=None, status=None, update_user_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, application=None, cluster=None, component=None, created=None, custom_dashboard_link=None, favorite=None, hidden=None, id=None, last_reported=None, last_updated=None, origin=None, satisfied_latency_millis=None, service=None, service_instance_count=None, source=None, status=None, update_user_id=None, _configuration=None):  # noqa: E501
         """MonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._application = None
+        self._cluster = None
         self._component = None
         self._created = None
         self._custom_dashboard_link = None
+        self._favorite = None
         self._hidden = None
+        self._id = None
         self._last_reported = None
         self._last_updated = None
+        self._origin = None
         self._satisfied_latency_millis = None
         self._service = None
         self._service_instance_count = None
@@ -86,17 +98,25 @@ def __init__(self, application=None, component=None, created=None, custom_dashbo
         self.discriminator = None
 
         self.application = application
+        if cluster is not None:
+            self.cluster = cluster
         self.component = component
         if created is not None:
             self.created = created
         if custom_dashboard_link is not None:
             self.custom_dashboard_link = custom_dashboard_link
+        if favorite is not None:
+            self.favorite = favorite
         if hidden is not None:
             self.hidden = hidden
+        if id is not None:
+            self.id = id
         if last_reported is not None:
             self.last_reported = last_reported
         if last_updated is not None:
             self.last_updated = last_updated
+        if origin is not None:
+            self.origin = origin
         if satisfied_latency_millis is not None:
             self.satisfied_latency_millis = satisfied_latency_millis
         self.service = service
@@ -132,6 +152,29 @@ def application(self, application):
 
         self._application = application
 
+    @property
+    def cluster(self):
+        """Gets the cluster of this MonitoredServiceDTO.  # noqa: E501
+
+        Cluster of monitored service  # noqa: E501
+
+        :return: The cluster of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._cluster
+
+    @cluster.setter
+    def cluster(self, cluster):
+        """Sets the cluster of this MonitoredServiceDTO.
+
+        Cluster of monitored service  # noqa: E501
+
+        :param cluster: The cluster of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._cluster = cluster
+
     @property
     def component(self):
         """Gets the component of this MonitoredServiceDTO.  # noqa: E501
@@ -203,6 +246,29 @@ def custom_dashboard_link(self, custom_dashboard_link):
 
         self._custom_dashboard_link = custom_dashboard_link
 
+    @property
+    def favorite(self):
+        """Gets the favorite of this MonitoredServiceDTO.  # noqa: E501
+
+        favorite status of monitored service  # noqa: E501
+
+        :return: The favorite of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: bool
+        """
+        return self._favorite
+
+    @favorite.setter
+    def favorite(self, favorite):
+        """Sets the favorite of this MonitoredServiceDTO.
+
+        favorite status of monitored service  # noqa: E501
+
+        :param favorite: The favorite of this MonitoredServiceDTO.  # noqa: E501
+        :type: bool
+        """
+
+        self._favorite = favorite
+
     @property
     def hidden(self):
         """Gets the hidden of this MonitoredServiceDTO.  # noqa: E501
@@ -226,6 +292,29 @@ def hidden(self, hidden):
 
         self._hidden = hidden
 
+    @property
+    def id(self):
+        """Gets the id of this MonitoredServiceDTO.  # noqa: E501
+
+        unique ID of monitored service  # noqa: E501
+
+        :return: The id of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this MonitoredServiceDTO.
+
+        unique ID of monitored service  # noqa: E501
+
+        :param id: The id of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._id = id
+
     @property
     def last_reported(self):
         """Gets the last_reported of this MonitoredServiceDTO.  # noqa: E501
@@ -272,6 +361,29 @@ def last_updated(self, last_updated):
 
         self._last_updated = last_updated
 
+    @property
+    def origin(self):
+        """Gets the origin of this MonitoredServiceDTO.  # noqa: E501
+
+        origin of monitored service  # noqa: E501
+
+        :return: The origin of this MonitoredServiceDTO.  # noqa: E501
+        :rtype: str
+        """
+        return self._origin
+
+    @origin.setter
+    def origin(self, origin):
+        """Sets the origin of this MonitoredServiceDTO.
+
+        origin of monitored service  # noqa: E501
+
+        :param origin: The origin of this MonitoredServiceDTO.  # noqa: E501
+        :type: str
+        """
+
+        self._origin = origin
+
     @property
     def satisfied_latency_millis(self):
         """Gets the satisfied_latency_millis of this MonitoredServiceDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 58c40a5..17fafc7 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -149,7 +149,7 @@ def entity_type(self, entity_type):
         """
         if self._configuration.client_side_validation and entity_type is None:
             raise ValueError("Invalid value for `entity_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN", "ALERT_ANALYTICS", "LOG_ALERT"]  # noqa: E501
+        allowed_values = ["DASHBOARD", "ALERT", "MAINTENANCE_WINDOW", "NOTIFICANT", "EVENT", "SOURCE", "EXTERNAL_LINK", "AGENT", "CLOUD_INTEGRATION", "APPLICATION", "REGISTERED_QUERY", "USER", "USER_GROUP", "SERVICE_ACCOUNT", "INGESTION_POLICY", "ROLE", "TOKEN", "ALERT_ANALYTICS", "LOG_ALERT", "MONITORED_SERVICE"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 entity_type not in allowed_values):
             raise ValueError(

From 23f91ba8abf24c35b2bdc0a33474974c8b6f6c7f Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Mon, 18 Sep 2023 08:16:20 -0700
Subject: [PATCH 145/161] Autogenerated Update v2.202.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   2 +-
 docs/AccountUserAndServiceAccountApi.md       |  52 ++++-----
 docs/ApiTokenApi.md                           |  22 ++--
 docs/RoleApi.md                               |  18 +--
 docs/SearchApi.md                             |  30 ++---
 docs/UserApi.md                               |  28 ++---
 docs/UserGroupApi.md                          |  18 +--
 setup.py                                      |   2 +-
 .../account__user_and_service_account_api.py  | 104 +++++++++---------
 wavefront_api_client/api/api_token_api.py     |  44 ++++----
 wavefront_api_client/api/role_api.py          |  36 +++---
 wavefront_api_client/api/search_api.py        |  60 +++++-----
 wavefront_api_client/api/user_api.py          |  56 +++++-----
 wavefront_api_client/api/user_group_api.py    |  36 +++---
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 18 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 9d1014b..9b50fe2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.201.1"
+    "packageVersion": "2.202.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 1f0b9a8..9d1014b 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.199.1"
+    "packageVersion": "2.201.1"
 }
diff --git a/README.md b/README.md
index fbdc3a5..7bff20f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.201.1
+- Package version: 2.202.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index 604cac1..ea11eba 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -37,7 +37,7 @@ Method | HTTP request | Description
 
 Activates the given service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -91,7 +91,7 @@ Name | Type | Description  | Notes
 
 Adds specific roles to the account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -147,7 +147,7 @@ Name | Type | Description  | Notes
 
 Adds specific groups to the account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -203,7 +203,7 @@ Name | Type | Description  | Notes
 
 Creates or updates a user account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -259,7 +259,7 @@ Name | Type | Description  | Notes
 
 Creates a service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -313,7 +313,7 @@ Name | Type | Description  | Notes
 
 Deactivates the given service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -367,7 +367,7 @@ Name | Type | Description  | Notes
 
 Deletes an account (user or service account) identified by id
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -421,7 +421,7 @@ Name | Type | Description  | Notes
 
 Deletes multiple accounts (users or service accounts)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -475,7 +475,7 @@ Name | Type | Description  | Notes
 
 Get a specific account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -529,7 +529,7 @@ Name | Type | Description  | Notes
 
 Returns business functions of a specific account (user or service account).
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -583,7 +583,7 @@ Name | Type | Description  | Notes
 
 Get all accounts (users and service accounts) of a customer
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -639,7 +639,7 @@ Name | Type | Description  | Notes
 
 Get all service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -689,7 +689,7 @@ This endpoint does not need any parameter.
 
 Get all user accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -739,7 +739,7 @@ This endpoint does not need any parameter.
 
 Retrieves a service account by identifier
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -793,7 +793,7 @@ Name | Type | Description  | Notes
 
 Retrieves a user by identifier (email address)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -847,7 +847,7 @@ Name | Type | Description  | Notes
 
 Get all users with Accounts permission
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -897,7 +897,7 @@ This endpoint does not need any parameter.
 
 Grants a specific permission to account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -953,7 +953,7 @@ Name | Type | Description  | Notes
 
 Grant a permission to accounts (users or service accounts)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -1009,7 +1009,7 @@ Name | Type | Description  | Notes
 
 Invite user accounts with given user groups and permissions.
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1063,7 +1063,7 @@ Name | Type | Description  | Notes
 
 Removes specific roles from the account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1119,7 +1119,7 @@ Name | Type | Description  | Notes
 
 Removes specific groups from the account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1175,7 +1175,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from account (user or service account)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -1231,7 +1231,7 @@ Name | Type | Description  | Notes
 
 Revoke a permission from accounts (users or service accounts)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -1287,7 +1287,7 @@ Name | Type | Description  | Notes
 
 Updates the service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -1343,7 +1343,7 @@ Name | Type | Description  | Notes
 
 Update user with given user groups and permissions.
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1399,7 +1399,7 @@ Name | Type | Description  | Notes
 
 Returns valid accounts (users and service accounts), also invalid identifiers from the given list
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
index c2457e5..f160d05 100644
--- a/docs/ApiTokenApi.md
+++ b/docs/ApiTokenApi.md
@@ -22,7 +22,7 @@ Method | HTTP request | Description
 
 Create new api token
 
-Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -72,7 +72,7 @@ This endpoint does not need any parameter.
 
 Delete the specified api token for a customer
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -126,7 +126,7 @@ Name | Type | Description  | Notes
 
 Delete the specified api token
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -180,7 +180,7 @@ Name | Type | Description  | Notes
 
 Delete the specified api token of the given service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -236,7 +236,7 @@ Name | Type | Description  | Notes
 
 Create a new api token for the service account
 
-Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. 
 
 ### Example
 ```python
@@ -292,7 +292,7 @@ Name | Type | Description  | Notes
 
 Get all api tokens for a user
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -342,7 +342,7 @@ This endpoint does not need any parameter.
 
 Get the specified api token for a customer
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -396,7 +396,7 @@ Name | Type | Description  | Notes
 
 Get all api tokens for a customer
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -446,7 +446,7 @@ This endpoint does not need any parameter.
 
 Get all api tokens for the given service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -500,7 +500,7 @@ Name | Type | Description  | Notes
 
 Update the name of the specified api token
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -556,7 +556,7 @@ Name | Type | Description  | Notes
 
 Update the name of the specified api token for the given service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
diff --git a/docs/RoleApi.md b/docs/RoleApi.md
index 3b7db42..a521ec3 100644
--- a/docs/RoleApi.md
+++ b/docs/RoleApi.md
@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 Add accounts and groups to a role
 
-Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 
 Create a role
 
-Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -130,7 +130,7 @@ Name | Type | Description  | Notes
 
 Delete a role by ID
 
-Deletes a role with a given ID. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Deletes a role with a given ID. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -184,7 +184,7 @@ Name | Type | Description  | Notes
 
 Get all roles
 
-Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -240,7 +240,7 @@ Name | Type | Description  | Notes
 
 Get a role by ID
 
-Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -294,7 +294,7 @@ Name | Type | Description  | Notes
 
 Grant a permission to roles
 
-Grants a given permission to a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -350,7 +350,7 @@ Name | Type | Description  | Notes
 
 Remove accounts and groups from a role
 
-Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -406,7 +406,7 @@ Name | Type | Description  | Notes
 
 Revoke a permission from roles
 
-Revokes a given permission from a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -462,7 +462,7 @@ Name | Type | Description  | Notes
 
 Update a role by ID
 
-Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index bf47b2b..1a1ada5 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -100,7 +100,7 @@ Method | HTTP request | Description
 
 Search over a customer's accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -154,7 +154,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -210,7 +210,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -3164,7 +3164,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's roles
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3218,7 +3218,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's roles
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3274,7 +3274,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's roles
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3546,7 +3546,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -3600,7 +3600,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -3656,7 +3656,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -4202,7 +4202,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's api tokens
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -4256,7 +4256,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's api tokens
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -4312,7 +4312,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's api tokens
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -4476,7 +4476,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's users
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4530,7 +4530,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's users
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4586,7 +4586,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's users
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 752c195..8e91756 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -26,7 +26,7 @@ Method | HTTP request | Description
 
 Adds specific groups to the user or service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -82,7 +82,7 @@ Name | Type | Description  | Notes
 
 Creates an user if the user doesn't already exist.
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -138,7 +138,7 @@ Name | Type | Description  | Notes
 
 Deletes multiple users or service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -192,7 +192,7 @@ Name | Type | Description  | Notes
 
 Deletes a user or service account identified by id
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -245,7 +245,7 @@ void (empty response body)
 
 Get all users
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -295,7 +295,7 @@ This endpoint does not need any parameter.
 
 Retrieves a user by identifier (email address)
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -403,7 +403,7 @@ Name | Type | Description  | Notes
 
 Grants a specific permission to multiple users or service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -459,7 +459,7 @@ Name | Type | Description  | Notes
 
 Grants a specific permission to user or service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -515,7 +515,7 @@ Name | Type | Description  | Notes
 
 Invite users with given user groups and permissions.
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -569,7 +569,7 @@ Name | Type | Description  | Notes
 
 Removes specific groups from the user or service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -625,7 +625,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from multiple users or service accounts
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -681,7 +681,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from user or service account
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -737,7 +737,7 @@ Name | Type | Description  | Notes
 
 Update user with given user groups, permissions and ingestion policy.
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -793,7 +793,7 @@ Name | Type | Description  | Notes
 
 Returns valid users and service accounts, also invalid identifiers from the given list
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index 5afb77a..cb0782c 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 Add multiple roles to a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 
 Add multiple users to a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -132,7 +132,7 @@ Name | Type | Description  | Notes
 
 Create a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -186,7 +186,7 @@ Name | Type | Description  | Notes
 
 Delete a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -240,7 +240,7 @@ Name | Type | Description  | Notes
 
 Get all user groups for a customer
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -296,7 +296,7 @@ Name | Type | Description  | Notes
 
 Get a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -350,7 +350,7 @@ Name | Type | Description  | Notes
 
 Remove multiple roles from a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -406,7 +406,7 @@ Name | Type | Description  | Notes
 
 Remove multiple users from a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -462,7 +462,7 @@ Name | Type | Description  | Notes
 
 Update a specific user group
 
-<b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/setup.py b/setup.py
index 6680e2a..434f924 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.201.1"
+VERSION = "2.202.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 3202bd5..437bc7a 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def activate_account(self, id, **kwargs):  # noqa: E501
         """Activates the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.activate_account(id, async_req=True)
@@ -58,7 +58,7 @@ def activate_account(self, id, **kwargs):  # noqa: E501
     def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Activates the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.activate_account_with_http_info(id, async_req=True)
@@ -135,7 +135,7 @@ def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_account_to_roles(self, id, **kwargs):  # noqa: E501
         """Adds specific roles to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_roles(id, async_req=True)
@@ -158,7 +158,7 @@ def add_account_to_roles(self, id, **kwargs):  # noqa: E501
     def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific roles to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_roles_with_http_info(id, async_req=True)
@@ -238,7 +238,7 @@ def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_user_groups(id, async_req=True)
@@ -261,7 +261,7 @@ def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
     def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_user_groups_with_http_info(id, async_req=True)
@@ -341,7 +341,7 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_or_update_user_account(async_req=True)
@@ -364,7 +364,7 @@ def create_or_update_user_account(self, **kwargs):  # noqa: E501
     def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_or_update_user_account_with_http_info(async_req=True)
@@ -440,7 +440,7 @@ def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
     def create_service_account(self, **kwargs):  # noqa: E501
         """Creates a service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_service_account(async_req=True)
@@ -462,7 +462,7 @@ def create_service_account(self, **kwargs):  # noqa: E501
     def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
         """Creates a service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_service_account_with_http_info(async_req=True)
@@ -535,7 +535,7 @@ def create_service_account_with_http_info(self, **kwargs):  # noqa: E501
     def deactivate_account(self, id, **kwargs):  # noqa: E501
         """Deactivates the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.deactivate_account(id, async_req=True)
@@ -557,7 +557,7 @@ def deactivate_account(self, id, **kwargs):  # noqa: E501
     def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deactivates the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.deactivate_account_with_http_info(id, async_req=True)
@@ -634,7 +634,7 @@ def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_account(self, id, **kwargs):  # noqa: E501
         """Deletes an account (user or service account) identified by id  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_account(id, async_req=True)
@@ -656,7 +656,7 @@ def delete_account(self, id, **kwargs):  # noqa: E501
     def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deletes an account (user or service account) identified by id  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_account_with_http_info(id, async_req=True)
@@ -729,7 +729,7 @@ def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_multiple_accounts(self, **kwargs):  # noqa: E501
         """Deletes multiple accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_accounts(async_req=True)
@@ -751,7 +751,7 @@ def delete_multiple_accounts(self, **kwargs):  # noqa: E501
     def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Deletes multiple accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_accounts_with_http_info(async_req=True)
@@ -824,7 +824,7 @@ def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_account(self, id, **kwargs):  # noqa: E501
         """Get a specific account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account(id, async_req=True)
@@ -846,7 +846,7 @@ def get_account(self, id, **kwargs):  # noqa: E501
     def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a specific account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_with_http_info(id, async_req=True)
@@ -919,7 +919,7 @@ def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_account_business_functions(self, id, **kwargs):  # noqa: E501
         """Returns business functions of a specific account (user or service account).  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_business_functions(id, async_req=True)
@@ -941,7 +941,7 @@ def get_account_business_functions(self, id, **kwargs):  # noqa: E501
     def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa: E501
         """Returns business functions of a specific account (user or service account).  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_business_functions_with_http_info(id, async_req=True)
@@ -1014,7 +1014,7 @@ def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa:
     def get_all_accounts(self, **kwargs):  # noqa: E501
         """Get all accounts (users and service accounts) of a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_accounts(async_req=True)
@@ -1037,7 +1037,7 @@ def get_all_accounts(self, **kwargs):  # noqa: E501
     def get_all_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all accounts (users and service accounts) of a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_accounts_with_http_info(async_req=True)
@@ -1109,7 +1109,7 @@ def get_all_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_all_service_accounts(self, **kwargs):  # noqa: E501
         """Get all service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_service_accounts(async_req=True)
@@ -1130,7 +1130,7 @@ def get_all_service_accounts(self, **kwargs):  # noqa: E501
     def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_service_accounts_with_http_info(async_req=True)
@@ -1196,7 +1196,7 @@ def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_all_user_accounts(self, **kwargs):  # noqa: E501
         """Get all user accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_accounts(async_req=True)
@@ -1217,7 +1217,7 @@ def get_all_user_accounts(self, **kwargs):  # noqa: E501
     def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all user accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_accounts_with_http_info(async_req=True)
@@ -1283,7 +1283,7 @@ def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_service_account(self, id, **kwargs):  # noqa: E501
         """Retrieves a service account by identifier  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_service_account(id, async_req=True)
@@ -1305,7 +1305,7 @@ def get_service_account(self, id, **kwargs):  # noqa: E501
     def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a service account by identifier  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_service_account_with_http_info(id, async_req=True)
@@ -1378,7 +1378,7 @@ def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_user_account(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_account(id, async_req=True)
@@ -1400,7 +1400,7 @@ def get_user_account(self, id, **kwargs):  # noqa: E501
     def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_account_with_http_info(id, async_req=True)
@@ -1473,7 +1473,7 @@ def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
         """Get all users with Accounts permission  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_users_with_accounts_permission(async_req=True)
@@ -1494,7 +1494,7 @@ def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
     def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users with Accounts permission  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_users_with_accounts_permission_with_http_info(async_req=True)
@@ -1560,7 +1560,7 @@ def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa:
     def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_account_permission(id, permission, async_req=True)
@@ -1583,7 +1583,7 @@ def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
     def grant_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_account_permission_with_http_info(id, permission, async_req=True)
@@ -1667,7 +1667,7 @@ def grant_account_permission_with_http_info(self, id, permission, **kwargs):  #
     def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
         """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_accounts(permission, async_req=True)
@@ -1690,7 +1690,7 @@ def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
     def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_accounts_with_http_info(permission, async_req=True)
@@ -1770,7 +1770,7 @@ def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  #
     def invite_user_accounts(self, **kwargs):  # noqa: E501
         """Invite user accounts with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_user_accounts(async_req=True)
@@ -1792,7 +1792,7 @@ def invite_user_accounts(self, **kwargs):  # noqa: E501
     def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Invite user accounts with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_user_accounts_with_http_info(async_req=True)
@@ -1865,7 +1865,7 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
         """Removes specific roles from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_roles(id, async_req=True)
@@ -1888,7 +1888,7 @@ def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
     def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific roles from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_roles_with_http_info(id, async_req=True)
@@ -1968,7 +1968,7 @@ def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
     def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_user_groups(id, async_req=True)
@@ -1991,7 +1991,7 @@ def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
     def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_user_groups_with_http_info(id, async_req=True)
@@ -2071,7 +2071,7 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_account_permission(id, permission, async_req=True)
@@ -2094,7 +2094,7 @@ def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
     def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_account_permission_with_http_info(id, permission, async_req=True)
@@ -2178,7 +2178,7 @@ def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  #
     def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
         """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_accounts(permission, async_req=True)
@@ -2201,7 +2201,7 @@ def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
     def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_accounts_with_http_info(permission, async_req=True)
@@ -2281,7 +2281,7 @@ def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):
     def update_service_account(self, id, **kwargs):  # noqa: E501
         """Updates the service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_service_account(id, async_req=True)
@@ -2304,7 +2304,7 @@ def update_service_account(self, id, **kwargs):  # noqa: E501
     def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Updates the service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_service_account_with_http_info(id, async_req=True)
@@ -2384,7 +2384,7 @@ def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_user_account(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_account(id, async_req=True)
@@ -2407,7 +2407,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
     def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_account_with_http_info(id, async_req=True)
@@ -2487,7 +2487,7 @@ def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def validate_accounts(self, **kwargs):  # noqa: E501
         """Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_accounts(async_req=True)
@@ -2509,7 +2509,7 @@ def validate_accounts(self, **kwargs):  # noqa: E501
     def validate_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Returns valid accounts (users and service accounts), also invalid identifiers from the given list  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_accounts_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index 6e23295..75f26d9 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def create_token(self, **kwargs):  # noqa: E501
         """Create new api token  # noqa: E501
 
-        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_token(async_req=True)
@@ -57,7 +57,7 @@ def create_token(self, **kwargs):  # noqa: E501
     def create_token_with_http_info(self, **kwargs):  # noqa: E501
         """Create new api token  # noqa: E501
 
-        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_token_with_http_info(async_req=True)
@@ -123,7 +123,7 @@ def create_token_with_http_info(self, **kwargs):  # noqa: E501
     def delete_customer_token(self, **kwargs):  # noqa: E501
         """Delete the specified api token for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_customer_token(async_req=True)
@@ -145,7 +145,7 @@ def delete_customer_token(self, **kwargs):  # noqa: E501
     def delete_customer_token_with_http_info(self, **kwargs):  # noqa: E501
         """Delete the specified api token for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_customer_token_with_http_info(async_req=True)
@@ -218,7 +218,7 @@ def delete_customer_token_with_http_info(self, **kwargs):  # noqa: E501
     def delete_token(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token(id, async_req=True)
@@ -240,7 +240,7 @@ def delete_token(self, id, **kwargs):  # noqa: E501
     def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_with_http_info(id, async_req=True)
@@ -313,7 +313,7 @@ def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_token_service_account(self, id, token, **kwargs):  # noqa: E501
         """Delete the specified api token of the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_service_account(id, token, async_req=True)
@@ -336,7 +336,7 @@ def delete_token_service_account(self, id, token, **kwargs):  # noqa: E501
     def delete_token_service_account_with_http_info(self, id, token, **kwargs):  # noqa: E501
         """Delete the specified api token of the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_service_account_with_http_info(id, token, async_req=True)
@@ -416,7 +416,7 @@ def delete_token_service_account_with_http_info(self, id, token, **kwargs):  # n
     def generate_token_service_account(self, id, **kwargs):  # noqa: E501
         """Create a new api token for the service account  # noqa: E501
 
-        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.generate_token_service_account(id, async_req=True)
@@ -439,7 +439,7 @@ def generate_token_service_account(self, id, **kwargs):  # noqa: E501
     def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Create a new api token for the service account  # noqa: E501
 
-        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the list of all api tokens for the service account. The newly created api token is the last element of returned list.   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.generate_token_service_account_with_http_info(id, async_req=True)
@@ -515,7 +515,7 @@ def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa:
     def get_all_tokens(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_tokens(async_req=True)
@@ -536,7 +536,7 @@ def get_all_tokens(self, **kwargs):  # noqa: E501
     def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_tokens_with_http_info(async_req=True)
@@ -602,7 +602,7 @@ def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
     def get_customer_token(self, id, **kwargs):  # noqa: E501
         """Get the specified api token for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_token(id, async_req=True)
@@ -624,7 +624,7 @@ def get_customer_token(self, id, **kwargs):  # noqa: E501
     def get_customer_token_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get the specified api token for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_token_with_http_info(id, async_req=True)
@@ -697,7 +697,7 @@ def get_customer_token_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_customer_tokens(self, **kwargs):  # noqa: E501
         """Get all api tokens for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_tokens(async_req=True)
@@ -718,7 +718,7 @@ def get_customer_tokens(self, **kwargs):  # noqa: E501
     def get_customer_tokens_with_http_info(self, **kwargs):  # noqa: E501
         """Get all api tokens for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_customer_tokens_with_http_info(async_req=True)
@@ -784,7 +784,7 @@ def get_customer_tokens_with_http_info(self, **kwargs):  # noqa: E501
     def get_tokens_service_account(self, id, **kwargs):  # noqa: E501
         """Get all api tokens for the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_tokens_service_account(id, async_req=True)
@@ -806,7 +806,7 @@ def get_tokens_service_account(self, id, **kwargs):  # noqa: E501
     def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get all api tokens for the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_tokens_service_account_with_http_info(id, async_req=True)
@@ -879,7 +879,7 @@ def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_token_name(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name(id, async_req=True)
@@ -902,7 +902,7 @@ def update_token_name(self, id, **kwargs):  # noqa: E501
     def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_with_http_info(id, async_req=True)
@@ -982,7 +982,7 @@ def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_token_name_service_account(self, id, token, **kwargs):  # noqa: E501
         """Update the name of the specified api token for the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_service_account(id, token, async_req=True)
@@ -1006,7 +1006,7 @@ def update_token_name_service_account(self, id, token, **kwargs):  # noqa: E501
     def update_token_name_service_account_with_http_info(self, id, token, **kwargs):  # noqa: E501
         """Update the name of the specified api token for the given service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_service_account_with_http_info(id, token, async_req=True)
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index cc35c27..d1c7032 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_assignees(self, id, body, **kwargs):  # noqa: E501
         """Add accounts and groups to a role  # noqa: E501
 
-        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_assignees(id, body, async_req=True)
@@ -59,7 +59,7 @@ def add_assignees(self, id, body, **kwargs):  # noqa: E501
     def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Add accounts and groups to a role  # noqa: E501
 
-        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_assignees_with_http_info(id, body, async_req=True)
@@ -143,7 +143,7 @@ def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
     def create_role(self, body, **kwargs):  # noqa: E501
         """Create a role  # noqa: E501
 
-        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_role(body, async_req=True)
@@ -165,7 +165,7 @@ def create_role(self, body, **kwargs):  # noqa: E501
     def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
         """Create a role  # noqa: E501
 
-        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_role_with_http_info(body, async_req=True)
@@ -242,7 +242,7 @@ def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
     def delete_role(self, id, **kwargs):  # noqa: E501
         """Delete a role by ID  # noqa: E501
 
-        Deletes a role with a given ID. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Deletes a role with a given ID. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role(id, async_req=True)
@@ -264,7 +264,7 @@ def delete_role(self, id, **kwargs):  # noqa: E501
     def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete a role by ID  # noqa: E501
 
-        Deletes a role with a given ID. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Deletes a role with a given ID. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role_with_http_info(id, async_req=True)
@@ -341,7 +341,7 @@ def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_roles(self, **kwargs):  # noqa: E501
         """Get all roles  # noqa: E501
 
-        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles(async_req=True)
@@ -364,7 +364,7 @@ def get_all_roles(self, **kwargs):  # noqa: E501
     def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
         """Get all roles  # noqa: E501
 
-        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles_with_http_info(async_req=True)
@@ -440,7 +440,7 @@ def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
     def get_role(self, id, **kwargs):  # noqa: E501
         """Get a role by ID  # noqa: E501
 
-        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role(id, async_req=True)
@@ -462,7 +462,7 @@ def get_role(self, id, **kwargs):  # noqa: E501
     def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a role by ID  # noqa: E501
 
-        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role_with_http_info(id, async_req=True)
@@ -539,7 +539,7 @@ def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
     def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
         """Grant a permission to roles  # noqa: E501
 
-        Grants a given permission to a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_roles(permission, body, async_req=True)
@@ -562,7 +562,7 @@ def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
     def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
         """Grant a permission to roles  # noqa: E501
 
-        Grants a given permission to a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_roles_with_http_info(permission, body, async_req=True)
@@ -646,7 +646,7 @@ def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):
     def remove_assignees(self, id, body, **kwargs):  # noqa: E501
         """Remove accounts and groups from a role  # noqa: E501
 
-        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_assignees(id, body, async_req=True)
@@ -669,7 +669,7 @@ def remove_assignees(self, id, body, **kwargs):  # noqa: E501
     def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Remove accounts and groups from a role  # noqa: E501
 
-        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_assignees_with_http_info(id, body, async_req=True)
@@ -753,7 +753,7 @@ def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
     def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E501
         """Revoke a permission from roles  # noqa: E501
 
-        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_roles(permission, body, async_req=True)
@@ -776,7 +776,7 @@ def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E50
     def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
         """Revoke a permission from roles  # noqa: E501
 
-        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_roles_with_http_info(permission, body, async_req=True)
@@ -860,7 +860,7 @@ def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs
     def update_role(self, id, body, **kwargs):  # noqa: E501
         """Update a role by ID  # noqa: E501
 
-        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_role(id, body, async_req=True)
@@ -883,7 +883,7 @@ def update_role(self, id, body, **kwargs):  # noqa: E501
     def update_role_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Update a role by ID  # noqa: E501
 
-        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_role_with_http_info(id, body, async_req=True)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 63bc143..0faade9 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def search_account_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_entities(async_req=True)
@@ -58,7 +58,7 @@ def search_account_entities(self, **kwargs):  # noqa: E501
     def search_account_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_entities_with_http_info(async_req=True)
@@ -131,7 +131,7 @@ def search_account_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_account_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facet(facet, async_req=True)
@@ -154,7 +154,7 @@ def search_account_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facet_with_http_info(facet, async_req=True)
@@ -234,7 +234,7 @@ def search_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E50
     def search_account_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facets(async_req=True)
@@ -256,7 +256,7 @@ def search_account_for_facets(self, **kwargs):  # noqa: E501
     def search_account_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_account_for_facets_with_http_info(async_req=True)
@@ -5516,7 +5516,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
     def search_role_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_entities(async_req=True)
@@ -5538,7 +5538,7 @@ def search_role_entities(self, **kwargs):  # noqa: E501
     def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_entities_with_http_info(async_req=True)
@@ -5611,7 +5611,7 @@ def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facet(facet, async_req=True)
@@ -5634,7 +5634,7 @@ def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facet_with_http_info(facet, async_req=True)
@@ -5714,7 +5714,7 @@ def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_role_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facets(async_req=True)
@@ -5736,7 +5736,7 @@ def search_role_for_facets(self, **kwargs):  # noqa: E501
     def search_role_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facets_with_http_info(async_req=True)
@@ -6197,7 +6197,7 @@ def search_saved_traces_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_service_account_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_entities(async_req=True)
@@ -6219,7 +6219,7 @@ def search_service_account_entities(self, **kwargs):  # noqa: E501
     def search_service_account_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_entities_with_http_info(async_req=True)
@@ -6292,7 +6292,7 @@ def search_service_account_entities_with_http_info(self, **kwargs):  # noqa: E50
     def search_service_account_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facet(facet, async_req=True)
@@ -6315,7 +6315,7 @@ def search_service_account_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_service_account_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facet_with_http_info(facet, async_req=True)
@@ -6395,7 +6395,7 @@ def search_service_account_for_facet_with_http_info(self, facet, **kwargs):  # n
     def search_service_account_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facets(async_req=True)
@@ -6417,7 +6417,7 @@ def search_service_account_for_facets(self, **kwargs):  # noqa: E501
     def search_service_account_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_service_account_for_facets_with_http_info(async_req=True)
@@ -7369,7 +7369,7 @@ def search_tagged_source_for_facets_with_http_info(self, **kwargs):  # noqa: E50
     def search_token_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's api tokens  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_entities(async_req=True)
@@ -7391,7 +7391,7 @@ def search_token_entities(self, **kwargs):  # noqa: E501
     def search_token_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's api tokens  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_entities_with_http_info(async_req=True)
@@ -7464,7 +7464,7 @@ def search_token_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_token_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's api tokens  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facet(facet, async_req=True)
@@ -7487,7 +7487,7 @@ def search_token_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_token_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's api tokens  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facet_with_http_info(facet, async_req=True)
@@ -7567,7 +7567,7 @@ def search_token_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_token_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's api tokens  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facets(async_req=True)
@@ -7589,7 +7589,7 @@ def search_token_for_facets(self, **kwargs):  # noqa: E501
     def search_token_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's api tokens  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_token_for_facets_with_http_info(async_req=True)
@@ -7860,7 +7860,7 @@ def search_traces_map_for_facets_with_http_info(self, **kwargs):  # noqa: E501
     def search_user_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_entities(async_req=True)
@@ -7882,7 +7882,7 @@ def search_user_entities(self, **kwargs):  # noqa: E501
     def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_entities_with_http_info(async_req=True)
@@ -7955,7 +7955,7 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facet(facet, async_req=True)
@@ -7978,7 +7978,7 @@ def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facet_with_http_info(facet, async_req=True)
@@ -8058,7 +8058,7 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_user_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facets(async_req=True)
@@ -8080,7 +8080,7 @@ def search_user_for_facets(self, **kwargs):  # noqa: E501
     def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facets_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 668a814..9620f56 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_user_to_user_groups(id, async_req=True)
@@ -59,7 +59,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
     def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_user_to_user_groups_with_http_info(id, async_req=True)
@@ -139,7 +139,7 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_user(self, **kwargs):  # noqa: E501
         """Creates an user if the user doesn't already exist.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user(async_req=True)
@@ -162,7 +162,7 @@ def create_user(self, **kwargs):  # noqa: E501
     def create_user_with_http_info(self, **kwargs):  # noqa: E501
         """Creates an user if the user doesn't already exist.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_with_http_info(async_req=True)
@@ -238,7 +238,7 @@ def create_user_with_http_info(self, **kwargs):  # noqa: E501
     def delete_multiple_users(self, **kwargs):  # noqa: E501
         """Deletes multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_users(async_req=True)
@@ -260,7 +260,7 @@ def delete_multiple_users(self, **kwargs):  # noqa: E501
     def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
         """Deletes multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_users_with_http_info(async_req=True)
@@ -333,7 +333,7 @@ def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
     def delete_user(self, id, **kwargs):  # noqa: E501
         """Deletes a user or service account identified by id  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user(id, async_req=True)
@@ -355,7 +355,7 @@ def delete_user(self, id, **kwargs):  # noqa: E501
     def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deletes a user or service account identified by id  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_with_http_info(id, async_req=True)
@@ -428,7 +428,7 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_users(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_users(async_req=True)
@@ -449,7 +449,7 @@ def get_all_users(self, **kwargs):  # noqa: E501
     def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_users_with_http_info(async_req=True)
@@ -515,7 +515,7 @@ def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
     def get_user(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user(id, async_req=True)
@@ -537,7 +537,7 @@ def get_user(self, id, **kwargs):  # noqa: E501
     def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_with_http_info(id, async_req=True)
@@ -705,7 +705,7 @@ def get_user_business_functions_with_http_info(self, id, **kwargs):  # noqa: E50
     def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_users(permission, async_req=True)
@@ -728,7 +728,7 @@ def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
     def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_users_with_http_info(permission, async_req=True)
@@ -808,7 +808,7 @@ def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noq
     def grant_user_permission(self, id, **kwargs):  # noqa: E501
         """Grants a specific permission to user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_user_permission(id, async_req=True)
@@ -831,7 +831,7 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
     def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """Grants a specific permission to user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_user_permission_with_http_info(id, async_req=True)
@@ -911,7 +911,7 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
     def invite_users(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_users(async_req=True)
@@ -933,7 +933,7 @@ def invite_users(self, **kwargs):  # noqa: E501
     def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_users_with_http_info(async_req=True)
@@ -1006,7 +1006,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
     def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_user_from_user_groups(id, async_req=True)
@@ -1029,7 +1029,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
     def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_user_from_user_groups_with_http_info(id, async_req=True)
@@ -1109,7 +1109,7 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
     def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_users(permission, async_req=True)
@@ -1132,7 +1132,7 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
     def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_users_with_http_info(permission, async_req=True)
@@ -1212,7 +1212,7 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
     def revoke_user_permission(self, id, **kwargs):  # noqa: E501
         """Revokes a specific permission from user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_user_permission(id, async_req=True)
@@ -1235,7 +1235,7 @@ def revoke_user_permission(self, id, **kwargs):  # noqa: E501
     def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """Revokes a specific permission from user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_user_permission_with_http_info(id, async_req=True)
@@ -1315,7 +1315,7 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_user(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user(id, async_req=True)
@@ -1338,7 +1338,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
     def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_with_http_info(id, async_req=True)
@@ -1418,7 +1418,7 @@ def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
     def validate_users(self, **kwargs):  # noqa: E501
         """Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_users(async_req=True)
@@ -1440,7 +1440,7 @@ def validate_users(self, **kwargs):  # noqa: E501
     def validate_users_with_http_info(self, **kwargs):  # noqa: E501
         """Returns valid users and service accounts, also invalid identifiers from the given list  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.validate_users_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index dd9048b..c6f3e46 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_roles_to_user_group(id, async_req=True)
@@ -59,7 +59,7 @@ def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
     def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_roles_to_user_group_with_http_info(id, async_req=True)
@@ -139,7 +139,7 @@ def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_users_to_user_group(id, async_req=True)
@@ -162,7 +162,7 @@ def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
     def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_users_to_user_group_with_http_info(id, async_req=True)
@@ -242,7 +242,7 @@ def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_user_group(self, **kwargs):  # noqa: E501
         """Create a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_group(async_req=True)
@@ -264,7 +264,7 @@ def create_user_group(self, **kwargs):  # noqa: E501
     def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
         """Create a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_group_with_http_info(async_req=True)
@@ -337,7 +337,7 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
     def delete_user_group(self, id, **kwargs):  # noqa: E501
         """Delete a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_group(id, async_req=True)
@@ -359,7 +359,7 @@ def delete_user_group(self, id, **kwargs):  # noqa: E501
     def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_group_with_http_info(id, async_req=True)
@@ -432,7 +432,7 @@ def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_user_groups(self, **kwargs):  # noqa: E501
         """Get all user groups for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_groups(async_req=True)
@@ -455,7 +455,7 @@ def get_all_user_groups(self, **kwargs):  # noqa: E501
     def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
         """Get all user groups for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_groups_with_http_info(async_req=True)
@@ -527,7 +527,7 @@ def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
     def get_user_group(self, id, **kwargs):  # noqa: E501
         """Get a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_group(id, async_req=True)
@@ -549,7 +549,7 @@ def get_user_group(self, id, **kwargs):  # noqa: E501
     def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_group_with_http_info(id, async_req=True)
@@ -622,7 +622,7 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_roles_from_user_group(id, async_req=True)
@@ -645,7 +645,7 @@ def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
     def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_roles_from_user_group_with_http_info(id, async_req=True)
@@ -725,7 +725,7 @@ def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
     def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple users from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_users_from_user_group(id, async_req=True)
@@ -748,7 +748,7 @@ def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
     def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Remove multiple users from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_users_from_user_group_with_http_info(id, async_req=True)
@@ -828,7 +828,7 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
     def update_user_group(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_group(id, async_req=True)
@@ -851,7 +851,7 @@ def update_user_group(self, id, **kwargs):  # noqa: E501
     def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to standalone Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_group_with_http_info(id, async_req=True)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 2092b70..e9685a7 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.201.1/python'
+        self.user_agent = 'Swagger-Codegen/2.202.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index b1f7b05..d1d9cbc 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.201.1".\
+               "SDK Package Version: 2.202.0".\
                format(env=sys.platform, pyversion=sys.version)

From 918ad74ea6cd5f54456e47985733e586ee9b2352 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <austinov@vmware.com>
Date: Tue, 19 Sep 2023 14:57:49 -0700
Subject: [PATCH 146/161] Prepare Release v2.202.2.

---
 .github/workflows/build.yml                   |   2 +-
 .gitignore                                    |   3 +
 .swagger-codegen/VERSION                      |   2 +-
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 docs/AlertAnalyticsApi.md                     |  65 -----
 docs/GlobalAlertAnalytic.md                   |  12 -
 docs/ResponseContainerGlobalAlertAnalytic.md  |  11 -
 docs/RolePropertiesDTO.md                     |  14 --
 generate_client                               |   2 +-
 test/__init__.py                              |   1 +
 test/test_alert_analytics_api.py              |  41 ----
 test/test_global_alert_analytic.py            |  40 ---
 ...esponse_container_global_alert_analytic.py |  40 ---
 test/test_role_properties_dto.py              |  40 ---
 .../api/alert_analytics_api.py                | 137 -----------
 .../models/global_alert_analytic.py           | 175 --------------
 ...esponse_container_global_alert_analytic.py | 150 ------------
 .../models/role_properties_dto.py             | 227 ------------------
 19 files changed, 9 insertions(+), 957 deletions(-)
 delete mode 100644 docs/AlertAnalyticsApi.md
 delete mode 100644 docs/GlobalAlertAnalytic.md
 delete mode 100644 docs/ResponseContainerGlobalAlertAnalytic.md
 delete mode 100644 docs/RolePropertiesDTO.md
 delete mode 100644 test/test_alert_analytics_api.py
 delete mode 100644 test/test_global_alert_analytic.py
 delete mode 100644 test/test_response_container_global_alert_analytic.py
 delete mode 100644 test/test_role_properties_dto.py
 delete mode 100644 wavefront_api_client/api/alert_analytics_api.py
 delete mode 100644 wavefront_api_client/models/global_alert_analytic.py
 delete mode 100644 wavefront_api_client/models/response_container_global_alert_analytic.py
 delete mode 100644 wavefront_api_client/models/role_properties_dto.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee6280f..e160ba8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/.gitignore b/.gitignore
index a655050..b323e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,6 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# MacOS
+.DS_Store
diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION
index 96ab4a5..b0bea14 100644
--- a/.swagger-codegen/VERSION
+++ b/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.30
\ No newline at end of file
+2.4.32
\ No newline at end of file
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 9b50fe2..ef5cf88 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.202.0"
+    "packageVersion": "2.202.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9d1014b..9b50fe2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.201.1"
+    "packageVersion": "2.202.0"
 }
diff --git a/docs/AlertAnalyticsApi.md b/docs/AlertAnalyticsApi.md
deleted file mode 100644
index b35d5e3..0000000
--- a/docs/AlertAnalyticsApi.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# wavefront_api_client.AlertAnalyticsApi
-
-All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**get_global_alert_analytics**](AlertAnalyticsApi.md#get_global_alert_analytics) | **GET** /api/v2/alert/analytics/global | Get Global Alert Analytics for a customer
-
-
-# **get_global_alert_analytics**
-> ResponseContainerGlobalAlertAnalytic get_global_alert_analytics(start, end=end)
-
-Get Global Alert Analytics for a customer
-
-
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# Configure API key authorization: api_key
-configuration = wavefront_api_client.Configuration()
-configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
-
-# create an instance of the API class
-api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
-start = 789 # int | Start time in epoch seconds
-end = 789 # int | End time in epoch seconds (optional)
-
-try:
-    # Get Global Alert Analytics for a customer
-    api_response = api_instance.get_global_alert_analytics(start, end=end)
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling AlertAnalyticsApi->get_global_alert_analytics: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **start** | **int**| Start time in epoch seconds | 
- **end** | **int**| End time in epoch seconds | [optional] 
-
-### Return type
-
-[**ResponseContainerGlobalAlertAnalytic**](ResponseContainerGlobalAlertAnalytic.md)
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/GlobalAlertAnalytic.md b/docs/GlobalAlertAnalytic.md
deleted file mode 100644
index 259fd3f..0000000
--- a/docs/GlobalAlertAnalytic.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# GlobalAlertAnalytic
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**error_breakdown** | **dict(str, int)** |  | [optional] 
-**failed** | **int** |  | [optional] 
-**success** | **int** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/ResponseContainerGlobalAlertAnalytic.md b/docs/ResponseContainerGlobalAlertAnalytic.md
deleted file mode 100644
index 3079f7a..0000000
--- a/docs/ResponseContainerGlobalAlertAnalytic.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ResponseContainerGlobalAlertAnalytic
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**response** | [**GlobalAlertAnalytic**](GlobalAlertAnalytic.md) |  | [optional] 
-**status** | [**ResponseStatus**](ResponseStatus.md) |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/docs/RolePropertiesDTO.md b/docs/RolePropertiesDTO.md
deleted file mode 100644
index 7381155..0000000
--- a/docs/RolePropertiesDTO.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# RolePropertiesDTO
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**deletable** | **bool** |  | [optional] 
-**name_editable** | **bool** |  | [optional] 
-**perms_editable** | **bool** |  | [optional] 
-**users_addable** | **bool** |  | [optional] 
-**users_removable** | **bool** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/generate_client b/generate_client
index a266065..68c0940 100755
--- a/generate_client
+++ b/generate_client
@@ -9,7 +9,7 @@ function _exit {
 [[ "$1" ]] || _exit "Please specify cluster as an argument."
 
 CGEN_NAME="swagger-codegen-cli"
-CGEN_VER="2.4.30"  # For 3.x use CGEN_VER="3.0.42"
+CGEN_VER="2.4.32"  # For 3.x use CGEN_VER="3.0.42"
 CGEN_JAR_NAME="${CGEN_NAME}-${CGEN_VER}.jar"
 CGEN_JAR_URL="https://search.maven.org/remotecontent?filepath=\
 io/swagger/swagger-codegen-cli/${CGEN_VER}/${CGEN_JAR_NAME}"
diff --git a/test/__init__.py b/test/__init__.py
index e69de29..576f56f 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -0,0 +1 @@
+# coding: utf-8
\ No newline at end of file
diff --git a/test/test_alert_analytics_api.py b/test/test_alert_analytics_api.py
deleted file mode 100644
index 9510bb8..0000000
--- a/test/test_alert_analytics_api.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestAlertAnalyticsApi(unittest.TestCase):
-    """AlertAnalyticsApi unit test stubs"""
-
-    def setUp(self):
-        self.api = wavefront_api_client.api.alert_analytics_api.AlertAnalyticsApi()  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    def test_get_global_alert_analytics(self):
-        """Test case for get_global_alert_analytics
-
-        Get Global Alert Analytics for a customer  # noqa: E501
-        """
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_global_alert_analytic.py b/test/test_global_alert_analytic.py
deleted file mode 100644
index fe8b33d..0000000
--- a/test/test_global_alert_analytic.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.global_alert_analytic import GlobalAlertAnalytic  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestGlobalAlertAnalytic(unittest.TestCase):
-    """GlobalAlertAnalytic unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testGlobalAlertAnalytic(self):
-        """Test GlobalAlertAnalytic"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.global_alert_analytic.GlobalAlertAnalytic()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_response_container_global_alert_analytic.py b/test/test_response_container_global_alert_analytic.py
deleted file mode 100644
index bbcbae7..0000000
--- a/test/test_response_container_global_alert_analytic.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.response_container_global_alert_analytic import ResponseContainerGlobalAlertAnalytic  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestResponseContainerGlobalAlertAnalytic(unittest.TestCase):
-    """ResponseContainerGlobalAlertAnalytic unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testResponseContainerGlobalAlertAnalytic(self):
-        """Test ResponseContainerGlobalAlertAnalytic"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.response_container_global_alert_analytic.ResponseContainerGlobalAlertAnalytic()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_role_properties_dto.py b/test/test_role_properties_dto.py
deleted file mode 100644
index 5d610ca..0000000
--- a/test/test_role_properties_dto.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import unittest
-
-import wavefront_api_client
-from wavefront_api_client.models.role_properties_dto import RolePropertiesDTO  # noqa: E501
-from wavefront_api_client.rest import ApiException
-
-
-class TestRolePropertiesDTO(unittest.TestCase):
-    """RolePropertiesDTO unit test stubs"""
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def testRolePropertiesDTO(self):
-        """Test RolePropertiesDTO"""
-        # FIXME: construct object with mandatory attributes with example values
-        # model = wavefront_api_client.models.role_properties_dto.RolePropertiesDTO()  # noqa: E501
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/wavefront_api_client/api/alert_analytics_api.py b/wavefront_api_client/api/alert_analytics_api.py
deleted file mode 100644
index f1a5c31..0000000
--- a/wavefront_api_client/api/alert_analytics_api.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from wavefront_api_client.api_client import ApiClient
-
-
-class AlertAnalyticsApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def get_global_alert_analytics(self, start, **kwargs):  # noqa: E501
-        """Get Global Alert Analytics for a customer  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_global_alert_analytics(start, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int start: Start time in epoch seconds (required)
-        :param int end: End time in epoch seconds
-        :return: ResponseContainerGlobalAlertAnalytic
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.get_global_alert_analytics_with_http_info(start, **kwargs)  # noqa: E501
-        else:
-            (data) = self.get_global_alert_analytics_with_http_info(start, **kwargs)  # noqa: E501
-            return data
-
-    def get_global_alert_analytics_with_http_info(self, start, **kwargs):  # noqa: E501
-        """Get Global Alert Analytics for a customer  # noqa: E501
-
-          # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.get_global_alert_analytics_with_http_info(start, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int start: Start time in epoch seconds (required)
-        :param int end: End time in epoch seconds
-        :return: ResponseContainerGlobalAlertAnalytic
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['start', 'end']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_global_alert_analytics" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'start' is set
-        if self.api_client.client_side_validation and ('start' not in params or
-                                                       params['start'] is None):  # noqa: E501
-            raise ValueError("Missing the required parameter `start` when calling `get_global_alert_analytics`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-        if 'start' in params:
-            query_params.append(('start', params['start']))  # noqa: E501
-        if 'end' in params:
-            query_params.append(('end', params['end']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['application/json'])  # noqa: E501
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['api_key']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/v2/alert/analytics/global', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='ResponseContainerGlobalAlertAnalytic',  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/wavefront_api_client/models/global_alert_analytic.py b/wavefront_api_client/models/global_alert_analytic.py
deleted file mode 100644
index 2ffc914..0000000
--- a/wavefront_api_client/models/global_alert_analytic.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class GlobalAlertAnalytic(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'error_breakdown': 'dict(str, int)',
-        'failed': 'int',
-        'success': 'int'
-    }
-
-    attribute_map = {
-        'error_breakdown': 'errorBreakdown',
-        'failed': 'failed',
-        'success': 'success'
-    }
-
-    def __init__(self, error_breakdown=None, failed=None, success=None, _configuration=None):  # noqa: E501
-        """GlobalAlertAnalytic - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._error_breakdown = None
-        self._failed = None
-        self._success = None
-        self.discriminator = None
-
-        if error_breakdown is not None:
-            self.error_breakdown = error_breakdown
-        if failed is not None:
-            self.failed = failed
-        if success is not None:
-            self.success = success
-
-    @property
-    def error_breakdown(self):
-        """Gets the error_breakdown of this GlobalAlertAnalytic.  # noqa: E501
-
-
-        :return: The error_breakdown of this GlobalAlertAnalytic.  # noqa: E501
-        :rtype: dict(str, int)
-        """
-        return self._error_breakdown
-
-    @error_breakdown.setter
-    def error_breakdown(self, error_breakdown):
-        """Sets the error_breakdown of this GlobalAlertAnalytic.
-
-
-        :param error_breakdown: The error_breakdown of this GlobalAlertAnalytic.  # noqa: E501
-        :type: dict(str, int)
-        """
-
-        self._error_breakdown = error_breakdown
-
-    @property
-    def failed(self):
-        """Gets the failed of this GlobalAlertAnalytic.  # noqa: E501
-
-
-        :return: The failed of this GlobalAlertAnalytic.  # noqa: E501
-        :rtype: int
-        """
-        return self._failed
-
-    @failed.setter
-    def failed(self, failed):
-        """Sets the failed of this GlobalAlertAnalytic.
-
-
-        :param failed: The failed of this GlobalAlertAnalytic.  # noqa: E501
-        :type: int
-        """
-
-        self._failed = failed
-
-    @property
-    def success(self):
-        """Gets the success of this GlobalAlertAnalytic.  # noqa: E501
-
-
-        :return: The success of this GlobalAlertAnalytic.  # noqa: E501
-        :rtype: int
-        """
-        return self._success
-
-    @success.setter
-    def success(self, success):
-        """Sets the success of this GlobalAlertAnalytic.
-
-
-        :param success: The success of this GlobalAlertAnalytic.  # noqa: E501
-        :type: int
-        """
-
-        self._success = success
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(GlobalAlertAnalytic, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, GlobalAlertAnalytic):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, GlobalAlertAnalytic):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/response_container_global_alert_analytic.py b/wavefront_api_client/models/response_container_global_alert_analytic.py
deleted file mode 100644
index 1ea2610..0000000
--- a/wavefront_api_client/models/response_container_global_alert_analytic.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class ResponseContainerGlobalAlertAnalytic(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'response': 'GlobalAlertAnalytic',
-        'status': 'ResponseStatus'
-    }
-
-    attribute_map = {
-        'response': 'response',
-        'status': 'status'
-    }
-
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
-        """ResponseContainerGlobalAlertAnalytic - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._response = None
-        self._status = None
-        self.discriminator = None
-
-        if response is not None:
-            self.response = response
-        self.status = status
-
-    @property
-    def response(self):
-        """Gets the response of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
-
-
-        :return: The response of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
-        :rtype: GlobalAlertAnalytic
-        """
-        return self._response
-
-    @response.setter
-    def response(self, response):
-        """Sets the response of this ResponseContainerGlobalAlertAnalytic.
-
-
-        :param response: The response of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
-        :type: GlobalAlertAnalytic
-        """
-
-        self._response = response
-
-    @property
-    def status(self):
-        """Gets the status of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
-
-
-        :return: The status of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
-        :rtype: ResponseStatus
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """Sets the status of this ResponseContainerGlobalAlertAnalytic.
-
-
-        :param status: The status of this ResponseContainerGlobalAlertAnalytic.  # noqa: E501
-        :type: ResponseStatus
-        """
-        if self._configuration.client_side_validation and status is None:
-            raise ValueError("Invalid value for `status`, must not be `None`")  # noqa: E501
-
-        self._status = status
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ResponseContainerGlobalAlertAnalytic, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ResponseContainerGlobalAlertAnalytic):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, ResponseContainerGlobalAlertAnalytic):
-            return True
-
-        return self.to_dict() != other.to_dict()
diff --git a/wavefront_api_client/models/role_properties_dto.py b/wavefront_api_client/models/role_properties_dto.py
deleted file mode 100644
index 42c591e..0000000
--- a/wavefront_api_client/models/role_properties_dto.py
+++ /dev/null
@@ -1,227 +0,0 @@
-# coding: utf-8
-
-"""
-    Wavefront REST API Documentation
-
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
-
-    OpenAPI spec version: v2
-    Contact: chitimba@wavefront.com
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-from wavefront_api_client.configuration import Configuration
-
-
-class RolePropertiesDTO(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'deletable': 'bool',
-        'name_editable': 'bool',
-        'perms_editable': 'bool',
-        'users_addable': 'bool',
-        'users_removable': 'bool'
-    }
-
-    attribute_map = {
-        'deletable': 'deletable',
-        'name_editable': 'nameEditable',
-        'perms_editable': 'permsEditable',
-        'users_addable': 'usersAddable',
-        'users_removable': 'usersRemovable'
-    }
-
-    def __init__(self, deletable=None, name_editable=None, perms_editable=None, users_addable=None, users_removable=None, _configuration=None):  # noqa: E501
-        """RolePropertiesDTO - a model defined in Swagger"""  # noqa: E501
-        if _configuration is None:
-            _configuration = Configuration()
-        self._configuration = _configuration
-
-        self._deletable = None
-        self._name_editable = None
-        self._perms_editable = None
-        self._users_addable = None
-        self._users_removable = None
-        self.discriminator = None
-
-        if deletable is not None:
-            self.deletable = deletable
-        if name_editable is not None:
-            self.name_editable = name_editable
-        if perms_editable is not None:
-            self.perms_editable = perms_editable
-        if users_addable is not None:
-            self.users_addable = users_addable
-        if users_removable is not None:
-            self.users_removable = users_removable
-
-    @property
-    def deletable(self):
-        """Gets the deletable of this RolePropertiesDTO.  # noqa: E501
-
-
-        :return: The deletable of this RolePropertiesDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._deletable
-
-    @deletable.setter
-    def deletable(self, deletable):
-        """Sets the deletable of this RolePropertiesDTO.
-
-
-        :param deletable: The deletable of this RolePropertiesDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._deletable = deletable
-
-    @property
-    def name_editable(self):
-        """Gets the name_editable of this RolePropertiesDTO.  # noqa: E501
-
-
-        :return: The name_editable of this RolePropertiesDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._name_editable
-
-    @name_editable.setter
-    def name_editable(self, name_editable):
-        """Sets the name_editable of this RolePropertiesDTO.
-
-
-        :param name_editable: The name_editable of this RolePropertiesDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._name_editable = name_editable
-
-    @property
-    def perms_editable(self):
-        """Gets the perms_editable of this RolePropertiesDTO.  # noqa: E501
-
-
-        :return: The perms_editable of this RolePropertiesDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._perms_editable
-
-    @perms_editable.setter
-    def perms_editable(self, perms_editable):
-        """Sets the perms_editable of this RolePropertiesDTO.
-
-
-        :param perms_editable: The perms_editable of this RolePropertiesDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._perms_editable = perms_editable
-
-    @property
-    def users_addable(self):
-        """Gets the users_addable of this RolePropertiesDTO.  # noqa: E501
-
-
-        :return: The users_addable of this RolePropertiesDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._users_addable
-
-    @users_addable.setter
-    def users_addable(self, users_addable):
-        """Sets the users_addable of this RolePropertiesDTO.
-
-
-        :param users_addable: The users_addable of this RolePropertiesDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._users_addable = users_addable
-
-    @property
-    def users_removable(self):
-        """Gets the users_removable of this RolePropertiesDTO.  # noqa: E501
-
-
-        :return: The users_removable of this RolePropertiesDTO.  # noqa: E501
-        :rtype: bool
-        """
-        return self._users_removable
-
-    @users_removable.setter
-    def users_removable(self, users_removable):
-        """Sets the users_removable of this RolePropertiesDTO.
-
-
-        :param users_removable: The users_removable of this RolePropertiesDTO.  # noqa: E501
-        :type: bool
-        """
-
-        self._users_removable = users_removable
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(RolePropertiesDTO, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, RolePropertiesDTO):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        if not isinstance(other, RolePropertiesDTO):
-            return True
-
-        return self.to_dict() != other.to_dict()

From a1002f5a122c02e12f4a93dea3702b49caf15780 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 20 Sep 2023 08:16:20 -0700
Subject: [PATCH 147/161] Autogenerated Update v2.202.0.

---
 .gitignore                    | 3 ---
 .swagger-codegen/config.json  | 2 +-
 .swagger-codegen/config.jsone | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b323e86..a655050 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,3 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
-
-# MacOS
-.DS_Store
diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index ef5cf88..9b50fe2 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.202.2"
+    "packageVersion": "2.202.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9b50fe2..ef5cf88 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.202.0"
+    "packageVersion": "2.202.2"
 }

From aa40aa966325403d7a64df2b7d4b2886c62876c6 Mon Sep 17 00:00:00 2001
From: Artem Ustinov <austinov@vmware.com>
Date: Wed, 20 Sep 2023 16:23:55 -0700
Subject: [PATCH 148/161] Prepare Release v2.202.2

Prepare Release and Upgrade to Trusted Publishers.
---
 .github/workflows/publish_on_merge.yml   | 4 +++-
 .github/workflows/publish_on_release.yml | 5 +++--
 .swagger-codegen/config.jsone            | 2 +-
 README.md                                | 2 +-
 setup.py                                 | 2 +-
 wavefront_api_client/api_client.py       | 2 +-
 wavefront_api_client/configuration.py    | 2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish_on_merge.yml b/.github/workflows/publish_on_merge.yml
index 2314d55..9c8c6e8 100644
--- a/.github/workflows/publish_on_merge.yml
+++ b/.github/workflows/publish_on_merge.yml
@@ -9,12 +9,14 @@ jobs:
   prepare:
     uses: ./.github/workflows/package.yml
   publish:
+    environment: test
     needs: prepare
+    permissions:
+      id-token: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
       - name: Publish the Package on TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
           repository-url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/publish_on_release.yml b/.github/workflows/publish_on_release.yml
index 091c46e..64ba146 100644
--- a/.github/workflows/publish_on_release.yml
+++ b/.github/workflows/publish_on_release.yml
@@ -9,12 +9,13 @@ jobs:
   prepare:
     uses: ./.github/workflows/package.yml
   publish:
+    environment: release
     needs: prepare
+    permissions:
+      id-token: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
       - name: Publish the Package
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index ef5cf88..9d1014b 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.202.2"
+    "packageVersion": "2.201.1"
 }
diff --git a/README.md b/README.md
index 7bff20f..9b24411 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.202.0
+- Package version: 2.202.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/setup.py b/setup.py
index 434f924..399bde7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.202.0"
+VERSION = "2.202.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e9685a7..fc081fc 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.202.0/python'
+        self.user_agent = 'Swagger-Codegen/2.202.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index d1d9cbc..e1912da 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.202.0".\
+               "SDK Package Version: 2.202.2".\
                format(env=sys.platform, pyversion=sys.version)

From 2b7057b63465639fad3c3fbb454bca4a38276420 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 26 Sep 2023 08:16:19 -0700
Subject: [PATCH 149/161] Autogenerated Update v2.203.2.

---
 .swagger-codegen/config.json              |  2 +-
 .swagger-codegen/config.jsone             |  2 +-
 README.md                                 |  2 +-
 docs/ApiTokenApi.md                       |  6 +++---
 setup.py                                  |  2 +-
 wavefront_api_client/api/api_token_api.py | 12 ++++++------
 wavefront_api_client/api_client.py        |  2 +-
 wavefront_api_client/configuration.py     |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 9b50fe2..6edb882 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.202.0"
+    "packageVersion": "2.203.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9d1014b..9b50fe2 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.201.1"
+    "packageVersion": "2.202.0"
 }
diff --git a/README.md b/README.md
index 9b24411..00116f0 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.202.2
+- Package version: 2.203.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
index f160d05..bfea904 100644
--- a/docs/ApiTokenApi.md
+++ b/docs/ApiTokenApi.md
@@ -126,7 +126,7 @@ Name | Type | Description  | Notes
 
 Delete the specified api token
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -292,7 +292,7 @@ Name | Type | Description  | Notes
 
 Get all api tokens for a user
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
@@ -500,7 +500,7 @@ Name | Type | Description  | Notes
 
 Update the name of the specified api token
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+
 
 ### Example
 ```python
diff --git a/setup.py b/setup.py
index 399bde7..bfa58be 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.202.2"
+VERSION = "2.203.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index 75f26d9..77f50d5 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -218,7 +218,7 @@ def delete_customer_token_with_http_info(self, **kwargs):  # noqa: E501
     def delete_token(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token(id, async_req=True)
@@ -240,7 +240,7 @@ def delete_token(self, id, **kwargs):  # noqa: E501
     def delete_token_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_token_with_http_info(id, async_req=True)
@@ -515,7 +515,7 @@ def generate_token_service_account_with_http_info(self, id, **kwargs):  # noqa:
     def get_all_tokens(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_tokens(async_req=True)
@@ -536,7 +536,7 @@ def get_all_tokens(self, **kwargs):  # noqa: E501
     def get_all_tokens_with_http_info(self, **kwargs):  # noqa: E501
         """Get all api tokens for a user  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_tokens_with_http_info(async_req=True)
@@ -879,7 +879,7 @@ def get_tokens_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_token_name(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name(id, async_req=True)
@@ -902,7 +902,7 @@ def update_token_name(self, id, **kwargs):  # noqa: E501
     def update_token_name_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update the name of the specified api token  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+          # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_token_name_with_http_info(id, async_req=True)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index fc081fc..b4452c4 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.202.2/python'
+        self.user_agent = 'Swagger-Codegen/2.203.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index e1912da..06302bb 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.202.2".\
+               "SDK Package Version: 2.203.2".\
                format(env=sys.platform, pyversion=sys.version)

From 7106bce21e1eee634bc1265a91cc434892e6693a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 14 Nov 2023 08:16:20 -0800
Subject: [PATCH 150/161] Autogenerated Update v2.210.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  12 +-
 docs/SecurityPolicyApi.md                     | 281 ++++++++++
 setup.py                                      |   2 +-
 test/test_security_policy_api.py              |  69 +++
 wavefront_api_client/__init__.py              |   2 +-
 wavefront_api_client/api/__init__.py          |   2 +-
 .../api/security_policy_api.py                | 517 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 11 files changed, 880 insertions(+), 13 deletions(-)
 create mode 100644 docs/SecurityPolicyApi.md
 create mode 100644 test/test_security_policy_api.py
 create mode 100644 wavefront_api_client/api/security_policy_api.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 6edb882..d1a9877 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.203.2"
+    "packageVersion": "2.210.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 9b50fe2..6edb882 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.202.0"
+    "packageVersion": "2.203.2"
 }
diff --git a/README.md b/README.md
index 00116f0..9779106 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.203.2
+- Package version: 2.210.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -224,11 +224,6 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
-*MetricsPolicyApi* | [**get_metrics_policy**](docs/MetricsPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
-*MetricsPolicyApi* | [**get_metrics_policy_by_version**](docs/MetricsPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
-*MetricsPolicyApi* | [**get_metrics_policy_history**](docs/MetricsPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
-*MetricsPolicyApi* | [**revert_metrics_policy_by_version**](docs/MetricsPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
-*MetricsPolicyApi* | [**update_metrics_policy**](docs/MetricsPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
 *MonitoredApplicationApi* | [**get_all_applications**](docs/MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored services
 *MonitoredApplicationApi* | [**get_application**](docs/MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
 *MonitoredApplicationApi* | [**update_service**](docs/MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
@@ -402,6 +397,11 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_web_hook_entities**](docs/SearchApi.md#search_web_hook_entities) | **POST** /api/v2/search/webhook | Search over a customer&#39;s webhooks
 *SearchApi* | [**search_web_hook_for_facet**](docs/SearchApi.md#search_web_hook_for_facet) | **POST** /api/v2/search/webhook/{facet} | Lists the values of a specific facet over the customer&#39;s webhooks
 *SearchApi* | [**search_webhook_for_facets**](docs/SearchApi.md#search_webhook_for_facets) | **POST** /api/v2/search/webhook/facets | Lists the values of one or more facets over the customer&#39;s webhooks
+*SecurityPolicyApi* | [**get_metrics_policy**](docs/SecurityPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
+*SecurityPolicyApi* | [**get_metrics_policy_by_version**](docs/SecurityPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
+*SecurityPolicyApi* | [**get_metrics_policy_history**](docs/SecurityPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
+*SecurityPolicyApi* | [**revert_metrics_policy_by_version**](docs/SecurityPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
+*SecurityPolicyApi* | [**update_metrics_policy**](docs/SecurityPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
 *SourceApi* | [**add_source_tag**](docs/SourceApi.md#add_source_tag) | **PUT** /api/v2/source/{id}/tag/{tagValue} | Add a tag to a specific source
 *SourceApi* | [**create_source**](docs/SourceApi.md#create_source) | **POST** /api/v2/source | Create metadata (description or tags) for a specific source
 *SourceApi* | [**delete_source**](docs/SourceApi.md#delete_source) | **DELETE** /api/v2/source/{id} | Delete metadata (description and tags) for a specific source
diff --git a/docs/SecurityPolicyApi.md b/docs/SecurityPolicyApi.md
new file mode 100644
index 0000000..84a7b2c
--- /dev/null
+++ b/docs/SecurityPolicyApi.md
@@ -0,0 +1,281 @@
+# wavefront_api_client.SecurityPolicyApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_metrics_policy**](SecurityPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
+[**get_metrics_policy_by_version**](SecurityPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
+[**get_metrics_policy_history**](SecurityPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
+[**revert_metrics_policy_by_version**](SecurityPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
+[**update_metrics_policy**](SecurityPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
+
+
+# **get_metrics_policy**
+> ResponseContainerMetricsPolicyReadModel get_metrics_policy()
+
+Get the metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+
+try:
+    # Get the metrics policy
+    api_response = api_instance.get_metrics_policy()
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->get_metrics_policy: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_metrics_policy_by_version**
+> ResponseContainerMetricsPolicyReadModel get_metrics_policy_by_version(version)
+
+Get a specific historical version of a metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+version = 789 # int | 
+
+try:
+    # Get a specific historical version of a metrics policy
+    api_response = api_instance.get_metrics_policy_by_version(version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->get_metrics_policy_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_metrics_policy_history**
+> ResponseContainerHistoryResponse get_metrics_policy_history(offset=offset, limit=limit)
+
+Get the version history of metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of metrics policy
+    api_response = api_instance.get_metrics_policy_history(offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->get_metrics_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **revert_metrics_policy_by_version**
+> ResponseContainerMetricsPolicyReadModel revert_metrics_policy_by_version(version)
+
+Revert to a specific historical version of a metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+version = 789 # int | 
+
+try:
+    # Revert to a specific historical version of a metrics policy
+    api_response = api_instance.revert_metrics_policy_by_version(version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->revert_metrics_policy_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_metrics_policy**
+> ResponseContainerMetricsPolicyReadModel update_metrics_policy(body=body)
+
+Update the metrics policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+body = wavefront_api_client.MetricsPolicyWriteModel() # MetricsPolicyWriteModel | Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre> (optional)
+
+try:
+    # Update the metrics policy
+    api_response = api_instance.update_metrics_policy(body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->update_metrics_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**MetricsPolicyWriteModel**](MetricsPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{ \&quot;policyRules\&quot;: [{   \&quot;name\&quot;: \&quot;Policy rule1 name\&quot;,   \&quot;description\&quot;: \&quot;Policy rule1 description\&quot;,   \&quot;prefixes\&quot;: [\&quot;revenue.*\&quot;],   \&quot;tags\&quot;: [{\&quot;key\&quot;:\&quot;sensitive\&quot;,  \&quot;value\&quot;:\&quot;false\&quot;},              {\&quot;key\&quot;:\&quot;source\&quot;,  \&quot;value\&quot;:\&quot;app1\&quot;}],   \&quot;tagsAnded\&quot;: \&quot;true\&quot;,   \&quot;accessType\&quot;: \&quot;ALLOW\&quot;,   \&quot;accounts\&quot;: [\&quot;accountId1\&quot;, \&quot;accountId2\&quot;],   \&quot;userGroups\&quot;: [\&quot;userGroupId1\&quot;],   \&quot;roles\&quot;: [\&quot;roleId\&quot;] }, {   \&quot;name\&quot;: \&quot;Policy rule2 name\&quot;,   \&quot;description\&quot;: \&quot;Policy rule2 description\&quot;,   \&quot;prefixes\&quot;: [\&quot;revenue.*\&quot;],   \&quot;accessType\&quot;: \&quot;BLOCK\&quot;,   \&quot;accounts\&quot;: [\&quot;accountId3\&quot;],   \&quot;userGroups\&quot;: [\&quot;userGroupId1\&quot;] }] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/setup.py b/setup.py
index bfa58be..ff4510e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.203.2"
+VERSION = "2.210.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_security_policy_api.py b/test/test_security_policy_api.py
new file mode 100644
index 0000000..52a9ec2
--- /dev/null
+++ b/test/test_security_policy_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.security_policy_api import SecurityPolicyApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestSecurityPolicyApi(unittest.TestCase):
+    """SecurityPolicyApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.security_policy_api.SecurityPolicyApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_metrics_policy(self):
+        """Test case for get_metrics_policy
+
+        Get the metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_get_metrics_policy_by_version(self):
+        """Test case for get_metrics_policy_by_version
+
+        Get a specific historical version of a metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_get_metrics_policy_history(self):
+        """Test case for get_metrics_policy_history
+
+        Get the version history of metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_revert_metrics_policy_by_version(self):
+        """Test case for revert_metrics_policy_by_version
+
+        Revert to a specific historical version of a metrics policy  # noqa: E501
+        """
+        pass
+
+    def test_update_metrics_policy(self):
+        """Test case for update_metrics_policy
+
+        Update the metrics policy  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 13e0c43..033444f 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -31,7 +31,6 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
-from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi
 from wavefront_api_client.api.monitored_application_api import MonitoredApplicationApi
 from wavefront_api_client.api.monitored_service_api import MonitoredServiceApi
 from wavefront_api_client.api.notificant_api import NotificantApi
@@ -46,6 +45,7 @@
 from wavefront_api_client.api.saved_traces_search_api import SavedTracesSearchApi
 from wavefront_api_client.api.saved_traces_search_group_api import SavedTracesSearchGroupApi
 from wavefront_api_client.api.search_api import SearchApi
+from wavefront_api_client.api.security_policy_api import SecurityPolicyApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi
 from wavefront_api_client.api.usage_api import UsageApi
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index f043315..21b30d0 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -18,7 +18,6 @@
 from wavefront_api_client.api.maintenance_window_api import MaintenanceWindowApi
 from wavefront_api_client.api.message_api import MessageApi
 from wavefront_api_client.api.metric_api import MetricApi
-from wavefront_api_client.api.metrics_policy_api import MetricsPolicyApi
 from wavefront_api_client.api.monitored_application_api import MonitoredApplicationApi
 from wavefront_api_client.api.monitored_service_api import MonitoredServiceApi
 from wavefront_api_client.api.notificant_api import NotificantApi
@@ -33,6 +32,7 @@
 from wavefront_api_client.api.saved_traces_search_api import SavedTracesSearchApi
 from wavefront_api_client.api.saved_traces_search_group_api import SavedTracesSearchGroupApi
 from wavefront_api_client.api.search_api import SearchApi
+from wavefront_api_client.api.security_policy_api import SecurityPolicyApi
 from wavefront_api_client.api.source_api import SourceApi
 from wavefront_api_client.api.span_sampling_policy_api import SpanSamplingPolicyApi
 from wavefront_api_client.api.usage_api import UsageApi
diff --git a/wavefront_api_client/api/security_policy_api.py b/wavefront_api_client/api/security_policy_api.py
new file mode 100644
index 0000000..331e4e3
--- /dev/null
+++ b/wavefront_api_client/api/security_policy_api.py
@@ -0,0 +1,517 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class SecurityPolicyApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_metrics_policy(self, **kwargs):  # noqa: E501
+        """Get the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_metrics_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Get the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = []  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_metrics_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_metrics_policy_by_version(self, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_by_version(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+            return data
+
+    def get_metrics_policy_by_version_with_http_info(self, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_by_version_with_http_info(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_metrics_policy_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `get_metrics_policy_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy/history/{version}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_metrics_policy_history(self, **kwargs):  # noqa: E501
+        """Get the version history of metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_history(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_metrics_policy_history_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_metrics_policy_history_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_metrics_policy_history_with_http_info(self, **kwargs):  # noqa: E501
+        """Get the version history of metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_metrics_policy_history_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_metrics_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def revert_metrics_policy_by_version(self, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revert_metrics_policy_by_version(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revert_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revert_metrics_policy_by_version_with_http_info(version, **kwargs)  # noqa: E501
+            return data
+
+    def revert_metrics_policy_by_version_with_http_info(self, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revert_metrics_policy_by_version_with_http_info(version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revert_metrics_policy_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `revert_metrics_policy_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy/revert/{version}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def update_metrics_policy(self, **kwargs):  # noqa: E501
+        """Update the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_metrics_policy(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param MetricsPolicyWriteModel body: Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre>
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.update_metrics_policy_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def update_metrics_policy_with_http_info(self, **kwargs):  # noqa: E501
+        """Update the metrics policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_metrics_policy_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param MetricsPolicyWriteModel body: Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre>
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_metrics_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/metricspolicy', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b4452c4..eb5df00 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.203.2/python'
+        self.user_agent = 'Swagger-Codegen/2.210.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 06302bb..27a8fa2 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.203.2".\
+               "SDK Package Version: 2.210.2".\
                format(env=sys.platform, pyversion=sys.version)

From b6aaa65701f502e59edcacbf520b5a86fb438a93 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 5 Dec 2023 08:16:22 -0800
Subject: [PATCH 151/161] Autogenerated Update v2.213.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   2 +-
 docs/AlertAnalyticsSummary.md                 |   2 +
 docs/AlertAnalyticsSummaryDetail.md           |   5 +
 docs/ResponseContainer.md                     |   1 +
 docs/ResponseContainerAccessPolicy.md         |   1 +
 docs/ResponseContainerAccessPolicyAction.md   |   1 +
 docs/ResponseContainerAccount.md              |   1 +
 docs/ResponseContainerAlert.md                |   1 +
 .../ResponseContainerAlertAnalyticsSummary.md |   1 +
 docs/ResponseContainerApiTokenModel.md        |   1 +
 docs/ResponseContainerCloudIntegration.md     |   1 +
 docs/ResponseContainerClusterInfoDTO.md       |   1 +
 docs/ResponseContainerDashboard.md            |   1 +
 ...sponseContainerDefaultSavedAppMapSearch.md |   1 +
 ...sponseContainerDefaultSavedTracesSearch.md |   1 +
 ...esponseContainerDerivedMetricDefinition.md |   1 +
 docs/ResponseContainerEvent.md                |   1 +
 docs/ResponseContainerExternalLink.md         |   1 +
 docs/ResponseContainerFacetResponse.md        |   1 +
 ...esponseContainerFacetsResponseContainer.md |   1 +
 docs/ResponseContainerHistoryResponse.md      |   1 +
 ...sponseContainerIngestionPolicyReadModel.md |   1 +
 docs/ResponseContainerIntegration.md          |   1 +
 docs/ResponseContainerIntegrationStatus.md    |   1 +
 ...seContainerListAccessControlListReadDTO.md |   1 +
 ...esponseContainerListAlertErrorGroupInfo.md |   1 +
 docs/ResponseContainerListApiTokenModel.md    |   1 +
 docs/ResponseContainerListIntegration.md      |   1 +
 ...seContainerListIntegrationManifestGroup.md |   1 +
 ...sponseContainerListNotificationMessages.md |   1 +
 docs/ResponseContainerListServiceAccount.md   |   1 +
 docs/ResponseContainerListString.md           |   1 +
 docs/ResponseContainerListUserApiToken.md     |   1 +
 docs/ResponseContainerListUserDTO.md          |   1 +
 docs/ResponseContainerMaintenanceWindow.md    |   1 +
 docs/ResponseContainerMap.md                  |   1 +
 docs/ResponseContainerMapStringInteger.md     |   1 +
 ...onseContainerMapStringIntegrationStatus.md |   1 +
 docs/ResponseContainerMessage.md              |   1 +
 ...ResponseContainerMetricsPolicyReadModel.md |   1 +
 ...esponseContainerMonitoredApplicationDTO.md |   1 +
 docs/ResponseContainerMonitoredCluster.md     |   1 +
 docs/ResponseContainerMonitoredServiceDTO.md  |   1 +
 docs/ResponseContainerNotificant.md           |   1 +
 docs/ResponseContainerPagedAccount.md         |   1 +
 docs/ResponseContainerPagedAlert.md           |   1 +
 ...ntainerPagedAlertAnalyticsSummaryDetail.md |   1 +
 docs/ResponseContainerPagedAlertWithStats.md  |   1 +
 docs/ResponseContainerPagedAnomaly.md         |   1 +
 docs/ResponseContainerPagedApiTokenModel.md   |   1 +
 .../ResponseContainerPagedCloudIntegration.md |   1 +
 ...eContainerPagedCustomerFacingUserObject.md |   1 +
 docs/ResponseContainerPagedDashboard.md       |   1 +
 ...seContainerPagedDerivedMetricDefinition.md |   1 +
 ...erPagedDerivedMetricDefinitionWithStats.md |   1 +
 docs/ResponseContainerPagedEvent.md           |   1 +
 docs/ResponseContainerPagedExternalLink.md    |   1 +
 ...eContainerPagedIngestionPolicyReadModel.md |   1 +
 docs/ResponseContainerPagedIntegration.md     |   1 +
 ...ResponseContainerPagedMaintenanceWindow.md |   1 +
 docs/ResponseContainerPagedMessage.md         |   1 +
 ...seContainerPagedMonitoredApplicationDTO.md |   1 +
 .../ResponseContainerPagedMonitoredCluster.md |   1 +
 ...sponseContainerPagedMonitoredServiceDTO.md |   1 +
 docs/ResponseContainerPagedNotificant.md      |   1 +
 docs/ResponseContainerPagedProxy.md           |   1 +
 ...esponseContainerPagedRecentAppMapSearch.md |   1 +
 ...esponseContainerPagedRecentTracesSearch.md |   1 +
 docs/ResponseContainerPagedRelatedEvent.md    |   1 +
 ...onseContainerPagedReportEventAnomalyDTO.md |   1 +
 docs/ResponseContainerPagedRoleDTO.md         |   1 +
 ...ResponseContainerPagedSavedAppMapSearch.md |   1 +
 ...nseContainerPagedSavedAppMapSearchGroup.md |   1 +
 docs/ResponseContainerPagedSavedSearch.md     |   1 +
 ...ResponseContainerPagedSavedTracesSearch.md |   1 +
 ...nseContainerPagedSavedTracesSearchGroup.md |   1 +
 docs/ResponseContainerPagedServiceAccount.md  |   1 +
 docs/ResponseContainerPagedSource.md          |   1 +
 ...esponseContainerPagedSpanSamplingPolicy.md |   1 +
 docs/ResponseContainerPagedUserGroupModel.md  |   1 +
 docs/ResponseContainerProxy.md                |   1 +
 docs/ResponseContainerQueryTypeDTO.md         |   1 +
 docs/ResponseContainerRecentAppMapSearch.md   |   1 +
 docs/ResponseContainerRecentTracesSearch.md   |   1 +
 docs/ResponseContainerRoleDTO.md              |   1 +
 docs/ResponseContainerSavedAppMapSearch.md    |   1 +
 ...ResponseContainerSavedAppMapSearchGroup.md |   1 +
 docs/ResponseContainerSavedSearch.md          |   1 +
 docs/ResponseContainerSavedTracesSearch.md    |   1 +
 ...ResponseContainerSavedTracesSearchGroup.md |   1 +
 docs/ResponseContainerServiceAccount.md       |   1 +
 docs/ResponseContainerSetBusinessFunction.md  |   1 +
 docs/ResponseContainerSetSourceLabelPair.md   |   1 +
 docs/ResponseContainerSource.md               |   1 +
 docs/ResponseContainerSpanSamplingPolicy.md   |   1 +
 docs/ResponseContainerString.md               |   1 +
 docs/ResponseContainerTagsResponse.md         |   1 +
 docs/ResponseContainerUserApiToken.md         |   1 +
 docs/ResponseContainerUserDTO.md              |   1 +
 docs/ResponseContainerUserGroupModel.md       |   1 +
 docs/ResponseContainerValidatedUsersDTO.md    |   1 +
 docs/ResponseContainerVoid.md                 |   1 +
 setup.py                                      |   2 +-
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 .../models/alert_analytics_summary.py         |  58 +++++++-
 .../models/alert_analytics_summary_detail.py  | 132 +++++++++++++++++-
 .../models/response_container.py              |  28 +++-
 .../response_container_access_policy.py       |  28 +++-
 ...response_container_access_policy_action.py |  28 +++-
 .../models/response_container_account.py      |  28 +++-
 .../models/response_container_alert.py        |  28 +++-
 ...ponse_container_alert_analytics_summary.py |  28 +++-
 .../response_container_api_token_model.py     |  28 +++-
 .../response_container_cloud_integration.py   |  28 +++-
 .../response_container_cluster_info_dto.py    |  28 +++-
 .../models/response_container_dashboard.py    |  28 +++-
 ..._container_default_saved_app_map_search.py |  28 +++-
 ...e_container_default_saved_traces_search.py |  28 +++-
 ...nse_container_derived_metric_definition.py |  28 +++-
 .../models/response_container_event.py        |  28 +++-
 .../response_container_external_link.py       |  28 +++-
 .../response_container_facet_response.py      |  28 +++-
 ...nse_container_facets_response_container.py |  28 +++-
 .../response_container_history_response.py    |  28 +++-
 ...e_container_ingestion_policy_read_model.py |  28 +++-
 .../models/response_container_integration.py  |  28 +++-
 .../response_container_integration_status.py  |  28 +++-
 ...ainer_list_access_control_list_read_dto.py |  28 +++-
 ...e_container_list_alert_error_group_info.py |  28 +++-
 ...response_container_list_api_token_model.py |  28 +++-
 .../response_container_list_integration.py    |  28 +++-
 ...ntainer_list_integration_manifest_group.py |  28 +++-
 ...se_container_list_notification_messages.py |  28 +++-
 ...response_container_list_service_account.py |  28 +++-
 .../models/response_container_list_string.py  |  28 +++-
 .../response_container_list_user_api_token.py |  28 +++-
 .../response_container_list_user_dto.py       |  28 +++-
 .../response_container_maintenance_window.py  |  28 +++-
 .../models/response_container_map.py          |  28 +++-
 .../response_container_map_string_integer.py  |  28 +++-
 ...container_map_string_integration_status.py |  28 +++-
 .../models/response_container_message.py      |  28 +++-
 ...nse_container_metrics_policy_read_model.py |  28 +++-
 ...nse_container_monitored_application_dto.py |  28 +++-
 .../response_container_monitored_cluster.py   |  28 +++-
 ...esponse_container_monitored_service_dto.py |  28 +++-
 .../models/response_container_notificant.py   |  28 +++-
 .../response_container_paged_account.py       |  28 +++-
 .../models/response_container_paged_alert.py  |  28 +++-
 ...er_paged_alert_analytics_summary_detail.py |  28 +++-
 ...sponse_container_paged_alert_with_stats.py |  28 +++-
 .../response_container_paged_anomaly.py       |  28 +++-
 ...esponse_container_paged_api_token_model.py |  28 +++-
 ...ponse_container_paged_cloud_integration.py |  28 +++-
 ...ainer_paged_customer_facing_user_object.py |  28 +++-
 .../response_container_paged_dashboard.py     |  28 +++-
 ...ntainer_paged_derived_metric_definition.py |  28 +++-
 ...ed_derived_metric_definition_with_stats.py |  28 +++-
 .../models/response_container_paged_event.py  |  28 +++-
 .../response_container_paged_external_link.py |  28 +++-
 ...ainer_paged_ingestion_policy_read_model.py |  28 +++-
 .../response_container_paged_integration.py   |  28 +++-
 ...onse_container_paged_maintenance_window.py |  28 +++-
 .../response_container_paged_message.py       |  28 +++-
 ...ntainer_paged_monitored_application_dto.py |  28 +++-
 ...ponse_container_paged_monitored_cluster.py |  28 +++-
 ...e_container_paged_monitored_service_dto.py |  28 +++-
 .../response_container_paged_notificant.py    |  28 +++-
 .../models/response_container_paged_proxy.py  |  28 +++-
 ...e_container_paged_recent_app_map_search.py |  28 +++-
 ...se_container_paged_recent_traces_search.py |  28 +++-
 .../response_container_paged_related_event.py |  28 +++-
 ...ontainer_paged_report_event_anomaly_dto.py |  28 +++-
 .../response_container_paged_role_dto.py      |  28 +++-
 ...se_container_paged_saved_app_map_search.py |  28 +++-
 ...tainer_paged_saved_app_map_search_group.py |  28 +++-
 .../response_container_paged_saved_search.py  |  28 +++-
 ...nse_container_paged_saved_traces_search.py |  28 +++-
 ...ntainer_paged_saved_traces_search_group.py |  28 +++-
 ...esponse_container_paged_service_account.py |  28 +++-
 .../models/response_container_paged_source.py |  28 +++-
 ...se_container_paged_span_sampling_policy.py |  28 +++-
 ...sponse_container_paged_user_group_model.py |  28 +++-
 .../models/response_container_proxy.py        |  28 +++-
 .../response_container_query_type_dto.py      |  28 +++-
 ...esponse_container_recent_app_map_search.py |  28 +++-
 ...response_container_recent_traces_search.py |  28 +++-
 .../models/response_container_role_dto.py     |  28 +++-
 ...response_container_saved_app_map_search.py |  28 +++-
 ...se_container_saved_app_map_search_group.py |  28 +++-
 .../models/response_container_saved_search.py |  28 +++-
 .../response_container_saved_traces_search.py |  28 +++-
 ...nse_container_saved_traces_search_group.py |  28 +++-
 .../response_container_service_account.py     |  28 +++-
 ...esponse_container_set_business_function.py |  28 +++-
 ...esponse_container_set_source_label_pair.py |  28 +++-
 .../models/response_container_source.py       |  28 +++-
 ...response_container_span_sampling_policy.py |  28 +++-
 .../models/response_container_string.py       |  28 +++-
 .../response_container_tags_response.py       |  28 +++-
 .../response_container_user_api_token.py      |  28 +++-
 .../models/response_container_user_dto.py     |  28 +++-
 .../response_container_user_group_model.py    |  28 +++-
 .../response_container_validated_users_dto.py |  28 +++-
 .../models/response_container_void.py         |  28 +++-
 208 files changed, 2971 insertions(+), 109 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index d1a9877..7ea07f4 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.210.2"
+    "packageVersion": "2.213.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 6edb882..d1a9877 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.203.2"
+    "packageVersion": "2.210.2"
 }
diff --git a/README.md b/README.md
index 9779106..fe11ed1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.210.2
+- Package version: 2.213.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/AlertAnalyticsSummary.md b/docs/AlertAnalyticsSummary.md
index 9b1a633..e8afbbb 100644
--- a/docs/AlertAnalyticsSummary.md
+++ b/docs/AlertAnalyticsSummary.md
@@ -3,8 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**total_active_no_target** | **int** |  | [optional] 
 **total_evaluated** | **int** |  | [optional] 
 **total_failed** | **int** |  | [optional] 
+**total_no_data** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AlertAnalyticsSummaryDetail.md b/docs/AlertAnalyticsSummaryDetail.md
index 4f94b54..8e1b180 100644
--- a/docs/AlertAnalyticsSummaryDetail.md
+++ b/docs/AlertAnalyticsSummaryDetail.md
@@ -13,6 +13,11 @@ Name | Type | Description | Notes
 **error_groups_summary** | [**list[AlertErrorGroupSummary]**](AlertErrorGroupSummary.md) |  | [optional] 
 **failure_percentage** | **float** |  | [optional] 
 **failure_percentage_range** | **str** |  | [optional] 
+**is_no_data** | **bool** |  | [optional] 
+**is_no_target** | **bool** |  | [optional] 
+**last_event_time** | **str** |  | [optional] 
+**last_updated_time** | **str** |  | [optional] 
+**last_updated_user_id** | **str** |  | [optional] 
 **tags** | **list[str]** |  | [optional] 
 **total_evaluated** | **int** |  | [optional] 
 **total_failed** | **int** |  | [optional] 
diff --git a/docs/ResponseContainer.md b/docs/ResponseContainer.md
index c9db167..00c1291 100644
--- a/docs/ResponseContainer.md
+++ b/docs/ResponseContainer.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **object** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerAccessPolicy.md b/docs/ResponseContainerAccessPolicy.md
index d483310..47841d8 100644
--- a/docs/ResponseContainerAccessPolicy.md
+++ b/docs/ResponseContainerAccessPolicy.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**AccessPolicy**](AccessPolicy.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerAccessPolicyAction.md b/docs/ResponseContainerAccessPolicyAction.md
index 2926d65..0be1778 100644
--- a/docs/ResponseContainerAccessPolicyAction.md
+++ b/docs/ResponseContainerAccessPolicyAction.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **str** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerAccount.md b/docs/ResponseContainerAccount.md
index 76bb26b..43825f2 100644
--- a/docs/ResponseContainerAccount.md
+++ b/docs/ResponseContainerAccount.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Account**](Account.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerAlert.md b/docs/ResponseContainerAlert.md
index 25e4816..5795056 100644
--- a/docs/ResponseContainerAlert.md
+++ b/docs/ResponseContainerAlert.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Alert**](Alert.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerAlertAnalyticsSummary.md b/docs/ResponseContainerAlertAnalyticsSummary.md
index a832e57..dbf5c11 100644
--- a/docs/ResponseContainerAlertAnalyticsSummary.md
+++ b/docs/ResponseContainerAlertAnalyticsSummary.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**AlertAnalyticsSummary**](AlertAnalyticsSummary.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerApiTokenModel.md b/docs/ResponseContainerApiTokenModel.md
index 31b0232..644a5d4 100644
--- a/docs/ResponseContainerApiTokenModel.md
+++ b/docs/ResponseContainerApiTokenModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**ApiTokenModel**](ApiTokenModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerCloudIntegration.md b/docs/ResponseContainerCloudIntegration.md
index ee4e1ff..d4ea272 100644
--- a/docs/ResponseContainerCloudIntegration.md
+++ b/docs/ResponseContainerCloudIntegration.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**CloudIntegration**](CloudIntegration.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerClusterInfoDTO.md b/docs/ResponseContainerClusterInfoDTO.md
index 19ccfc7..42b664f 100644
--- a/docs/ResponseContainerClusterInfoDTO.md
+++ b/docs/ResponseContainerClusterInfoDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**ClusterInfoDTO**](ClusterInfoDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerDashboard.md b/docs/ResponseContainerDashboard.md
index 44519a0..db288c4 100644
--- a/docs/ResponseContainerDashboard.md
+++ b/docs/ResponseContainerDashboard.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Dashboard**](Dashboard.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerDefaultSavedAppMapSearch.md b/docs/ResponseContainerDefaultSavedAppMapSearch.md
index 60672c8..684fcdd 100644
--- a/docs/ResponseContainerDefaultSavedAppMapSearch.md
+++ b/docs/ResponseContainerDefaultSavedAppMapSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**DefaultSavedAppMapSearch**](DefaultSavedAppMapSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerDefaultSavedTracesSearch.md b/docs/ResponseContainerDefaultSavedTracesSearch.md
index e3324ef..0295312 100644
--- a/docs/ResponseContainerDefaultSavedTracesSearch.md
+++ b/docs/ResponseContainerDefaultSavedTracesSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**DefaultSavedTracesSearch**](DefaultSavedTracesSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerDerivedMetricDefinition.md b/docs/ResponseContainerDerivedMetricDefinition.md
index 35ef0e4..0ebbf9e 100644
--- a/docs/ResponseContainerDerivedMetricDefinition.md
+++ b/docs/ResponseContainerDerivedMetricDefinition.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**DerivedMetricDefinition**](DerivedMetricDefinition.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerEvent.md b/docs/ResponseContainerEvent.md
index a0deefb..81bf1cf 100644
--- a/docs/ResponseContainerEvent.md
+++ b/docs/ResponseContainerEvent.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Event**](Event.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerExternalLink.md b/docs/ResponseContainerExternalLink.md
index 36934d9..dbbf358 100644
--- a/docs/ResponseContainerExternalLink.md
+++ b/docs/ResponseContainerExternalLink.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**ExternalLink**](ExternalLink.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerFacetResponse.md b/docs/ResponseContainerFacetResponse.md
index b9f7709..7002e34 100644
--- a/docs/ResponseContainerFacetResponse.md
+++ b/docs/ResponseContainerFacetResponse.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**FacetResponse**](FacetResponse.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerFacetsResponseContainer.md b/docs/ResponseContainerFacetsResponseContainer.md
index c615302..494145a 100644
--- a/docs/ResponseContainerFacetsResponseContainer.md
+++ b/docs/ResponseContainerFacetsResponseContainer.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**FacetsResponseContainer**](FacetsResponseContainer.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerHistoryResponse.md b/docs/ResponseContainerHistoryResponse.md
index bd4c153..533ddf8 100644
--- a/docs/ResponseContainerHistoryResponse.md
+++ b/docs/ResponseContainerHistoryResponse.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**HistoryResponse**](HistoryResponse.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerIngestionPolicyReadModel.md b/docs/ResponseContainerIngestionPolicyReadModel.md
index 743f81b..2188068 100644
--- a/docs/ResponseContainerIngestionPolicyReadModel.md
+++ b/docs/ResponseContainerIngestionPolicyReadModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**IngestionPolicyReadModel**](IngestionPolicyReadModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerIntegration.md b/docs/ResponseContainerIntegration.md
index 28cba81..f738aaa 100644
--- a/docs/ResponseContainerIntegration.md
+++ b/docs/ResponseContainerIntegration.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Integration**](Integration.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerIntegrationStatus.md b/docs/ResponseContainerIntegrationStatus.md
index 8f776d1..9401a48 100644
--- a/docs/ResponseContainerIntegrationStatus.md
+++ b/docs/ResponseContainerIntegrationStatus.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**IntegrationStatus**](IntegrationStatus.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListAccessControlListReadDTO.md b/docs/ResponseContainerListAccessControlListReadDTO.md
index 435283c..173b1a2 100644
--- a/docs/ResponseContainerListAccessControlListReadDTO.md
+++ b/docs/ResponseContainerListAccessControlListReadDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[AccessControlListReadDTO]**](AccessControlListReadDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListAlertErrorGroupInfo.md b/docs/ResponseContainerListAlertErrorGroupInfo.md
index f98620d..6b5a73f 100644
--- a/docs/ResponseContainerListAlertErrorGroupInfo.md
+++ b/docs/ResponseContainerListAlertErrorGroupInfo.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[AlertErrorGroupInfo]**](AlertErrorGroupInfo.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListApiTokenModel.md b/docs/ResponseContainerListApiTokenModel.md
index 952e859..d325800 100644
--- a/docs/ResponseContainerListApiTokenModel.md
+++ b/docs/ResponseContainerListApiTokenModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[ApiTokenModel]**](ApiTokenModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListIntegration.md b/docs/ResponseContainerListIntegration.md
index bf40f69..28768de 100644
--- a/docs/ResponseContainerListIntegration.md
+++ b/docs/ResponseContainerListIntegration.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[Integration]**](Integration.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListIntegrationManifestGroup.md b/docs/ResponseContainerListIntegrationManifestGroup.md
index 5f82f34..52277a2 100644
--- a/docs/ResponseContainerListIntegrationManifestGroup.md
+++ b/docs/ResponseContainerListIntegrationManifestGroup.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[IntegrationManifestGroup]**](IntegrationManifestGroup.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListNotificationMessages.md b/docs/ResponseContainerListNotificationMessages.md
index ccc71c3..5021a19 100644
--- a/docs/ResponseContainerListNotificationMessages.md
+++ b/docs/ResponseContainerListNotificationMessages.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[NotificationMessages]**](NotificationMessages.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListServiceAccount.md b/docs/ResponseContainerListServiceAccount.md
index 589b881..393dc63 100644
--- a/docs/ResponseContainerListServiceAccount.md
+++ b/docs/ResponseContainerListServiceAccount.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[ServiceAccount]**](ServiceAccount.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListString.md b/docs/ResponseContainerListString.md
index 7aee40b..9c2ed30 100644
--- a/docs/ResponseContainerListString.md
+++ b/docs/ResponseContainerListString.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **list[str]** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListUserApiToken.md b/docs/ResponseContainerListUserApiToken.md
index 2a7df32..659fe45 100644
--- a/docs/ResponseContainerListUserApiToken.md
+++ b/docs/ResponseContainerListUserApiToken.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[UserApiToken]**](UserApiToken.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerListUserDTO.md b/docs/ResponseContainerListUserDTO.md
index 1f73496..dd699d3 100644
--- a/docs/ResponseContainerListUserDTO.md
+++ b/docs/ResponseContainerListUserDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[UserDTO]**](UserDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMaintenanceWindow.md b/docs/ResponseContainerMaintenanceWindow.md
index bd23b52..ce7e135 100644
--- a/docs/ResponseContainerMaintenanceWindow.md
+++ b/docs/ResponseContainerMaintenanceWindow.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**MaintenanceWindow**](MaintenanceWindow.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMap.md b/docs/ResponseContainerMap.md
index 950a2f6..fbaa759 100644
--- a/docs/ResponseContainerMap.md
+++ b/docs/ResponseContainerMap.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **dict(str, object)** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMapStringInteger.md b/docs/ResponseContainerMapStringInteger.md
index 0342f42..27de6d3 100644
--- a/docs/ResponseContainerMapStringInteger.md
+++ b/docs/ResponseContainerMapStringInteger.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **dict(str, int)** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMapStringIntegrationStatus.md b/docs/ResponseContainerMapStringIntegrationStatus.md
index 02fe003..48ce7c3 100644
--- a/docs/ResponseContainerMapStringIntegrationStatus.md
+++ b/docs/ResponseContainerMapStringIntegrationStatus.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**dict(str, IntegrationStatus)**](IntegrationStatus.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMessage.md b/docs/ResponseContainerMessage.md
index 019462a..5370197 100644
--- a/docs/ResponseContainerMessage.md
+++ b/docs/ResponseContainerMessage.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Message**](Message.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMetricsPolicyReadModel.md b/docs/ResponseContainerMetricsPolicyReadModel.md
index 03a9569..1b0405e 100644
--- a/docs/ResponseContainerMetricsPolicyReadModel.md
+++ b/docs/ResponseContainerMetricsPolicyReadModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**MetricsPolicyReadModel**](MetricsPolicyReadModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMonitoredApplicationDTO.md b/docs/ResponseContainerMonitoredApplicationDTO.md
index 50b8813..7202ebb 100644
--- a/docs/ResponseContainerMonitoredApplicationDTO.md
+++ b/docs/ResponseContainerMonitoredApplicationDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**MonitoredApplicationDTO**](MonitoredApplicationDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMonitoredCluster.md b/docs/ResponseContainerMonitoredCluster.md
index f997c58..7408862 100644
--- a/docs/ResponseContainerMonitoredCluster.md
+++ b/docs/ResponseContainerMonitoredCluster.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**MonitoredCluster**](MonitoredCluster.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerMonitoredServiceDTO.md b/docs/ResponseContainerMonitoredServiceDTO.md
index e48e1dc..086575e 100644
--- a/docs/ResponseContainerMonitoredServiceDTO.md
+++ b/docs/ResponseContainerMonitoredServiceDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**MonitoredServiceDTO**](MonitoredServiceDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerNotificant.md b/docs/ResponseContainerNotificant.md
index 1626594..9fcf6cd 100644
--- a/docs/ResponseContainerNotificant.md
+++ b/docs/ResponseContainerNotificant.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Notificant**](Notificant.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedAccount.md b/docs/ResponseContainerPagedAccount.md
index fa1a3c1..2377ab5 100644
--- a/docs/ResponseContainerPagedAccount.md
+++ b/docs/ResponseContainerPagedAccount.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedAccount**](PagedAccount.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedAlert.md b/docs/ResponseContainerPagedAlert.md
index 76e9add..7e53c4c 100644
--- a/docs/ResponseContainerPagedAlert.md
+++ b/docs/ResponseContainerPagedAlert.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedAlert**](PagedAlert.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md b/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md
index 131ea16..2013927 100644
--- a/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md
+++ b/docs/ResponseContainerPagedAlertAnalyticsSummaryDetail.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedAlertAnalyticsSummaryDetail**](PagedAlertAnalyticsSummaryDetail.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedAlertWithStats.md b/docs/ResponseContainerPagedAlertWithStats.md
index 9f33bda..ebf3c75 100644
--- a/docs/ResponseContainerPagedAlertWithStats.md
+++ b/docs/ResponseContainerPagedAlertWithStats.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedAlertWithStats**](PagedAlertWithStats.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedAnomaly.md b/docs/ResponseContainerPagedAnomaly.md
index d3799ef..1369334 100644
--- a/docs/ResponseContainerPagedAnomaly.md
+++ b/docs/ResponseContainerPagedAnomaly.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedAnomaly**](PagedAnomaly.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedApiTokenModel.md b/docs/ResponseContainerPagedApiTokenModel.md
index a391f54..145f070 100644
--- a/docs/ResponseContainerPagedApiTokenModel.md
+++ b/docs/ResponseContainerPagedApiTokenModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedApiTokenModel**](PagedApiTokenModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedCloudIntegration.md b/docs/ResponseContainerPagedCloudIntegration.md
index f58ab7a..828f617 100644
--- a/docs/ResponseContainerPagedCloudIntegration.md
+++ b/docs/ResponseContainerPagedCloudIntegration.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedCloudIntegration**](PagedCloudIntegration.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedCustomerFacingUserObject.md b/docs/ResponseContainerPagedCustomerFacingUserObject.md
index 2c5d975..cee95c0 100644
--- a/docs/ResponseContainerPagedCustomerFacingUserObject.md
+++ b/docs/ResponseContainerPagedCustomerFacingUserObject.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedCustomerFacingUserObject**](PagedCustomerFacingUserObject.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedDashboard.md b/docs/ResponseContainerPagedDashboard.md
index de6fb0c..5643ecb 100644
--- a/docs/ResponseContainerPagedDashboard.md
+++ b/docs/ResponseContainerPagedDashboard.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedDashboard**](PagedDashboard.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedDerivedMetricDefinition.md b/docs/ResponseContainerPagedDerivedMetricDefinition.md
index 1dceb9f..c9eb488 100644
--- a/docs/ResponseContainerPagedDerivedMetricDefinition.md
+++ b/docs/ResponseContainerPagedDerivedMetricDefinition.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedDerivedMetricDefinition**](PagedDerivedMetricDefinition.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md b/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md
index fe16088..581fbf0 100644
--- a/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md
+++ b/docs/ResponseContainerPagedDerivedMetricDefinitionWithStats.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedDerivedMetricDefinitionWithStats**](PagedDerivedMetricDefinitionWithStats.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedEvent.md b/docs/ResponseContainerPagedEvent.md
index 86711ef..5ba3893 100644
--- a/docs/ResponseContainerPagedEvent.md
+++ b/docs/ResponseContainerPagedEvent.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedEvent**](PagedEvent.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedExternalLink.md b/docs/ResponseContainerPagedExternalLink.md
index 8318bd3..ee00808 100644
--- a/docs/ResponseContainerPagedExternalLink.md
+++ b/docs/ResponseContainerPagedExternalLink.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedExternalLink**](PagedExternalLink.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedIngestionPolicyReadModel.md b/docs/ResponseContainerPagedIngestionPolicyReadModel.md
index 08548ec..b32e3da 100644
--- a/docs/ResponseContainerPagedIngestionPolicyReadModel.md
+++ b/docs/ResponseContainerPagedIngestionPolicyReadModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedIngestionPolicyReadModel**](PagedIngestionPolicyReadModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedIntegration.md b/docs/ResponseContainerPagedIntegration.md
index e44231a..de322ad 100644
--- a/docs/ResponseContainerPagedIntegration.md
+++ b/docs/ResponseContainerPagedIntegration.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedIntegration**](PagedIntegration.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedMaintenanceWindow.md b/docs/ResponseContainerPagedMaintenanceWindow.md
index e31a9b9..fea99a4 100644
--- a/docs/ResponseContainerPagedMaintenanceWindow.md
+++ b/docs/ResponseContainerPagedMaintenanceWindow.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedMaintenanceWindow**](PagedMaintenanceWindow.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedMessage.md b/docs/ResponseContainerPagedMessage.md
index c4c3c71..1ec5280 100644
--- a/docs/ResponseContainerPagedMessage.md
+++ b/docs/ResponseContainerPagedMessage.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedMessage**](PagedMessage.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedMonitoredApplicationDTO.md b/docs/ResponseContainerPagedMonitoredApplicationDTO.md
index 1692390..b6f3b42 100644
--- a/docs/ResponseContainerPagedMonitoredApplicationDTO.md
+++ b/docs/ResponseContainerPagedMonitoredApplicationDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedMonitoredApplicationDTO**](PagedMonitoredApplicationDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedMonitoredCluster.md b/docs/ResponseContainerPagedMonitoredCluster.md
index ebfcfa8..75d6ed0 100644
--- a/docs/ResponseContainerPagedMonitoredCluster.md
+++ b/docs/ResponseContainerPagedMonitoredCluster.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedMonitoredCluster**](PagedMonitoredCluster.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedMonitoredServiceDTO.md b/docs/ResponseContainerPagedMonitoredServiceDTO.md
index 97bc452..74a5e52 100644
--- a/docs/ResponseContainerPagedMonitoredServiceDTO.md
+++ b/docs/ResponseContainerPagedMonitoredServiceDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedMonitoredServiceDTO**](PagedMonitoredServiceDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedNotificant.md b/docs/ResponseContainerPagedNotificant.md
index 24c675a..e3425a9 100644
--- a/docs/ResponseContainerPagedNotificant.md
+++ b/docs/ResponseContainerPagedNotificant.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedNotificant**](PagedNotificant.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedProxy.md b/docs/ResponseContainerPagedProxy.md
index 0a2fbea..f4abab8 100644
--- a/docs/ResponseContainerPagedProxy.md
+++ b/docs/ResponseContainerPagedProxy.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedProxy**](PagedProxy.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedRecentAppMapSearch.md b/docs/ResponseContainerPagedRecentAppMapSearch.md
index bd38d7d..4ec7926 100644
--- a/docs/ResponseContainerPagedRecentAppMapSearch.md
+++ b/docs/ResponseContainerPagedRecentAppMapSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedRecentAppMapSearch**](PagedRecentAppMapSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedRecentTracesSearch.md b/docs/ResponseContainerPagedRecentTracesSearch.md
index 13c9afd..854f722 100644
--- a/docs/ResponseContainerPagedRecentTracesSearch.md
+++ b/docs/ResponseContainerPagedRecentTracesSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedRecentTracesSearch**](PagedRecentTracesSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedRelatedEvent.md b/docs/ResponseContainerPagedRelatedEvent.md
index d72a5e0..a74f3f7 100644
--- a/docs/ResponseContainerPagedRelatedEvent.md
+++ b/docs/ResponseContainerPagedRelatedEvent.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedRelatedEvent**](PagedRelatedEvent.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedReportEventAnomalyDTO.md b/docs/ResponseContainerPagedReportEventAnomalyDTO.md
index ac12fab..f785398 100644
--- a/docs/ResponseContainerPagedReportEventAnomalyDTO.md
+++ b/docs/ResponseContainerPagedReportEventAnomalyDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedReportEventAnomalyDTO**](PagedReportEventAnomalyDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedRoleDTO.md b/docs/ResponseContainerPagedRoleDTO.md
index 9cfdf60..68f23e2 100644
--- a/docs/ResponseContainerPagedRoleDTO.md
+++ b/docs/ResponseContainerPagedRoleDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedRoleDTO**](PagedRoleDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSavedAppMapSearch.md b/docs/ResponseContainerPagedSavedAppMapSearch.md
index 0f5c303..8718bcd 100644
--- a/docs/ResponseContainerPagedSavedAppMapSearch.md
+++ b/docs/ResponseContainerPagedSavedAppMapSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSavedAppMapSearch**](PagedSavedAppMapSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSavedAppMapSearchGroup.md b/docs/ResponseContainerPagedSavedAppMapSearchGroup.md
index 3027237..a9fa59f 100644
--- a/docs/ResponseContainerPagedSavedAppMapSearchGroup.md
+++ b/docs/ResponseContainerPagedSavedAppMapSearchGroup.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSavedAppMapSearchGroup**](PagedSavedAppMapSearchGroup.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSavedSearch.md b/docs/ResponseContainerPagedSavedSearch.md
index 72f40e5..f2a3faa 100644
--- a/docs/ResponseContainerPagedSavedSearch.md
+++ b/docs/ResponseContainerPagedSavedSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSavedSearch**](PagedSavedSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSavedTracesSearch.md b/docs/ResponseContainerPagedSavedTracesSearch.md
index 7cca8e7..a581359 100644
--- a/docs/ResponseContainerPagedSavedTracesSearch.md
+++ b/docs/ResponseContainerPagedSavedTracesSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSavedTracesSearch**](PagedSavedTracesSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSavedTracesSearchGroup.md b/docs/ResponseContainerPagedSavedTracesSearchGroup.md
index d480f57..05f98d9 100644
--- a/docs/ResponseContainerPagedSavedTracesSearchGroup.md
+++ b/docs/ResponseContainerPagedSavedTracesSearchGroup.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSavedTracesSearchGroup**](PagedSavedTracesSearchGroup.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedServiceAccount.md b/docs/ResponseContainerPagedServiceAccount.md
index dccd756..d26ef77 100644
--- a/docs/ResponseContainerPagedServiceAccount.md
+++ b/docs/ResponseContainerPagedServiceAccount.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedServiceAccount**](PagedServiceAccount.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSource.md b/docs/ResponseContainerPagedSource.md
index 11189d0..bb71fff 100644
--- a/docs/ResponseContainerPagedSource.md
+++ b/docs/ResponseContainerPagedSource.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSource**](PagedSource.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedSpanSamplingPolicy.md b/docs/ResponseContainerPagedSpanSamplingPolicy.md
index 60bbe3f..243f0d0 100644
--- a/docs/ResponseContainerPagedSpanSamplingPolicy.md
+++ b/docs/ResponseContainerPagedSpanSamplingPolicy.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedSpanSamplingPolicy**](PagedSpanSamplingPolicy.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerPagedUserGroupModel.md b/docs/ResponseContainerPagedUserGroupModel.md
index abe6c27..ccffc55 100644
--- a/docs/ResponseContainerPagedUserGroupModel.md
+++ b/docs/ResponseContainerPagedUserGroupModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**PagedUserGroupModel**](PagedUserGroupModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerProxy.md b/docs/ResponseContainerProxy.md
index d597cc0..2379f01 100644
--- a/docs/ResponseContainerProxy.md
+++ b/docs/ResponseContainerProxy.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Proxy**](Proxy.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerQueryTypeDTO.md b/docs/ResponseContainerQueryTypeDTO.md
index d16b091..80e4a0d 100644
--- a/docs/ResponseContainerQueryTypeDTO.md
+++ b/docs/ResponseContainerQueryTypeDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**QueryTypeDTO**](QueryTypeDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerRecentAppMapSearch.md b/docs/ResponseContainerRecentAppMapSearch.md
index 9be1cba..821aa17 100644
--- a/docs/ResponseContainerRecentAppMapSearch.md
+++ b/docs/ResponseContainerRecentAppMapSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**RecentAppMapSearch**](RecentAppMapSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerRecentTracesSearch.md b/docs/ResponseContainerRecentTracesSearch.md
index f9cee4b..c70fbaa 100644
--- a/docs/ResponseContainerRecentTracesSearch.md
+++ b/docs/ResponseContainerRecentTracesSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**RecentTracesSearch**](RecentTracesSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerRoleDTO.md b/docs/ResponseContainerRoleDTO.md
index 33becdb..77c933a 100644
--- a/docs/ResponseContainerRoleDTO.md
+++ b/docs/ResponseContainerRoleDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**RoleDTO**](RoleDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSavedAppMapSearch.md b/docs/ResponseContainerSavedAppMapSearch.md
index f6fd70b..7056fcf 100644
--- a/docs/ResponseContainerSavedAppMapSearch.md
+++ b/docs/ResponseContainerSavedAppMapSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**SavedAppMapSearch**](SavedAppMapSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSavedAppMapSearchGroup.md b/docs/ResponseContainerSavedAppMapSearchGroup.md
index 9c3be98..e30f854 100644
--- a/docs/ResponseContainerSavedAppMapSearchGroup.md
+++ b/docs/ResponseContainerSavedAppMapSearchGroup.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**SavedAppMapSearchGroup**](SavedAppMapSearchGroup.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSavedSearch.md b/docs/ResponseContainerSavedSearch.md
index 1d1143a..93e5de7 100644
--- a/docs/ResponseContainerSavedSearch.md
+++ b/docs/ResponseContainerSavedSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**SavedSearch**](SavedSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSavedTracesSearch.md b/docs/ResponseContainerSavedTracesSearch.md
index e01889d..41db368 100644
--- a/docs/ResponseContainerSavedTracesSearch.md
+++ b/docs/ResponseContainerSavedTracesSearch.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**SavedTracesSearch**](SavedTracesSearch.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSavedTracesSearchGroup.md b/docs/ResponseContainerSavedTracesSearchGroup.md
index 55a7031..235c987 100644
--- a/docs/ResponseContainerSavedTracesSearchGroup.md
+++ b/docs/ResponseContainerSavedTracesSearchGroup.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**SavedTracesSearchGroup**](SavedTracesSearchGroup.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerServiceAccount.md b/docs/ResponseContainerServiceAccount.md
index 7541eed..7983691 100644
--- a/docs/ResponseContainerServiceAccount.md
+++ b/docs/ResponseContainerServiceAccount.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**ServiceAccount**](ServiceAccount.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSetBusinessFunction.md b/docs/ResponseContainerSetBusinessFunction.md
index f08f5e8..e7d4b8d 100644
--- a/docs/ResponseContainerSetBusinessFunction.md
+++ b/docs/ResponseContainerSetBusinessFunction.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **list[str]** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSetSourceLabelPair.md b/docs/ResponseContainerSetSourceLabelPair.md
index 6857d28..50d0051 100644
--- a/docs/ResponseContainerSetSourceLabelPair.md
+++ b/docs/ResponseContainerSetSourceLabelPair.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**list[SourceLabelPair]**](SourceLabelPair.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSource.md b/docs/ResponseContainerSource.md
index f02aa5e..6bb9ec7 100644
--- a/docs/ResponseContainerSource.md
+++ b/docs/ResponseContainerSource.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Source**](Source.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerSpanSamplingPolicy.md b/docs/ResponseContainerSpanSamplingPolicy.md
index 0a55529..91de5b4 100644
--- a/docs/ResponseContainerSpanSamplingPolicy.md
+++ b/docs/ResponseContainerSpanSamplingPolicy.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**SpanSamplingPolicy**](SpanSamplingPolicy.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerString.md b/docs/ResponseContainerString.md
index 582dc2a..d9ce827 100644
--- a/docs/ResponseContainerString.md
+++ b/docs/ResponseContainerString.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | **str** |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerTagsResponse.md b/docs/ResponseContainerTagsResponse.md
index 98a2531..b0669b9 100644
--- a/docs/ResponseContainerTagsResponse.md
+++ b/docs/ResponseContainerTagsResponse.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**TagsResponse**](TagsResponse.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerUserApiToken.md b/docs/ResponseContainerUserApiToken.md
index cb1523e..2a1c7d0 100644
--- a/docs/ResponseContainerUserApiToken.md
+++ b/docs/ResponseContainerUserApiToken.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**UserApiToken**](UserApiToken.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerUserDTO.md b/docs/ResponseContainerUserDTO.md
index aa42ad5..3b8326f 100644
--- a/docs/ResponseContainerUserDTO.md
+++ b/docs/ResponseContainerUserDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**UserDTO**](UserDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerUserGroupModel.md b/docs/ResponseContainerUserGroupModel.md
index 4ca832b..6de348a 100644
--- a/docs/ResponseContainerUserGroupModel.md
+++ b/docs/ResponseContainerUserGroupModel.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**UserGroupModel**](UserGroupModel.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerValidatedUsersDTO.md b/docs/ResponseContainerValidatedUsersDTO.md
index 4c05a98..46b93e6 100644
--- a/docs/ResponseContainerValidatedUsersDTO.md
+++ b/docs/ResponseContainerValidatedUsersDTO.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**ValidatedUsersDTO**](ValidatedUsersDTO.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/docs/ResponseContainerVoid.md b/docs/ResponseContainerVoid.md
index ebbbc35..1ccad8b 100644
--- a/docs/ResponseContainerVoid.md
+++ b/docs/ResponseContainerVoid.md
@@ -3,6 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**debug_info** | **list[str]** |  | [optional] 
 **response** | [**Void**](Void.md) |  | [optional] 
 **status** | [**ResponseStatus**](ResponseStatus.md) |  | 
 
diff --git a/setup.py b/setup.py
index ff4510e..2e3fdae 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.210.2"
+VERSION = "2.213.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index eb5df00..b6fe32e 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.210.2/python'
+        self.user_agent = 'Swagger-Codegen/2.213.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 27a8fa2..48e574b 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.210.2".\
+               "SDK Package Version: 2.213.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/alert_analytics_summary.py b/wavefront_api_client/models/alert_analytics_summary.py
index 2bdcce3..8d8e439 100644
--- a/wavefront_api_client/models/alert_analytics_summary.py
+++ b/wavefront_api_client/models/alert_analytics_summary.py
@@ -33,29 +33,60 @@ class AlertAnalyticsSummary(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'total_active_no_target': 'int',
         'total_evaluated': 'int',
-        'total_failed': 'int'
+        'total_failed': 'int',
+        'total_no_data': 'int'
     }
 
     attribute_map = {
+        'total_active_no_target': 'totalActiveNoTarget',
         'total_evaluated': 'totalEvaluated',
-        'total_failed': 'totalFailed'
+        'total_failed': 'totalFailed',
+        'total_no_data': 'totalNoData'
     }
 
-    def __init__(self, total_evaluated=None, total_failed=None, _configuration=None):  # noqa: E501
+    def __init__(self, total_active_no_target=None, total_evaluated=None, total_failed=None, total_no_data=None, _configuration=None):  # noqa: E501
         """AlertAnalyticsSummary - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._total_active_no_target = None
         self._total_evaluated = None
         self._total_failed = None
+        self._total_no_data = None
         self.discriminator = None
 
+        if total_active_no_target is not None:
+            self.total_active_no_target = total_active_no_target
         if total_evaluated is not None:
             self.total_evaluated = total_evaluated
         if total_failed is not None:
             self.total_failed = total_failed
+        if total_no_data is not None:
+            self.total_no_data = total_no_data
+
+    @property
+    def total_active_no_target(self):
+        """Gets the total_active_no_target of this AlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The total_active_no_target of this AlertAnalyticsSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_active_no_target
+
+    @total_active_no_target.setter
+    def total_active_no_target(self, total_active_no_target):
+        """Sets the total_active_no_target of this AlertAnalyticsSummary.
+
+
+        :param total_active_no_target: The total_active_no_target of this AlertAnalyticsSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._total_active_no_target = total_active_no_target
 
     @property
     def total_evaluated(self):
@@ -99,6 +130,27 @@ def total_failed(self, total_failed):
 
         self._total_failed = total_failed
 
+    @property
+    def total_no_data(self):
+        """Gets the total_no_data of this AlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The total_no_data of this AlertAnalyticsSummary.  # noqa: E501
+        :rtype: int
+        """
+        return self._total_no_data
+
+    @total_no_data.setter
+    def total_no_data(self, total_no_data):
+        """Sets the total_no_data of this AlertAnalyticsSummary.
+
+
+        :param total_no_data: The total_no_data of this AlertAnalyticsSummary.  # noqa: E501
+        :type: int
+        """
+
+        self._total_no_data = total_no_data
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/wavefront_api_client/models/alert_analytics_summary_detail.py b/wavefront_api_client/models/alert_analytics_summary_detail.py
index 002fdec..cc5fd21 100644
--- a/wavefront_api_client/models/alert_analytics_summary_detail.py
+++ b/wavefront_api_client/models/alert_analytics_summary_detail.py
@@ -43,6 +43,11 @@ class AlertAnalyticsSummaryDetail(object):
         'error_groups_summary': 'list[AlertErrorGroupSummary]',
         'failure_percentage': 'float',
         'failure_percentage_range': 'str',
+        'is_no_data': 'bool',
+        'is_no_target': 'bool',
+        'last_event_time': 'str',
+        'last_updated_time': 'str',
+        'last_updated_user_id': 'str',
         'tags': 'list[str]',
         'total_evaluated': 'int',
         'total_failed': 'int'
@@ -59,12 +64,17 @@ class AlertAnalyticsSummaryDetail(object):
         'error_groups_summary': 'errorGroupsSummary',
         'failure_percentage': 'failurePercentage',
         'failure_percentage_range': 'failurePercentageRange',
+        'is_no_data': 'isNoData',
+        'is_no_target': 'isNoTarget',
+        'last_event_time': 'lastEventTime',
+        'last_updated_time': 'lastUpdatedTime',
+        'last_updated_user_id': 'lastUpdatedUserId',
         'tags': 'tags',
         'total_evaluated': 'totalEvaluated',
         'total_failed': 'totalFailed'
     }
 
-    def __init__(self, alert_id=None, alert_name=None, avg_key_cardinality=None, avg_latency=None, avg_points=None, checking_frequency=None, creator_id=None, error_groups_summary=None, failure_percentage=None, failure_percentage_range=None, tags=None, total_evaluated=None, total_failed=None, _configuration=None):  # noqa: E501
+    def __init__(self, alert_id=None, alert_name=None, avg_key_cardinality=None, avg_latency=None, avg_points=None, checking_frequency=None, creator_id=None, error_groups_summary=None, failure_percentage=None, failure_percentage_range=None, is_no_data=None, is_no_target=None, last_event_time=None, last_updated_time=None, last_updated_user_id=None, tags=None, total_evaluated=None, total_failed=None, _configuration=None):  # noqa: E501
         """AlertAnalyticsSummaryDetail - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -80,6 +90,11 @@ def __init__(self, alert_id=None, alert_name=None, avg_key_cardinality=None, avg
         self._error_groups_summary = None
         self._failure_percentage = None
         self._failure_percentage_range = None
+        self._is_no_data = None
+        self._is_no_target = None
+        self._last_event_time = None
+        self._last_updated_time = None
+        self._last_updated_user_id = None
         self._tags = None
         self._total_evaluated = None
         self._total_failed = None
@@ -105,6 +120,16 @@ def __init__(self, alert_id=None, alert_name=None, avg_key_cardinality=None, avg
             self.failure_percentage = failure_percentage
         if failure_percentage_range is not None:
             self.failure_percentage_range = failure_percentage_range
+        if is_no_data is not None:
+            self.is_no_data = is_no_data
+        if is_no_target is not None:
+            self.is_no_target = is_no_target
+        if last_event_time is not None:
+            self.last_event_time = last_event_time
+        if last_updated_time is not None:
+            self.last_updated_time = last_updated_time
+        if last_updated_user_id is not None:
+            self.last_updated_user_id = last_updated_user_id
         if tags is not None:
             self.tags = tags
         if total_evaluated is not None:
@@ -334,6 +359,111 @@ def failure_percentage_range(self, failure_percentage_range):
 
         self._failure_percentage_range = failure_percentage_range
 
+    @property
+    def is_no_data(self):
+        """Gets the is_no_data of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The is_no_data of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_no_data
+
+    @is_no_data.setter
+    def is_no_data(self, is_no_data):
+        """Sets the is_no_data of this AlertAnalyticsSummaryDetail.
+
+
+        :param is_no_data: The is_no_data of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_no_data = is_no_data
+
+    @property
+    def is_no_target(self):
+        """Gets the is_no_target of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The is_no_target of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_no_target
+
+    @is_no_target.setter
+    def is_no_target(self, is_no_target):
+        """Sets the is_no_target of this AlertAnalyticsSummaryDetail.
+
+
+        :param is_no_target: The is_no_target of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_no_target = is_no_target
+
+    @property
+    def last_event_time(self):
+        """Gets the last_event_time of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The last_event_time of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_event_time
+
+    @last_event_time.setter
+    def last_event_time(self, last_event_time):
+        """Sets the last_event_time of this AlertAnalyticsSummaryDetail.
+
+
+        :param last_event_time: The last_event_time of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._last_event_time = last_event_time
+
+    @property
+    def last_updated_time(self):
+        """Gets the last_updated_time of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The last_updated_time of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_updated_time
+
+    @last_updated_time.setter
+    def last_updated_time(self, last_updated_time):
+        """Sets the last_updated_time of this AlertAnalyticsSummaryDetail.
+
+
+        :param last_updated_time: The last_updated_time of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._last_updated_time = last_updated_time
+
+    @property
+    def last_updated_user_id(self):
+        """Gets the last_updated_user_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The last_updated_user_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: str
+        """
+        return self._last_updated_user_id
+
+    @last_updated_user_id.setter
+    def last_updated_user_id(self, last_updated_user_id):
+        """Sets the last_updated_user_id of this AlertAnalyticsSummaryDetail.
+
+
+        :param last_updated_user_id: The last_updated_user_id of this AlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: str
+        """
+
+        self._last_updated_user_id = last_updated_user_id
+
     @property
     def tags(self):
         """Gets the tags of this AlertAnalyticsSummaryDetail.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index 77e9c6b..132a15f 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -33,29 +33,55 @@ class ResponseContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'object',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainer - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainer.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainer.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainer.
+
+
+        :param debug_info: The debug_info of this ResponseContainer.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainer.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_access_policy.py b/wavefront_api_client/models/response_container_access_policy.py
index 50d3503..c991d7c 100644
--- a/wavefront_api_client/models/response_container_access_policy.py
+++ b/wavefront_api_client/models/response_container_access_policy.py
@@ -33,29 +33,55 @@ class ResponseContainerAccessPolicy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'AccessPolicy',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAccessPolicy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerAccessPolicy.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerAccessPolicy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerAccessPolicy.
+
+
+        :param debug_info: The debug_info of this ResponseContainerAccessPolicy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerAccessPolicy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_access_policy_action.py b/wavefront_api_client/models/response_container_access_policy_action.py
index b42c1de..da491db 100644
--- a/wavefront_api_client/models/response_container_access_policy_action.py
+++ b/wavefront_api_client/models/response_container_access_policy_action.py
@@ -33,29 +33,55 @@ class ResponseContainerAccessPolicyAction(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'str',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAccessPolicyAction - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerAccessPolicyAction.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerAccessPolicyAction.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerAccessPolicyAction.
+
+
+        :param debug_info: The debug_info of this ResponseContainerAccessPolicyAction.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerAccessPolicyAction.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_account.py b/wavefront_api_client/models/response_container_account.py
index f49e0c2..0ae75a0 100644
--- a/wavefront_api_client/models/response_container_account.py
+++ b/wavefront_api_client/models/response_container_account.py
@@ -33,29 +33,55 @@ class ResponseContainerAccount(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Account',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerAccount.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerAccount.
+
+
+        :param debug_info: The debug_info of this ResponseContainerAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index cd455d9..9b8fa69 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -33,29 +33,55 @@ class ResponseContainerAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Alert',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAlert - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerAlert.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerAlert.
+
+
+        :param debug_info: The debug_info of this ResponseContainerAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerAlert.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_alert_analytics_summary.py b/wavefront_api_client/models/response_container_alert_analytics_summary.py
index 004e6b6..bbe0611 100644
--- a/wavefront_api_client/models/response_container_alert_analytics_summary.py
+++ b/wavefront_api_client/models/response_container_alert_analytics_summary.py
@@ -33,29 +33,55 @@ class ResponseContainerAlertAnalyticsSummary(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'AlertAnalyticsSummary',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerAlertAnalyticsSummary - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerAlertAnalyticsSummary.
+
+
+        :param debug_info: The debug_info of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerAlertAnalyticsSummary.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_api_token_model.py b/wavefront_api_client/models/response_container_api_token_model.py
index 77330e0..676cd07 100644
--- a/wavefront_api_client/models/response_container_api_token_model.py
+++ b/wavefront_api_client/models/response_container_api_token_model.py
@@ -33,29 +33,55 @@ class ResponseContainerApiTokenModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'ApiTokenModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerApiTokenModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerApiTokenModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerApiTokenModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerApiTokenModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerApiTokenModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerApiTokenModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 5072d0c..5724dcc 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -33,29 +33,55 @@ class ResponseContainerCloudIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'CloudIntegration',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerCloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerCloudIntegration.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerCloudIntegration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerCloudIntegration.
+
+
+        :param debug_info: The debug_info of this ResponseContainerCloudIntegration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerCloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_cluster_info_dto.py b/wavefront_api_client/models/response_container_cluster_info_dto.py
index 1d5ed25..c2e1b89 100644
--- a/wavefront_api_client/models/response_container_cluster_info_dto.py
+++ b/wavefront_api_client/models/response_container_cluster_info_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerClusterInfoDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'ClusterInfoDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerClusterInfoDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerClusterInfoDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerClusterInfoDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerClusterInfoDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerClusterInfoDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerClusterInfoDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index f6b1037..99533f0 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -33,29 +33,55 @@ class ResponseContainerDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Dashboard',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerDashboard - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerDashboard.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerDashboard.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerDashboard.
+
+
+        :param debug_info: The debug_info of this ResponseContainerDashboard.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerDashboard.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_default_saved_app_map_search.py b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
index d1875c4..057363e 100644
--- a/wavefront_api_client/models/response_container_default_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
@@ -33,29 +33,55 @@ class ResponseContainerDefaultSavedAppMapSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'DefaultSavedAppMapSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerDefaultSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerDefaultSavedAppMapSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerDefaultSavedAppMapSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_default_saved_traces_search.py b/wavefront_api_client/models/response_container_default_saved_traces_search.py
index 58caaa3..39b1115 100644
--- a/wavefront_api_client/models/response_container_default_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_default_saved_traces_search.py
@@ -33,29 +33,55 @@ class ResponseContainerDefaultSavedTracesSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'DefaultSavedTracesSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerDefaultSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerDefaultSavedTracesSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerDefaultSavedTracesSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 9da4a80..9ab5296 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -33,29 +33,55 @@ class ResponseContainerDerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'DerivedMetricDefinition',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerDerivedMetricDefinition.
+
+
+        :param debug_info: The debug_info of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerDerivedMetricDefinition.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 9d8377b..933c264 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -33,29 +33,55 @@ class ResponseContainerEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Event',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerEvent - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerEvent.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerEvent.
+
+
+        :param debug_info: The debug_info of this ResponseContainerEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerEvent.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index 5a90d7c..803bce3 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -33,29 +33,55 @@ class ResponseContainerExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'ExternalLink',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerExternalLink - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerExternalLink.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerExternalLink.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerExternalLink.
+
+
+        :param debug_info: The debug_info of this ResponseContainerExternalLink.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerExternalLink.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 45e6130..00843cc 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -33,29 +33,55 @@ class ResponseContainerFacetResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'FacetResponse',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerFacetResponse - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerFacetResponse.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerFacetResponse.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerFacetResponse.
+
+
+        :param debug_info: The debug_info of this ResponseContainerFacetResponse.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerFacetResponse.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index 5736436..d743ac2 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -33,29 +33,55 @@ class ResponseContainerFacetsResponseContainer(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'FacetsResponseContainer',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerFacetsResponseContainer - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerFacetsResponseContainer.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerFacetsResponseContainer.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerFacetsResponseContainer.
+
+
+        :param debug_info: The debug_info of this ResponseContainerFacetsResponseContainer.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerFacetsResponseContainer.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 555105b..8c8ae64 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -33,29 +33,55 @@ class ResponseContainerHistoryResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'HistoryResponse',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerHistoryResponse - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerHistoryResponse.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerHistoryResponse.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerHistoryResponse.
+
+
+        :param debug_info: The debug_info of this ResponseContainerHistoryResponse.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerHistoryResponse.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
index 23b3591..d173a5b 100644
--- a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
@@ -33,29 +33,55 @@ class ResponseContainerIngestionPolicyReadModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'IngestionPolicyReadModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerIngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerIngestionPolicyReadModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerIngestionPolicyReadModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index f237be8..500b050 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -33,29 +33,55 @@ class ResponseContainerIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Integration',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerIntegration.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerIntegration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerIntegration.
+
+
+        :param debug_info: The debug_info of this ResponseContainerIntegration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 0e10e72..1ef7ccc 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -33,29 +33,55 @@ class ResponseContainerIntegrationStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'IntegrationStatus',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerIntegrationStatus - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerIntegrationStatus.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerIntegrationStatus.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerIntegrationStatus.
+
+
+        :param debug_info: The debug_info of this ResponseContainerIntegrationStatus.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerIntegrationStatus.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
index 662f810..8060f0f 100644
--- a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerListAccessControlListReadDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[AccessControlListReadDTO]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListAccessControlListReadDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListAccessControlListReadDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListAccessControlListReadDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_alert_error_group_info.py b/wavefront_api_client/models/response_container_list_alert_error_group_info.py
index df8be06..a144aaa 100644
--- a/wavefront_api_client/models/response_container_list_alert_error_group_info.py
+++ b/wavefront_api_client/models/response_container_list_alert_error_group_info.py
@@ -33,29 +33,55 @@ class ResponseContainerListAlertErrorGroupInfo(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[AlertErrorGroupInfo]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListAlertErrorGroupInfo - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListAlertErrorGroupInfo.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListAlertErrorGroupInfo.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_api_token_model.py b/wavefront_api_client/models/response_container_list_api_token_model.py
index e1467c9..f8919b5 100644
--- a/wavefront_api_client/models/response_container_list_api_token_model.py
+++ b/wavefront_api_client/models/response_container_list_api_token_model.py
@@ -33,29 +33,55 @@ class ResponseContainerListApiTokenModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[ApiTokenModel]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListApiTokenModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListApiTokenModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListApiTokenModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListApiTokenModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListApiTokenModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListApiTokenModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index d2a87d1..887adf5 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -33,29 +33,55 @@ class ResponseContainerListIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[Integration]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListIntegration.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListIntegration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListIntegration.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListIntegration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index e1a552e..851f7f4 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -33,29 +33,55 @@ class ResponseContainerListIntegrationManifestGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[IntegrationManifestGroup]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListIntegrationManifestGroup - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListIntegrationManifestGroup.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListIntegrationManifestGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_notification_messages.py b/wavefront_api_client/models/response_container_list_notification_messages.py
index c2cbf29..f131314 100644
--- a/wavefront_api_client/models/response_container_list_notification_messages.py
+++ b/wavefront_api_client/models/response_container_list_notification_messages.py
@@ -33,29 +33,55 @@ class ResponseContainerListNotificationMessages(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[NotificationMessages]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListNotificationMessages - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListNotificationMessages.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListNotificationMessages.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListNotificationMessages.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListNotificationMessages.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListNotificationMessages.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
index 03f92d3..4e811bb 100644
--- a/wavefront_api_client/models/response_container_list_service_account.py
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -33,29 +33,55 @@ class ResponseContainerListServiceAccount(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[ServiceAccount]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListServiceAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListServiceAccount.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListServiceAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListServiceAccount.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListServiceAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index d933200..578936b 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -33,29 +33,55 @@ class ResponseContainerListString(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[str]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListString - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListString.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListString.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListString.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListString.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListString.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
index 3fc47a5..42bb29c 100644
--- a/wavefront_api_client/models/response_container_list_user_api_token.py
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -33,29 +33,55 @@ class ResponseContainerListUserApiToken(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[UserApiToken]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListUserApiToken - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListUserApiToken.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListUserApiToken.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListUserApiToken.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListUserApiToken.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListUserApiToken.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_list_user_dto.py b/wavefront_api_client/models/response_container_list_user_dto.py
index 5e7c38b..f8cc6a7 100644
--- a/wavefront_api_client/models/response_container_list_user_dto.py
+++ b/wavefront_api_client/models/response_container_list_user_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerListUserDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[UserDTO]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerListUserDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerListUserDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerListUserDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerListUserDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerListUserDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerListUserDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index 24c84b3..e816804 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -33,29 +33,55 @@ class ResponseContainerMaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'MaintenanceWindow',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMaintenanceWindow.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMaintenanceWindow.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMaintenanceWindow.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMaintenanceWindow.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_map.py b/wavefront_api_client/models/response_container_map.py
index 75c3bd5..80616c4 100644
--- a/wavefront_api_client/models/response_container_map.py
+++ b/wavefront_api_client/models/response_container_map.py
@@ -33,29 +33,55 @@ class ResponseContainerMap(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'dict(str, object)',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMap - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMap.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMap.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMap.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMap.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMap.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 2e56adf..1a166f5 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -33,29 +33,55 @@ class ResponseContainerMapStringInteger(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'dict(str, int)',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMapStringInteger - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMapStringInteger.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMapStringInteger.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMapStringInteger.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMapStringInteger.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMapStringInteger.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index b71253e..8666542 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -33,29 +33,55 @@ class ResponseContainerMapStringIntegrationStatus(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'dict(str, IntegrationStatus)',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMapStringIntegrationStatus - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMapStringIntegrationStatus.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMapStringIntegrationStatus.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index 63982a7..dabd90f 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -33,29 +33,55 @@ class ResponseContainerMessage(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Message',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMessage - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMessage.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMessage.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMessage.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMessage.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMessage.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_metrics_policy_read_model.py b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
index e73b0ba..0fb6b7e 100644
--- a/wavefront_api_client/models/response_container_metrics_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
@@ -33,29 +33,55 @@ class ResponseContainerMetricsPolicyReadModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'MetricsPolicyReadModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMetricsPolicyReadModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMetricsPolicyReadModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMetricsPolicyReadModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_monitored_application_dto.py b/wavefront_api_client/models/response_container_monitored_application_dto.py
index d085b85..e4b834d 100644
--- a/wavefront_api_client/models/response_container_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_application_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerMonitoredApplicationDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'MonitoredApplicationDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMonitoredApplicationDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMonitoredApplicationDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_monitored_cluster.py b/wavefront_api_client/models/response_container_monitored_cluster.py
index 49084cc..76723c7 100644
--- a/wavefront_api_client/models/response_container_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_monitored_cluster.py
@@ -33,29 +33,55 @@ class ResponseContainerMonitoredCluster(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'MonitoredCluster',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMonitoredCluster - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMonitoredCluster.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMonitoredCluster.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMonitoredCluster.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMonitoredCluster.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMonitoredCluster.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_monitored_service_dto.py b/wavefront_api_client/models/response_container_monitored_service_dto.py
index 982121f..3f8ff3b 100644
--- a/wavefront_api_client/models/response_container_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_service_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerMonitoredServiceDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'MonitoredServiceDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerMonitoredServiceDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerMonitoredServiceDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index aac9a75..15677f4 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -33,29 +33,55 @@ class ResponseContainerNotificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Notificant',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerNotificant - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerNotificant.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerNotificant.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerNotificant.
+
+
+        :param debug_info: The debug_info of this ResponseContainerNotificant.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerNotificant.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
index 13d5c3f..048e2ca 100644
--- a/wavefront_api_client/models/response_container_paged_account.py
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedAccount(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedAccount',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedAccount.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedAccount.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index 3c207cd..70bbca4 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedAlert(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedAlert',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAlert - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedAlert.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedAlert.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedAlert.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedAlert.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedAlert.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py b/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
index 5f65bde..6049fd7 100644
--- a/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
+++ b/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedAlertAnalyticsSummaryDetail(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedAlertAnalyticsSummaryDetail',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAlertAnalyticsSummaryDetail - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedAlertAnalyticsSummaryDetail.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedAlertAnalyticsSummaryDetail.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index 19169c4..e45b06e 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedAlertWithStats(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedAlertWithStats',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAlertWithStats - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedAlertWithStats.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedAlertWithStats.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedAlertWithStats.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedAlertWithStats.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedAlertWithStats.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_anomaly.py b/wavefront_api_client/models/response_container_paged_anomaly.py
index ab2a300..0d11f18 100644
--- a/wavefront_api_client/models/response_container_paged_anomaly.py
+++ b/wavefront_api_client/models/response_container_paged_anomaly.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedAnomaly(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedAnomaly',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedAnomaly - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedAnomaly.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedAnomaly.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedAnomaly.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedAnomaly.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedAnomaly.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_api_token_model.py b/wavefront_api_client/models/response_container_paged_api_token_model.py
index 64f0c2f..5c5b913 100644
--- a/wavefront_api_client/models/response_container_paged_api_token_model.py
+++ b/wavefront_api_client/models/response_container_paged_api_token_model.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedApiTokenModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedApiTokenModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedApiTokenModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedApiTokenModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedApiTokenModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedApiTokenModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index 543c2b0..c49c867 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedCloudIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedCloudIntegration',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedCloudIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedCloudIntegration.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedCloudIntegration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedCloudIntegration.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedCloudIntegration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedCloudIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 1c27f02..6efe517 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedCustomerFacingUserObject(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedCustomerFacingUserObject',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedCustomerFacingUserObject - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedCustomerFacingUserObject.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedCustomerFacingUserObject.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index 8aec387..d8c7b69 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedDashboard(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedDashboard',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedDashboard - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedDashboard.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedDashboard.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedDashboard.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedDashboard.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedDashboard.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index 9b8d19b..fb9981f 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedDerivedMetricDefinition(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedDerivedMetricDefinition',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedDerivedMetricDefinition - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedDerivedMetricDefinition.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedDerivedMetricDefinition.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index b29cd05..0bcac0e 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedDerivedMetricDefinitionWithStats(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedDerivedMetricDefinitionWithStats',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedDerivedMetricDefinitionWithStats - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedDerivedMetricDefinitionWithStats.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedDerivedMetricDefinitionWithStats.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index 4368723..9adc264 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedEvent',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedEvent - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedEvent.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedEvent.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedEvent.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index 5c61257..c917f16 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedExternalLink(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedExternalLink',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedExternalLink - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedExternalLink.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedExternalLink.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedExternalLink.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedExternalLink.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedExternalLink.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
index a278139..03db970 100644
--- a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedIngestionPolicyReadModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedIngestionPolicyReadModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedIngestionPolicyReadModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedIngestionPolicyReadModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedIngestionPolicyReadModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index bf7f85f..265a7db 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedIntegration(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedIntegration',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedIntegration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedIntegration.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedIntegration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedIntegration.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedIntegration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedIntegration.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index d16a628..f70893b 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedMaintenanceWindow(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedMaintenanceWindow',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMaintenanceWindow - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedMaintenanceWindow.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedMaintenanceWindow.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index ccccfff..d7a4bd5 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedMessage(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedMessage',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMessage - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedMessage.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedMessage.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedMessage.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedMessage.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedMessage.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
index f869246..7807c00 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedMonitoredApplicationDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedMonitoredApplicationDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMonitoredApplicationDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedMonitoredApplicationDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedMonitoredApplicationDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_monitored_cluster.py b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
index 8cb07e6..d166b4c 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedMonitoredCluster(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedMonitoredCluster',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMonitoredCluster - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedMonitoredCluster.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedMonitoredCluster.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
index af3f731..c07cee6 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedMonitoredServiceDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedMonitoredServiceDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedMonitoredServiceDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedMonitoredServiceDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedMonitoredServiceDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index d22f46d..8c635f1 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedNotificant(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedNotificant',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedNotificant - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedNotificant.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedNotificant.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedNotificant.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedNotificant.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedNotificant.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index c7594ce..ddae276 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedProxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedProxy',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedProxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedProxy.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedProxy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedProxy.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedProxy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedProxy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
index f6b30e3..7118b67 100644
--- a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
+++ b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedRecentAppMapSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedRecentAppMapSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedRecentAppMapSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedRecentAppMapSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedRecentAppMapSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_recent_traces_search.py b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
index a788836..8dc10ab 100644
--- a/wavefront_api_client/models/response_container_paged_recent_traces_search.py
+++ b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedRecentTracesSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedRecentTracesSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedRecentTracesSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedRecentTracesSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedRecentTracesSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_related_event.py b/wavefront_api_client/models/response_container_paged_related_event.py
index 3ee7eb0..e9130cd 100644
--- a/wavefront_api_client/models/response_container_paged_related_event.py
+++ b/wavefront_api_client/models/response_container_paged_related_event.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedRelatedEvent(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedRelatedEvent',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedRelatedEvent - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedRelatedEvent.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedRelatedEvent.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedRelatedEvent.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
index 41d9550..7c1f678 100644
--- a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedReportEventAnomalyDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedReportEventAnomalyDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedReportEventAnomalyDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedReportEventAnomalyDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedReportEventAnomalyDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_role_dto.py b/wavefront_api_client/models/response_container_paged_role_dto.py
index 829e3d8..d9869ed 100644
--- a/wavefront_api_client/models/response_container_paged_role_dto.py
+++ b/wavefront_api_client/models/response_container_paged_role_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedRoleDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedRoleDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedRoleDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedRoleDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedRoleDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedRoleDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedRoleDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedRoleDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
index 327358c..dda84a7 100644
--- a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSavedAppMapSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSavedAppMapSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSavedAppMapSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSavedAppMapSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
index f807a36..56ae938 100644
--- a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSavedAppMapSearchGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSavedAppMapSearchGroup',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSavedAppMapSearchGroup - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSavedAppMapSearchGroup.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSavedAppMapSearchGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 328d1f2..57df344 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSavedSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSavedSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSavedSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSavedSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSavedSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSavedSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSavedSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search.py b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
index b08afd2..4ba676c 100644
--- a/wavefront_api_client/models/response_container_paged_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSavedTracesSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSavedTracesSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSavedTracesSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSavedTracesSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
index 8095ade..9727445 100644
--- a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSavedTracesSearchGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSavedTracesSearchGroup',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSavedTracesSearchGroup - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSavedTracesSearchGroup.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSavedTracesSearchGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
index 0fbc325..057d25c 100644
--- a/wavefront_api_client/models/response_container_paged_service_account.py
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedServiceAccount(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedServiceAccount',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedServiceAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedServiceAccount.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedServiceAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedServiceAccount.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedServiceAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 0adde40..364a39f 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSource(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSource',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSource - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSource.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSource.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSource.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSource.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSource.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
index 52de244..ba13b3f 100644
--- a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedSpanSamplingPolicy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedSpanSamplingPolicy',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedSpanSamplingPolicy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedSpanSamplingPolicy.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedSpanSamplingPolicy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
index c1d6a1d..deb6b22 100644
--- a/wavefront_api_client/models/response_container_paged_user_group_model.py
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -33,29 +33,55 @@ class ResponseContainerPagedUserGroupModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'PagedUserGroupModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerPagedUserGroupModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerPagedUserGroupModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerPagedUserGroupModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerPagedUserGroupModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index 79aebe4..8d689f8 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -33,29 +33,55 @@ class ResponseContainerProxy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Proxy',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerProxy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerProxy.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerProxy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerProxy.
+
+
+        :param debug_info: The debug_info of this ResponseContainerProxy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerProxy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_query_type_dto.py b/wavefront_api_client/models/response_container_query_type_dto.py
index 216a72f..98990b4 100644
--- a/wavefront_api_client/models/response_container_query_type_dto.py
+++ b/wavefront_api_client/models/response_container_query_type_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerQueryTypeDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'QueryTypeDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerQueryTypeDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerQueryTypeDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerQueryTypeDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerQueryTypeDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerQueryTypeDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerQueryTypeDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_recent_app_map_search.py b/wavefront_api_client/models/response_container_recent_app_map_search.py
index 048ae96..111ebc3 100644
--- a/wavefront_api_client/models/response_container_recent_app_map_search.py
+++ b/wavefront_api_client/models/response_container_recent_app_map_search.py
@@ -33,29 +33,55 @@ class ResponseContainerRecentAppMapSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'RecentAppMapSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerRecentAppMapSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerRecentAppMapSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerRecentAppMapSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerRecentAppMapSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_recent_traces_search.py b/wavefront_api_client/models/response_container_recent_traces_search.py
index 4082420..5e8d21c 100644
--- a/wavefront_api_client/models/response_container_recent_traces_search.py
+++ b/wavefront_api_client/models/response_container_recent_traces_search.py
@@ -33,29 +33,55 @@ class ResponseContainerRecentTracesSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'RecentTracesSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerRecentTracesSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerRecentTracesSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerRecentTracesSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerRecentTracesSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerRecentTracesSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerRecentTracesSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_role_dto.py b/wavefront_api_client/models/response_container_role_dto.py
index d4912d9..3e87fbf 100644
--- a/wavefront_api_client/models/response_container_role_dto.py
+++ b/wavefront_api_client/models/response_container_role_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerRoleDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'RoleDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerRoleDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerRoleDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerRoleDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerRoleDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerRoleDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerRoleDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search.py b/wavefront_api_client/models/response_container_saved_app_map_search.py
index 9e7bf0a..31a4477 100644
--- a/wavefront_api_client/models/response_container_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_saved_app_map_search.py
@@ -33,29 +33,55 @@ class ResponseContainerSavedAppMapSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'SavedAppMapSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSavedAppMapSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSavedAppMapSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSavedAppMapSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSavedAppMapSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
index a57c60a..08af4ae 100644
--- a/wavefront_api_client/models/response_container_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
@@ -33,29 +33,55 @@ class ResponseContainerSavedAppMapSearchGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'SavedAppMapSearchGroup',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSavedAppMapSearchGroup - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSavedAppMapSearchGroup.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSavedAppMapSearchGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index a810621..c288d98 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -33,29 +33,55 @@ class ResponseContainerSavedSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'SavedSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSavedSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSavedSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSavedSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSavedSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSavedSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSavedSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_saved_traces_search.py b/wavefront_api_client/models/response_container_saved_traces_search.py
index e6077a9..c25f0bd 100644
--- a/wavefront_api_client/models/response_container_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_saved_traces_search.py
@@ -33,29 +33,55 @@ class ResponseContainerSavedTracesSearch(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'SavedTracesSearch',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSavedTracesSearch - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSavedTracesSearch.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSavedTracesSearch.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSavedTracesSearch.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSavedTracesSearch.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSavedTracesSearch.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_saved_traces_search_group.py b/wavefront_api_client/models/response_container_saved_traces_search_group.py
index e2d1482..ba7563e 100644
--- a/wavefront_api_client/models/response_container_saved_traces_search_group.py
+++ b/wavefront_api_client/models/response_container_saved_traces_search_group.py
@@ -33,29 +33,55 @@ class ResponseContainerSavedTracesSearchGroup(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'SavedTracesSearchGroup',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSavedTracesSearchGroup - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSavedTracesSearchGroup.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSavedTracesSearchGroup.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
index a47006c..ea216e0 100644
--- a/wavefront_api_client/models/response_container_service_account.py
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -33,29 +33,55 @@ class ResponseContainerServiceAccount(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'ServiceAccount',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerServiceAccount - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerServiceAccount.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerServiceAccount.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerServiceAccount.
+
+
+        :param debug_info: The debug_info of this ResponseContainerServiceAccount.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerServiceAccount.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index c29b909..4d02a63 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -33,29 +33,55 @@ class ResponseContainerSetBusinessFunction(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[str]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSetBusinessFunction - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSetBusinessFunction.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSetBusinessFunction.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSetBusinessFunction.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSetBusinessFunction.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSetBusinessFunction.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_source_label_pair.py b/wavefront_api_client/models/response_container_set_source_label_pair.py
index a01e8b2..3cbd855 100644
--- a/wavefront_api_client/models/response_container_set_source_label_pair.py
+++ b/wavefront_api_client/models/response_container_set_source_label_pair.py
@@ -33,29 +33,55 @@ class ResponseContainerSetSourceLabelPair(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'list[SourceLabelPair]',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSetSourceLabelPair - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSetSourceLabelPair.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSetSourceLabelPair.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSetSourceLabelPair.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 03795c8..474be0b 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -33,29 +33,55 @@ class ResponseContainerSource(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Source',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSource - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSource.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSource.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSource.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSource.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSource.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_span_sampling_policy.py b/wavefront_api_client/models/response_container_span_sampling_policy.py
index 78ebdb2..6fb6260 100644
--- a/wavefront_api_client/models/response_container_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_span_sampling_policy.py
@@ -33,29 +33,55 @@ class ResponseContainerSpanSamplingPolicy(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'SpanSamplingPolicy',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerSpanSamplingPolicy - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerSpanSamplingPolicy.
+
+
+        :param debug_info: The debug_info of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerSpanSamplingPolicy.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_string.py b/wavefront_api_client/models/response_container_string.py
index f133ec3..3ba3f3c 100644
--- a/wavefront_api_client/models/response_container_string.py
+++ b/wavefront_api_client/models/response_container_string.py
@@ -33,29 +33,55 @@ class ResponseContainerString(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'str',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerString - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerString.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerString.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerString.
+
+
+        :param debug_info: The debug_info of this ResponseContainerString.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerString.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index ebddf67..efc6da4 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -33,29 +33,55 @@ class ResponseContainerTagsResponse(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'TagsResponse',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerTagsResponse - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerTagsResponse.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerTagsResponse.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerTagsResponse.
+
+
+        :param debug_info: The debug_info of this ResponseContainerTagsResponse.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerTagsResponse.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
index 1967df2..7e88181 100644
--- a/wavefront_api_client/models/response_container_user_api_token.py
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -33,29 +33,55 @@ class ResponseContainerUserApiToken(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'UserApiToken',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerUserApiToken - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerUserApiToken.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerUserApiToken.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerUserApiToken.
+
+
+        :param debug_info: The debug_info of this ResponseContainerUserApiToken.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerUserApiToken.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_user_dto.py b/wavefront_api_client/models/response_container_user_dto.py
index 8aebe4c..ebcb871 100644
--- a/wavefront_api_client/models/response_container_user_dto.py
+++ b/wavefront_api_client/models/response_container_user_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerUserDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'UserDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerUserDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerUserDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerUserDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerUserDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerUserDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerUserDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
index 27f7bc2..32ec0af 100644
--- a/wavefront_api_client/models/response_container_user_group_model.py
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -33,29 +33,55 @@ class ResponseContainerUserGroupModel(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'UserGroupModel',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerUserGroupModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerUserGroupModel.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerUserGroupModel.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerUserGroupModel.
+
+
+        :param debug_info: The debug_info of this ResponseContainerUserGroupModel.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerUserGroupModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index 3ecd239..518c578 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -33,29 +33,55 @@ class ResponseContainerValidatedUsersDTO(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'ValidatedUsersDTO',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerValidatedUsersDTO - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerValidatedUsersDTO.
+
+
+        :param debug_info: The debug_info of this ResponseContainerValidatedUsersDTO.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerValidatedUsersDTO.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_void.py b/wavefront_api_client/models/response_container_void.py
index 0d8db42..19d7088 100644
--- a/wavefront_api_client/models/response_container_void.py
+++ b/wavefront_api_client/models/response_container_void.py
@@ -33,29 +33,55 @@ class ResponseContainerVoid(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'debug_info': 'list[str]',
         'response': 'Void',
         'status': 'ResponseStatus'
     }
 
     attribute_map = {
+        'debug_info': 'debugInfo',
         'response': 'response',
         'status': 'status'
     }
 
-    def __init__(self, response=None, status=None, _configuration=None):  # noqa: E501
+    def __init__(self, debug_info=None, response=None, status=None, _configuration=None):  # noqa: E501
         """ResponseContainerVoid - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._debug_info = None
         self._response = None
         self._status = None
         self.discriminator = None
 
+        if debug_info is not None:
+            self.debug_info = debug_info
         if response is not None:
             self.response = response
         self.status = status
 
+    @property
+    def debug_info(self):
+        """Gets the debug_info of this ResponseContainerVoid.  # noqa: E501
+
+
+        :return: The debug_info of this ResponseContainerVoid.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._debug_info
+
+    @debug_info.setter
+    def debug_info(self, debug_info):
+        """Sets the debug_info of this ResponseContainerVoid.
+
+
+        :param debug_info: The debug_info of this ResponseContainerVoid.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._debug_info = debug_info
+
     @property
     def response(self):
         """Gets the response of this ResponseContainerVoid.  # noqa: E501

From 2625e6aed64a0e00ee6bb4bef51bd5ba7f533f3e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 13 Dec 2023 08:16:26 -0800
Subject: [PATCH 152/161] Autogenerated Update v2.214.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  10 +-
 docs/AlertAnalyticsApi.md                     | 305 ++++++++++
 docs/SearchApi.md                             | 179 ++++++
 setup.py                                      |   2 +-
 test/test_alert_analytics_api.py              |  69 +++
 wavefront_api_client/__init__.py              |   1 +
 wavefront_api_client/api/__init__.py          |   1 +
 .../api/alert_analytics_api.py                | 573 ++++++++++++++++++
 wavefront_api_client/api/search_api.py        | 329 ++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 13 files changed, 1471 insertions(+), 6 deletions(-)
 create mode 100644 docs/AlertAnalyticsApi.md
 create mode 100644 test/test_alert_analytics_api.py
 create mode 100644 wavefront_api_client/api/alert_analytics_api.py

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 7ea07f4..4890b6c 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.213.0"
+    "packageVersion": "2.214.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index d1a9877..7ea07f4 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.210.2"
+    "packageVersion": "2.213.0"
 }
diff --git a/README.md b/README.md
index fe11ed1..b97dbe6 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.213.0
+- Package version: 2.214.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -128,6 +128,11 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**unhide_alert**](docs/AlertApi.md#unhide_alert) | **POST** /api/v2/alert/{id}/install | Unhide a specific integration alert
 *AlertApi* | [**unsnooze_alert**](docs/AlertApi.md#unsnooze_alert) | **POST** /api/v2/alert/{id}/unsnooze | Unsnooze a specific alert
 *AlertApi* | [**update_alert**](docs/AlertApi.md#update_alert) | **PUT** /api/v2/alert/{id} | Update a specific alert
+*AlertAnalyticsApi* | [**get_active_no_target_alert_summary_details**](docs/AlertAnalyticsApi.md#get_active_no_target_alert_summary_details) | **GET** /api/v2/alert/analytics/summary/alerts/noTarget | Get Active No Target Alert Summary for a customer
+*AlertAnalyticsApi* | [**get_alert_analytics_errors_summary**](docs/AlertAnalyticsApi.md#get_alert_analytics_errors_summary) | **GET** /api/v2/alert/analytics/summary/errors | Get Alert Analytics errors summary
+*AlertAnalyticsApi* | [**get_alert_analytics_summary**](docs/AlertAnalyticsApi.md#get_alert_analytics_summary) | **GET** /api/v2/alert/analytics/summary | Get Alert Analytics Summary for a customer
+*AlertAnalyticsApi* | [**get_failed_alert_summary_details**](docs/AlertAnalyticsApi.md#get_failed_alert_summary_details) | **GET** /api/v2/alert/analytics/summary/alerts/failed | Get Failed Alert Summary Details for a customer
+*AlertAnalyticsApi* | [**get_no_data_alert_summary_details**](docs/AlertAnalyticsApi.md#get_no_data_alert_summary_details) | **GET** /api/v2/alert/analytics/summary/alerts/noData | Get No Data Alert Summary for a customer
 *ApiTokenApi* | [**create_token**](docs/ApiTokenApi.md#create_token) | **POST** /api/v2/apitoken | Create new api token
 *ApiTokenApi* | [**delete_customer_token**](docs/ApiTokenApi.md#delete_customer_token) | **PUT** /api/v2/apitoken/customertokens/revoke | Delete the specified api token for a customer
 *ApiTokenApi* | [**delete_token**](docs/ApiTokenApi.md#delete_token) | **DELETE** /api/v2/apitoken/{id} | Delete the specified api token
@@ -315,6 +320,9 @@ Class | Method | HTTP request | Description
 *SearchApi* | [**search_alert_deleted_for_facet**](docs/SearchApi.md#search_alert_deleted_for_facet) | **POST** /api/v2/search/alert/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted alerts
 *SearchApi* | [**search_alert_deleted_for_facets**](docs/SearchApi.md#search_alert_deleted_for_facets) | **POST** /api/v2/search/alert/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted alerts
 *SearchApi* | [**search_alert_entities**](docs/SearchApi.md#search_alert_entities) | **POST** /api/v2/search/alert | Search over a customer&#39;s non-deleted alerts
+*SearchApi* | [**search_alert_execution_summary_entities**](docs/SearchApi.md#search_alert_execution_summary_entities) | **POST** /api/v2/search/alert-analytics-summary | Search over a customer&#39;s alert executions summaries
+*SearchApi* | [**search_alert_execution_summary_for_facet**](docs/SearchApi.md#search_alert_execution_summary_for_facet) | **POST** /api/v2/search/alert-analytics-summary/{facet} | Lists the values of a specific facet over the customer&#39;s alert executions summaries
+*SearchApi* | [**search_alert_execution_summary_for_facets**](docs/SearchApi.md#search_alert_execution_summary_for_facets) | **POST** /api/v2/search/alert-analytics-summary/facets | Lists the values of one or more facets over the customer&#39;s alert executions summaries
 *SearchApi* | [**search_alert_for_facet**](docs/SearchApi.md#search_alert_for_facet) | **POST** /api/v2/search/alert/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted alerts
 *SearchApi* | [**search_alert_for_facets**](docs/SearchApi.md#search_alert_for_facets) | **POST** /api/v2/search/alert/facets | Lists the values of one or more facets over the customer&#39;s non-deleted alerts
 *SearchApi* | [**search_cloud_integration_deleted_entities**](docs/SearchApi.md#search_cloud_integration_deleted_entities) | **POST** /api/v2/search/cloudintegration/deleted | Search over a customer&#39;s deleted cloud integrations
diff --git a/docs/AlertAnalyticsApi.md b/docs/AlertAnalyticsApi.md
new file mode 100644
index 0000000..e3c5427
--- /dev/null
+++ b/docs/AlertAnalyticsApi.md
@@ -0,0 +1,305 @@
+# wavefront_api_client.AlertAnalyticsApi
+
+All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_active_no_target_alert_summary_details**](AlertAnalyticsApi.md#get_active_no_target_alert_summary_details) | **GET** /api/v2/alert/analytics/summary/alerts/noTarget | Get Active No Target Alert Summary for a customer
+[**get_alert_analytics_errors_summary**](AlertAnalyticsApi.md#get_alert_analytics_errors_summary) | **GET** /api/v2/alert/analytics/summary/errors | Get Alert Analytics errors summary
+[**get_alert_analytics_summary**](AlertAnalyticsApi.md#get_alert_analytics_summary) | **GET** /api/v2/alert/analytics/summary | Get Alert Analytics Summary for a customer
+[**get_failed_alert_summary_details**](AlertAnalyticsApi.md#get_failed_alert_summary_details) | **GET** /api/v2/alert/analytics/summary/alerts/failed | Get Failed Alert Summary Details for a customer
+[**get_no_data_alert_summary_details**](AlertAnalyticsApi.md#get_no_data_alert_summary_details) | **GET** /api/v2/alert/analytics/summary/alerts/noData | Get No Data Alert Summary for a customer
+
+
+# **get_active_no_target_alert_summary_details**
+> ResponseContainerPagedAlertAnalyticsSummaryDetail get_active_no_target_alert_summary_details(start, end=end, offset=offset, limit=limit)
+
+Get Active No Target Alert Summary for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds, null to use now (optional)
+offset = 0 # int | offset for records (optional) (default to 0)
+limit = 50 # int | Number of records (optional) (default to 50)
+
+try:
+    # Get Active No Target Alert Summary for a customer
+    api_response = api_instance.get_active_no_target_alert_summary_details(start, end=end, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertAnalyticsApi->get_active_no_target_alert_summary_details: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds, null to use now | [optional] 
+ **offset** | **int**| offset for records | [optional] [default to 0]
+ **limit** | **int**| Number of records | [optional] [default to 50]
+
+### Return type
+
+[**ResponseContainerPagedAlertAnalyticsSummaryDetail**](ResponseContainerPagedAlertAnalyticsSummaryDetail.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_alert_analytics_errors_summary**
+> ResponseContainerListAlertErrorGroupInfo get_alert_analytics_errors_summary(start, end=end)
+
+Get Alert Analytics errors summary
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds, null to use now (optional)
+
+try:
+    # Get Alert Analytics errors summary
+    api_response = api_instance.get_alert_analytics_errors_summary(start, end=end)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertAnalyticsApi->get_alert_analytics_errors_summary: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds, null to use now | [optional] 
+
+### Return type
+
+[**ResponseContainerListAlertErrorGroupInfo**](ResponseContainerListAlertErrorGroupInfo.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_alert_analytics_summary**
+> ResponseContainerAlertAnalyticsSummary get_alert_analytics_summary(start, end=end)
+
+Get Alert Analytics Summary for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds, null to use now (optional)
+
+try:
+    # Get Alert Analytics Summary for a customer
+    api_response = api_instance.get_alert_analytics_summary(start, end=end)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertAnalyticsApi->get_alert_analytics_summary: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds, null to use now | [optional] 
+
+### Return type
+
+[**ResponseContainerAlertAnalyticsSummary**](ResponseContainerAlertAnalyticsSummary.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_failed_alert_summary_details**
+> ResponseContainerPagedAlertAnalyticsSummaryDetail get_failed_alert_summary_details(start, end=end, offset=offset, limit=limit)
+
+Get Failed Alert Summary Details for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds, null to use now (optional)
+offset = 0 # int | offset for records (optional) (default to 0)
+limit = 50 # int | Number of records (optional) (default to 50)
+
+try:
+    # Get Failed Alert Summary Details for a customer
+    api_response = api_instance.get_failed_alert_summary_details(start, end=end, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertAnalyticsApi->get_failed_alert_summary_details: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds, null to use now | [optional] 
+ **offset** | **int**| offset for records | [optional] [default to 0]
+ **limit** | **int**| Number of records | [optional] [default to 50]
+
+### Return type
+
+[**ResponseContainerPagedAlertAnalyticsSummaryDetail**](ResponseContainerPagedAlertAnalyticsSummaryDetail.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_no_data_alert_summary_details**
+> ResponseContainerPagedAlertAnalyticsSummaryDetail get_no_data_alert_summary_details(start, end=end, offset=offset, limit=limit)
+
+Get No Data Alert Summary for a customer
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertAnalyticsApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds, null to use now (optional)
+offset = 0 # int | offset for records (optional) (default to 0)
+limit = 50 # int | Number of records (optional) (default to 50)
+
+try:
+    # Get No Data Alert Summary for a customer
+    api_response = api_instance.get_no_data_alert_summary_details(start, end=end, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertAnalyticsApi->get_no_data_alert_summary_details: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds, null to use now | [optional] 
+ **offset** | **int**| offset for records | [optional] [default to 0]
+ **limit** | **int**| Number of records | [optional] [default to 50]
+
+### Return type
+
+[**ResponseContainerPagedAlertAnalyticsSummaryDetail**](ResponseContainerPagedAlertAnalyticsSummaryDetail.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index 1a1ada5..f817a49 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -11,6 +11,9 @@ Method | HTTP request | Description
 [**search_alert_deleted_for_facet**](SearchApi.md#search_alert_deleted_for_facet) | **POST** /api/v2/search/alert/deleted/{facet} | Lists the values of a specific facet over the customer&#39;s deleted alerts
 [**search_alert_deleted_for_facets**](SearchApi.md#search_alert_deleted_for_facets) | **POST** /api/v2/search/alert/deleted/facets | Lists the values of one or more facets over the customer&#39;s deleted alerts
 [**search_alert_entities**](SearchApi.md#search_alert_entities) | **POST** /api/v2/search/alert | Search over a customer&#39;s non-deleted alerts
+[**search_alert_execution_summary_entities**](SearchApi.md#search_alert_execution_summary_entities) | **POST** /api/v2/search/alert-analytics-summary | Search over a customer&#39;s alert executions summaries
+[**search_alert_execution_summary_for_facet**](SearchApi.md#search_alert_execution_summary_for_facet) | **POST** /api/v2/search/alert-analytics-summary/{facet} | Lists the values of a specific facet over the customer&#39;s alert executions summaries
+[**search_alert_execution_summary_for_facets**](SearchApi.md#search_alert_execution_summary_for_facets) | **POST** /api/v2/search/alert-analytics-summary/facets | Lists the values of one or more facets over the customer&#39;s alert executions summaries
 [**search_alert_for_facet**](SearchApi.md#search_alert_for_facet) | **POST** /api/v2/search/alert/{facet} | Lists the values of a specific facet over the customer&#39;s non-deleted alerts
 [**search_alert_for_facets**](SearchApi.md#search_alert_for_facets) | **POST** /api/v2/search/alert/facets | Lists the values of one or more facets over the customer&#39;s non-deleted alerts
 [**search_cloud_integration_deleted_entities**](SearchApi.md#search_cloud_integration_deleted_entities) | **POST** /api/v2/search/cloudintegration/deleted | Search over a customer&#39;s deleted cloud integrations
@@ -477,6 +480,182 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **search_alert_execution_summary_entities**
+> ResponseContainerPagedAlertAnalyticsSummaryDetail search_alert_execution_summary_entities(start, end=end, body=body)
+
+Search over a customer's alert executions summaries
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds (optional)
+body = wavefront_api_client.SortableSearchRequest() # SortableSearchRequest |  (optional)
+
+try:
+    # Search over a customer's alert executions summaries
+    api_response = api_instance.search_alert_execution_summary_entities(start, end=end, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_alert_execution_summary_entities: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds | [optional] 
+ **body** | [**SortableSearchRequest**](SortableSearchRequest.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerPagedAlertAnalyticsSummaryDetail**](ResponseContainerPagedAlertAnalyticsSummaryDetail.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_alert_execution_summary_for_facet**
+> ResponseContainerFacetResponse search_alert_execution_summary_for_facet(facet, start, end=end, body=body)
+
+Lists the values of a specific facet over the customer's alert executions summaries
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+facet = 'facet_example' # str | 
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds (optional)
+body = wavefront_api_client.FacetSearchRequestContainer() # FacetSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of a specific facet over the customer's alert executions summaries
+    api_response = api_instance.search_alert_execution_summary_for_facet(facet, start, end=end, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_alert_execution_summary_for_facet: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **facet** | **str**|  | 
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds | [optional] 
+ **body** | [**FacetSearchRequestContainer**](FacetSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetResponse**](ResponseContainerFacetResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **search_alert_execution_summary_for_facets**
+> ResponseContainerFacetsResponseContainer search_alert_execution_summary_for_facets(start, end=end, body=body)
+
+Lists the values of one or more facets over the customer's alert executions summaries
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SearchApi(wavefront_api_client.ApiClient(configuration))
+start = 789 # int | Start time in epoch seconds
+end = 789 # int | End time in epoch seconds (optional)
+body = wavefront_api_client.FacetsSearchRequestContainer() # FacetsSearchRequestContainer |  (optional)
+
+try:
+    # Lists the values of one or more facets over the customer's alert executions summaries
+    api_response = api_instance.search_alert_execution_summary_for_facets(start, end=end, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SearchApi->search_alert_execution_summary_for_facets: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **start** | **int**| Start time in epoch seconds | 
+ **end** | **int**| End time in epoch seconds | [optional] 
+ **body** | [**FacetsSearchRequestContainer**](FacetsSearchRequestContainer.md)|  | [optional] 
+
+### Return type
+
+[**ResponseContainerFacetsResponseContainer**](ResponseContainerFacetsResponseContainer.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **search_alert_for_facet**
 > ResponseContainerFacetResponse search_alert_for_facet(facet, body=body)
 
diff --git a/setup.py b/setup.py
index 2e3fdae..7dd2474 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.213.0"
+VERSION = "2.214.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_alert_analytics_api.py b/test/test_alert_analytics_api.py
new file mode 100644
index 0000000..298bdab
--- /dev/null
+++ b/test/test_alert_analytics_api.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+
+import wavefront_api_client
+from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi  # noqa: E501
+from wavefront_api_client.rest import ApiException
+
+
+class TestAlertAnalyticsApi(unittest.TestCase):
+    """AlertAnalyticsApi unit test stubs"""
+
+    def setUp(self):
+        self.api = wavefront_api_client.api.alert_analytics_api.AlertAnalyticsApi()  # noqa: E501
+
+    def tearDown(self):
+        pass
+
+    def test_get_active_no_target_alert_summary_details(self):
+        """Test case for get_active_no_target_alert_summary_details
+
+        Get Active No Target Alert Summary for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_analytics_errors_summary(self):
+        """Test case for get_alert_analytics_errors_summary
+
+        Get Alert Analytics errors summary  # noqa: E501
+        """
+        pass
+
+    def test_get_alert_analytics_summary(self):
+        """Test case for get_alert_analytics_summary
+
+        Get Alert Analytics Summary for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_failed_alert_summary_details(self):
+        """Test case for get_failed_alert_summary_details
+
+        Get Failed Alert Summary Details for a customer  # noqa: E501
+        """
+        pass
+
+    def test_get_no_data_alert_summary_details(self):
+        """Test case for get_no_data_alert_summary_details
+
+        Get No Data Alert Summary for a customer  # noqa: E501
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 033444f..86b24c6 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -19,6 +19,7 @@
 from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api/__init__.py b/wavefront_api_client/api/__init__.py
index 21b30d0..b97962c 100644
--- a/wavefront_api_client/api/__init__.py
+++ b/wavefront_api_client/api/__init__.py
@@ -6,6 +6,7 @@
 from wavefront_api_client.api.access_policy_api import AccessPolicyApi
 from wavefront_api_client.api.account__user_and_service_account_api import AccountUserAndServiceAccountApi
 from wavefront_api_client.api.alert_api import AlertApi
+from wavefront_api_client.api.alert_analytics_api import AlertAnalyticsApi
 from wavefront_api_client.api.api_token_api import ApiTokenApi
 from wavefront_api_client.api.cloud_integration_api import CloudIntegrationApi
 from wavefront_api_client.api.dashboard_api import DashboardApi
diff --git a/wavefront_api_client/api/alert_analytics_api.py b/wavefront_api_client/api/alert_analytics_api.py
new file mode 100644
index 0000000..62c7ad6
--- /dev/null
+++ b/wavefront_api_client/api/alert_analytics_api.py
@@ -0,0 +1,573 @@
+# coding: utf-8
+
+"""
+    Wavefront REST API Documentation
+
+    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+
+    OpenAPI spec version: v2
+    Contact: chitimba@wavefront.com
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+import re  # noqa: F401
+
+# python 2 and python 3 compatibility library
+import six
+
+from wavefront_api_client.api_client import ApiClient
+
+
+class AlertAnalyticsApi(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
+
+    def get_active_no_target_alert_summary_details(self, start, **kwargs):  # noqa: E501
+        """Get Active No Target Alert Summary for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_active_no_target_alert_summary_details(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :param int offset: offset for records
+        :param int limit: Number of records
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_active_no_target_alert_summary_details_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_active_no_target_alert_summary_details_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def get_active_no_target_alert_summary_details_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Get Active No Target Alert Summary for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_active_no_target_alert_summary_details_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :param int offset: offset for records
+        :param int limit: Number of records
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_active_no_target_alert_summary_details" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `get_active_no_target_alert_summary_details`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/analytics/summary/alerts/noTarget', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAlertAnalyticsSummaryDetail',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_alert_analytics_errors_summary(self, start, **kwargs):  # noqa: E501
+        """Get Alert Analytics errors summary  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_analytics_errors_summary(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :return: ResponseContainerListAlertErrorGroupInfo
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_alert_analytics_errors_summary_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_alert_analytics_errors_summary_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def get_alert_analytics_errors_summary_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Get Alert Analytics errors summary  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_analytics_errors_summary_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :return: ResponseContainerListAlertErrorGroupInfo
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_alert_analytics_errors_summary" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `get_alert_analytics_errors_summary`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/analytics/summary/errors', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerListAlertErrorGroupInfo',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_alert_analytics_summary(self, start, **kwargs):  # noqa: E501
+        """Get Alert Analytics Summary for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_analytics_summary(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :return: ResponseContainerAlertAnalyticsSummary
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_alert_analytics_summary_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_alert_analytics_summary_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def get_alert_analytics_summary_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Get Alert Analytics Summary for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alert_analytics_summary_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :return: ResponseContainerAlertAnalyticsSummary
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_alert_analytics_summary" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `get_alert_analytics_summary`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/analytics/summary', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerAlertAnalyticsSummary',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_failed_alert_summary_details(self, start, **kwargs):  # noqa: E501
+        """Get Failed Alert Summary Details for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_failed_alert_summary_details(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :param int offset: offset for records
+        :param int limit: Number of records
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_failed_alert_summary_details_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_failed_alert_summary_details_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def get_failed_alert_summary_details_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Get Failed Alert Summary Details for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_failed_alert_summary_details_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :param int offset: offset for records
+        :param int limit: Number of records
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_failed_alert_summary_details" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `get_failed_alert_summary_details`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/analytics/summary/alerts/failed', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAlertAnalyticsSummaryDetail',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_no_data_alert_summary_details(self, start, **kwargs):  # noqa: E501
+        """Get No Data Alert Summary for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_no_data_alert_summary_details(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :param int offset: offset for records
+        :param int limit: Number of records
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_no_data_alert_summary_details_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_no_data_alert_summary_details_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def get_no_data_alert_summary_details_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Get No Data Alert Summary for a customer  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_no_data_alert_summary_details_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds, null to use now
+        :param int offset: offset for records
+        :param int limit: Number of records
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_no_data_alert_summary_details" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `get_no_data_alert_summary_details`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/analytics/summary/alerts/noData', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAlertAnalyticsSummaryDetail',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 0faade9..7902fa1 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -714,6 +714,335 @@ def search_alert_entities_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def search_alert_execution_summary_entities(self, start, **kwargs):  # noqa: E501
+        """Search over a customer's alert executions summaries  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_execution_summary_entities(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_alert_execution_summary_entities_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_alert_execution_summary_entities_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def search_alert_execution_summary_entities_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Search over a customer's alert executions summaries  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_execution_summary_entities_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :param SortableSearchRequest body:
+        :return: ResponseContainerPagedAlertAnalyticsSummaryDetail
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_alert_execution_summary_entities" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `search_alert_execution_summary_entities`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/alert-analytics-summary', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAlertAnalyticsSummaryDetail',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_alert_execution_summary_for_facet(self, facet, start, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's alert executions summaries  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_execution_summary_for_facet(facet, start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_alert_execution_summary_for_facet_with_http_info(facet, start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_alert_execution_summary_for_facet_with_http_info(facet, start, **kwargs)  # noqa: E501
+            return data
+
+    def search_alert_execution_summary_for_facet_with_http_info(self, facet, start, **kwargs):  # noqa: E501
+        """Lists the values of a specific facet over the customer's alert executions summaries  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_execution_summary_for_facet_with_http_info(facet, start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str facet: (required)
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :param FacetSearchRequestContainer body:
+        :return: ResponseContainerFacetResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['facet', 'start', 'end', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_alert_execution_summary_for_facet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'facet' is set
+        if self.api_client.client_side_validation and ('facet' not in params or
+                                                       params['facet'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `facet` when calling `search_alert_execution_summary_for_facet`")  # noqa: E501
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `search_alert_execution_summary_for_facet`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'facet' in params:
+            path_params['facet'] = params['facet']  # noqa: E501
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/alert-analytics-summary/{facet}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def search_alert_execution_summary_for_facets(self, start, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's alert executions summaries  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_execution_summary_for_facets(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.search_alert_execution_summary_for_facets_with_http_info(start, **kwargs)  # noqa: E501
+        else:
+            (data) = self.search_alert_execution_summary_for_facets_with_http_info(start, **kwargs)  # noqa: E501
+            return data
+
+    def search_alert_execution_summary_for_facets_with_http_info(self, start, **kwargs):  # noqa: E501
+        """Lists the values of one or more facets over the customer's alert executions summaries  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.search_alert_execution_summary_for_facets_with_http_info(start, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int start: Start time in epoch seconds (required)
+        :param int end: End time in epoch seconds
+        :param FacetsSearchRequestContainer body:
+        :return: ResponseContainerFacetsResponseContainer
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['start', 'end', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method search_alert_execution_summary_for_facets" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'start' is set
+        if self.api_client.client_side_validation and ('start' not in params or
+                                                       params['start'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `start` when calling `search_alert_execution_summary_for_facets`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'start' in params:
+            query_params.append(('start', params['start']))  # noqa: E501
+        if 'end' in params:
+            query_params.append(('end', params['end']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/search/alert-analytics-summary/facets', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerFacetsResponseContainer',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def search_alert_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's non-deleted alerts  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index b6fe32e..15a9724 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.213.0/python'
+        self.user_agent = 'Swagger-Codegen/2.214.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 48e574b..7780b2a 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.213.0".\
+               "SDK Package Version: 2.214.0".\
                format(env=sys.platform, pyversion=sys.version)

From b3d739b5ae3e7cdeddc9e49e86994d3dad0356c4 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 9 Jan 2024 08:16:19 -0800
Subject: [PATCH 153/161] Autogenerated Update v2.216.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |  11 +-
 docs/MetricsPolicyReadModel.md                |   3 +-
 docs/MetricsPolicyWriteModel.md               |   3 +-
 docs/MonitoredApplicationApi.md               |   6 +-
 docs/MonitoredServiceApi.md                   |   6 +-
 docs/SecurityPolicyApi.md                     | 285 ++++++++++
 setup.py                                      |   2 +-
 .../api/monitored_application_api.py          |   4 +-
 .../api/monitored_service_api.py              |   4 +-
 .../api/security_policy_api.py                | 523 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 .../models/metrics_policy_read_model.py       |  41 +-
 .../models/metrics_policy_write_model.py      |  41 +-
 ...esponse_container_set_business_function.py |   2 +-
 17 files changed, 912 insertions(+), 27 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 4890b6c..e28c62e 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.214.0"
+    "packageVersion": "2.216.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 7ea07f4..4890b6c 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.213.0"
+    "packageVersion": "2.214.0"
 }
diff --git a/README.md b/README.md
index b97dbe6..9b4195e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.214.0
+- Package version: 2.216.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -229,7 +229,7 @@ Class | Method | HTTP request | Description
 *MessageApi* | [**user_get_messages**](docs/MessageApi.md#user_get_messages) | **GET** /api/v2/message | Gets messages applicable to the current user, i.e. within time range and distribution scope
 *MessageApi* | [**user_read_message**](docs/MessageApi.md#user_read_message) | **POST** /api/v2/message/{id}/read | Mark a specific message as read
 *MetricApi* | [**get_metric_details**](docs/MetricApi.md#get_metric_details) | **GET** /api/v2/chart/metric/detail | Get more details on a metric, including reporting sources and approximate last time reported
-*MonitoredApplicationApi* | [**get_all_applications**](docs/MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored services
+*MonitoredApplicationApi* | [**get_all_applications**](docs/MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored applications
 *MonitoredApplicationApi* | [**get_application**](docs/MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
 *MonitoredApplicationApi* | [**update_service**](docs/MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
 *MonitoredServiceApi* | [**batch_update**](docs/MonitoredServiceApi.md#batch_update) | **PUT** /api/v2/monitoredservice/services | Update multiple applications and services in a batch. Batch size is limited to 100.
@@ -237,7 +237,7 @@ Class | Method | HTTP request | Description
 *MonitoredServiceApi* | [**get_all_services**](docs/MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
 *MonitoredServiceApi* | [**get_component**](docs/MonitoredServiceApi.md#get_component) | **GET** /api/v2/monitoredservice/{application}/{service}/{component} | Get a specific application
 *MonitoredServiceApi* | [**get_service**](docs/MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
-*MonitoredServiceApi* | [**get_services_of_application**](docs/MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
+*MonitoredServiceApi* | [**get_services_of_application**](docs/MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get services for a specific application
 *MonitoredServiceApi* | [**update_service**](docs/MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
 *NotificantApi* | [**create_notificant**](docs/NotificantApi.md#create_notificant) | **POST** /api/v2/notificant | Create a notification target
 *NotificantApi* | [**delete_notificant**](docs/NotificantApi.md#delete_notificant) | **DELETE** /api/v2/notificant/{id} | Delete a specific notification target
@@ -408,8 +408,13 @@ Class | Method | HTTP request | Description
 *SecurityPolicyApi* | [**get_metrics_policy**](docs/SecurityPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
 *SecurityPolicyApi* | [**get_metrics_policy_by_version**](docs/SecurityPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
 *SecurityPolicyApi* | [**get_metrics_policy_history**](docs/SecurityPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
+*SecurityPolicyApi* | [**get_security_policy**](docs/SecurityPolicyApi.md#get_security_policy) | **GET** /api/v2/securitypolicy/{type} | Get the security policy
+*SecurityPolicyApi* | [**get_security_policy_by_version**](docs/SecurityPolicyApi.md#get_security_policy_by_version) | **GET** /api/v2/securitypolicy/{type}/history/{version} | Get a specific historical version of a security policy
+*SecurityPolicyApi* | [**get_security_policy_history**](docs/SecurityPolicyApi.md#get_security_policy_history) | **GET** /api/v2/securitypolicy/{type}/history | Get the version history of security policy
 *SecurityPolicyApi* | [**revert_metrics_policy_by_version**](docs/SecurityPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
+*SecurityPolicyApi* | [**revert_security_policy_by_version**](docs/SecurityPolicyApi.md#revert_security_policy_by_version) | **POST** /api/v2/securitypolicy/{type}/revert/{version} | Revert to a specific historical version of a security policy
 *SecurityPolicyApi* | [**update_metrics_policy**](docs/SecurityPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
+*SecurityPolicyApi* | [**update_security_policy**](docs/SecurityPolicyApi.md#update_security_policy) | **PUT** /api/v2/securitypolicy/{type} | Update the security policy
 *SourceApi* | [**add_source_tag**](docs/SourceApi.md#add_source_tag) | **PUT** /api/v2/source/{id}/tag/{tagValue} | Add a tag to a specific source
 *SourceApi* | [**create_source**](docs/SourceApi.md#create_source) | **POST** /api/v2/source | Create metadata (description or tags) for a specific source
 *SourceApi* | [**delete_source**](docs/SourceApi.md#delete_source) | **DELETE** /api/v2/source/{id} | Delete metadata (description and tags) for a specific source
diff --git a/docs/MetricsPolicyReadModel.md b/docs/MetricsPolicyReadModel.md
index 4502936..5fcb35a 100644
--- a/docs/MetricsPolicyReadModel.md
+++ b/docs/MetricsPolicyReadModel.md
@@ -3,8 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**customer** | **str** | The customer identifier of the metrics policy | [optional] 
+**customer** | **str** | The customer identifier of the security policy | [optional] 
 **policy_rules** | [**list[PolicyRuleReadModel]**](PolicyRuleReadModel.md) | The list of policy rules of the metrics policy | [optional] 
+**type** | **str** | The type of the security policy | [optional] 
 **updated_epoch_millis** | **int** | The date time of the metrics policy update | [optional] 
 **updater_id** | **str** | The id of the metrics policy updater | [optional] 
 
diff --git a/docs/MetricsPolicyWriteModel.md b/docs/MetricsPolicyWriteModel.md
index 7217fab..d50e4e6 100644
--- a/docs/MetricsPolicyWriteModel.md
+++ b/docs/MetricsPolicyWriteModel.md
@@ -3,8 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**customer** | **str** | The customer identifier of the metrics policy | [optional] 
+**customer** | **str** | The customer identifier of the security policy | [optional] 
 **policy_rules** | [**list[PolicyRuleWriteModel]**](PolicyRuleWriteModel.md) | The policy rules of the metrics policy | [optional] 
+**type** | **str** | The type of the security policy | [optional] 
 **updated_epoch_millis** | **int** | The date time of the metrics policy update | [optional] 
 **updater_id** | **str** | The id of the metrics policy updater | [optional] 
 
diff --git a/docs/MonitoredApplicationApi.md b/docs/MonitoredApplicationApi.md
index 6e2f4bc..cf5e966 100644
--- a/docs/MonitoredApplicationApi.md
+++ b/docs/MonitoredApplicationApi.md
@@ -4,7 +4,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**get_all_applications**](MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored services
+[**get_all_applications**](MonitoredApplicationApi.md#get_all_applications) | **GET** /api/v2/monitoredapplication | Get all monitored applications
 [**get_application**](MonitoredApplicationApi.md#get_application) | **GET** /api/v2/monitoredapplication/{application} | Get a specific application
 [**update_service**](MonitoredApplicationApi.md#update_service) | **PUT** /api/v2/monitoredapplication/{application} | Update a specific service
 
@@ -12,7 +12,7 @@ Method | HTTP request | Description
 # **get_all_applications**
 > ResponseContainerPagedMonitoredApplicationDTO get_all_applications(offset=offset, limit=limit)
 
-Get all monitored services
+Get all monitored applications
 
 
 
@@ -36,7 +36,7 @@ offset = 0 # int |  (optional) (default to 0)
 limit = 100 # int |  (optional) (default to 100)
 
 try:
-    # Get all monitored services
+    # Get all monitored applications
     api_response = api_instance.get_all_applications(offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
diff --git a/docs/MonitoredServiceApi.md b/docs/MonitoredServiceApi.md
index b7b249e..0761402 100644
--- a/docs/MonitoredServiceApi.md
+++ b/docs/MonitoredServiceApi.md
@@ -9,7 +9,7 @@ Method | HTTP request | Description
 [**get_all_services**](MonitoredServiceApi.md#get_all_services) | **GET** /api/v2/monitoredservice | Get all monitored services
 [**get_component**](MonitoredServiceApi.md#get_component) | **GET** /api/v2/monitoredservice/{application}/{service}/{component} | Get a specific application
 [**get_service**](MonitoredServiceApi.md#get_service) | **GET** /api/v2/monitoredservice/{application}/{service} | Get a specific application
-[**get_services_of_application**](MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get a specific application
+[**get_services_of_application**](MonitoredServiceApi.md#get_services_of_application) | **GET** /api/v2/monitoredservice/{application} | Get services for a specific application
 [**update_service**](MonitoredServiceApi.md#update_service) | **PUT** /api/v2/monitoredservice/{application}/{service} | Update a specific service
 
 
@@ -296,7 +296,7 @@ Name | Type | Description  | Notes
 # **get_services_of_application**
 > ResponseContainerPagedMonitoredServiceDTO get_services_of_application(application, include_component=include_component, offset=offset, limit=limit)
 
-Get a specific application
+Get services for a specific application
 
 
 
@@ -322,7 +322,7 @@ offset = 0 # int |  (optional) (default to 0)
 limit = 100 # int |  (optional) (default to 100)
 
 try:
-    # Get a specific application
+    # Get services for a specific application
     api_response = api_instance.get_services_of_application(application, include_component=include_component, offset=offset, limit=limit)
     pprint(api_response)
 except ApiException as e:
diff --git a/docs/SecurityPolicyApi.md b/docs/SecurityPolicyApi.md
index 84a7b2c..37b5d74 100644
--- a/docs/SecurityPolicyApi.md
+++ b/docs/SecurityPolicyApi.md
@@ -7,8 +7,13 @@ Method | HTTP request | Description
 [**get_metrics_policy**](SecurityPolicyApi.md#get_metrics_policy) | **GET** /api/v2/metricspolicy | Get the metrics policy
 [**get_metrics_policy_by_version**](SecurityPolicyApi.md#get_metrics_policy_by_version) | **GET** /api/v2/metricspolicy/history/{version} | Get a specific historical version of a metrics policy
 [**get_metrics_policy_history**](SecurityPolicyApi.md#get_metrics_policy_history) | **GET** /api/v2/metricspolicy/history | Get the version history of metrics policy
+[**get_security_policy**](SecurityPolicyApi.md#get_security_policy) | **GET** /api/v2/securitypolicy/{type} | Get the security policy
+[**get_security_policy_by_version**](SecurityPolicyApi.md#get_security_policy_by_version) | **GET** /api/v2/securitypolicy/{type}/history/{version} | Get a specific historical version of a security policy
+[**get_security_policy_history**](SecurityPolicyApi.md#get_security_policy_history) | **GET** /api/v2/securitypolicy/{type}/history | Get the version history of security policy
 [**revert_metrics_policy_by_version**](SecurityPolicyApi.md#revert_metrics_policy_by_version) | **POST** /api/v2/metricspolicy/revert/{version} | Revert to a specific historical version of a metrics policy
+[**revert_security_policy_by_version**](SecurityPolicyApi.md#revert_security_policy_by_version) | **POST** /api/v2/securitypolicy/{type}/revert/{version} | Revert to a specific historical version of a security policy
 [**update_metrics_policy**](SecurityPolicyApi.md#update_metrics_policy) | **PUT** /api/v2/metricspolicy | Update the metrics policy
+[**update_security_policy**](SecurityPolicyApi.md#update_security_policy) | **PUT** /api/v2/securitypolicy/{type} | Update the security policy
 
 
 # **get_metrics_policy**
@@ -171,6 +176,174 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_security_policy**
+> ResponseContainerMetricsPolicyReadModel get_security_policy(type)
+
+Get the security policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+type = 'type_example' # str | 
+
+try:
+    # Get the security policy
+    api_response = api_instance.get_security_policy(type)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->get_security_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **type** | **str**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_security_policy_by_version**
+> ResponseContainerMetricsPolicyReadModel get_security_policy_by_version(type, version)
+
+Get a specific historical version of a security policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+type = 'type_example' # str | 
+version = 789 # int | 
+
+try:
+    # Get a specific historical version of a security policy
+    api_response = api_instance.get_security_policy_by_version(type, version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->get_security_policy_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **type** | **str**|  | 
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_security_policy_history**
+> ResponseContainerHistoryResponse get_security_policy_history(type, offset=offset, limit=limit)
+
+Get the version history of security policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+type = 'type_example' # str | 
+offset = 0 # int |  (optional) (default to 0)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get the version history of security policy
+    api_response = api_instance.get_security_policy_history(type, offset=offset, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->get_security_policy_history: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **type** | **str**|  | 
+ **offset** | **int**|  | [optional] [default to 0]
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerHistoryResponse**](ResponseContainerHistoryResponse.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **revert_metrics_policy_by_version**
 > ResponseContainerMetricsPolicyReadModel revert_metrics_policy_by_version(version)
 
@@ -225,6 +398,62 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **revert_security_policy_by_version**
+> ResponseContainerMetricsPolicyReadModel revert_security_policy_by_version(type, version)
+
+Revert to a specific historical version of a security policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+type = 'type_example' # str | 
+version = 789 # int | 
+
+try:
+    # Revert to a specific historical version of a security policy
+    api_response = api_instance.revert_security_policy_by_version(type, version)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->revert_security_policy_by_version: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **type** | **str**|  | 
+ **version** | **int**|  | 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **update_metrics_policy**
 > ResponseContainerMetricsPolicyReadModel update_metrics_policy(body=body)
 
@@ -279,3 +508,59 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **update_security_policy**
+> ResponseContainerMetricsPolicyReadModel update_security_policy(type, body=body)
+
+Update the security policy
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.SecurityPolicyApi(wavefront_api_client.ApiClient(configuration))
+type = 'type_example' # str | 
+body = wavefront_api_client.MetricsPolicyWriteModel() # MetricsPolicyWriteModel | Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre> (optional)
+
+try:
+    # Update the security policy
+    api_response = api_instance.update_security_policy(type, body=body)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling SecurityPolicyApi->update_security_policy: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **type** | **str**|  | 
+ **body** | [**MetricsPolicyWriteModel**](MetricsPolicyWriteModel.md)| Example Body:  &lt;pre&gt;{ \&quot;policyRules\&quot;: [{   \&quot;name\&quot;: \&quot;Policy rule1 name\&quot;,   \&quot;description\&quot;: \&quot;Policy rule1 description\&quot;,   \&quot;prefixes\&quot;: [\&quot;revenue.*\&quot;],   \&quot;tags\&quot;: [{\&quot;key\&quot;:\&quot;sensitive\&quot;,  \&quot;value\&quot;:\&quot;false\&quot;},              {\&quot;key\&quot;:\&quot;source\&quot;,  \&quot;value\&quot;:\&quot;app1\&quot;}],   \&quot;tagsAnded\&quot;: \&quot;true\&quot;,   \&quot;accessType\&quot;: \&quot;ALLOW\&quot;,   \&quot;accounts\&quot;: [\&quot;accountId1\&quot;, \&quot;accountId2\&quot;],   \&quot;userGroups\&quot;: [\&quot;userGroupId1\&quot;],   \&quot;roles\&quot;: [\&quot;roleId\&quot;] }, {   \&quot;name\&quot;: \&quot;Policy rule2 name\&quot;,   \&quot;description\&quot;: \&quot;Policy rule2 description\&quot;,   \&quot;prefixes\&quot;: [\&quot;revenue.*\&quot;],   \&quot;accessType\&quot;: \&quot;BLOCK\&quot;,   \&quot;accounts\&quot;: [\&quot;accountId3\&quot;],   \&quot;userGroups\&quot;: [\&quot;userGroupId1\&quot;] }] }&lt;/pre&gt; | [optional] 
+
+### Return type
+
+[**ResponseContainerMetricsPolicyReadModel**](ResponseContainerMetricsPolicyReadModel.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/setup.py b/setup.py
index 7dd2474..b6f64d6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.214.0"
+VERSION = "2.216.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/monitored_application_api.py b/wavefront_api_client/api/monitored_application_api.py
index 125c307..39a9a04 100644
--- a/wavefront_api_client/api/monitored_application_api.py
+++ b/wavefront_api_client/api/monitored_application_api.py
@@ -34,7 +34,7 @@ def __init__(self, api_client=None):
         self.api_client = api_client
 
     def get_all_applications(self, **kwargs):  # noqa: E501
-        """Get all monitored services  # noqa: E501
+        """Get all monitored applications  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -57,7 +57,7 @@ def get_all_applications(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_applications_with_http_info(self, **kwargs):  # noqa: E501
-        """Get all monitored services  # noqa: E501
+        """Get all monitored applications  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index 10b2d68..b94e381 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -533,7 +533,7 @@ def get_service_with_http_info(self, application, service, **kwargs):  # noqa: E
             collection_formats=collection_formats)
 
     def get_services_of_application(self, application, **kwargs):  # noqa: E501
-        """Get a specific application  # noqa: E501
+        """Get services for a specific application  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -558,7 +558,7 @@ def get_services_of_application(self, application, **kwargs):  # noqa: E501
             return data
 
     def get_services_of_application_with_http_info(self, application, **kwargs):  # noqa: E501
-        """Get a specific application  # noqa: E501
+        """Get services for a specific application  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
diff --git a/wavefront_api_client/api/security_policy_api.py b/wavefront_api_client/api/security_policy_api.py
index 331e4e3..7cdd3c7 100644
--- a/wavefront_api_client/api/security_policy_api.py
+++ b/wavefront_api_client/api/security_policy_api.py
@@ -322,6 +322,319 @@ def get_metrics_policy_history_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_security_policy(self, type, **kwargs):  # noqa: E501
+        """Get the security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_security_policy(type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_security_policy_with_http_info(type, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_security_policy_with_http_info(type, **kwargs)  # noqa: E501
+            return data
+
+    def get_security_policy_with_http_info(self, type, **kwargs):  # noqa: E501
+        """Get the security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_security_policy_with_http_info(type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['type']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_security_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'type' is set
+        if self.api_client.client_side_validation and ('type' not in params or
+                                                       params['type'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `type` when calling `get_security_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'type' in params:
+            path_params['type'] = params['type']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/securitypolicy/{type}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_security_policy_by_version(self, type, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_security_policy_by_version(type, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_security_policy_by_version_with_http_info(type, version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_security_policy_by_version_with_http_info(type, version, **kwargs)  # noqa: E501
+            return data
+
+    def get_security_policy_by_version_with_http_info(self, type, version, **kwargs):  # noqa: E501
+        """Get a specific historical version of a security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_security_policy_by_version_with_http_info(type, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['type', 'version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_security_policy_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'type' is set
+        if self.api_client.client_side_validation and ('type' not in params or
+                                                       params['type'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `type` when calling `get_security_policy_by_version`")  # noqa: E501
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `get_security_policy_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'type' in params:
+            path_params['type'] = params['type']  # noqa: E501
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/securitypolicy/{type}/history/{version}', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
+    def get_security_policy_history(self, type, **kwargs):  # noqa: E501
+        """Get the version history of security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_security_policy_history(type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_security_policy_history_with_http_info(type, **kwargs)  # noqa: E501
+        else:
+            (data) = self.get_security_policy_history_with_http_info(type, **kwargs)  # noqa: E501
+            return data
+
+    def get_security_policy_history_with_http_info(self, type, **kwargs):  # noqa: E501
+        """Get the version history of security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_security_policy_history_with_http_info(type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param int offset:
+        :param int limit:
+        :return: ResponseContainerHistoryResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['type', 'offset', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_security_policy_history" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'type' is set
+        if self.api_client.client_side_validation and ('type' not in params or
+                                                       params['type'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `type` when calling `get_security_policy_history`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'type' in params:
+            path_params['type'] = params['type']  # noqa: E501
+
+        query_params = []
+        if 'offset' in params:
+            query_params.append(('offset', params['offset']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/securitypolicy/{type}/history', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerHistoryResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def revert_metrics_policy_by_version(self, version, **kwargs):  # noqa: E501
         """Revert to a specific historical version of a metrics policy  # noqa: E501
 
@@ -421,6 +734,113 @@ def revert_metrics_policy_by_version_with_http_info(self, version, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def revert_security_policy_by_version(self, type, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revert_security_policy_by_version(type, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.revert_security_policy_by_version_with_http_info(type, version, **kwargs)  # noqa: E501
+        else:
+            (data) = self.revert_security_policy_by_version_with_http_info(type, version, **kwargs)  # noqa: E501
+            return data
+
+    def revert_security_policy_by_version_with_http_info(self, type, version, **kwargs):  # noqa: E501
+        """Revert to a specific historical version of a security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.revert_security_policy_by_version_with_http_info(type, version, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param int version: (required)
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['type', 'version']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method revert_security_policy_by_version" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'type' is set
+        if self.api_client.client_side_validation and ('type' not in params or
+                                                       params['type'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `type` when calling `revert_security_policy_by_version`")  # noqa: E501
+        # verify the required parameter 'version' is set
+        if self.api_client.client_side_validation and ('version' not in params or
+                                                       params['version'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `version` when calling `revert_security_policy_by_version`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'type' in params:
+            path_params['type'] = params['type']  # noqa: E501
+        if 'version' in params:
+            path_params['version'] = params['version']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/securitypolicy/{type}/revert/{version}', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def update_metrics_policy(self, **kwargs):  # noqa: E501
         """Update the metrics policy  # noqa: E501
 
@@ -515,3 +935,106 @@ def update_metrics_policy_with_http_info(self, **kwargs):  # noqa: E501
             _preload_content=params.get('_preload_content', True),
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
+
+    def update_security_policy(self, type, **kwargs):  # noqa: E501
+        """Update the security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_security_policy(type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param MetricsPolicyWriteModel body: Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre>
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_security_policy_with_http_info(type, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_security_policy_with_http_info(type, **kwargs)  # noqa: E501
+            return data
+
+    def update_security_policy_with_http_info(self, type, **kwargs):  # noqa: E501
+        """Update the security policy  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_security_policy_with_http_info(type, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str type: (required)
+        :param MetricsPolicyWriteModel body: Example Body:  <pre>{ \"policyRules\": [{   \"name\": \"Policy rule1 name\",   \"description\": \"Policy rule1 description\",   \"prefixes\": [\"revenue.*\"],   \"tags\": [{\"key\":\"sensitive\",  \"value\":\"false\"},              {\"key\":\"source\",  \"value\":\"app1\"}],   \"tagsAnded\": \"true\",   \"accessType\": \"ALLOW\",   \"accounts\": [\"accountId1\", \"accountId2\"],   \"userGroups\": [\"userGroupId1\"],   \"roles\": [\"roleId\"] }, {   \"name\": \"Policy rule2 name\",   \"description\": \"Policy rule2 description\",   \"prefixes\": [\"revenue.*\"],   \"accessType\": \"BLOCK\",   \"accounts\": [\"accountId3\"],   \"userGroups\": [\"userGroupId1\"] }] }</pre>
+        :return: ResponseContainerMetricsPolicyReadModel
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['type', 'body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_security_policy" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'type' is set
+        if self.api_client.client_side_validation and ('type' not in params or
+                                                       params['type'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `type` when calling `update_security_policy`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+        if 'type' in params:
+            path_params['type'] = params['type']  # noqa: E501
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/securitypolicy/{type}', 'PUT',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerMetricsPolicyReadModel',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 15a9724..c509900 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.214.0/python'
+        self.user_agent = 'Swagger-Codegen/2.216.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 7780b2a..36bdedb 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.214.0".\
+               "SDK Package Version: 2.216.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/metrics_policy_read_model.py b/wavefront_api_client/models/metrics_policy_read_model.py
index 3efef99..9048c58 100644
--- a/wavefront_api_client/models/metrics_policy_read_model.py
+++ b/wavefront_api_client/models/metrics_policy_read_model.py
@@ -35,6 +35,7 @@ class MetricsPolicyReadModel(object):
     swagger_types = {
         'customer': 'str',
         'policy_rules': 'list[PolicyRuleReadModel]',
+        'type': 'str',
         'updated_epoch_millis': 'int',
         'updater_id': 'str'
     }
@@ -42,11 +43,12 @@ class MetricsPolicyReadModel(object):
     attribute_map = {
         'customer': 'customer',
         'policy_rules': 'policyRules',
+        'type': 'type',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, policy_rules=None, type=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MetricsPolicyReadModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -54,6 +56,7 @@ def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None,
 
         self._customer = None
         self._policy_rules = None
+        self._type = None
         self._updated_epoch_millis = None
         self._updater_id = None
         self.discriminator = None
@@ -62,6 +65,8 @@ def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None,
             self.customer = customer
         if policy_rules is not None:
             self.policy_rules = policy_rules
+        if type is not None:
+            self.type = type
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
@@ -71,7 +76,7 @@ def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None,
     def customer(self):
         """Gets the customer of this MetricsPolicyReadModel.  # noqa: E501
 
-        The customer identifier of the metrics policy  # noqa: E501
+        The customer identifier of the security policy  # noqa: E501
 
         :return: The customer of this MetricsPolicyReadModel.  # noqa: E501
         :rtype: str
@@ -82,7 +87,7 @@ def customer(self):
     def customer(self, customer):
         """Sets the customer of this MetricsPolicyReadModel.
 
-        The customer identifier of the metrics policy  # noqa: E501
+        The customer identifier of the security policy  # noqa: E501
 
         :param customer: The customer of this MetricsPolicyReadModel.  # noqa: E501
         :type: str
@@ -113,6 +118,36 @@ def policy_rules(self, policy_rules):
 
         self._policy_rules = policy_rules
 
+    @property
+    def type(self):
+        """Gets the type of this MetricsPolicyReadModel.  # noqa: E501
+
+        The type of the security policy  # noqa: E501
+
+        :return: The type of this MetricsPolicyReadModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this MetricsPolicyReadModel.
+
+        The type of the security policy  # noqa: E501
+
+        :param type: The type of this MetricsPolicyReadModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["metric", "tracing"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
+
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this MetricsPolicyReadModel.  # noqa: E501
diff --git a/wavefront_api_client/models/metrics_policy_write_model.py b/wavefront_api_client/models/metrics_policy_write_model.py
index 61896c6..2dbe181 100644
--- a/wavefront_api_client/models/metrics_policy_write_model.py
+++ b/wavefront_api_client/models/metrics_policy_write_model.py
@@ -35,6 +35,7 @@ class MetricsPolicyWriteModel(object):
     swagger_types = {
         'customer': 'str',
         'policy_rules': 'list[PolicyRuleWriteModel]',
+        'type': 'str',
         'updated_epoch_millis': 'int',
         'updater_id': 'str'
     }
@@ -42,11 +43,12 @@ class MetricsPolicyWriteModel(object):
     attribute_map = {
         'customer': 'customer',
         'policy_rules': 'policyRules',
+        'type': 'type',
         'updated_epoch_millis': 'updatedEpochMillis',
         'updater_id': 'updaterId'
     }
 
-    def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, customer=None, policy_rules=None, type=None, updated_epoch_millis=None, updater_id=None, _configuration=None):  # noqa: E501
         """MetricsPolicyWriteModel - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -54,6 +56,7 @@ def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None,
 
         self._customer = None
         self._policy_rules = None
+        self._type = None
         self._updated_epoch_millis = None
         self._updater_id = None
         self.discriminator = None
@@ -62,6 +65,8 @@ def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None,
             self.customer = customer
         if policy_rules is not None:
             self.policy_rules = policy_rules
+        if type is not None:
+            self.type = type
         if updated_epoch_millis is not None:
             self.updated_epoch_millis = updated_epoch_millis
         if updater_id is not None:
@@ -71,7 +76,7 @@ def __init__(self, customer=None, policy_rules=None, updated_epoch_millis=None,
     def customer(self):
         """Gets the customer of this MetricsPolicyWriteModel.  # noqa: E501
 
-        The customer identifier of the metrics policy  # noqa: E501
+        The customer identifier of the security policy  # noqa: E501
 
         :return: The customer of this MetricsPolicyWriteModel.  # noqa: E501
         :rtype: str
@@ -82,7 +87,7 @@ def customer(self):
     def customer(self, customer):
         """Sets the customer of this MetricsPolicyWriteModel.
 
-        The customer identifier of the metrics policy  # noqa: E501
+        The customer identifier of the security policy  # noqa: E501
 
         :param customer: The customer of this MetricsPolicyWriteModel.  # noqa: E501
         :type: str
@@ -113,6 +118,36 @@ def policy_rules(self, policy_rules):
 
         self._policy_rules = policy_rules
 
+    @property
+    def type(self):
+        """Gets the type of this MetricsPolicyWriteModel.  # noqa: E501
+
+        The type of the security policy  # noqa: E501
+
+        :return: The type of this MetricsPolicyWriteModel.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this MetricsPolicyWriteModel.
+
+        The type of the security policy  # noqa: E501
+
+        :param type: The type of this MetricsPolicyWriteModel.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["metric", "tracing"]  # noqa: E501
+        if (self._configuration.client_side_validation and
+                type not in allowed_values):
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
+
     @property
     def updated_epoch_millis(self):
         """Gets the updated_epoch_millis of this MetricsPolicyWriteModel.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 4d02a63..e6521d9 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -100,7 +100,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "METRICS_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From 775c13f79071905621672e3eb2561492a494671e Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Thu, 25 Jan 2024 08:16:20 -0800
Subject: [PATCH 154/161] Autogenerated Update v2.217.0.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/EC2Configuration.md                      |  1 +
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/ec2_configuration.py               | 30 ++++++++++++++++++-
 ...esponse_container_set_business_function.py |  2 +-
 9 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index e28c62e..851b5e6 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.216.0"
+    "packageVersion": "2.217.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 4890b6c..e28c62e 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.214.0"
+    "packageVersion": "2.216.0"
 }
diff --git a/README.md b/README.md
index 9b4195e..1daa33d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.216.0
+- Package version: 2.217.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/EC2Configuration.md b/docs/EC2Configuration.md
index 3cd582f..7d9eaa5 100644
--- a/docs/EC2Configuration.md
+++ b/docs/EC2Configuration.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **base_credentials** | [**AWSBaseCredentials**](AWSBaseCredentials.md) |  | [optional] 
+**custom_namespaces** | **list[str]** | A list of custom namespace that limit what we query from metric plus | [optional] 
 **host_name_tags** | **list[str]** | A list of AWS instance tags that, when found, will be used as the \&quot;source\&quot; name in a series.  Default: [\&quot;hostname\&quot;, \&quot;host\&quot;, \&quot;name\&quot;].  If no tag in this list is found, the series source is set to the instance id. | [optional] 
 **instance_selection_tags_expr** | **str** | A string expressing the allow list of AWS instance tag-value pairs.  If the instance&#39;s AWS tags match this allow list, data about this instance is ingested from EC2 APIs  Multiple entries are OR&#39;ed.  Key-value pairs in the string are separated by commas and in the form k&#x3D;v.  Example: \&quot;k1&#x3D;v1, k1&#x3D;v2, k3&#x3D;v3\&quot;. | [optional] 
 **metric_filter_regex** | **str** | A regular expression that a metric name must match (case-insensitively) in order to be ingested | [optional] 
diff --git a/setup.py b/setup.py
index b6f64d6..670f619 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.216.0"
+VERSION = "2.217.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index c509900..e6564f7 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.216.0/python'
+        self.user_agent = 'Swagger-Codegen/2.217.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 36bdedb..088426e 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.216.0".\
+               "SDK Package Version: 2.217.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index 52935c2..fe85f3c 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -34,6 +34,7 @@ class EC2Configuration(object):
     """
     swagger_types = {
         'base_credentials': 'AWSBaseCredentials',
+        'custom_namespaces': 'list[str]',
         'host_name_tags': 'list[str]',
         'instance_selection_tags_expr': 'str',
         'metric_filter_regex': 'str',
@@ -43,6 +44,7 @@ class EC2Configuration(object):
 
     attribute_map = {
         'base_credentials': 'baseCredentials',
+        'custom_namespaces': 'customNamespaces',
         'host_name_tags': 'hostNameTags',
         'instance_selection_tags_expr': 'instanceSelectionTagsExpr',
         'metric_filter_regex': 'metricFilterRegex',
@@ -50,13 +52,14 @@ class EC2Configuration(object):
         'volume_selection_tags_expr': 'volumeSelectionTagsExpr'
     }
 
-    def __init__(self, base_credentials=None, host_name_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, point_tag_filter_regex=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
+    def __init__(self, base_credentials=None, custom_namespaces=None, host_name_tags=None, instance_selection_tags_expr=None, metric_filter_regex=None, point_tag_filter_regex=None, volume_selection_tags_expr=None, _configuration=None):  # noqa: E501
         """EC2Configuration - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._base_credentials = None
+        self._custom_namespaces = None
         self._host_name_tags = None
         self._instance_selection_tags_expr = None
         self._metric_filter_regex = None
@@ -66,6 +69,8 @@ def __init__(self, base_credentials=None, host_name_tags=None, instance_selectio
 
         if base_credentials is not None:
             self.base_credentials = base_credentials
+        if custom_namespaces is not None:
+            self.custom_namespaces = custom_namespaces
         if host_name_tags is not None:
             self.host_name_tags = host_name_tags
         if instance_selection_tags_expr is not None:
@@ -98,6 +103,29 @@ def base_credentials(self, base_credentials):
 
         self._base_credentials = base_credentials
 
+    @property
+    def custom_namespaces(self):
+        """Gets the custom_namespaces of this EC2Configuration.  # noqa: E501
+
+        A list of custom namespace that limit what we query from metric plus  # noqa: E501
+
+        :return: The custom_namespaces of this EC2Configuration.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._custom_namespaces
+
+    @custom_namespaces.setter
+    def custom_namespaces(self, custom_namespaces):
+        """Sets the custom_namespaces of this EC2Configuration.
+
+        A list of custom namespace that limit what we query from metric plus  # noqa: E501
+
+        :param custom_namespaces: The custom_namespaces of this EC2Configuration.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._custom_namespaces = custom_namespaces
+
     @property
     def host_name_tags(self):
         """Gets the host_name_tags of this EC2Configuration.  # noqa: E501
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index e6521d9..19b87be 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -100,7 +100,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From bb05522153dc644b4330d08ad7a243c94bd91b71 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Mon, 4 Mar 2024 08:16:27 -0800
Subject: [PATCH 155/161] Autogenerated Update v2.219.2.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/IngestionSpyApi.md                       |  54 +++++++++
 setup.py                                      |   2 +-
 wavefront_api_client/api/ingestion_spy_api.py | 104 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 ...esponse_container_set_business_function.py |   2 +-
 9 files changed, 166 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 851b5e6..e021715 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.217.0"
+    "packageVersion": "2.219.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index e28c62e..851b5e6 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.216.0"
+    "packageVersion": "2.217.0"
 }
diff --git a/README.md b/README.md
index 1daa33d..819b225 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.217.0
+- Package version: 2.219.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -206,6 +206,7 @@ Class | Method | HTTP request | Description
 *ExternalLinkApi* | [**get_external_link**](docs/ExternalLinkApi.md#get_external_link) | **GET** /api/v2/extlink/{id} | Get a specific external link
 *ExternalLinkApi* | [**update_external_link**](docs/ExternalLinkApi.md#update_external_link) | **PUT** /api/v2/extlink/{id} | Update a specific external link
 *IngestionSpyApi* | [**spy_on_delta_counters**](docs/IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
+*IngestionSpyApi* | [**spy_on_ephemeral_points**](docs/IngestionSpyApi.md#spy_on_ephemeral_points) | **GET** /api/spy/ephemeral | Gets a sampling of new ephemeral metric data points that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_histograms**](docs/IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_id_creations**](docs/IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 *IngestionSpyApi* | [**spy_on_points**](docs/IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
diff --git a/docs/IngestionSpyApi.md b/docs/IngestionSpyApi.md
index d88ad74..d63cbde 100644
--- a/docs/IngestionSpyApi.md
+++ b/docs/IngestionSpyApi.md
@@ -5,6 +5,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**spy_on_delta_counters**](IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
+[**spy_on_ephemeral_points**](IngestionSpyApi.md#spy_on_ephemeral_points) | **GET** /api/spy/ephemeral | Gets a sampling of new ephemeral metric data points that are added to existing time series.
 [**spy_on_histograms**](IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 [**spy_on_id_creations**](IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 [**spy_on_points**](IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
@@ -64,6 +65,59 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **spy_on_ephemeral_points**
+> spy_on_ephemeral_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
+
+Gets a sampling of new ephemeral metric data points that are added to existing time series.
+
+Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+metric = 'metric_example' # str | List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. (optional)
+host = 'host_example' # str | List a point only if its source name starts with the specified case-sensitive prefix. (optional)
+point_tag_key = ['point_tag_key_example'] # list[str] | List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values (optional)
+sampling = 0.01 # float | goes from 0 to 1 with 0.01 being 1% (optional) (default to 0.01)
+
+try:
+    # Gets a sampling of new ephemeral metric data points that are added to existing time series.
+    api_instance.spy_on_ephemeral_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_ephemeral_points: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **metric** | **str**| List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric&#x3D;Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. | [optional] 
+ **host** | **str**| List a point only if its source name starts with the specified case-sensitive prefix. | [optional] 
+ **point_tag_key** | [**list[str]**](str.md)| List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey&#x3D;env&amp;pointTagKey&#x3D;datacenter  put env in the first line and datacenter in the second line as values | [optional] 
+ **sampling** | **float**| goes from 0 to 1 with 0.01 being 1% | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **spy_on_histograms**
 > spy_on_histograms(histogram=histogram, host=host, histogram_tag_key=histogram_tag_key, sampling=sampling)
 
diff --git a/setup.py b/setup.py
index 670f619..f12017a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.217.0"
+VERSION = "2.219.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index be5a112..0a41066 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -137,6 +137,110 @@ def spy_on_delta_counters_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def spy_on_ephemeral_points(self, **kwargs):  # noqa: E501
+        """Gets a sampling of new ephemeral metric data points that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_ephemeral_points(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
+        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
+        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_ephemeral_points_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_ephemeral_points_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_ephemeral_points_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets a sampling of new ephemeral metric data points that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_ephemeral_points_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
+        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
+        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['metric', 'host', 'point_tag_key', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_ephemeral_points" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'metric' in params:
+            query_params.append(('metric', params['metric']))  # noqa: E501
+        if 'host' in params:
+            query_params.append(('host', params['host']))  # noqa: E501
+        if 'point_tag_key' in params:
+            query_params.append(('pointTagKey', params['point_tag_key']))  # noqa: E501
+            collection_formats['pointTagKey'] = 'multi'  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/ephemeral', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def spy_on_histograms(self, **kwargs):  # noqa: E501
         """Gets new histograms that are added to existing time series.  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index e6564f7..099f932 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.217.0/python'
+        self.user_agent = 'Swagger-Codegen/2.219.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 088426e..1d5626c 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.217.0".\
+               "SDK Package Version: 2.219.2".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 19b87be..5c3697d 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -100,7 +100,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_EPHEMERAL_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_METRIC_TYPE", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From e5f6ab9d73b29a46811885316fcb0c80e21c0b8a Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 5 Mar 2024 08:16:23 -0800
Subject: [PATCH 156/161] Autogenerated Update v2.218.0.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/IngestionSpyApi.md                       |  54 ---------
 setup.py                                      |   2 +-
 wavefront_api_client/api/ingestion_spy_api.py | 104 ------------------
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 ...esponse_container_set_business_function.py |   2 +-
 9 files changed, 7 insertions(+), 166 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index e021715..5b7327a 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.219.2"
+    "packageVersion": "2.218.0"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 851b5e6..e021715 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.217.0"
+    "packageVersion": "2.219.2"
 }
diff --git a/README.md b/README.md
index 819b225..c98a082 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.219.2
+- Package version: 2.218.0
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -206,7 +206,6 @@ Class | Method | HTTP request | Description
 *ExternalLinkApi* | [**get_external_link**](docs/ExternalLinkApi.md#get_external_link) | **GET** /api/v2/extlink/{id} | Get a specific external link
 *ExternalLinkApi* | [**update_external_link**](docs/ExternalLinkApi.md#update_external_link) | **PUT** /api/v2/extlink/{id} | Update a specific external link
 *IngestionSpyApi* | [**spy_on_delta_counters**](docs/IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
-*IngestionSpyApi* | [**spy_on_ephemeral_points**](docs/IngestionSpyApi.md#spy_on_ephemeral_points) | **GET** /api/spy/ephemeral | Gets a sampling of new ephemeral metric data points that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_histograms**](docs/IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_id_creations**](docs/IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 *IngestionSpyApi* | [**spy_on_points**](docs/IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
diff --git a/docs/IngestionSpyApi.md b/docs/IngestionSpyApi.md
index d63cbde..d88ad74 100644
--- a/docs/IngestionSpyApi.md
+++ b/docs/IngestionSpyApi.md
@@ -5,7 +5,6 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**spy_on_delta_counters**](IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
-[**spy_on_ephemeral_points**](IngestionSpyApi.md#spy_on_ephemeral_points) | **GET** /api/spy/ephemeral | Gets a sampling of new ephemeral metric data points that are added to existing time series.
 [**spy_on_histograms**](IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 [**spy_on_id_creations**](IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 [**spy_on_points**](IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
@@ -65,59 +64,6 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **spy_on_ephemeral_points**
-> spy_on_ephemeral_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
-
-Gets a sampling of new ephemeral metric data points that are added to existing time series.
-
-Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy
-
-### Example
-```python
-from __future__ import print_function
-import time
-import wavefront_api_client
-from wavefront_api_client.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = wavefront_api_client.IngestionSpyApi()
-metric = 'metric_example' # str | List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. (optional)
-host = 'host_example' # str | List a point only if its source name starts with the specified case-sensitive prefix. (optional)
-point_tag_key = ['point_tag_key_example'] # list[str] | List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values (optional)
-sampling = 0.01 # float | goes from 0 to 1 with 0.01 being 1% (optional) (default to 0.01)
-
-try:
-    # Gets a sampling of new ephemeral metric data points that are added to existing time series.
-    api_instance.spy_on_ephemeral_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
-except ApiException as e:
-    print("Exception when calling IngestionSpyApi->spy_on_ephemeral_points: %s\n" % e)
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **metric** | **str**| List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric&#x3D;Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. | [optional] 
- **host** | **str**| List a point only if its source name starts with the specified case-sensitive prefix. | [optional] 
- **point_tag_key** | [**list[str]**](str.md)| List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey&#x3D;env&amp;pointTagKey&#x3D;datacenter  put env in the first line and datacenter in the second line as values | [optional] 
- **sampling** | **float**| goes from 0 to 1 with 0.01 being 1% | [optional] [default to 0.01]
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: text/plain
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 # **spy_on_histograms**
 > spy_on_histograms(histogram=histogram, host=host, histogram_tag_key=histogram_tag_key, sampling=sampling)
 
diff --git a/setup.py b/setup.py
index f12017a..c5157d4 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.219.2"
+VERSION = "2.218.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index 0a41066..be5a112 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -137,110 +137,6 @@ def spy_on_delta_counters_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def spy_on_ephemeral_points(self, **kwargs):  # noqa: E501
-        """Gets a sampling of new ephemeral metric data points that are added to existing time series.  # noqa: E501
-
-        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.spy_on_ephemeral_points(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
-        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
-        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
-        :param float sampling: goes from 0 to 1 with 0.01 being 1%
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.spy_on_ephemeral_points_with_http_info(**kwargs)  # noqa: E501
-        else:
-            (data) = self.spy_on_ephemeral_points_with_http_info(**kwargs)  # noqa: E501
-            return data
-
-    def spy_on_ephemeral_points_with_http_info(self, **kwargs):  # noqa: E501
-        """Gets a sampling of new ephemeral metric data points that are added to existing time series.  # noqa: E501
-
-        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.spy_on_ephemeral_points_with_http_info(async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
-        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
-        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
-        :param float sampling: goes from 0 to 1 with 0.01 being 1%
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['metric', 'host', 'point_tag_key', 'sampling']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method spy_on_ephemeral_points" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        collection_formats = {}
-
-        path_params = {}
-
-        query_params = []
-        if 'metric' in params:
-            query_params.append(('metric', params['metric']))  # noqa: E501
-        if 'host' in params:
-            query_params.append(('host', params['host']))  # noqa: E501
-        if 'point_tag_key' in params:
-            query_params.append(('pointTagKey', params['point_tag_key']))  # noqa: E501
-            collection_formats['pointTagKey'] = 'multi'  # noqa: E501
-        if 'sampling' in params:
-            query_params.append(('sampling', params['sampling']))  # noqa: E501
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['text/plain'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = []  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/spy/ephemeral', 'GET',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type=None,  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
-
     def spy_on_histograms(self, **kwargs):  # noqa: E501
         """Gets new histograms that are added to existing time series.  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 099f932..006de78 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.219.2/python'
+        self.user_agent = 'Swagger-Codegen/2.218.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 1d5626c..97b5b9f 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.219.2".\
+               "SDK Package Version: 2.218.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 5c3697d..19b87be 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -100,7 +100,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_EPHEMERAL_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_METRIC_TYPE", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From 03c14ca4561592214b616fdd46cf87e556d60343 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Fri, 15 Mar 2024 08:16:19 -0700
Subject: [PATCH 157/161] Autogenerated Update v2.219.6.

---
 .swagger-codegen/config.json                  |   2 +-
 .swagger-codegen/config.jsone                 |   2 +-
 README.md                                     |   3 +-
 docs/IngestionSpyApi.md                       |  54 +++++++++
 setup.py                                      |   2 +-
 wavefront_api_client/api/ingestion_spy_api.py | 104 ++++++++++++++++++
 wavefront_api_client/api_client.py            |   2 +-
 wavefront_api_client/configuration.py         |   2 +-
 ...esponse_container_set_business_function.py |   2 +-
 9 files changed, 166 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 5b7327a..2891ac8 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.218.0"
+    "packageVersion": "2.219.6"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index e021715..5b7327a 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.219.2"
+    "packageVersion": "2.218.0"
 }
diff --git a/README.md b/README.md
index c98a082..7455348 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.218.0
+- Package version: 2.219.6
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -206,6 +206,7 @@ Class | Method | HTTP request | Description
 *ExternalLinkApi* | [**get_external_link**](docs/ExternalLinkApi.md#get_external_link) | **GET** /api/v2/extlink/{id} | Get a specific external link
 *ExternalLinkApi* | [**update_external_link**](docs/ExternalLinkApi.md#update_external_link) | **PUT** /api/v2/extlink/{id} | Update a specific external link
 *IngestionSpyApi* | [**spy_on_delta_counters**](docs/IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
+*IngestionSpyApi* | [**spy_on_ephemeral_points**](docs/IngestionSpyApi.md#spy_on_ephemeral_points) | **GET** /api/spy/ephemeral | Gets a sampling of new ephemeral metric data points that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_histograms**](docs/IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_id_creations**](docs/IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 *IngestionSpyApi* | [**spy_on_points**](docs/IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
diff --git a/docs/IngestionSpyApi.md b/docs/IngestionSpyApi.md
index d88ad74..d63cbde 100644
--- a/docs/IngestionSpyApi.md
+++ b/docs/IngestionSpyApi.md
@@ -5,6 +5,7 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**spy_on_delta_counters**](IngestionSpyApi.md#spy_on_delta_counters) | **GET** /api/spy/deltas | Gets new delta counters that are added to existing time series.
+[**spy_on_ephemeral_points**](IngestionSpyApi.md#spy_on_ephemeral_points) | **GET** /api/spy/ephemeral | Gets a sampling of new ephemeral metric data points that are added to existing time series.
 [**spy_on_histograms**](IngestionSpyApi.md#spy_on_histograms) | **GET** /api/spy/histograms | Gets new histograms that are added to existing time series.
 [**spy_on_id_creations**](IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 [**spy_on_points**](IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
@@ -64,6 +65,59 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **spy_on_ephemeral_points**
+> spy_on_ephemeral_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
+
+Gets a sampling of new ephemeral metric data points that are added to existing time series.
+
+Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# create an instance of the API class
+api_instance = wavefront_api_client.IngestionSpyApi()
+metric = 'metric_example' # str | List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. (optional)
+host = 'host_example' # str | List a point only if its source name starts with the specified case-sensitive prefix. (optional)
+point_tag_key = ['point_tag_key_example'] # list[str] | List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values (optional)
+sampling = 0.01 # float | goes from 0 to 1 with 0.01 being 1% (optional) (default to 0.01)
+
+try:
+    # Gets a sampling of new ephemeral metric data points that are added to existing time series.
+    api_instance.spy_on_ephemeral_points(metric=metric, host=host, point_tag_key=point_tag_key, sampling=sampling)
+except ApiException as e:
+    print("Exception when calling IngestionSpyApi->spy_on_ephemeral_points: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **metric** | **str**| List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric&#x3D;Cust matches metrics named Customer, Customers, Customer.alerts, but not customer. | [optional] 
+ **host** | **str**| List a point only if its source name starts with the specified case-sensitive prefix. | [optional] 
+ **point_tag_key** | [**list[str]**](str.md)| List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey&#x3D;env&amp;pointTagKey&#x3D;datacenter  put env in the first line and datacenter in the second line as values | [optional] 
+ **sampling** | **float**| goes from 0 to 1 with 0.01 being 1% | [optional] [default to 0.01]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **spy_on_histograms**
 > spy_on_histograms(histogram=histogram, host=host, histogram_tag_key=histogram_tag_key, sampling=sampling)
 
diff --git a/setup.py b/setup.py
index c5157d4..b41313d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.218.0"
+VERSION = "2.219.6"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index be5a112..0a41066 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -137,6 +137,110 @@ def spy_on_delta_counters_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def spy_on_ephemeral_points(self, **kwargs):  # noqa: E501
+        """Gets a sampling of new ephemeral metric data points that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_ephemeral_points(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
+        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
+        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.spy_on_ephemeral_points_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.spy_on_ephemeral_points_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def spy_on_ephemeral_points_with_http_info(self, **kwargs):  # noqa: E501
+        """Gets a sampling of new ephemeral metric data points that are added to existing time series.  # noqa: E501
+
+        Try it Out button won't work in this case, as it's a streaming API.  Endpoint: https://<cluster>.wavefront.com/api/spy/ephemeral.   Details usage can be find at: https://docs.wavefront.com/wavefront_monitoring_spy.html#get-ingested-metric-points-with-spy  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.spy_on_ephemeral_points_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param str metric: List a point only if its metric name starts with the specified case-sensitive prefix. E.g., metric=Cust matches metrics named Customer, Customers, Customer.alerts, but not customer.
+        :param str host: List a point only if its source name starts with the specified case-sensitive prefix.
+        :param list[str] point_tag_key: List a point only if it has the specified point tag key. Add this parameter multiple times to specify multiple point tags, e.g., pointTagKey=env&pointTagKey=datacenter  put env in the first line and datacenter in the second line as values
+        :param float sampling: goes from 0 to 1 with 0.01 being 1%
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['metric', 'host', 'point_tag_key', 'sampling']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method spy_on_ephemeral_points" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'metric' in params:
+            query_params.append(('metric', params['metric']))  # noqa: E501
+        if 'host' in params:
+            query_params.append(('host', params['host']))  # noqa: E501
+        if 'point_tag_key' in params:
+            query_params.append(('pointTagKey', params['point_tag_key']))  # noqa: E501
+            collection_formats['pointTagKey'] = 'multi'  # noqa: E501
+        if 'sampling' in params:
+            query_params.append(('sampling', params['sampling']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/spy/ephemeral', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type=None,  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def spy_on_histograms(self, **kwargs):  # noqa: E501
         """Gets new histograms that are added to existing time series.  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 006de78..369cd65 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.218.0/python'
+        self.user_agent = 'Swagger-Codegen/2.219.6/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 97b5b9f..c4291bf 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.218.0".\
+               "SDK Package Version: 2.219.6".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 19b87be..5c3697d 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -100,7 +100,7 @@ def response(self, response):
         :param response: The response of this ResponseContainerSetBusinessFunction.  # noqa: E501
         :type: list[str]
         """
-        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
+        allowed_values = ["VIEW_MONITORED_APPLICATION_SERVICE", "VIEW_MONITORED_CLUSTER", "VIEW_MONITORED_CLUSTER_TAGS", "VIEW_DASHBOARDS", "VIEW_DASHBOARDS_TAGS", "VIEW_METRIC_TIMESERIES", "VIEW_EPHEMERAL_METRIC_TIMESERIES", "VIEW_HOSTS", "VIEW_HOST_TAGS", "VIEW_AGENT_TAGS", "VIEW_EVENTS", "VIEW_EVENT_TAGS", "VIEW_ALERTS", "VIEW_ALERT_TAGS", "VIEW_REGISTERED_QUERIES", "VIEW_REGISTERED_QUERY_TAGS", "VIEW_MAINTENANCE_WINDOWS", "VIEW_NOTIFICANTS", "VIEW_CUSTOM_METRICS", "VIEW_TARGETS", "VIEW_AGENTS", "VIEW_SSH_CONFIGS", "VIEW_EXTERNAL_SERVICES", "VIEW_EXTERNAL_SERVICES_TAGS", "VIEW_EXTERNAL_LINKS", "VIEW_EXTERNAL_LINK_DIGESTS", "VIEW_EXTERNAL_LINK_TAGS", "VIEW_LOGS", "VIEW_SLOW_QUERY_PAGE", "VIEW_SAVED_SEARCHES", "VIEW_MY_MESSAGES", "VIEW_APPLICATIONS", "VIEW_ANOMALY", "SPY_ON_POINTS", "SPY_ON_ID_CREATIONS", "SPY_UNUSED_METRICS", "VIEW_SAML_SSO_SETTINGS", "VIEW_INGESTION_POLICY", "VIEW_CLUSTER_INFO", "VIEW_QUERY_FEDERATION", "MODIFY_MONITORED_APPLICATION_SERVICE", "MODIFY_MONITORED_CLUSTER", "MODIFY_MONITORED_CLUSTER_TAGS", "MODIFY_PRIVATE_TAGS", "MODIFY_CUSTOM_METRICS", "MODIFY_DASHBOARDS", "MODIFY_EVENTS", "MODIFY_EVENT_TAGS", "MODIFY_AGENTS", "MODIFY_AGENT_TAGS", "MODIFY_HOSTS", "MODIFY_HOST_TAGS", "MODIFY_MACHINES", "MODIFY_SSH_CONFIGS", "MODIFY_ALERTS", "MODIFY_ALERT_TAGS", "MODIFY_REGISTERED_QUERIES", "MODIFY_REGISTERED_QUERY_TAGS", "MODIFY_MAINTENANCE_WINDOWS", "MODIFY_NOTIFICANTS", "MODIFY_DASHBOARD_TAGS", "MODIFY_TARGETS", "MODIFY_EXTERNAL_SERVICES", "MODIFY_EXTERNAL_SERVICES_TAGS", "CREATE_EMBEDDED_CHARTS", "MODIFY_METRIC_VISIBILITY", "MODIFY_METRIC_TYPE", "MODIFY_EXTERNAL_LINKS", "MODIFY_EXTERNAL_LINK_TAGS", "MODIFY_SAVED_SEARCHES", "MODIFY_SAVED_TRACES_SEARCH", "MODIFY_OWN_ONBOARDING_STATE", "MODIFY_APPLICATIONS", "INGESTION_POLICY_MANAGEMENT", "SECURITY_POLICY_MANAGEMENT", "MODIFY_SAML_SSO_SETTINGS", "METRIC_INGESTION", "METRIC_INGESTION_LISTENER", "LOGIN", "LOGOUT", "CHANGE_PASSWORD", "SEND_FORGOTTEN_PASSWORD_EMAILS", "CHANGE_USER_PREFERENCE", "CREATE_TOKEN", "REVOKE_ALL_SESSIONS", "REVOKE_ALL_TOKENS", "REVOKE_TOKEN", "GET_TOKENS", "GET_ALL_ACCOUNTS", "GET_ALL_USERS", "GET_ALL_SERVICE_ACCOUNTS", "ADMINISTER_GROUPS", "DELETE_ACCOUNT", "INVITE_USER", "ADMINISTER_SERVICE_ACCOUNTS", "NO_REAUTH_INVITE_USER", "ADMINISTER_USER_GROUPS", "ADMINISTER_ALL_TOKENS", "ADMINISTER_CUSTOMER_PREFERENCES", "ROLES_MANAGEMENT", "VIEW_CUSTOMERS", "MODIFY_CUSTOMER", "DELETE_CUSTOMER", "SEND_UI_METRICS", "UPGRADE_CUSTOMER", "TOKEN"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 not set(response).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(

From 7ee332842de04dffbfb0874cb46b9af086979228 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 26 Mar 2024 08:16:25 -0700
Subject: [PATCH 158/161] Autogenerated Update v2.220.3.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     |  2 +-
 docs/StatsModelInternalUse.md                 |  2 +-
 setup.py                                      |  2 +-
 wavefront_api_client/api_client.py            |  2 +-
 wavefront_api_client/configuration.py         |  2 +-
 .../models/stats_model_internal_use.py        | 30 +++++++++----------
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 2891ac8..be9cc73 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.219.6"
+    "packageVersion": "2.220.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 5b7327a..2891ac8 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.218.0"
+    "packageVersion": "2.219.6"
 }
diff --git a/README.md b/README.md
index 7455348..4d571b5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.219.6
+- Package version: 2.220.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/StatsModelInternalUse.md b/docs/StatsModelInternalUse.md
index 124879b..1cfdde1 100644
--- a/docs/StatsModelInternalUse.md
+++ b/docs/StatsModelInternalUse.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **buffer_keys** | **int** |  | [optional] 
-**cached_compacted_keys** | **int** |  | [optional] 
+**cached_compacted_points** | **int** |  | [optional] 
 **compacted_keys** | **int** |  | [optional] 
 **compacted_points** | **int** |  | [optional] 
 **cpu_ns** | **int** |  | [optional] 
diff --git a/setup.py b/setup.py
index b41313d..c92c353 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.219.6"
+VERSION = "2.220.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 369cd65..3b22933 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.219.6/python'
+        self.user_agent = 'Swagger-Codegen/2.220.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index c4291bf..8a9c53a 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.219.6".\
+               "SDK Package Version: 2.220.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
index 77f426a..ff37c6c 100644
--- a/wavefront_api_client/models/stats_model_internal_use.py
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -34,7 +34,7 @@ class StatsModelInternalUse(object):
     """
     swagger_types = {
         'buffer_keys': 'int',
-        'cached_compacted_keys': 'int',
+        'cached_compacted_points': 'int',
         'compacted_keys': 'int',
         'compacted_points': 'int',
         'cpu_ns': 'int',
@@ -56,7 +56,7 @@ class StatsModelInternalUse(object):
 
     attribute_map = {
         'buffer_keys': 'buffer_keys',
-        'cached_compacted_keys': 'cached_compacted_keys',
+        'cached_compacted_points': 'cached_compacted_points',
         'compacted_keys': 'compacted_keys',
         'compacted_points': 'compacted_points',
         'cpu_ns': 'cpu_ns',
@@ -76,14 +76,14 @@ class StatsModelInternalUse(object):
         'summaries': 'summaries'
     }
 
-    def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=None, compacted_points=None, cpu_ns=None, distributions=None, edges=None, hosts_used=None, keys=None, latency=None, metrics=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, spans=None, summaries=None, _configuration=None):  # noqa: E501
+    def __init__(self, buffer_keys=None, cached_compacted_points=None, compacted_keys=None, compacted_points=None, cpu_ns=None, distributions=None, edges=None, hosts_used=None, keys=None, latency=None, metrics=None, metrics_used=None, points=None, queries=None, query_tasks=None, s3_keys=None, skipped_compacted_keys=None, spans=None, summaries=None, _configuration=None):  # noqa: E501
         """StatsModelInternalUse - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._buffer_keys = None
-        self._cached_compacted_keys = None
+        self._cached_compacted_points = None
         self._compacted_keys = None
         self._compacted_points = None
         self._cpu_ns = None
@@ -105,8 +105,8 @@ def __init__(self, buffer_keys=None, cached_compacted_keys=None, compacted_keys=
 
         if buffer_keys is not None:
             self.buffer_keys = buffer_keys
-        if cached_compacted_keys is not None:
-            self.cached_compacted_keys = cached_compacted_keys
+        if cached_compacted_points is not None:
+            self.cached_compacted_points = cached_compacted_points
         if compacted_keys is not None:
             self.compacted_keys = compacted_keys
         if compacted_points is not None:
@@ -164,25 +164,25 @@ def buffer_keys(self, buffer_keys):
         self._buffer_keys = buffer_keys
 
     @property
-    def cached_compacted_keys(self):
-        """Gets the cached_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+    def cached_compacted_points(self):
+        """Gets the cached_compacted_points of this StatsModelInternalUse.  # noqa: E501
 
 
-        :return: The cached_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :return: The cached_compacted_points of this StatsModelInternalUse.  # noqa: E501
         :rtype: int
         """
-        return self._cached_compacted_keys
+        return self._cached_compacted_points
 
-    @cached_compacted_keys.setter
-    def cached_compacted_keys(self, cached_compacted_keys):
-        """Sets the cached_compacted_keys of this StatsModelInternalUse.
+    @cached_compacted_points.setter
+    def cached_compacted_points(self, cached_compacted_points):
+        """Sets the cached_compacted_points of this StatsModelInternalUse.
 
 
-        :param cached_compacted_keys: The cached_compacted_keys of this StatsModelInternalUse.  # noqa: E501
+        :param cached_compacted_points: The cached_compacted_points of this StatsModelInternalUse.  # noqa: E501
         :type: int
         """
 
-        self._cached_compacted_keys = cached_compacted_keys
+        self._cached_compacted_points = cached_compacted_points
 
     @property
     def compacted_keys(self):

From e64efcf965d49bfd51f0f057344e06ef525350d9 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Wed, 8 May 2024 08:16:20 -0700
Subject: [PATCH 159/161] Autogenerated Update v2.222.2.

---
 .swagger-codegen/config.json          |  2 +-
 .swagger-codegen/config.jsone         |  2 +-
 README.md                             |  3 +-
 docs/AlertApi.md                      | 57 ++++++++++++++++
 setup.py                              |  2 +-
 wavefront_api_client/api/alert_api.py | 95 +++++++++++++++++++++++++++
 wavefront_api_client/api_client.py    |  2 +-
 wavefront_api_client/configuration.py |  2 +-
 8 files changed, 159 insertions(+), 6 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index be9cc73..7a7ebc7 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.220.3"
+    "packageVersion": "2.222.2"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 2891ac8..be9cc73 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.219.6"
+    "packageVersion": "2.220.3"
 }
diff --git a/README.md b/README.md
index 4d571b5..3f461c2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.220.3
+- Package version: 2.222.2
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -116,6 +116,7 @@ Class | Method | HTTP request | Description
 *AlertApi* | [**get_alert_tags**](docs/AlertApi.md#get_alert_tags) | **GET** /api/v2/alert/{id}/tag | Get all tags associated with a specific alert
 *AlertApi* | [**get_alert_version**](docs/AlertApi.md#get_alert_version) | **GET** /api/v2/alert/{id}/history/{version} | Get a specific historical version of a specific alert
 *AlertApi* | [**get_alerts_summary**](docs/AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
+*AlertApi* | [**get_alerts_with_pagination**](docs/AlertApi.md#get_alerts_with_pagination) | **GET** /api/v2/alert/paginated | Get all alerts for a customer with pagination
 *AlertApi* | [**get_all_alert**](docs/AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 *AlertApi* | [**hide_alert**](docs/AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
 *AlertApi* | [**preview_alert_notification**](docs/AlertApi.md#preview_alert_notification) | **POST** /api/v2/alert/preview | Get all the notification preview for a specific alert
diff --git a/docs/AlertApi.md b/docs/AlertApi.md
index b687e91..566dc76 100644
--- a/docs/AlertApi.md
+++ b/docs/AlertApi.md
@@ -16,6 +16,7 @@ Method | HTTP request | Description
 [**get_alert_tags**](AlertApi.md#get_alert_tags) | **GET** /api/v2/alert/{id}/tag | Get all tags associated with a specific alert
 [**get_alert_version**](AlertApi.md#get_alert_version) | **GET** /api/v2/alert/{id}/history/{version} | Get a specific historical version of a specific alert
 [**get_alerts_summary**](AlertApi.md#get_alerts_summary) | **GET** /api/v2/alert/summary | Count alerts of various statuses for a customer
+[**get_alerts_with_pagination**](AlertApi.md#get_alerts_with_pagination) | **GET** /api/v2/alert/paginated | Get all alerts for a customer with pagination
 [**get_all_alert**](AlertApi.md#get_all_alert) | **GET** /api/v2/alert | Get all alerts for a customer
 [**hide_alert**](AlertApi.md#hide_alert) | **POST** /api/v2/alert/{id}/uninstall | Hide a specific integration alert 
 [**preview_alert_notification**](AlertApi.md#preview_alert_notification) | **POST** /api/v2/alert/preview | Get all the notification preview for a specific alert
@@ -689,6 +690,62 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **get_alerts_with_pagination**
+> ResponseContainerPagedAlert get_alerts_with_pagination(cursor=cursor, limit=limit)
+
+Get all alerts for a customer with pagination
+
+
+
+### Example
+```python
+from __future__ import print_function
+import time
+import wavefront_api_client
+from wavefront_api_client.rest import ApiException
+from pprint import pprint
+
+# Configure API key authorization: api_key
+configuration = wavefront_api_client.Configuration()
+configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['X-AUTH-TOKEN'] = 'Bearer'
+
+# create an instance of the API class
+api_instance = wavefront_api_client.AlertApi(wavefront_api_client.ApiClient(configuration))
+cursor = 789 # int |  (optional)
+limit = 100 # int |  (optional) (default to 100)
+
+try:
+    # Get all alerts for a customer with pagination
+    api_response = api_instance.get_alerts_with_pagination(cursor=cursor, limit=limit)
+    pprint(api_response)
+except ApiException as e:
+    print("Exception when calling AlertApi->get_alerts_with_pagination: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **cursor** | **int**|  | [optional] 
+ **limit** | **int**|  | [optional] [default to 100]
+
+### Return type
+
+[**ResponseContainerPagedAlert**](ResponseContainerPagedAlert.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **get_all_alert**
 > ResponseContainerPagedAlert get_all_alert(offset=offset, limit=limit)
 
diff --git a/setup.py b/setup.py
index c92c353..9130c6a 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.220.3"
+VERSION = "2.222.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index ae3f3f0..41790af 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -1210,6 +1210,101 @@ def get_alerts_summary_with_http_info(self, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def get_alerts_with_pagination(self, **kwargs):  # noqa: E501
+        """Get all alerts for a customer with pagination  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alerts_with_pagination(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int cursor:
+        :param int limit:
+        :return: ResponseContainerPagedAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.get_alerts_with_pagination_with_http_info(**kwargs)  # noqa: E501
+        else:
+            (data) = self.get_alerts_with_pagination_with_http_info(**kwargs)  # noqa: E501
+            return data
+
+    def get_alerts_with_pagination_with_http_info(self, **kwargs):  # noqa: E501
+        """Get all alerts for a customer with pagination  # noqa: E501
+
+          # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.get_alerts_with_pagination_with_http_info(async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param int cursor:
+        :param int limit:
+        :return: ResponseContainerPagedAlert
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['cursor', 'limit']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_alerts_with_pagination" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+        if 'cursor' in params:
+            query_params.append(('cursor', params['cursor']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['api_key']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/api/v2/alert/paginated', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='ResponseContainerPagedAlert',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def get_all_alert(self, **kwargs):  # noqa: E501
         """Get all alerts for a customer  # noqa: E501
 
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 3b22933..6f4eb6b 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.220.3/python'
+        self.user_agent = 'Swagger-Codegen/2.222.2/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 8a9c53a..44060d2 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.220.3".\
+               "SDK Package Version: 2.222.2".\
                format(env=sys.platform, pyversion=sys.version)

From fee13e1a86664aa4d3707adad4cd18a613091511 Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Thu, 9 May 2024 08:16:29 -0700
Subject: [PATCH 160/161] Autogenerated Update v2.222.3.

---
 .swagger-codegen/config.json          |  2 +-
 .swagger-codegen/config.jsone         |  2 +-
 README.md                             |  2 +-
 docs/Module.md                        |  1 +
 setup.py                              |  2 +-
 wavefront_api_client/api_client.py    |  2 +-
 wavefront_api_client/configuration.py |  2 +-
 wavefront_api_client/models/module.py | 28 ++++++++++++++++++++++++++-
 8 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 7a7ebc7..4cf104f 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.222.2"
+    "packageVersion": "2.222.3"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index be9cc73..7a7ebc7 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.220.3"
+    "packageVersion": "2.222.2"
 }
diff --git a/README.md b/README.md
index 3f461c2..a05b830 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.222.2
+- Package version: 2.222.3
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/docs/Module.md b/docs/Module.md
index c4f5529..4da2ad8 100644
--- a/docs/Module.md
+++ b/docs/Module.md
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **layer** | [**ModuleLayer**](ModuleLayer.md) |  | [optional] 
 **name** | **str** |  | [optional] 
 **named** | **bool** |  | [optional] 
+**native_access_enabled** | **bool** |  | [optional] 
 **packages** | **list[str]** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/setup.py b/setup.py
index 9130c6a..1b8d4d8 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.222.2"
+VERSION = "2.222.3"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 6f4eb6b..337e2b1 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.222.2/python'
+        self.user_agent = 'Swagger-Codegen/2.222.3/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index 44060d2..f45a129 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.222.2".\
+               "SDK Package Version: 2.222.3".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/module.py b/wavefront_api_client/models/module.py
index 64c35cb..75510b9 100644
--- a/wavefront_api_client/models/module.py
+++ b/wavefront_api_client/models/module.py
@@ -40,6 +40,7 @@ class Module(object):
         'layer': 'ModuleLayer',
         'name': 'str',
         'named': 'bool',
+        'native_access_enabled': 'bool',
         'packages': 'list[str]'
     }
 
@@ -51,10 +52,11 @@ class Module(object):
         'layer': 'layer',
         'name': 'name',
         'named': 'named',
+        'native_access_enabled': 'nativeAccessEnabled',
         'packages': 'packages'
     }
 
-    def __init__(self, annotations=None, class_loader=None, declared_annotations=None, descriptor=None, layer=None, name=None, named=None, packages=None, _configuration=None):  # noqa: E501
+    def __init__(self, annotations=None, class_loader=None, declared_annotations=None, descriptor=None, layer=None, name=None, named=None, native_access_enabled=None, packages=None, _configuration=None):  # noqa: E501
         """Module - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -67,6 +69,7 @@ def __init__(self, annotations=None, class_loader=None, declared_annotations=Non
         self._layer = None
         self._name = None
         self._named = None
+        self._native_access_enabled = None
         self._packages = None
         self.discriminator = None
 
@@ -84,6 +87,8 @@ def __init__(self, annotations=None, class_loader=None, declared_annotations=Non
             self.name = name
         if named is not None:
             self.named = named
+        if native_access_enabled is not None:
+            self.native_access_enabled = native_access_enabled
         if packages is not None:
             self.packages = packages
 
@@ -234,6 +239,27 @@ def named(self, named):
 
         self._named = named
 
+    @property
+    def native_access_enabled(self):
+        """Gets the native_access_enabled of this Module.  # noqa: E501
+
+
+        :return: The native_access_enabled of this Module.  # noqa: E501
+        :rtype: bool
+        """
+        return self._native_access_enabled
+
+    @native_access_enabled.setter
+    def native_access_enabled(self, native_access_enabled):
+        """Sets the native_access_enabled of this Module.
+
+
+        :param native_access_enabled: The native_access_enabled of this Module.  # noqa: E501
+        :type: bool
+        """
+
+        self._native_access_enabled = native_access_enabled
+
     @property
     def packages(self):
         """Gets the packages of this Module.  # noqa: E501

From c411175f4b04630d6d27bc07e65c86e7743754cb Mon Sep 17 00:00:00 2001
From: wf-jenkins <svc.tobs-eso@vmware.com>
Date: Tue, 11 Jun 2024 08:16:25 -0700
Subject: [PATCH 161/161] Autogenerated Update v2.223.1.

---
 .swagger-codegen/config.json                  |  2 +-
 .swagger-codegen/config.jsone                 |  2 +-
 README.md                                     | 20 ++---
 docs/AWSBaseCredentials.md                    |  2 +-
 docs/AccountUserAndServiceAccountApi.md       | 36 ++++-----
 docs/AlertSource.md                           |  2 +-
 docs/ApiTokenApi.md                           |  2 +-
 docs/IntegrationApi.md                        | 48 ++++++------
 docs/RoleApi.md                               | 18 ++---
 docs/SearchApi.md                             | 12 +--
 docs/UserApi.md                               | 26 +++----
 docs/UserGroupApi.md                          | 18 ++---
 setup.py                                      | 12 +--
 wavefront_api_client/__init__.py              |  4 +-
 wavefront_api_client/api/access_policy_api.py |  4 +-
 .../account__user_and_service_account_api.py  | 76 +++++++++----------
 .../api/alert_analytics_api.py                |  4 +-
 wavefront_api_client/api/alert_api.py         |  4 +-
 wavefront_api_client/api/api_token_api.py     |  8 +-
 .../api/cloud_integration_api.py              |  4 +-
 wavefront_api_client/api/dashboard_api.py     |  4 +-
 .../api/derived_metric_api.py                 |  4 +-
 .../api/direct_ingestion_api.py               |  4 +-
 wavefront_api_client/api/event_api.py         |  4 +-
 wavefront_api_client/api/external_link_api.py |  4 +-
 wavefront_api_client/api/ingestion_spy_api.py |  4 +-
 wavefront_api_client/api/integration_api.py   | 36 ++++-----
 .../api/maintenance_window_api.py             |  4 +-
 wavefront_api_client/api/message_api.py       |  4 +-
 wavefront_api_client/api/metric_api.py        |  4 +-
 .../api/monitored_application_api.py          |  4 +-
 .../api/monitored_service_api.py              |  4 +-
 wavefront_api_client/api/notificant_api.py    |  4 +-
 wavefront_api_client/api/proxy_api.py         |  4 +-
 wavefront_api_client/api/query_api.py         |  4 +-
 .../api/recent_app_map_search_api.py          |  4 +-
 .../api/recent_traces_search_api.py           |  4 +-
 wavefront_api_client/api/role_api.py          | 40 +++++-----
 .../api/saved_app_map_search_api.py           |  4 +-
 .../api/saved_app_map_search_group_api.py     |  4 +-
 wavefront_api_client/api/saved_search_api.py  |  4 +-
 .../api/saved_traces_search_api.py            |  4 +-
 .../api/saved_traces_search_group_api.py      |  4 +-
 wavefront_api_client/api/search_api.py        | 28 +++----
 .../api/security_policy_api.py                |  4 +-
 wavefront_api_client/api/source_api.py        |  4 +-
 .../api/span_sampling_policy_api.py           |  4 +-
 wavefront_api_client/api/usage_api.py         |  4 +-
 wavefront_api_client/api/user_api.py          | 56 +++++++-------
 wavefront_api_client/api/user_group_api.py    | 40 +++++-----
 wavefront_api_client/api/wavefront_api.py     |  4 +-
 wavefront_api_client/api/webhook_api.py       |  4 +-
 wavefront_api_client/api_client.py            |  6 +-
 wavefront_api_client/configuration.py         |  6 +-
 wavefront_api_client/models/__init__.py       |  4 +-
 .../models/access_control_element.py          |  4 +-
 .../models/access_control_list_read_dto.py    |  4 +-
 .../models/access_control_list_simple.py      |  4 +-
 .../models/access_control_list_write_dto.py   |  4 +-
 wavefront_api_client/models/access_policy.py  |  4 +-
 .../models/access_policy_rule_dto.py          |  4 +-
 wavefront_api_client/models/account.py        |  4 +-
 wavefront_api_client/models/alert.py          |  4 +-
 .../models/alert_analytics_summary.py         |  4 +-
 .../models/alert_analytics_summary_detail.py  |  4 +-
 .../models/alert_dashboard.py                 |  4 +-
 .../models/alert_error_group_info.py          |  4 +-
 .../models/alert_error_group_summary.py       |  4 +-
 .../models/alert_error_summary.py             |  4 +-
 wavefront_api_client/models/alert_min.py      |  4 +-
 wavefront_api_client/models/alert_route.py    |  4 +-
 wavefront_api_client/models/alert_source.py   |  8 +-
 wavefront_api_client/models/annotation.py     |  4 +-
 wavefront_api_client/models/anomaly.py        |  4 +-
 .../models/api_token_model.py                 |  4 +-
 .../models/app_dynamics_configuration.py      |  4 +-
 .../models/app_search_filter.py               |  4 +-
 .../models/app_search_filter_value.py         |  4 +-
 .../models/app_search_filters.py              |  4 +-
 .../models/aws_base_credentials.py            |  8 +-
 .../azure_activity_log_configuration.py       |  4 +-
 .../models/azure_base_credentials.py          |  4 +-
 .../models/azure_configuration.py             |  4 +-
 wavefront_api_client/models/chart.py          |  4 +-
 wavefront_api_client/models/chart_settings.py |  4 +-
 .../models/chart_source_query.py              |  4 +-
 wavefront_api_client/models/class_loader.py   |  4 +-
 .../models/cloud_integration.py               |  4 +-
 .../models/cloud_trail_configuration.py       |  4 +-
 .../models/cloud_watch_configuration.py       |  4 +-
 .../models/cluster_info_dto.py                |  4 +-
 wavefront_api_client/models/conversion.py     |  4 +-
 .../models/conversion_object.py               |  4 +-
 .../models/customer_facing_user_object.py     |  4 +-
 wavefront_api_client/models/dashboard.py      |  4 +-
 wavefront_api_client/models/dashboard_min.py  |  4 +-
 .../models/dashboard_parameter_value.py       |  4 +-
 .../models/dashboard_section.py               |  4 +-
 .../models/dashboard_section_row.py           |  4 +-
 .../models/default_saved_app_map_search.py    |  4 +-
 .../models/default_saved_traces_search.py     |  4 +-
 .../models/derived_metric_definition.py       |  4 +-
 .../models/dynatrace_configuration.py         |  4 +-
 .../models/ec2_configuration.py               |  4 +-
 wavefront_api_client/models/event.py          |  4 +-
 .../models/event_search_request.py            |  4 +-
 .../models/event_time_range.py                |  4 +-
 wavefront_api_client/models/external_link.py  |  4 +-
 wavefront_api_client/models/facet_response.py |  4 +-
 .../models/facet_search_request_container.py  |  4 +-
 .../models/facets_response_container.py       |  4 +-
 .../models/facets_search_request_container.py |  4 +-
 .../models/fast_reader_builder.py             |  4 +-
 wavefront_api_client/models/field.py          |  4 +-
 .../models/gcp_billing_configuration.py       |  4 +-
 .../models/gcp_configuration.py               |  4 +-
 wavefront_api_client/models/history_entry.py  |  4 +-
 .../models/history_response.py                |  4 +-
 .../models/ingestion_policy_alert.py          |  4 +-
 .../models/ingestion_policy_metadata.py       |  4 +-
 .../models/ingestion_policy_read_model.py     |  4 +-
 .../models/ingestion_policy_write_model.py    |  4 +-
 wavefront_api_client/models/install_alerts.py |  4 +-
 wavefront_api_client/models/integration.py    |  4 +-
 .../models/integration_alert.py               |  4 +-
 .../models/integration_alias.py               |  4 +-
 .../models/integration_dashboard.py           |  4 +-
 .../models/integration_manifest_group.py      |  4 +-
 .../models/integration_metrics.py             |  4 +-
 .../models/integration_status.py              |  4 +-
 wavefront_api_client/models/json_node.py      |  4 +-
 .../models/kubernetes_component.py            |  4 +-
 .../models/kubernetes_component_status.py     |  4 +-
 wavefront_api_client/models/logical_type.py   |  4 +-
 wavefront_api_client/models/logs_sort.py      |  4 +-
 wavefront_api_client/models/logs_table.py     |  4 +-
 .../models/maintenance_window.py              |  4 +-
 wavefront_api_client/models/message.py        |  4 +-
 wavefront_api_client/models/metric_details.py |  4 +-
 .../models/metric_details_response.py         |  4 +-
 wavefront_api_client/models/metric_status.py  |  4 +-
 .../models/metrics_policy_read_model.py       |  4 +-
 .../models/metrics_policy_write_model.py      |  4 +-
 wavefront_api_client/models/module.py         |  4 +-
 .../models/module_descriptor.py               |  4 +-
 wavefront_api_client/models/module_layer.py   |  4 +-
 .../models/monitored_application_dto.py       |  4 +-
 .../models/monitored_cluster.py               |  4 +-
 .../models/monitored_service_dto.py           |  4 +-
 .../models/new_relic_configuration.py         |  4 +-
 .../models/new_relic_metric_filters.py        |  4 +-
 wavefront_api_client/models/notificant.py     |  4 +-
 .../models/notification_messages.py           |  4 +-
 wavefront_api_client/models/package.py        |  4 +-
 wavefront_api_client/models/paged.py          |  4 +-
 wavefront_api_client/models/paged_account.py  |  4 +-
 wavefront_api_client/models/paged_alert.py    |  4 +-
 .../paged_alert_analytics_summary_detail.py   |  4 +-
 .../models/paged_alert_with_stats.py          |  4 +-
 wavefront_api_client/models/paged_anomaly.py  |  4 +-
 .../models/paged_api_token_model.py           |  4 +-
 .../models/paged_cloud_integration.py         |  4 +-
 .../paged_customer_facing_user_object.py      |  4 +-
 .../models/paged_dashboard.py                 |  4 +-
 .../models/paged_derived_metric_definition.py |  4 +-
 ...ed_derived_metric_definition_with_stats.py |  4 +-
 wavefront_api_client/models/paged_event.py    |  4 +-
 .../models/paged_external_link.py             |  4 +-
 .../paged_ingestion_policy_read_model.py      |  4 +-
 .../models/paged_integration.py               |  4 +-
 .../models/paged_maintenance_window.py        |  4 +-
 wavefront_api_client/models/paged_message.py  |  4 +-
 .../models/paged_monitored_application_dto.py |  4 +-
 .../models/paged_monitored_cluster.py         |  4 +-
 .../models/paged_monitored_service_dto.py     |  4 +-
 .../models/paged_notificant.py                |  4 +-
 wavefront_api_client/models/paged_proxy.py    |  4 +-
 .../models/paged_recent_app_map_search.py     |  4 +-
 .../models/paged_recent_traces_search.py      |  4 +-
 .../models/paged_related_event.py             |  4 +-
 .../models/paged_report_event_anomaly_dto.py  |  4 +-
 wavefront_api_client/models/paged_role_dto.py |  4 +-
 .../models/paged_saved_app_map_search.py      |  4 +-
 .../paged_saved_app_map_search_group.py       |  4 +-
 .../models/paged_saved_search.py              |  4 +-
 .../models/paged_saved_traces_search.py       |  4 +-
 .../models/paged_saved_traces_search_group.py |  4 +-
 .../models/paged_service_account.py           |  4 +-
 wavefront_api_client/models/paged_source.py   |  4 +-
 .../models/paged_span_sampling_policy.py      |  4 +-
 .../models/paged_user_group_model.py          |  4 +-
 wavefront_api_client/models/point.py          |  4 +-
 .../models/policy_rule_read_model.py          |  4 +-
 .../models/policy_rule_write_model.py         |  4 +-
 wavefront_api_client/models/proxy.py          |  4 +-
 wavefront_api_client/models/query_event.py    |  4 +-
 wavefront_api_client/models/query_result.py   |  4 +-
 wavefront_api_client/models/query_type_dto.py |  4 +-
 wavefront_api_client/models/raw_timeseries.py |  4 +-
 .../models/recent_app_map_search.py           |  4 +-
 .../models/recent_traces_search.py            |  4 +-
 .../models/related_anomaly.py                 |  4 +-
 wavefront_api_client/models/related_data.py   |  4 +-
 wavefront_api_client/models/related_event.py  |  4 +-
 .../models/related_event_time_range.py        |  4 +-
 .../models/report_event_anomaly_dto.py        |  4 +-
 .../models/response_container.py              |  4 +-
 .../response_container_access_policy.py       |  4 +-
 ...response_container_access_policy_action.py |  4 +-
 .../models/response_container_account.py      |  4 +-
 .../models/response_container_alert.py        |  4 +-
 ...ponse_container_alert_analytics_summary.py |  4 +-
 .../response_container_api_token_model.py     |  4 +-
 .../response_container_cloud_integration.py   |  4 +-
 .../response_container_cluster_info_dto.py    |  4 +-
 .../models/response_container_dashboard.py    |  4 +-
 ..._container_default_saved_app_map_search.py |  4 +-
 ...e_container_default_saved_traces_search.py |  4 +-
 ...nse_container_derived_metric_definition.py |  4 +-
 .../models/response_container_event.py        |  4 +-
 .../response_container_external_link.py       |  4 +-
 .../response_container_facet_response.py      |  4 +-
 ...nse_container_facets_response_container.py |  4 +-
 .../response_container_history_response.py    |  4 +-
 ...e_container_ingestion_policy_read_model.py |  4 +-
 .../models/response_container_integration.py  |  4 +-
 .../response_container_integration_status.py  |  4 +-
 ...ainer_list_access_control_list_read_dto.py |  4 +-
 ...e_container_list_alert_error_group_info.py |  4 +-
 ...response_container_list_api_token_model.py |  4 +-
 .../response_container_list_integration.py    |  4 +-
 ...ntainer_list_integration_manifest_group.py |  4 +-
 ...se_container_list_notification_messages.py |  4 +-
 ...response_container_list_service_account.py |  4 +-
 .../models/response_container_list_string.py  |  4 +-
 .../response_container_list_user_api_token.py |  4 +-
 .../response_container_list_user_dto.py       |  4 +-
 .../response_container_maintenance_window.py  |  4 +-
 .../models/response_container_map.py          |  4 +-
 .../response_container_map_string_integer.py  |  4 +-
 ...container_map_string_integration_status.py |  4 +-
 .../models/response_container_message.py      |  4 +-
 ...nse_container_metrics_policy_read_model.py |  4 +-
 ...nse_container_monitored_application_dto.py |  4 +-
 .../response_container_monitored_cluster.py   |  4 +-
 ...esponse_container_monitored_service_dto.py |  4 +-
 .../models/response_container_notificant.py   |  4 +-
 .../response_container_paged_account.py       |  4 +-
 .../models/response_container_paged_alert.py  |  4 +-
 ...er_paged_alert_analytics_summary_detail.py |  4 +-
 ...sponse_container_paged_alert_with_stats.py |  4 +-
 .../response_container_paged_anomaly.py       |  4 +-
 ...esponse_container_paged_api_token_model.py |  4 +-
 ...ponse_container_paged_cloud_integration.py |  4 +-
 ...ainer_paged_customer_facing_user_object.py |  4 +-
 .../response_container_paged_dashboard.py     |  4 +-
 ...ntainer_paged_derived_metric_definition.py |  4 +-
 ...ed_derived_metric_definition_with_stats.py |  4 +-
 .../models/response_container_paged_event.py  |  4 +-
 .../response_container_paged_external_link.py |  4 +-
 ...ainer_paged_ingestion_policy_read_model.py |  4 +-
 .../response_container_paged_integration.py   |  4 +-
 ...onse_container_paged_maintenance_window.py |  4 +-
 .../response_container_paged_message.py       |  4 +-
 ...ntainer_paged_monitored_application_dto.py |  4 +-
 ...ponse_container_paged_monitored_cluster.py |  4 +-
 ...e_container_paged_monitored_service_dto.py |  4 +-
 .../response_container_paged_notificant.py    |  4 +-
 .../models/response_container_paged_proxy.py  |  4 +-
 ...e_container_paged_recent_app_map_search.py |  4 +-
 ...se_container_paged_recent_traces_search.py |  4 +-
 .../response_container_paged_related_event.py |  4 +-
 ...ontainer_paged_report_event_anomaly_dto.py |  4 +-
 .../response_container_paged_role_dto.py      |  4 +-
 ...se_container_paged_saved_app_map_search.py |  4 +-
 ...tainer_paged_saved_app_map_search_group.py |  4 +-
 .../response_container_paged_saved_search.py  |  4 +-
 ...nse_container_paged_saved_traces_search.py |  4 +-
 ...ntainer_paged_saved_traces_search_group.py |  4 +-
 ...esponse_container_paged_service_account.py |  4 +-
 .../models/response_container_paged_source.py |  4 +-
 ...se_container_paged_span_sampling_policy.py |  4 +-
 ...sponse_container_paged_user_group_model.py |  4 +-
 .../models/response_container_proxy.py        |  4 +-
 .../response_container_query_type_dto.py      |  4 +-
 ...esponse_container_recent_app_map_search.py |  4 +-
 ...response_container_recent_traces_search.py |  4 +-
 .../models/response_container_role_dto.py     |  4 +-
 ...response_container_saved_app_map_search.py |  4 +-
 ...se_container_saved_app_map_search_group.py |  4 +-
 .../models/response_container_saved_search.py |  4 +-
 .../response_container_saved_traces_search.py |  4 +-
 ...nse_container_saved_traces_search_group.py |  4 +-
 .../response_container_service_account.py     |  4 +-
 ...esponse_container_set_business_function.py |  4 +-
 ...esponse_container_set_source_label_pair.py |  4 +-
 .../models/response_container_source.py       |  4 +-
 ...response_container_span_sampling_policy.py |  4 +-
 .../models/response_container_string.py       |  4 +-
 .../response_container_tags_response.py       |  4 +-
 .../response_container_user_api_token.py      |  4 +-
 .../models/response_container_user_dto.py     |  4 +-
 .../response_container_user_group_model.py    |  4 +-
 .../response_container_validated_users_dto.py |  4 +-
 .../models/response_container_void.py         |  4 +-
 .../models/response_status.py                 |  4 +-
 .../models/role_create_dto.py                 |  4 +-
 wavefront_api_client/models/role_dto.py       |  4 +-
 .../models/role_update_dto.py                 |  4 +-
 .../models/saved_app_map_search.py            |  4 +-
 .../models/saved_app_map_search_group.py      |  4 +-
 wavefront_api_client/models/saved_search.py   |  4 +-
 .../models/saved_traces_search.py             |  4 +-
 .../models/saved_traces_search_group.py       |  4 +-
 wavefront_api_client/models/schema.py         |  4 +-
 wavefront_api_client/models/search_query.py   |  4 +-
 .../models/service_account.py                 |  4 +-
 .../models/service_account_write.py           |  4 +-
 wavefront_api_client/models/setup.py          |  4 +-
 .../models/snowflake_configuration.py         |  4 +-
 .../models/sortable_search_request.py         |  4 +-
 wavefront_api_client/models/sorting.py        |  4 +-
 wavefront_api_client/models/source.py         |  4 +-
 .../models/source_label_pair.py               |  4 +-
 .../models/source_search_request_container.py |  4 +-
 wavefront_api_client/models/span.py           |  4 +-
 .../models/span_sampling_policy.py            |  4 +-
 wavefront_api_client/models/specific_data.py  |  4 +-
 .../models/stats_model_internal_use.py        |  4 +-
 wavefront_api_client/models/stripe.py         |  4 +-
 wavefront_api_client/models/tags_response.py  |  4 +-
 wavefront_api_client/models/target_info.py    |  4 +-
 wavefront_api_client/models/timeseries.py     |  4 +-
 wavefront_api_client/models/trace.py          |  4 +-
 .../models/triage_dashboard.py                |  4 +-
 wavefront_api_client/models/tuple_result.py   |  4 +-
 .../models/tuple_value_result.py              |  4 +-
 wavefront_api_client/models/user_api_token.py |  4 +-
 wavefront_api_client/models/user_dto.py       |  4 +-
 wavefront_api_client/models/user_group.py     |  4 +-
 .../models/user_group_model.py                |  4 +-
 .../models/user_group_properties_dto.py       |  4 +-
 .../models/user_group_write.py                |  4 +-
 wavefront_api_client/models/user_model.py     |  4 +-
 .../models/user_request_dto.py                |  4 +-
 wavefront_api_client/models/user_to_create.py |  4 +-
 .../models/validated_users_dto.py             |  4 +-
 wavefront_api_client/models/void.py           |  4 +-
 .../models/vrops_configuration.py             |  4 +-
 wavefront_api_client/models/wf_tags.py        |  4 +-
 wavefront_api_client/rest.py                  |  4 +-
 351 files changed, 910 insertions(+), 910 deletions(-)

diff --git a/.swagger-codegen/config.json b/.swagger-codegen/config.json
index 4cf104f..1ff549b 100644
--- a/.swagger-codegen/config.json
+++ b/.swagger-codegen/config.json
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.222.3"
+    "packageVersion": "2.223.1"
 }
diff --git a/.swagger-codegen/config.jsone b/.swagger-codegen/config.jsone
index 7a7ebc7..4cf104f 100644
--- a/.swagger-codegen/config.jsone
+++ b/.swagger-codegen/config.jsone
@@ -3,5 +3,5 @@
     "gitUserId": "wavefrontHQ",
     "packageName": "wavefront_api_client",
     "packageUrl": "https://github.com/wavefrontHQ/python-client",
-    "packageVersion": "2.222.2"
+    "packageVersion": "2.222.3"
 }
diff --git a/README.md b/README.md
index a05b830..794dc4e 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # wavefront-api-client
-<p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>
+<p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>
 
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: v2
-- Package version: 2.222.3
+- Package version: 2.223.1
 - Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -212,17 +212,17 @@ Class | Method | HTTP request | Description
 *IngestionSpyApi* | [**spy_on_id_creations**](docs/IngestionSpyApi.md#spy_on_id_creations) | **GET** /api/spy/ids | Gets newly allocated IDs that correspond to new metric names, source names, point tags, or span tags. A new ID generally indicates that a new time series has been introduced.
 *IngestionSpyApi* | [**spy_on_points**](docs/IngestionSpyApi.md#spy_on_points) | **GET** /api/spy/points | Gets a sampling of new metric data points that are added to existing time series.
 *IngestionSpyApi* | [**spy_on_spans**](docs/IngestionSpyApi.md#spy_on_spans) | **GET** /api/spy/spans | Gets new spans with existing source names and span tags.
-*IntegrationApi* | [**get_all_integration**](docs/IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Wavefront integrations available, along with their status
-*IntegrationApi* | [**get_all_integration_in_manifests**](docs/IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
-*IntegrationApi* | [**get_all_integration_in_manifests_min**](docs/IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Wavefront integrations as structured in their integration manifests.
-*IntegrationApi* | [**get_all_integration_statuses**](docs/IntegrationApi.md#get_all_integration_statuses) | **GET** /api/v2/integration/status | Gets the status of all Wavefront integrations
+*IntegrationApi* | [**get_all_integration**](docs/IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Tanzu Observability integrations available, along with their status
+*IntegrationApi* | [**get_all_integration_in_manifests**](docs/IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Tanzu Observability integrations as structured in their integration manifests, along with their status and content
+*IntegrationApi* | [**get_all_integration_in_manifests_min**](docs/IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Tanzu Observability integrations as structured in their integration manifests.
+*IntegrationApi* | [**get_all_integration_statuses**](docs/IntegrationApi.md#get_all_integration_statuses) | **GET** /api/v2/integration/status | Gets the status of all Tanzu Observability integrations
 *IntegrationApi* | [**get_installed_integration**](docs/IntegrationApi.md#get_installed_integration) | **GET** /api/v2/integration/installed | Gets a flat list of all Integrations that are installed, along with their status
-*IntegrationApi* | [**get_integration**](docs/IntegrationApi.md#get_integration) | **GET** /api/v2/integration/{id} | Gets a single Wavefront integration by its id, along with its status
-*IntegrationApi* | [**get_integration_status**](docs/IntegrationApi.md#get_integration_status) | **GET** /api/v2/integration/{id}/status | Gets the status of a single Wavefront integration
+*IntegrationApi* | [**get_integration**](docs/IntegrationApi.md#get_integration) | **GET** /api/v2/integration/{id} | Gets a single Tanzu Observability integration by its id, along with its status
+*IntegrationApi* | [**get_integration_status**](docs/IntegrationApi.md#get_integration_status) | **GET** /api/v2/integration/{id}/status | Gets the status of a single Tanzu Observability integration
 *IntegrationApi* | [**install_all_integration_alerts**](docs/IntegrationApi.md#install_all_integration_alerts) | **POST** /api/v2/integration/{id}/install-all-alerts | Enable all alerts associated with this integration
-*IntegrationApi* | [**install_integration**](docs/IntegrationApi.md#install_integration) | **POST** /api/v2/integration/{id}/install | Installs a Wavefront integration
+*IntegrationApi* | [**install_integration**](docs/IntegrationApi.md#install_integration) | **POST** /api/v2/integration/{id}/install | Installs a Tanzu Observability integration
 *IntegrationApi* | [**uninstall_all_integration_alerts**](docs/IntegrationApi.md#uninstall_all_integration_alerts) | **POST** /api/v2/integration/{id}/uninstall-all-alerts | Disable all alerts associated with this integration
-*IntegrationApi* | [**uninstall_integration**](docs/IntegrationApi.md#uninstall_integration) | **POST** /api/v2/integration/{id}/uninstall | Uninstalls a Wavefront integration
+*IntegrationApi* | [**uninstall_integration**](docs/IntegrationApi.md#uninstall_integration) | **POST** /api/v2/integration/{id}/uninstall | Uninstalls a Tanzu Observability integration
 *MaintenanceWindowApi* | [**create_maintenance_window**](docs/MaintenanceWindowApi.md#create_maintenance_window) | **POST** /api/v2/maintenancewindow | Create a maintenance window
 *MaintenanceWindowApi* | [**delete_maintenance_window**](docs/MaintenanceWindowApi.md#delete_maintenance_window) | **DELETE** /api/v2/maintenancewindow/{id} | Delete a specific maintenance window
 *MaintenanceWindowApi* | [**get_all_maintenance_window**](docs/MaintenanceWindowApi.md#get_all_maintenance_window) | **GET** /api/v2/maintenancewindow | Get all maintenance windows for a customer
diff --git a/docs/AWSBaseCredentials.md b/docs/AWSBaseCredentials.md
index 02520ba..c64341a 100644
--- a/docs/AWSBaseCredentials.md
+++ b/docs/AWSBaseCredentials.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **external_id** | **str** | The external id corresponding to the Role ARN | 
-**role_arn** | **str** | The Role ARN that the customer has created in AWS IAM to allow access to Wavefront | 
+**role_arn** | **str** | The Role ARN that the customer has created in AWS IAM to allow access to Tanzu Observability | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AccountUserAndServiceAccountApi.md b/docs/AccountUserAndServiceAccountApi.md
index ea11eba..2525ef7 100644
--- a/docs/AccountUserAndServiceAccountApi.md
+++ b/docs/AccountUserAndServiceAccountApi.md
@@ -91,7 +91,7 @@ Name | Type | Description  | Notes
 
 Adds specific roles to the account (user or service account)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -147,7 +147,7 @@ Name | Type | Description  | Notes
 
 Adds specific groups to the account (user or service account)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -203,7 +203,7 @@ Name | Type | Description  | Notes
 
 Creates or updates a user account
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -367,7 +367,7 @@ Name | Type | Description  | Notes
 
 Deletes an account (user or service account) identified by id
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -421,7 +421,7 @@ Name | Type | Description  | Notes
 
 Deletes multiple accounts (users or service accounts)
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -475,7 +475,7 @@ Name | Type | Description  | Notes
 
 Get a specific account (user or service account)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -583,7 +583,7 @@ Name | Type | Description  | Notes
 
 Get all accounts (users and service accounts) of a customer
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -689,7 +689,7 @@ This endpoint does not need any parameter.
 
 Get all user accounts
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -793,7 +793,7 @@ Name | Type | Description  | Notes
 
 Retrieves a user by identifier (email address)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -847,7 +847,7 @@ Name | Type | Description  | Notes
 
 Get all users with Accounts permission
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -897,7 +897,7 @@ This endpoint does not need any parameter.
 
 Grants a specific permission to account (user or service account)
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -953,7 +953,7 @@ Name | Type | Description  | Notes
 
 Grant a permission to accounts (users or service accounts)
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -1009,7 +1009,7 @@ Name | Type | Description  | Notes
 
 Invite user accounts with given user groups and permissions.
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1063,7 +1063,7 @@ Name | Type | Description  | Notes
 
 Removes specific roles from the account (user or service account)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1119,7 +1119,7 @@ Name | Type | Description  | Notes
 
 Removes specific groups from the account (user or service account)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -1175,7 +1175,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from account (user or service account)
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -1231,7 +1231,7 @@ Name | Type | Description  | Notes
 
 Revoke a permission from accounts (users or service accounts)
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -1343,7 +1343,7 @@ Name | Type | Description  | Notes
 
 Update user with given user groups and permissions.
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/AlertSource.md b/docs/AlertSource.md
index 3b92e30..b2d5b05 100644
--- a/docs/AlertSource.md
+++ b/docs/AlertSource.md
@@ -10,7 +10,7 @@ Name | Type | Description | Notes
 **name** | **str** | The alert source query name. Used as the variable name in the other query. | [optional] 
 **query** | **str** | The alert query. Support both Wavefront Query and Prometheus Query. | [optional] 
 **query_builder_enabled** | **bool** | A flag indicate whether the alert source query builder enabled or not. | [optional] 
-**query_builder_serialization** | **str** | The string serialization of the alert source query builder, mostly used by Wavefront UI. | [optional] 
+**query_builder_serialization** | **str** | The string serialization of the alert source query builder, mostly used by Tanzu Observability UI. | [optional] 
 **query_type** | **str** | The type of the alert query. Supported types are [PROMQL, WQL]. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/ApiTokenApi.md b/docs/ApiTokenApi.md
index bfea904..acb9b22 100644
--- a/docs/ApiTokenApi.md
+++ b/docs/ApiTokenApi.md
@@ -22,7 +22,7 @@ Method | HTTP request | Description
 
 Create new api token
 
-Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/IntegrationApi.md b/docs/IntegrationApi.md
index 82d9aa6..7f42122 100644
--- a/docs/IntegrationApi.md
+++ b/docs/IntegrationApi.md
@@ -4,23 +4,23 @@ All URIs are relative to *https://YOUR_INSTANCE.wavefront.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**get_all_integration**](IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Wavefront integrations available, along with their status
-[**get_all_integration_in_manifests**](IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
-[**get_all_integration_in_manifests_min**](IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Wavefront integrations as structured in their integration manifests.
-[**get_all_integration_statuses**](IntegrationApi.md#get_all_integration_statuses) | **GET** /api/v2/integration/status | Gets the status of all Wavefront integrations
+[**get_all_integration**](IntegrationApi.md#get_all_integration) | **GET** /api/v2/integration | Gets a flat list of all Tanzu Observability integrations available, along with their status
+[**get_all_integration_in_manifests**](IntegrationApi.md#get_all_integration_in_manifests) | **GET** /api/v2/integration/manifests | Gets all Tanzu Observability integrations as structured in their integration manifests, along with their status and content
+[**get_all_integration_in_manifests_min**](IntegrationApi.md#get_all_integration_in_manifests_min) | **GET** /api/v2/integration/manifests/min | Gets all Tanzu Observability integrations as structured in their integration manifests.
+[**get_all_integration_statuses**](IntegrationApi.md#get_all_integration_statuses) | **GET** /api/v2/integration/status | Gets the status of all Tanzu Observability integrations
 [**get_installed_integration**](IntegrationApi.md#get_installed_integration) | **GET** /api/v2/integration/installed | Gets a flat list of all Integrations that are installed, along with their status
-[**get_integration**](IntegrationApi.md#get_integration) | **GET** /api/v2/integration/{id} | Gets a single Wavefront integration by its id, along with its status
-[**get_integration_status**](IntegrationApi.md#get_integration_status) | **GET** /api/v2/integration/{id}/status | Gets the status of a single Wavefront integration
+[**get_integration**](IntegrationApi.md#get_integration) | **GET** /api/v2/integration/{id} | Gets a single Tanzu Observability integration by its id, along with its status
+[**get_integration_status**](IntegrationApi.md#get_integration_status) | **GET** /api/v2/integration/{id}/status | Gets the status of a single Tanzu Observability integration
 [**install_all_integration_alerts**](IntegrationApi.md#install_all_integration_alerts) | **POST** /api/v2/integration/{id}/install-all-alerts | Enable all alerts associated with this integration
-[**install_integration**](IntegrationApi.md#install_integration) | **POST** /api/v2/integration/{id}/install | Installs a Wavefront integration
+[**install_integration**](IntegrationApi.md#install_integration) | **POST** /api/v2/integration/{id}/install | Installs a Tanzu Observability integration
 [**uninstall_all_integration_alerts**](IntegrationApi.md#uninstall_all_integration_alerts) | **POST** /api/v2/integration/{id}/uninstall-all-alerts | Disable all alerts associated with this integration
-[**uninstall_integration**](IntegrationApi.md#uninstall_integration) | **POST** /api/v2/integration/{id}/uninstall | Uninstalls a Wavefront integration
+[**uninstall_integration**](IntegrationApi.md#uninstall_integration) | **POST** /api/v2/integration/{id}/uninstall | Uninstalls a Tanzu Observability integration
 
 
 # **get_all_integration**
 > ResponseContainerPagedIntegration get_all_integration(offset=offset, limit=limit, exclude_dashboard=exclude_dashboard)
 
-Gets a flat list of all Wavefront integrations available, along with their status
+Gets a flat list of all Tanzu Observability integrations available, along with their status
 
 
 
@@ -45,7 +45,7 @@ limit = 100 # int | Limit the number of queried integrations to reduce the respo
 exclude_dashboard = false # bool | Whether to exclude information on dashboards, default is set to false (optional) (default to false)
 
 try:
-    # Gets a flat list of all Wavefront integrations available, along with their status
+    # Gets a flat list of all Tanzu Observability integrations available, along with their status
     api_response = api_instance.get_all_integration(offset=offset, limit=limit, exclude_dashboard=exclude_dashboard)
     pprint(api_response)
 except ApiException as e:
@@ -78,7 +78,7 @@ Name | Type | Description  | Notes
 # **get_all_integration_in_manifests**
 > ResponseContainerListIntegrationManifestGroup get_all_integration_in_manifests()
 
-Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
+Gets all Tanzu Observability integrations as structured in their integration manifests, along with their status and content
 
 
 
@@ -100,7 +100,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
 
 try:
-    # Gets all Wavefront integrations as structured in their integration manifests, along with their status and content
+    # Gets all Tanzu Observability integrations as structured in their integration manifests, along with their status and content
     api_response = api_instance.get_all_integration_in_manifests()
     pprint(api_response)
 except ApiException as e:
@@ -128,7 +128,7 @@ This endpoint does not need any parameter.
 # **get_all_integration_in_manifests_min**
 > ResponseContainerListIntegrationManifestGroup get_all_integration_in_manifests_min()
 
-Gets all Wavefront integrations as structured in their integration manifests.
+Gets all Tanzu Observability integrations as structured in their integration manifests.
 
 
 
@@ -150,7 +150,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
 
 try:
-    # Gets all Wavefront integrations as structured in their integration manifests.
+    # Gets all Tanzu Observability integrations as structured in their integration manifests.
     api_response = api_instance.get_all_integration_in_manifests_min()
     pprint(api_response)
 except ApiException as e:
@@ -178,7 +178,7 @@ This endpoint does not need any parameter.
 # **get_all_integration_statuses**
 > ResponseContainerMapStringIntegrationStatus get_all_integration_statuses()
 
-Gets the status of all Wavefront integrations
+Gets the status of all Tanzu Observability integrations
 
 
 
@@ -200,7 +200,7 @@ configuration.api_key['X-AUTH-TOKEN'] = 'YOUR_API_KEY'
 api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClient(configuration))
 
 try:
-    # Gets the status of all Wavefront integrations
+    # Gets the status of all Tanzu Observability integrations
     api_response = api_instance.get_all_integration_statuses()
     pprint(api_response)
 except ApiException as e:
@@ -284,7 +284,7 @@ Name | Type | Description  | Notes
 # **get_integration**
 > ResponseContainerIntegration get_integration(id, refresh=refresh)
 
-Gets a single Wavefront integration by its id, along with its status
+Gets a single Tanzu Observability integration by its id, along with its status
 
 
 
@@ -308,7 +308,7 @@ id = 'id_example' # str |
 refresh = true # bool |  (optional)
 
 try:
-    # Gets a single Wavefront integration by its id, along with its status
+    # Gets a single Tanzu Observability integration by its id, along with its status
     api_response = api_instance.get_integration(id, refresh=refresh)
     pprint(api_response)
 except ApiException as e:
@@ -340,7 +340,7 @@ Name | Type | Description  | Notes
 # **get_integration_status**
 > ResponseContainerIntegrationStatus get_integration_status(id)
 
-Gets the status of a single Wavefront integration
+Gets the status of a single Tanzu Observability integration
 
 
 
@@ -363,7 +363,7 @@ api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClien
 id = 'id_example' # str | 
 
 try:
-    # Gets the status of a single Wavefront integration
+    # Gets the status of a single Tanzu Observability integration
     api_response = api_instance.get_integration_status(id)
     pprint(api_response)
 except ApiException as e:
@@ -450,7 +450,7 @@ Name | Type | Description  | Notes
 # **install_integration**
 > ResponseContainerIntegrationStatus install_integration(id)
 
-Installs a Wavefront integration
+Installs a Tanzu Observability integration
 
 
 
@@ -473,7 +473,7 @@ api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClien
 id = 'id_example' # str | 
 
 try:
-    # Installs a Wavefront integration
+    # Installs a Tanzu Observability integration
     api_response = api_instance.install_integration(id)
     pprint(api_response)
 except ApiException as e:
@@ -558,7 +558,7 @@ Name | Type | Description  | Notes
 # **uninstall_integration**
 > ResponseContainerIntegrationStatus uninstall_integration(id)
 
-Uninstalls a Wavefront integration
+Uninstalls a Tanzu Observability integration
 
 
 
@@ -581,7 +581,7 @@ api_instance = wavefront_api_client.IntegrationApi(wavefront_api_client.ApiClien
 id = 'id_example' # str | 
 
 try:
-    # Uninstalls a Wavefront integration
+    # Uninstalls a Tanzu Observability integration
     api_response = api_instance.uninstall_integration(id)
     pprint(api_response)
 except ApiException as e:
diff --git a/docs/RoleApi.md b/docs/RoleApi.md
index a521ec3..1dfe1d2 100644
--- a/docs/RoleApi.md
+++ b/docs/RoleApi.md
@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 Add accounts and groups to a role
 
-Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 
 Create a role
 
-Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -130,7 +130,7 @@ Name | Type | Description  | Notes
 
 Delete a role by ID
 
-Deletes a role with a given ID. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Deletes a role with a given ID. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -184,7 +184,7 @@ Name | Type | Description  | Notes
 
 Get all roles
 
-Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -240,7 +240,7 @@ Name | Type | Description  | Notes
 
 Get a role by ID
 
-Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -294,7 +294,7 @@ Name | Type | Description  | Notes
 
 Grant a permission to roles
 
-Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -350,7 +350,7 @@ Name | Type | Description  | Notes
 
 Remove accounts and groups from a role
 
-Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -406,7 +406,7 @@ Name | Type | Description  | Notes
 
 Revoke a permission from roles
 
-Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -462,7 +462,7 @@ Name | Type | Description  | Notes
 
 Update a role by ID
 
-Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
index f817a49..8d2204c 100644
--- a/docs/SearchApi.md
+++ b/docs/SearchApi.md
@@ -3343,7 +3343,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's roles
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3397,7 +3397,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's roles
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -3453,7 +3453,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's roles
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4655,7 +4655,7 @@ Name | Type | Description  | Notes
 
 Search over a customer's users
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4709,7 +4709,7 @@ Name | Type | Description  | Notes
 
 Lists the values of a specific facet over the customer's users
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -4765,7 +4765,7 @@ Name | Type | Description  | Notes
 
 Lists the values of one or more facets over the customer's users
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/UserApi.md b/docs/UserApi.md
index 8e91756..6d8ab44 100644
--- a/docs/UserApi.md
+++ b/docs/UserApi.md
@@ -26,7 +26,7 @@ Method | HTTP request | Description
 
 Adds specific groups to the user or service account
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -82,7 +82,7 @@ Name | Type | Description  | Notes
 
 Creates an user if the user doesn't already exist.
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -138,7 +138,7 @@ Name | Type | Description  | Notes
 
 Deletes multiple users or service accounts
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -192,7 +192,7 @@ Name | Type | Description  | Notes
 
 Deletes a user or service account identified by id
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -245,7 +245,7 @@ void (empty response body)
 
 Get all users
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -295,7 +295,7 @@ This endpoint does not need any parameter.
 
 Retrieves a user by identifier (email address)
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -403,7 +403,7 @@ Name | Type | Description  | Notes
 
 Grants a specific permission to multiple users or service accounts
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -459,7 +459,7 @@ Name | Type | Description  | Notes
 
 Grants a specific permission to user or service account
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -515,7 +515,7 @@ Name | Type | Description  | Notes
 
 Invite users with given user groups and permissions.
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -569,7 +569,7 @@ Name | Type | Description  | Notes
 
 Removes specific groups from the user or service account
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -625,7 +625,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from multiple users or service accounts
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -681,7 +681,7 @@ Name | Type | Description  | Notes
 
 Revokes a specific permission from user or service account
 
-<b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.
+<b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.
 
 ### Example
 ```python
@@ -737,7 +737,7 @@ Name | Type | Description  | Notes
 
 Update user with given user groups, permissions and ingestion policy.
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/docs/UserGroupApi.md b/docs/UserGroupApi.md
index cb0782c..792c0d8 100644
--- a/docs/UserGroupApi.md
+++ b/docs/UserGroupApi.md
@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 Add multiple roles to a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 
 Add multiple users to a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -132,7 +132,7 @@ Name | Type | Description  | Notes
 
 Create a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -186,7 +186,7 @@ Name | Type | Description  | Notes
 
 Delete a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -240,7 +240,7 @@ Name | Type | Description  | Notes
 
 Get all user groups for a customer
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -296,7 +296,7 @@ Name | Type | Description  | Notes
 
 Get a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -350,7 +350,7 @@ Name | Type | Description  | Notes
 
 Remove multiple roles from a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -406,7 +406,7 @@ Name | Type | Description  | Notes
 
 Remove multiple users from a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
@@ -462,7 +462,7 @@ Name | Type | Description  | Notes
 
 Update a specific user group
 
-<b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.
+<b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.
 
 ### Example
 ```python
diff --git a/setup.py b/setup.py
index 1b8d4d8..79c425a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "wavefront-api-client"
-VERSION = "2.222.3"
+VERSION = "2.223.1"
 # To install the library, run the following
 #
 # python setup.py install
@@ -33,14 +33,14 @@
 setup(
     name=NAME,
     version=VERSION,
-    description="Wavefront REST API Documentation",
+    description="Tanzu Observability REST API Documentation",
     author_email="chitimba@wavefront.com",
     url="https://github.com/wavefrontHQ/python-client",
-    keywords=["Swagger", "Wavefront REST API Documentation"],
+    keywords=["Swagger", "Tanzu Observability REST API Documentation"],
     install_requires=REQUIRES,
     packages=find_packages(),
     include_package_data=True,
     long_description="""\
-    &lt;p&gt;The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.&lt;/p&gt;&lt;p&gt;When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see &lt;a href&#x3D;\&quot;http://docs.wavefront.com/using_wavefront_api.html\&quot;&gt;Use the Wavefront REST API.&lt;/a&gt;&lt;/p&gt;  # noqa: E501
+    &lt;p&gt;The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.&lt;/p&gt;&lt;p&gt;When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see &lt;a href&#x3D;\&quot;http://docs.wavefront.com/using_wavefront_api.html\&quot;&gt;Use the Tanzu Observability REST API.&lt;/a&gt;&lt;/p&gt;  # noqa: E501
     """
 )
diff --git a/wavefront_api_client/__init__.py b/wavefront_api_client/__init__.py
index 86b24c6..e0294b0 100644
--- a/wavefront_api_client/__init__.py
+++ b/wavefront_api_client/__init__.py
@@ -3,9 +3,9 @@
 # flake8: noqa
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/access_policy_api.py b/wavefront_api_client/api/access_policy_api.py
index 535358f..26e9f99 100644
--- a/wavefront_api_client/api/access_policy_api.py
+++ b/wavefront_api_client/api/access_policy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/account__user_and_service_account_api.py b/wavefront_api_client/api/account__user_and_service_account_api.py
index 437bc7a..60a8ff5 100644
--- a/wavefront_api_client/api/account__user_and_service_account_api.py
+++ b/wavefront_api_client/api/account__user_and_service_account_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -135,7 +135,7 @@ def activate_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_account_to_roles(self, id, **kwargs):  # noqa: E501
         """Adds specific roles to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_roles(id, async_req=True)
@@ -158,7 +158,7 @@ def add_account_to_roles(self, id, **kwargs):  # noqa: E501
     def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific roles to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_roles_with_http_info(id, async_req=True)
@@ -238,7 +238,7 @@ def add_account_to_roles_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_user_groups(id, async_req=True)
@@ -261,7 +261,7 @@ def add_account_to_user_groups(self, id, **kwargs):  # noqa: E501
     def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_account_to_user_groups_with_http_info(id, async_req=True)
@@ -341,7 +341,7 @@ def add_account_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_or_update_user_account(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_or_update_user_account(async_req=True)
@@ -364,7 +364,7 @@ def create_or_update_user_account(self, **kwargs):  # noqa: E501
     def create_or_update_user_account_with_http_info(self, **kwargs):  # noqa: E501
         """Creates or updates a user account  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_or_update_user_account_with_http_info(async_req=True)
@@ -634,7 +634,7 @@ def deactivate_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_account(self, id, **kwargs):  # noqa: E501
         """Deletes an account (user or service account) identified by id  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_account(id, async_req=True)
@@ -656,7 +656,7 @@ def delete_account(self, id, **kwargs):  # noqa: E501
     def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deletes an account (user or service account) identified by id  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_account_with_http_info(id, async_req=True)
@@ -729,7 +729,7 @@ def delete_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def delete_multiple_accounts(self, **kwargs):  # noqa: E501
         """Deletes multiple accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_accounts(async_req=True)
@@ -751,7 +751,7 @@ def delete_multiple_accounts(self, **kwargs):  # noqa: E501
     def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Deletes multiple accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_accounts_with_http_info(async_req=True)
@@ -824,7 +824,7 @@ def delete_multiple_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_account(self, id, **kwargs):  # noqa: E501
         """Get a specific account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account(id, async_req=True)
@@ -846,7 +846,7 @@ def get_account(self, id, **kwargs):  # noqa: E501
     def get_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a specific account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_account_with_http_info(id, async_req=True)
@@ -1014,7 +1014,7 @@ def get_account_business_functions_with_http_info(self, id, **kwargs):  # noqa:
     def get_all_accounts(self, **kwargs):  # noqa: E501
         """Get all accounts (users and service accounts) of a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_accounts(async_req=True)
@@ -1037,7 +1037,7 @@ def get_all_accounts(self, **kwargs):  # noqa: E501
     def get_all_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all accounts (users and service accounts) of a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_accounts_with_http_info(async_req=True)
@@ -1196,7 +1196,7 @@ def get_all_service_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def get_all_user_accounts(self, **kwargs):  # noqa: E501
         """Get all user accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_accounts(async_req=True)
@@ -1217,7 +1217,7 @@ def get_all_user_accounts(self, **kwargs):  # noqa: E501
     def get_all_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Get all user accounts  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_accounts_with_http_info(async_req=True)
@@ -1378,7 +1378,7 @@ def get_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_user_account(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_account(id, async_req=True)
@@ -1400,7 +1400,7 @@ def get_user_account(self, id, **kwargs):  # noqa: E501
     def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_account_with_http_info(id, async_req=True)
@@ -1473,7 +1473,7 @@ def get_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
         """Get all users with Accounts permission  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_users_with_accounts_permission(async_req=True)
@@ -1494,7 +1494,7 @@ def get_users_with_accounts_permission(self, **kwargs):  # noqa: E501
     def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users with Accounts permission  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_users_with_accounts_permission_with_http_info(async_req=True)
@@ -1560,7 +1560,7 @@ def get_users_with_accounts_permission_with_http_info(self, **kwargs):  # noqa:
     def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_account_permission(id, permission, async_req=True)
@@ -1583,7 +1583,7 @@ def grant_account_permission(self, id, permission, **kwargs):  # noqa: E501
     def grant_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to account (user or service account)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_account_permission_with_http_info(id, permission, async_req=True)
@@ -1667,7 +1667,7 @@ def grant_account_permission_with_http_info(self, id, permission, **kwargs):  #
     def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
         """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_accounts(permission, async_req=True)
@@ -1690,7 +1690,7 @@ def grant_permission_to_accounts(self, permission, **kwargs):  # noqa: E501
     def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Grant a permission to accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_accounts_with_http_info(permission, async_req=True)
@@ -1770,7 +1770,7 @@ def grant_permission_to_accounts_with_http_info(self, permission, **kwargs):  #
     def invite_user_accounts(self, **kwargs):  # noqa: E501
         """Invite user accounts with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_user_accounts(async_req=True)
@@ -1792,7 +1792,7 @@ def invite_user_accounts(self, **kwargs):  # noqa: E501
     def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
         """Invite user accounts with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_user_accounts_with_http_info(async_req=True)
@@ -1865,7 +1865,7 @@ def invite_user_accounts_with_http_info(self, **kwargs):  # noqa: E501
     def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
         """Removes specific roles from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_roles(id, async_req=True)
@@ -1888,7 +1888,7 @@ def remove_account_from_roles(self, id, **kwargs):  # noqa: E501
     def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific roles from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_roles_with_http_info(id, async_req=True)
@@ -1968,7 +1968,7 @@ def remove_account_from_roles_with_http_info(self, id, **kwargs):  # noqa: E501
     def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_user_groups(id, async_req=True)
@@ -1991,7 +1991,7 @@ def remove_account_from_user_groups(self, id, **kwargs):  # noqa: E501
     def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the account (user or service account)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_account_from_user_groups_with_http_info(id, async_req=True)
@@ -2071,7 +2071,7 @@ def remove_account_from_user_groups_with_http_info(self, id, **kwargs):  # noqa:
     def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_account_permission(id, permission, async_req=True)
@@ -2094,7 +2094,7 @@ def revoke_account_permission(self, id, permission, **kwargs):  # noqa: E501
     def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from account (user or service account)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_account_permission_with_http_info(id, permission, async_req=True)
@@ -2178,7 +2178,7 @@ def revoke_account_permission_with_http_info(self, id, permission, **kwargs):  #
     def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
         """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_accounts(permission, async_req=True)
@@ -2201,7 +2201,7 @@ def revoke_permission_from_accounts(self, permission, **kwargs):  # noqa: E501
     def revoke_permission_from_accounts_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Revoke a permission from accounts (users or service accounts)  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_accounts_with_http_info(permission, async_req=True)
@@ -2384,7 +2384,7 @@ def update_service_account_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_user_account(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_account(id, async_req=True)
@@ -2407,7 +2407,7 @@ def update_user_account(self, id, **kwargs):  # noqa: E501
     def update_user_account_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_account_with_http_info(id, async_req=True)
diff --git a/wavefront_api_client/api/alert_analytics_api.py b/wavefront_api_client/api/alert_analytics_api.py
index 62c7ad6..c4169ad 100644
--- a/wavefront_api_client/api/alert_analytics_api.py
+++ b/wavefront_api_client/api/alert_analytics_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/alert_api.py b/wavefront_api_client/api/alert_api.py
index 41790af..6afbe87 100644
--- a/wavefront_api_client/api/alert_api.py
+++ b/wavefront_api_client/api/alert_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/api_token_api.py b/wavefront_api_client/api/api_token_api.py
index 77f50d5..db8afd7 100644
--- a/wavefront_api_client/api/api_token_api.py
+++ b/wavefront_api_client/api/api_token_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def create_token(self, **kwargs):  # noqa: E501
         """Create new api token  # noqa: E501
 
-        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_token(async_req=True)
@@ -57,7 +57,7 @@ def create_token(self, **kwargs):  # noqa: E501
     def create_token_with_http_info(self, **kwargs):  # noqa: E501
         """Create new api token  # noqa: E501
 
-        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the list of all api tokens for a user. The newly created api token is the last element of returned list. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_token_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/cloud_integration_api.py b/wavefront_api_client/api/cloud_integration_api.py
index 3183833..d407aa9 100644
--- a/wavefront_api_client/api/cloud_integration_api.py
+++ b/wavefront_api_client/api/cloud_integration_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/dashboard_api.py b/wavefront_api_client/api/dashboard_api.py
index 85ec725..1285c21 100644
--- a/wavefront_api_client/api/dashboard_api.py
+++ b/wavefront_api_client/api/dashboard_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/derived_metric_api.py b/wavefront_api_client/api/derived_metric_api.py
index 480bc66..8cc7424 100644
--- a/wavefront_api_client/api/derived_metric_api.py
+++ b/wavefront_api_client/api/derived_metric_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/direct_ingestion_api.py b/wavefront_api_client/api/direct_ingestion_api.py
index 2b3c60e..2b133c2 100644
--- a/wavefront_api_client/api/direct_ingestion_api.py
+++ b/wavefront_api_client/api/direct_ingestion_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/event_api.py b/wavefront_api_client/api/event_api.py
index 7f86dce..bf30385 100644
--- a/wavefront_api_client/api/event_api.py
+++ b/wavefront_api_client/api/event_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/external_link_api.py b/wavefront_api_client/api/external_link_api.py
index 4c28f4d..f3ecb0a 100644
--- a/wavefront_api_client/api/external_link_api.py
+++ b/wavefront_api_client/api/external_link_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/ingestion_spy_api.py b/wavefront_api_client/api/ingestion_spy_api.py
index 0a41066..0bfa384 100644
--- a/wavefront_api_client/api/ingestion_spy_api.py
+++ b/wavefront_api_client/api/ingestion_spy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/integration_api.py b/wavefront_api_client/api/integration_api.py
index a082588..a26af89 100644
--- a/wavefront_api_client/api/integration_api.py
+++ b/wavefront_api_client/api/integration_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -34,7 +34,7 @@ def __init__(self, api_client=None):
         self.api_client = api_client
 
     def get_all_integration(self, **kwargs):  # noqa: E501
-        """Gets a flat list of all Wavefront integrations available, along with their status  # noqa: E501
+        """Gets a flat list of all Tanzu Observability integrations available, along with their status  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -58,7 +58,7 @@ def get_all_integration(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
-        """Gets a flat list of all Wavefront integrations available, along with their status  # noqa: E501
+        """Gets a flat list of all Tanzu Observability integrations available, along with their status  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -133,7 +133,7 @@ def get_all_integration_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_all_integration_in_manifests(self, **kwargs):  # noqa: E501
-        """Gets all Wavefront integrations as structured in their integration manifests, along with their status and content  # noqa: E501
+        """Gets all Tanzu Observability integrations as structured in their integration manifests, along with their status and content  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -154,7 +154,7 @@ def get_all_integration_in_manifests(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_integration_in_manifests_with_http_info(self, **kwargs):  # noqa: E501
-        """Gets all Wavefront integrations as structured in their integration manifests, along with their status and content  # noqa: E501
+        """Gets all Tanzu Observability integrations as structured in their integration manifests, along with their status and content  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -220,7 +220,7 @@ def get_all_integration_in_manifests_with_http_info(self, **kwargs):  # noqa: E5
             collection_formats=collection_formats)
 
     def get_all_integration_in_manifests_min(self, **kwargs):  # noqa: E501
-        """Gets all Wavefront integrations as structured in their integration manifests.  # noqa: E501
+        """Gets all Tanzu Observability integrations as structured in their integration manifests.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -241,7 +241,7 @@ def get_all_integration_in_manifests_min(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_integration_in_manifests_min_with_http_info(self, **kwargs):  # noqa: E501
-        """Gets all Wavefront integrations as structured in their integration manifests.  # noqa: E501
+        """Gets all Tanzu Observability integrations as structured in their integration manifests.  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -307,7 +307,7 @@ def get_all_integration_in_manifests_min_with_http_info(self, **kwargs):  # noqa
             collection_formats=collection_formats)
 
     def get_all_integration_statuses(self, **kwargs):  # noqa: E501
-        """Gets the status of all Wavefront integrations  # noqa: E501
+        """Gets the status of all Tanzu Observability integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -328,7 +328,7 @@ def get_all_integration_statuses(self, **kwargs):  # noqa: E501
             return data
 
     def get_all_integration_statuses_with_http_info(self, **kwargs):  # noqa: E501
-        """Gets the status of all Wavefront integrations  # noqa: E501
+        """Gets the status of all Tanzu Observability integrations  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -489,7 +489,7 @@ def get_installed_integration_with_http_info(self, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_integration(self, id, **kwargs):  # noqa: E501
-        """Gets a single Wavefront integration by its id, along with its status  # noqa: E501
+        """Gets a single Tanzu Observability integration by its id, along with its status  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -512,7 +512,7 @@ def get_integration(self, id, **kwargs):  # noqa: E501
             return data
 
     def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Gets a single Wavefront integration by its id, along with its status  # noqa: E501
+        """Gets a single Tanzu Observability integration by its id, along with its status  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -588,7 +588,7 @@ def get_integration_with_http_info(self, id, **kwargs):  # noqa: E501
             collection_formats=collection_formats)
 
     def get_integration_status(self, id, **kwargs):  # noqa: E501
-        """Gets the status of a single Wavefront integration  # noqa: E501
+        """Gets the status of a single Tanzu Observability integration  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -610,7 +610,7 @@ def get_integration_status(self, id, **kwargs):  # noqa: E501
             return data
 
     def get_integration_status_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Gets the status of a single Wavefront integration  # noqa: E501
+        """Gets the status of a single Tanzu Observability integration  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -782,7 +782,7 @@ def install_all_integration_alerts_with_http_info(self, id, **kwargs):  # noqa:
             collection_formats=collection_formats)
 
     def install_integration(self, id, **kwargs):  # noqa: E501
-        """Installs a Wavefront integration  # noqa: E501
+        """Installs a Tanzu Observability integration  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -804,7 +804,7 @@ def install_integration(self, id, **kwargs):  # noqa: E501
             return data
 
     def install_integration_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Installs a Wavefront integration  # noqa: E501
+        """Installs a Tanzu Observability integration  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -972,7 +972,7 @@ def uninstall_all_integration_alerts_with_http_info(self, id, **kwargs):  # noqa
             collection_formats=collection_formats)
 
     def uninstall_integration(self, id, **kwargs):  # noqa: E501
-        """Uninstalls a Wavefront integration  # noqa: E501
+        """Uninstalls a Tanzu Observability integration  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
@@ -994,7 +994,7 @@ def uninstall_integration(self, id, **kwargs):  # noqa: E501
             return data
 
     def uninstall_integration_with_http_info(self, id, **kwargs):  # noqa: E501
-        """Uninstalls a Wavefront integration  # noqa: E501
+        """Uninstalls a Tanzu Observability integration  # noqa: E501
 
           # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
diff --git a/wavefront_api_client/api/maintenance_window_api.py b/wavefront_api_client/api/maintenance_window_api.py
index 9a1154b..029fad8 100644
--- a/wavefront_api_client/api/maintenance_window_api.py
+++ b/wavefront_api_client/api/maintenance_window_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/message_api.py b/wavefront_api_client/api/message_api.py
index c0ade09..6644788 100644
--- a/wavefront_api_client/api/message_api.py
+++ b/wavefront_api_client/api/message_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/metric_api.py b/wavefront_api_client/api/metric_api.py
index 5c52c32..cfb2805 100644
--- a/wavefront_api_client/api/metric_api.py
+++ b/wavefront_api_client/api/metric_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/monitored_application_api.py b/wavefront_api_client/api/monitored_application_api.py
index 39a9a04..637221e 100644
--- a/wavefront_api_client/api/monitored_application_api.py
+++ b/wavefront_api_client/api/monitored_application_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/monitored_service_api.py b/wavefront_api_client/api/monitored_service_api.py
index b94e381..bab161b 100644
--- a/wavefront_api_client/api/monitored_service_api.py
+++ b/wavefront_api_client/api/monitored_service_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/notificant_api.py b/wavefront_api_client/api/notificant_api.py
index 861ad16..58787eb 100644
--- a/wavefront_api_client/api/notificant_api.py
+++ b/wavefront_api_client/api/notificant_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/proxy_api.py b/wavefront_api_client/api/proxy_api.py
index 71c10ed..28a13ca 100644
--- a/wavefront_api_client/api/proxy_api.py
+++ b/wavefront_api_client/api/proxy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/query_api.py b/wavefront_api_client/api/query_api.py
index 54122e8..5cec215 100644
--- a/wavefront_api_client/api/query_api.py
+++ b/wavefront_api_client/api/query_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/recent_app_map_search_api.py b/wavefront_api_client/api/recent_app_map_search_api.py
index 3fce60e..4c5c677 100644
--- a/wavefront_api_client/api/recent_app_map_search_api.py
+++ b/wavefront_api_client/api/recent_app_map_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/recent_traces_search_api.py b/wavefront_api_client/api/recent_traces_search_api.py
index ab5abf7..f2d6626 100644
--- a/wavefront_api_client/api/recent_traces_search_api.py
+++ b/wavefront_api_client/api/recent_traces_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/role_api.py b/wavefront_api_client/api/role_api.py
index d1c7032..9fdf9cf 100644
--- a/wavefront_api_client/api/role_api.py
+++ b/wavefront_api_client/api/role_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_assignees(self, id, body, **kwargs):  # noqa: E501
         """Add accounts and groups to a role  # noqa: E501
 
-        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_assignees(id, body, async_req=True)
@@ -59,7 +59,7 @@ def add_assignees(self, id, body, **kwargs):  # noqa: E501
     def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Add accounts and groups to a role  # noqa: E501
 
-        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Assigns a role with a given ID to a list of user and service accounts and groups. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_assignees_with_http_info(id, body, async_req=True)
@@ -143,7 +143,7 @@ def add_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
     def create_role(self, body, **kwargs):  # noqa: E501
         """Create a role  # noqa: E501
 
-        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_role(body, async_req=True)
@@ -165,7 +165,7 @@ def create_role(self, body, **kwargs):  # noqa: E501
     def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
         """Create a role  # noqa: E501
 
-        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Creates a role with a specific unique name. Optionally, you can grant permissions to the role, assign the role to accounts and groups, specify a description, and configure the management properties of the role. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_role_with_http_info(body, async_req=True)
@@ -242,7 +242,7 @@ def create_role_with_http_info(self, body, **kwargs):  # noqa: E501
     def delete_role(self, id, **kwargs):  # noqa: E501
         """Delete a role by ID  # noqa: E501
 
-        Deletes a role with a given ID. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Deletes a role with a given ID. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role(id, async_req=True)
@@ -264,7 +264,7 @@ def delete_role(self, id, **kwargs):  # noqa: E501
     def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete a role by ID  # noqa: E501
 
-        Deletes a role with a given ID. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Deletes a role with a given ID. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_role_with_http_info(id, async_req=True)
@@ -341,7 +341,7 @@ def delete_role_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_roles(self, **kwargs):  # noqa: E501
         """Get all roles  # noqa: E501
 
-        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles(async_req=True)
@@ -364,7 +364,7 @@ def get_all_roles(self, **kwargs):  # noqa: E501
     def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
         """Get all roles  # noqa: E501
 
-        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns all existing roles in the service instance with detailed information for each role, including assigned groups and accounts, management properties, permissions, name, ID, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_roles_with_http_info(async_req=True)
@@ -440,7 +440,7 @@ def get_all_roles_with_http_info(self, **kwargs):  # noqa: E501
     def get_role(self, id, **kwargs):  # noqa: E501
         """Get a role by ID  # noqa: E501
 
-        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role(id, async_req=True)
@@ -462,7 +462,7 @@ def get_role(self, id, **kwargs):  # noqa: E501
     def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a role by ID  # noqa: E501
 
-        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Returns the details of a role with a given ID. The response includes assigned groups and accounts, management properties, permissions, name, description, and the time of the last update and who has done it. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_role_with_http_info(id, async_req=True)
@@ -539,7 +539,7 @@ def get_role_with_http_info(self, id, **kwargs):  # noqa: E501
     def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
         """Grant a permission to roles  # noqa: E501
 
-        Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_roles(permission, body, async_req=True)
@@ -562,7 +562,7 @@ def grant_permission_to_roles(self, permission, body, **kwargs):  # noqa: E501
     def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
         """Grant a permission to roles  # noqa: E501
 
-        Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Grants a given permission to a list of roles. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_roles_with_http_info(permission, body, async_req=True)
@@ -646,7 +646,7 @@ def grant_permission_to_roles_with_http_info(self, permission, body, **kwargs):
     def remove_assignees(self, id, body, **kwargs):  # noqa: E501
         """Remove accounts and groups from a role  # noqa: E501
 
-        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_assignees(id, body, async_req=True)
@@ -669,7 +669,7 @@ def remove_assignees(self, id, body, **kwargs):  # noqa: E501
     def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Remove accounts and groups from a role  # noqa: E501
 
-        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a role with a given ID from a list of user and service accounts and groups. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_assignees_with_http_info(id, body, async_req=True)
@@ -753,7 +753,7 @@ def remove_assignees_with_http_info(self, id, body, **kwargs):  # noqa: E501
     def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E501
         """Revoke a permission from roles  # noqa: E501
 
-        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_roles(permission, body, async_req=True)
@@ -776,7 +776,7 @@ def revoke_permission_from_roles(self, permission, body, **kwargs):  # noqa: E50
     def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs):  # noqa: E501
         """Revoke a permission from roles  # noqa: E501
 
-        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Revokes a given permission from a list of roles. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_roles_with_http_info(permission, body, async_req=True)
@@ -860,7 +860,7 @@ def revoke_permission_from_roles_with_http_info(self, permission, body, **kwargs
     def update_role(self, id, body, **kwargs):  # noqa: E501
         """Update a role by ID  # noqa: E501
 
-        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_role(id, body, async_req=True)
@@ -883,7 +883,7 @@ def update_role(self, id, body, **kwargs):  # noqa: E501
     def update_role_with_http_info(self, id, body, **kwargs):  # noqa: E501
         """Update a role by ID  # noqa: E501
 
-        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        Updates a role with a given ID. You can update the assigned groups and accounts, management properties, permissions, ID, name, and description. <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_role_with_http_info(id, body, async_req=True)
diff --git a/wavefront_api_client/api/saved_app_map_search_api.py b/wavefront_api_client/api/saved_app_map_search_api.py
index f599c21..7f03c90 100644
--- a/wavefront_api_client/api/saved_app_map_search_api.py
+++ b/wavefront_api_client/api/saved_app_map_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_app_map_search_group_api.py b/wavefront_api_client/api/saved_app_map_search_group_api.py
index 93076cb..0734a26 100644
--- a/wavefront_api_client/api/saved_app_map_search_group_api.py
+++ b/wavefront_api_client/api/saved_app_map_search_group_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_search_api.py b/wavefront_api_client/api/saved_search_api.py
index ba5e777..c4763df 100644
--- a/wavefront_api_client/api/saved_search_api.py
+++ b/wavefront_api_client/api/saved_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_traces_search_api.py b/wavefront_api_client/api/saved_traces_search_api.py
index 9e45ef3..0b0ef93 100644
--- a/wavefront_api_client/api/saved_traces_search_api.py
+++ b/wavefront_api_client/api/saved_traces_search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/saved_traces_search_group_api.py b/wavefront_api_client/api/saved_traces_search_group_api.py
index 64d030c..7f72e20 100644
--- a/wavefront_api_client/api/saved_traces_search_group_api.py
+++ b/wavefront_api_client/api/saved_traces_search_group_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/search_api.py b/wavefront_api_client/api/search_api.py
index 7902fa1..3d46cec 100644
--- a/wavefront_api_client/api/search_api.py
+++ b/wavefront_api_client/api/search_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -5845,7 +5845,7 @@ def search_report_event_for_facets_with_http_info(self, **kwargs):  # noqa: E501
     def search_role_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_entities(async_req=True)
@@ -5867,7 +5867,7 @@ def search_role_entities(self, **kwargs):  # noqa: E501
     def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_entities_with_http_info(async_req=True)
@@ -5940,7 +5940,7 @@ def search_role_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facet(facet, async_req=True)
@@ -5963,7 +5963,7 @@ def search_role_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facet_with_http_info(facet, async_req=True)
@@ -6043,7 +6043,7 @@ def search_role_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_role_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facets(async_req=True)
@@ -6065,7 +6065,7 @@ def search_role_for_facets(self, **kwargs):  # noqa: E501
     def search_role_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's roles  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_role_for_facets_with_http_info(async_req=True)
@@ -8189,7 +8189,7 @@ def search_traces_map_for_facets_with_http_info(self, **kwargs):  # noqa: E501
     def search_user_entities(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_entities(async_req=True)
@@ -8211,7 +8211,7 @@ def search_user_entities(self, **kwargs):  # noqa: E501
     def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
         """Search over a customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_entities_with_http_info(async_req=True)
@@ -8284,7 +8284,7 @@ def search_user_entities_with_http_info(self, **kwargs):  # noqa: E501
     def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facet(facet, async_req=True)
@@ -8307,7 +8307,7 @@ def search_user_for_facet(self, facet, **kwargs):  # noqa: E501
     def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
         """Lists the values of a specific facet over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facet_with_http_info(facet, async_req=True)
@@ -8387,7 +8387,7 @@ def search_user_for_facet_with_http_info(self, facet, **kwargs):  # noqa: E501
     def search_user_for_facets(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facets(async_req=True)
@@ -8409,7 +8409,7 @@ def search_user_for_facets(self, **kwargs):  # noqa: E501
     def search_user_for_facets_with_http_info(self, **kwargs):  # noqa: E501
         """Lists the values of one or more facets over the customer's users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.search_user_for_facets_with_http_info(async_req=True)
diff --git a/wavefront_api_client/api/security_policy_api.py b/wavefront_api_client/api/security_policy_api.py
index 7cdd3c7..0d850f7 100644
--- a/wavefront_api_client/api/security_policy_api.py
+++ b/wavefront_api_client/api/security_policy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/source_api.py b/wavefront_api_client/api/source_api.py
index 95f61b9..8bda0be 100644
--- a/wavefront_api_client/api/source_api.py
+++ b/wavefront_api_client/api/source_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/span_sampling_policy_api.py b/wavefront_api_client/api/span_sampling_policy_api.py
index 36417fc..f32979a 100644
--- a/wavefront_api_client/api/span_sampling_policy_api.py
+++ b/wavefront_api_client/api/span_sampling_policy_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/usage_api.py b/wavefront_api_client/api/usage_api.py
index 32f99aa..5d3ad76 100644
--- a/wavefront_api_client/api/usage_api.py
+++ b/wavefront_api_client/api/usage_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/user_api.py b/wavefront_api_client/api/user_api.py
index 9620f56..5f8e8ca 100644
--- a/wavefront_api_client/api/user_api.py
+++ b/wavefront_api_client/api/user_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_user_to_user_groups(id, async_req=True)
@@ -59,7 +59,7 @@ def add_user_to_user_groups(self, id, **kwargs):  # noqa: E501
     def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Adds specific groups to the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_user_to_user_groups_with_http_info(id, async_req=True)
@@ -139,7 +139,7 @@ def add_user_to_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_user(self, **kwargs):  # noqa: E501
         """Creates an user if the user doesn't already exist.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user(async_req=True)
@@ -162,7 +162,7 @@ def create_user(self, **kwargs):  # noqa: E501
     def create_user_with_http_info(self, **kwargs):  # noqa: E501
         """Creates an user if the user doesn't already exist.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_with_http_info(async_req=True)
@@ -238,7 +238,7 @@ def create_user_with_http_info(self, **kwargs):  # noqa: E501
     def delete_multiple_users(self, **kwargs):  # noqa: E501
         """Deletes multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_users(async_req=True)
@@ -260,7 +260,7 @@ def delete_multiple_users(self, **kwargs):  # noqa: E501
     def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
         """Deletes multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_multiple_users_with_http_info(async_req=True)
@@ -333,7 +333,7 @@ def delete_multiple_users_with_http_info(self, **kwargs):  # noqa: E501
     def delete_user(self, id, **kwargs):  # noqa: E501
         """Deletes a user or service account identified by id  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user(id, async_req=True)
@@ -355,7 +355,7 @@ def delete_user(self, id, **kwargs):  # noqa: E501
     def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Deletes a user or service account identified by id  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_with_http_info(id, async_req=True)
@@ -428,7 +428,7 @@ def delete_user_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_users(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_users(async_req=True)
@@ -449,7 +449,7 @@ def get_all_users(self, **kwargs):  # noqa: E501
     def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
         """Get all users  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_users_with_http_info(async_req=True)
@@ -515,7 +515,7 @@ def get_all_users_with_http_info(self, **kwargs):  # noqa: E501
     def get_user(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user(id, async_req=True)
@@ -537,7 +537,7 @@ def get_user(self, id, **kwargs):  # noqa: E501
     def get_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Retrieves a user by identifier (email address)  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_with_http_info(id, async_req=True)
@@ -705,7 +705,7 @@ def get_user_business_functions_with_http_info(self, id, **kwargs):  # noqa: E50
     def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_users(permission, async_req=True)
@@ -728,7 +728,7 @@ def grant_permission_to_users(self, permission, **kwargs):  # noqa: E501
     def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Grants a specific permission to multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_permission_to_users_with_http_info(permission, async_req=True)
@@ -808,7 +808,7 @@ def grant_permission_to_users_with_http_info(self, permission, **kwargs):  # noq
     def grant_user_permission(self, id, **kwargs):  # noqa: E501
         """Grants a specific permission to user or service account  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_user_permission(id, async_req=True)
@@ -831,7 +831,7 @@ def grant_user_permission(self, id, **kwargs):  # noqa: E501
     def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """Grants a specific permission to user or service account  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.grant_user_permission_with_http_info(id, async_req=True)
@@ -911,7 +911,7 @@ def grant_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
     def invite_users(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_users(async_req=True)
@@ -933,7 +933,7 @@ def invite_users(self, **kwargs):  # noqa: E501
     def invite_users_with_http_info(self, **kwargs):  # noqa: E501
         """Invite users with given user groups and permissions.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.invite_users_with_http_info(async_req=True)
@@ -1006,7 +1006,7 @@ def invite_users_with_http_info(self, **kwargs):  # noqa: E501
     def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_user_from_user_groups(id, async_req=True)
@@ -1029,7 +1029,7 @@ def remove_user_from_user_groups(self, id, **kwargs):  # noqa: E501
     def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E501
         """Removes specific groups from the user or service account  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_user_from_user_groups_with_http_info(id, async_req=True)
@@ -1109,7 +1109,7 @@ def remove_user_from_user_groups_with_http_info(self, id, **kwargs):  # noqa: E5
     def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_users(permission, async_req=True)
@@ -1132,7 +1132,7 @@ def revoke_permission_from_users(self, permission, **kwargs):  # noqa: E501
     def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  # noqa: E501
         """Revokes a specific permission from multiple users or service accounts  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_permission_from_users_with_http_info(permission, async_req=True)
@@ -1212,7 +1212,7 @@ def revoke_permission_from_users_with_http_info(self, permission, **kwargs):  #
     def revoke_user_permission(self, id, **kwargs):  # noqa: E501
         """Revokes a specific permission from user or service account  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_user_permission(id, async_req=True)
@@ -1235,7 +1235,7 @@ def revoke_user_permission(self, id, **kwargs):  # noqa: E501
     def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
         """Revokes a specific permission from user or service account  # noqa: E501
 
-        <b>Note</b>: For original Operations for Applications instances, applies to user accounts and service accounts. For Operations for Applications instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
+        <b>Note</b>: For original Tanzu Observability instances, applies to user accounts and service accounts. For Tanzu Observability instances that are onboarded to VMware Cloud services, applies only to service accounts.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.revoke_user_permission_with_http_info(id, async_req=True)
@@ -1315,7 +1315,7 @@ def revoke_user_permission_with_http_info(self, id, **kwargs):  # noqa: E501
     def update_user(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user(id, async_req=True)
@@ -1338,7 +1338,7 @@ def update_user(self, id, **kwargs):  # noqa: E501
     def update_user_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update user with given user groups, permissions and ingestion policy.  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_with_http_info(id, async_req=True)
diff --git a/wavefront_api_client/api/user_group_api.py b/wavefront_api_client/api/user_group_api.py
index c6f3e46..bada57b 100644
--- a/wavefront_api_client/api/user_group_api.py
+++ b/wavefront_api_client/api/user_group_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -36,7 +36,7 @@ def __init__(self, api_client=None):
     def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_roles_to_user_group(id, async_req=True)
@@ -59,7 +59,7 @@ def add_roles_to_user_group(self, id, **kwargs):  # noqa: E501
     def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Add multiple roles to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_roles_to_user_group_with_http_info(id, async_req=True)
@@ -139,7 +139,7 @@ def add_roles_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_users_to_user_group(id, async_req=True)
@@ -162,7 +162,7 @@ def add_users_to_user_group(self, id, **kwargs):  # noqa: E501
     def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Add multiple users to a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.add_users_to_user_group_with_http_info(id, async_req=True)
@@ -242,7 +242,7 @@ def add_users_to_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def create_user_group(self, **kwargs):  # noqa: E501
         """Create a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_group(async_req=True)
@@ -264,7 +264,7 @@ def create_user_group(self, **kwargs):  # noqa: E501
     def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
         """Create a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.create_user_group_with_http_info(async_req=True)
@@ -337,7 +337,7 @@ def create_user_group_with_http_info(self, **kwargs):  # noqa: E501
     def delete_user_group(self, id, **kwargs):  # noqa: E501
         """Delete a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_group(id, async_req=True)
@@ -359,7 +359,7 @@ def delete_user_group(self, id, **kwargs):  # noqa: E501
     def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Delete a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.delete_user_group_with_http_info(id, async_req=True)
@@ -432,7 +432,7 @@ def delete_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def get_all_user_groups(self, **kwargs):  # noqa: E501
         """Get all user groups for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_groups(async_req=True)
@@ -455,7 +455,7 @@ def get_all_user_groups(self, **kwargs):  # noqa: E501
     def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
         """Get all user groups for a customer  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_all_user_groups_with_http_info(async_req=True)
@@ -527,7 +527,7 @@ def get_all_user_groups_with_http_info(self, **kwargs):  # noqa: E501
     def get_user_group(self, id, **kwargs):  # noqa: E501
         """Get a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_group(id, async_req=True)
@@ -549,7 +549,7 @@ def get_user_group(self, id, **kwargs):  # noqa: E501
     def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Get a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_user_group_with_http_info(id, async_req=True)
@@ -622,7 +622,7 @@ def get_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
     def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_roles_from_user_group(id, async_req=True)
@@ -645,7 +645,7 @@ def remove_roles_from_user_group(self, id, **kwargs):  # noqa: E501
     def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Remove multiple roles from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_roles_from_user_group_with_http_info(id, async_req=True)
@@ -725,7 +725,7 @@ def remove_roles_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
     def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
         """Remove multiple users from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_users_from_user_group(id, async_req=True)
@@ -748,7 +748,7 @@ def remove_users_from_user_group(self, id, **kwargs):  # noqa: E501
     def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Remove multiple users from a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.remove_users_from_user_group_with_http_info(id, async_req=True)
@@ -828,7 +828,7 @@ def remove_users_from_user_group_with_http_info(self, id, **kwargs):  # noqa: E5
     def update_user_group(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_group(id, async_req=True)
@@ -851,7 +851,7 @@ def update_user_group(self, id, **kwargs):  # noqa: E501
     def update_user_group_with_http_info(self, id, **kwargs):  # noqa: E501
         """Update a specific user group  # noqa: E501
 
-        <b>Note</b>: Applies only to original Operations for Applications instances that are not onboarded to VMware Cloud services.  # noqa: E501
+        <b>Note</b>: Applies only to original Tanzu Observability instances that are not onboarded to VMware Cloud services.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.update_user_group_with_http_info(id, async_req=True)
diff --git a/wavefront_api_client/api/wavefront_api.py b/wavefront_api_client/api/wavefront_api.py
index e99f68f..fd85982 100644
--- a/wavefront_api_client/api/wavefront_api.py
+++ b/wavefront_api_client/api/wavefront_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api/webhook_api.py b/wavefront_api_client/api/webhook_api.py
index 42169e8..8dd4002 100644
--- a/wavefront_api_client/api/webhook_api.py
+++ b/wavefront_api_client/api/webhook_api.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/api_client.py b/wavefront_api_client/api_client.py
index 337e2b1..5f79e1f 100644
--- a/wavefront_api_client/api_client.py
+++ b/wavefront_api_client/api_client.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -74,7 +74,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Swagger-Codegen/2.222.3/python'
+        self.user_agent = 'Swagger-Codegen/2.223.1/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
diff --git a/wavefront_api_client/configuration.py b/wavefront_api_client/configuration.py
index f45a129..945d051 100644
--- a/wavefront_api_client/configuration.py
+++ b/wavefront_api_client/configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -251,5 +251,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: 2.222.3".\
+               "SDK Package Version: 2.223.1".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/wavefront_api_client/models/__init__.py b/wavefront_api_client/models/__init__.py
index 90415ef..b3aaf73 100644
--- a/wavefront_api_client/models/__init__.py
+++ b/wavefront_api_client/models/__init__.py
@@ -2,9 +2,9 @@
 
 # flake8: noqa
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_element.py b/wavefront_api_client/models/access_control_element.py
index 3353714..99535a1 100644
--- a/wavefront_api_client/models/access_control_element.py
+++ b/wavefront_api_client/models/access_control_element.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_list_read_dto.py b/wavefront_api_client/models/access_control_list_read_dto.py
index 5622d09..af64a50 100644
--- a/wavefront_api_client/models/access_control_list_read_dto.py
+++ b/wavefront_api_client/models/access_control_list_read_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_list_simple.py b/wavefront_api_client/models/access_control_list_simple.py
index df6929d..f70d9bd 100644
--- a/wavefront_api_client/models/access_control_list_simple.py
+++ b/wavefront_api_client/models/access_control_list_simple.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_control_list_write_dto.py b/wavefront_api_client/models/access_control_list_write_dto.py
index 826f570..4d99114 100644
--- a/wavefront_api_client/models/access_control_list_write_dto.py
+++ b/wavefront_api_client/models/access_control_list_write_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_policy.py b/wavefront_api_client/models/access_policy.py
index c194176..de274cf 100644
--- a/wavefront_api_client/models/access_policy.py
+++ b/wavefront_api_client/models/access_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/access_policy_rule_dto.py b/wavefront_api_client/models/access_policy_rule_dto.py
index 0372b53..00eb888 100644
--- a/wavefront_api_client/models/access_policy_rule_dto.py
+++ b/wavefront_api_client/models/access_policy_rule_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/account.py b/wavefront_api_client/models/account.py
index 5c8db86..afedc6d 100644
--- a/wavefront_api_client/models/account.py
+++ b/wavefront_api_client/models/account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert.py b/wavefront_api_client/models/alert.py
index 7d20839..afbfbdc 100644
--- a/wavefront_api_client/models/alert.py
+++ b/wavefront_api_client/models/alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_analytics_summary.py b/wavefront_api_client/models/alert_analytics_summary.py
index 8d8e439..d35dc97 100644
--- a/wavefront_api_client/models/alert_analytics_summary.py
+++ b/wavefront_api_client/models/alert_analytics_summary.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_analytics_summary_detail.py b/wavefront_api_client/models/alert_analytics_summary_detail.py
index cc5fd21..c22489f 100644
--- a/wavefront_api_client/models/alert_analytics_summary_detail.py
+++ b/wavefront_api_client/models/alert_analytics_summary_detail.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_dashboard.py b/wavefront_api_client/models/alert_dashboard.py
index 40d1fe3..0fbd8aa 100644
--- a/wavefront_api_client/models/alert_dashboard.py
+++ b/wavefront_api_client/models/alert_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_error_group_info.py b/wavefront_api_client/models/alert_error_group_info.py
index b0839a9..3842fa9 100644
--- a/wavefront_api_client/models/alert_error_group_info.py
+++ b/wavefront_api_client/models/alert_error_group_info.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_error_group_summary.py b/wavefront_api_client/models/alert_error_group_summary.py
index 12523b5..72059c5 100644
--- a/wavefront_api_client/models/alert_error_group_summary.py
+++ b/wavefront_api_client/models/alert_error_group_summary.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_error_summary.py b/wavefront_api_client/models/alert_error_summary.py
index 35b83d5..4153a43 100644
--- a/wavefront_api_client/models/alert_error_summary.py
+++ b/wavefront_api_client/models/alert_error_summary.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_min.py b/wavefront_api_client/models/alert_min.py
index d62a4ec..b3dff39 100644
--- a/wavefront_api_client/models/alert_min.py
+++ b/wavefront_api_client/models/alert_min.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_route.py b/wavefront_api_client/models/alert_route.py
index 2a3590e..826ddd0 100644
--- a/wavefront_api_client/models/alert_route.py
+++ b/wavefront_api_client/models/alert_route.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/alert_source.py b/wavefront_api_client/models/alert_source.py
index 5418258..cffec0c 100644
--- a/wavefront_api_client/models/alert_source.py
+++ b/wavefront_api_client/models/alert_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -265,7 +265,7 @@ def query_builder_enabled(self, query_builder_enabled):
     def query_builder_serialization(self):
         """Gets the query_builder_serialization of this AlertSource.  # noqa: E501
 
-        The string serialization of the alert source query builder, mostly used by Wavefront UI.  # noqa: E501
+        The string serialization of the alert source query builder, mostly used by Tanzu Observability UI.  # noqa: E501
 
         :return: The query_builder_serialization of this AlertSource.  # noqa: E501
         :rtype: str
@@ -276,7 +276,7 @@ def query_builder_serialization(self):
     def query_builder_serialization(self, query_builder_serialization):
         """Sets the query_builder_serialization of this AlertSource.
 
-        The string serialization of the alert source query builder, mostly used by Wavefront UI.  # noqa: E501
+        The string serialization of the alert source query builder, mostly used by Tanzu Observability UI.  # noqa: E501
 
         :param query_builder_serialization: The query_builder_serialization of this AlertSource.  # noqa: E501
         :type: str
diff --git a/wavefront_api_client/models/annotation.py b/wavefront_api_client/models/annotation.py
index f0d90eb..dbfe14f 100644
--- a/wavefront_api_client/models/annotation.py
+++ b/wavefront_api_client/models/annotation.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/anomaly.py b/wavefront_api_client/models/anomaly.py
index 239950f..9d98bf2 100644
--- a/wavefront_api_client/models/anomaly.py
+++ b/wavefront_api_client/models/anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/api_token_model.py b/wavefront_api_client/models/api_token_model.py
index 4d4ee83..088600b 100644
--- a/wavefront_api_client/models/api_token_model.py
+++ b/wavefront_api_client/models/api_token_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_dynamics_configuration.py b/wavefront_api_client/models/app_dynamics_configuration.py
index 39e7836..d8208e3 100644
--- a/wavefront_api_client/models/app_dynamics_configuration.py
+++ b/wavefront_api_client/models/app_dynamics_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_search_filter.py b/wavefront_api_client/models/app_search_filter.py
index 79f7964..c548e6b 100644
--- a/wavefront_api_client/models/app_search_filter.py
+++ b/wavefront_api_client/models/app_search_filter.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_search_filter_value.py b/wavefront_api_client/models/app_search_filter_value.py
index 8b9721f..1c6e769 100644
--- a/wavefront_api_client/models/app_search_filter_value.py
+++ b/wavefront_api_client/models/app_search_filter_value.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/app_search_filters.py b/wavefront_api_client/models/app_search_filters.py
index a338a83..f90b7a8 100644
--- a/wavefront_api_client/models/app_search_filters.py
+++ b/wavefront_api_client/models/app_search_filters.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/aws_base_credentials.py b/wavefront_api_client/models/aws_base_credentials.py
index 87fc0ed..51e1bd9 100644
--- a/wavefront_api_client/models/aws_base_credentials.py
+++ b/wavefront_api_client/models/aws_base_credentials.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
@@ -84,7 +84,7 @@ def external_id(self, external_id):
     def role_arn(self):
         """Gets the role_arn of this AWSBaseCredentials.  # noqa: E501
 
-        The Role ARN that the customer has created in AWS IAM to allow access to Wavefront  # noqa: E501
+        The Role ARN that the customer has created in AWS IAM to allow access to Tanzu Observability  # noqa: E501
 
         :return: The role_arn of this AWSBaseCredentials.  # noqa: E501
         :rtype: str
@@ -95,7 +95,7 @@ def role_arn(self):
     def role_arn(self, role_arn):
         """Sets the role_arn of this AWSBaseCredentials.
 
-        The Role ARN that the customer has created in AWS IAM to allow access to Wavefront  # noqa: E501
+        The Role ARN that the customer has created in AWS IAM to allow access to Tanzu Observability  # noqa: E501
 
         :param role_arn: The role_arn of this AWSBaseCredentials.  # noqa: E501
         :type: str
diff --git a/wavefront_api_client/models/azure_activity_log_configuration.py b/wavefront_api_client/models/azure_activity_log_configuration.py
index 74ec11b..25a15c2 100644
--- a/wavefront_api_client/models/azure_activity_log_configuration.py
+++ b/wavefront_api_client/models/azure_activity_log_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/azure_base_credentials.py b/wavefront_api_client/models/azure_base_credentials.py
index 7c80795..4a3660b 100644
--- a/wavefront_api_client/models/azure_base_credentials.py
+++ b/wavefront_api_client/models/azure_base_credentials.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/azure_configuration.py b/wavefront_api_client/models/azure_configuration.py
index 7468b1a..fb59f1f 100644
--- a/wavefront_api_client/models/azure_configuration.py
+++ b/wavefront_api_client/models/azure_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/chart.py b/wavefront_api_client/models/chart.py
index 1189340..2f9ec06 100644
--- a/wavefront_api_client/models/chart.py
+++ b/wavefront_api_client/models/chart.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/chart_settings.py b/wavefront_api_client/models/chart_settings.py
index f995f8f..df9ed23 100644
--- a/wavefront_api_client/models/chart_settings.py
+++ b/wavefront_api_client/models/chart_settings.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/chart_source_query.py b/wavefront_api_client/models/chart_source_query.py
index b31c307..06be5f6 100644
--- a/wavefront_api_client/models/chart_source_query.py
+++ b/wavefront_api_client/models/chart_source_query.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/class_loader.py b/wavefront_api_client/models/class_loader.py
index b2d4a3b..d6f4b17 100644
--- a/wavefront_api_client/models/class_loader.py
+++ b/wavefront_api_client/models/class_loader.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cloud_integration.py b/wavefront_api_client/models/cloud_integration.py
index 86b8d8e..ef74b86 100644
--- a/wavefront_api_client/models/cloud_integration.py
+++ b/wavefront_api_client/models/cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cloud_trail_configuration.py b/wavefront_api_client/models/cloud_trail_configuration.py
index 1e171a9..e0da501 100644
--- a/wavefront_api_client/models/cloud_trail_configuration.py
+++ b/wavefront_api_client/models/cloud_trail_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cloud_watch_configuration.py b/wavefront_api_client/models/cloud_watch_configuration.py
index 151faa1..50c9e36 100644
--- a/wavefront_api_client/models/cloud_watch_configuration.py
+++ b/wavefront_api_client/models/cloud_watch_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/cluster_info_dto.py b/wavefront_api_client/models/cluster_info_dto.py
index 56ce5dc..bec12fb 100644
--- a/wavefront_api_client/models/cluster_info_dto.py
+++ b/wavefront_api_client/models/cluster_info_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/conversion.py b/wavefront_api_client/models/conversion.py
index 978d7f7..d5bc778 100644
--- a/wavefront_api_client/models/conversion.py
+++ b/wavefront_api_client/models/conversion.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/conversion_object.py b/wavefront_api_client/models/conversion_object.py
index ee2a757..73becaa 100644
--- a/wavefront_api_client/models/conversion_object.py
+++ b/wavefront_api_client/models/conversion_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/customer_facing_user_object.py b/wavefront_api_client/models/customer_facing_user_object.py
index c3c912b..ecad7f7 100644
--- a/wavefront_api_client/models/customer_facing_user_object.py
+++ b/wavefront_api_client/models/customer_facing_user_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard.py b/wavefront_api_client/models/dashboard.py
index 8ead580..4fce7b1 100644
--- a/wavefront_api_client/models/dashboard.py
+++ b/wavefront_api_client/models/dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_min.py b/wavefront_api_client/models/dashboard_min.py
index 4015d43..6964288 100644
--- a/wavefront_api_client/models/dashboard_min.py
+++ b/wavefront_api_client/models/dashboard_min.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_parameter_value.py b/wavefront_api_client/models/dashboard_parameter_value.py
index eb28da8..7c0e312 100644
--- a/wavefront_api_client/models/dashboard_parameter_value.py
+++ b/wavefront_api_client/models/dashboard_parameter_value.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_section.py b/wavefront_api_client/models/dashboard_section.py
index 8ccfe99..5549a7f 100644
--- a/wavefront_api_client/models/dashboard_section.py
+++ b/wavefront_api_client/models/dashboard_section.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dashboard_section_row.py b/wavefront_api_client/models/dashboard_section_row.py
index 1fb84f1..d0e044a 100644
--- a/wavefront_api_client/models/dashboard_section_row.py
+++ b/wavefront_api_client/models/dashboard_section_row.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/default_saved_app_map_search.py b/wavefront_api_client/models/default_saved_app_map_search.py
index 4f1bf3e..2ceeaf7 100644
--- a/wavefront_api_client/models/default_saved_app_map_search.py
+++ b/wavefront_api_client/models/default_saved_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/default_saved_traces_search.py b/wavefront_api_client/models/default_saved_traces_search.py
index 820c4a9..38873d0 100644
--- a/wavefront_api_client/models/default_saved_traces_search.py
+++ b/wavefront_api_client/models/default_saved_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/derived_metric_definition.py b/wavefront_api_client/models/derived_metric_definition.py
index b81da20..aa74e68 100644
--- a/wavefront_api_client/models/derived_metric_definition.py
+++ b/wavefront_api_client/models/derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/dynatrace_configuration.py b/wavefront_api_client/models/dynatrace_configuration.py
index d8e5d7a..364709c 100644
--- a/wavefront_api_client/models/dynatrace_configuration.py
+++ b/wavefront_api_client/models/dynatrace_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ec2_configuration.py b/wavefront_api_client/models/ec2_configuration.py
index fe85f3c..28a61e7 100644
--- a/wavefront_api_client/models/ec2_configuration.py
+++ b/wavefront_api_client/models/ec2_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/event.py b/wavefront_api_client/models/event.py
index a0c8831..25caae5 100644
--- a/wavefront_api_client/models/event.py
+++ b/wavefront_api_client/models/event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/event_search_request.py b/wavefront_api_client/models/event_search_request.py
index 4bc48d1..a4975c0 100644
--- a/wavefront_api_client/models/event_search_request.py
+++ b/wavefront_api_client/models/event_search_request.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/event_time_range.py b/wavefront_api_client/models/event_time_range.py
index ee3f2c5..5c2f451 100644
--- a/wavefront_api_client/models/event_time_range.py
+++ b/wavefront_api_client/models/event_time_range.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/external_link.py b/wavefront_api_client/models/external_link.py
index cf9d23b..797a6fc 100644
--- a/wavefront_api_client/models/external_link.py
+++ b/wavefront_api_client/models/external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facet_response.py b/wavefront_api_client/models/facet_response.py
index 4240c2e..dffdcb3 100644
--- a/wavefront_api_client/models/facet_response.py
+++ b/wavefront_api_client/models/facet_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facet_search_request_container.py b/wavefront_api_client/models/facet_search_request_container.py
index 4b2903c..7b5ef59 100644
--- a/wavefront_api_client/models/facet_search_request_container.py
+++ b/wavefront_api_client/models/facet_search_request_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facets_response_container.py b/wavefront_api_client/models/facets_response_container.py
index 9425df4..aa58860 100644
--- a/wavefront_api_client/models/facets_response_container.py
+++ b/wavefront_api_client/models/facets_response_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/facets_search_request_container.py b/wavefront_api_client/models/facets_search_request_container.py
index d921f0d..6f1c03d 100644
--- a/wavefront_api_client/models/facets_search_request_container.py
+++ b/wavefront_api_client/models/facets_search_request_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/fast_reader_builder.py b/wavefront_api_client/models/fast_reader_builder.py
index 9677650..afcd0ac 100644
--- a/wavefront_api_client/models/fast_reader_builder.py
+++ b/wavefront_api_client/models/fast_reader_builder.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/field.py b/wavefront_api_client/models/field.py
index 03b7e1c..8c56264 100644
--- a/wavefront_api_client/models/field.py
+++ b/wavefront_api_client/models/field.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/gcp_billing_configuration.py b/wavefront_api_client/models/gcp_billing_configuration.py
index 5374d34..b36b263 100644
--- a/wavefront_api_client/models/gcp_billing_configuration.py
+++ b/wavefront_api_client/models/gcp_billing_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/gcp_configuration.py b/wavefront_api_client/models/gcp_configuration.py
index 2162445..5a1bd42 100644
--- a/wavefront_api_client/models/gcp_configuration.py
+++ b/wavefront_api_client/models/gcp_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/history_entry.py b/wavefront_api_client/models/history_entry.py
index 6f6fffa..1872cc8 100644
--- a/wavefront_api_client/models/history_entry.py
+++ b/wavefront_api_client/models/history_entry.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/history_response.py b/wavefront_api_client/models/history_response.py
index 94c0988..87cf496 100644
--- a/wavefront_api_client/models/history_response.py
+++ b/wavefront_api_client/models/history_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_alert.py b/wavefront_api_client/models/ingestion_policy_alert.py
index 0210d62..668abd2 100644
--- a/wavefront_api_client/models/ingestion_policy_alert.py
+++ b/wavefront_api_client/models/ingestion_policy_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_metadata.py b/wavefront_api_client/models/ingestion_policy_metadata.py
index 4bc5546..e798ed9 100644
--- a/wavefront_api_client/models/ingestion_policy_metadata.py
+++ b/wavefront_api_client/models/ingestion_policy_metadata.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_read_model.py b/wavefront_api_client/models/ingestion_policy_read_model.py
index 3f77894..477a937 100644
--- a/wavefront_api_client/models/ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/ingestion_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/ingestion_policy_write_model.py b/wavefront_api_client/models/ingestion_policy_write_model.py
index 5d4c4b9..2163c8c 100644
--- a/wavefront_api_client/models/ingestion_policy_write_model.py
+++ b/wavefront_api_client/models/ingestion_policy_write_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/install_alerts.py b/wavefront_api_client/models/install_alerts.py
index 436f7bb..e9dd6c4 100644
--- a/wavefront_api_client/models/install_alerts.py
+++ b/wavefront_api_client/models/install_alerts.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration.py b/wavefront_api_client/models/integration.py
index e8f25a4..f30d330 100644
--- a/wavefront_api_client/models/integration.py
+++ b/wavefront_api_client/models/integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_alert.py b/wavefront_api_client/models/integration_alert.py
index d8ebf89..fb75f2d 100644
--- a/wavefront_api_client/models/integration_alert.py
+++ b/wavefront_api_client/models/integration_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_alias.py b/wavefront_api_client/models/integration_alias.py
index f76f8f1..dd7e23c 100644
--- a/wavefront_api_client/models/integration_alias.py
+++ b/wavefront_api_client/models/integration_alias.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_dashboard.py b/wavefront_api_client/models/integration_dashboard.py
index 0345ecc..756f864 100644
--- a/wavefront_api_client/models/integration_dashboard.py
+++ b/wavefront_api_client/models/integration_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_manifest_group.py b/wavefront_api_client/models/integration_manifest_group.py
index 8b24f8a..385cbd1 100644
--- a/wavefront_api_client/models/integration_manifest_group.py
+++ b/wavefront_api_client/models/integration_manifest_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_metrics.py b/wavefront_api_client/models/integration_metrics.py
index f18c0b6..25a8cca 100644
--- a/wavefront_api_client/models/integration_metrics.py
+++ b/wavefront_api_client/models/integration_metrics.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/integration_status.py b/wavefront_api_client/models/integration_status.py
index e49c61a..b8a8cfe 100644
--- a/wavefront_api_client/models/integration_status.py
+++ b/wavefront_api_client/models/integration_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/json_node.py b/wavefront_api_client/models/json_node.py
index ad282f2..f3ea828 100644
--- a/wavefront_api_client/models/json_node.py
+++ b/wavefront_api_client/models/json_node.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/kubernetes_component.py b/wavefront_api_client/models/kubernetes_component.py
index 0d9283d..e48cddc 100644
--- a/wavefront_api_client/models/kubernetes_component.py
+++ b/wavefront_api_client/models/kubernetes_component.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/kubernetes_component_status.py b/wavefront_api_client/models/kubernetes_component_status.py
index 7859f39..4c06a5f 100644
--- a/wavefront_api_client/models/kubernetes_component_status.py
+++ b/wavefront_api_client/models/kubernetes_component_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/logical_type.py b/wavefront_api_client/models/logical_type.py
index 8e44843..b05c54e 100644
--- a/wavefront_api_client/models/logical_type.py
+++ b/wavefront_api_client/models/logical_type.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/logs_sort.py b/wavefront_api_client/models/logs_sort.py
index b9abb02..48a321e 100644
--- a/wavefront_api_client/models/logs_sort.py
+++ b/wavefront_api_client/models/logs_sort.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/logs_table.py b/wavefront_api_client/models/logs_table.py
index 867b3b9..26ba97a 100644
--- a/wavefront_api_client/models/logs_table.py
+++ b/wavefront_api_client/models/logs_table.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/maintenance_window.py b/wavefront_api_client/models/maintenance_window.py
index baa9288..96d26dc 100644
--- a/wavefront_api_client/models/maintenance_window.py
+++ b/wavefront_api_client/models/maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/message.py b/wavefront_api_client/models/message.py
index 78590e2..280a4a4 100644
--- a/wavefront_api_client/models/message.py
+++ b/wavefront_api_client/models/message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metric_details.py b/wavefront_api_client/models/metric_details.py
index 458cc38..ff833a9 100644
--- a/wavefront_api_client/models/metric_details.py
+++ b/wavefront_api_client/models/metric_details.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metric_details_response.py b/wavefront_api_client/models/metric_details_response.py
index b0f12c8..b35f697 100644
--- a/wavefront_api_client/models/metric_details_response.py
+++ b/wavefront_api_client/models/metric_details_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metric_status.py b/wavefront_api_client/models/metric_status.py
index b252637..6903ace 100644
--- a/wavefront_api_client/models/metric_status.py
+++ b/wavefront_api_client/models/metric_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metrics_policy_read_model.py b/wavefront_api_client/models/metrics_policy_read_model.py
index 9048c58..f9a0909 100644
--- a/wavefront_api_client/models/metrics_policy_read_model.py
+++ b/wavefront_api_client/models/metrics_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/metrics_policy_write_model.py b/wavefront_api_client/models/metrics_policy_write_model.py
index 2dbe181..07ecbcf 100644
--- a/wavefront_api_client/models/metrics_policy_write_model.py
+++ b/wavefront_api_client/models/metrics_policy_write_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/module.py b/wavefront_api_client/models/module.py
index 75510b9..838f8db 100644
--- a/wavefront_api_client/models/module.py
+++ b/wavefront_api_client/models/module.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/module_descriptor.py b/wavefront_api_client/models/module_descriptor.py
index e288daa..e8d6562 100644
--- a/wavefront_api_client/models/module_descriptor.py
+++ b/wavefront_api_client/models/module_descriptor.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/module_layer.py b/wavefront_api_client/models/module_layer.py
index 5ace739..63569d7 100644
--- a/wavefront_api_client/models/module_layer.py
+++ b/wavefront_api_client/models/module_layer.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/monitored_application_dto.py b/wavefront_api_client/models/monitored_application_dto.py
index f661046..efc7037 100644
--- a/wavefront_api_client/models/monitored_application_dto.py
+++ b/wavefront_api_client/models/monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/monitored_cluster.py b/wavefront_api_client/models/monitored_cluster.py
index 0f800ae..cd6bf9b 100644
--- a/wavefront_api_client/models/monitored_cluster.py
+++ b/wavefront_api_client/models/monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/monitored_service_dto.py b/wavefront_api_client/models/monitored_service_dto.py
index 1fe2586..074cd46 100644
--- a/wavefront_api_client/models/monitored_service_dto.py
+++ b/wavefront_api_client/models/monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/new_relic_configuration.py b/wavefront_api_client/models/new_relic_configuration.py
index 66b8c94..b90e6a2 100644
--- a/wavefront_api_client/models/new_relic_configuration.py
+++ b/wavefront_api_client/models/new_relic_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/new_relic_metric_filters.py b/wavefront_api_client/models/new_relic_metric_filters.py
index 5dd9ac5..d40036b 100644
--- a/wavefront_api_client/models/new_relic_metric_filters.py
+++ b/wavefront_api_client/models/new_relic_metric_filters.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/notificant.py b/wavefront_api_client/models/notificant.py
index d9c6da4..09d1fad 100644
--- a/wavefront_api_client/models/notificant.py
+++ b/wavefront_api_client/models/notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/notification_messages.py b/wavefront_api_client/models/notification_messages.py
index 0d23915..b62d781 100644
--- a/wavefront_api_client/models/notification_messages.py
+++ b/wavefront_api_client/models/notification_messages.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/package.py b/wavefront_api_client/models/package.py
index d756ed9..c181327 100644
--- a/wavefront_api_client/models/package.py
+++ b/wavefront_api_client/models/package.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged.py b/wavefront_api_client/models/paged.py
index cfe84e1..7b2afc4 100644
--- a/wavefront_api_client/models/paged.py
+++ b/wavefront_api_client/models/paged.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_account.py b/wavefront_api_client/models/paged_account.py
index 3d0d4ca..350c105 100644
--- a/wavefront_api_client/models/paged_account.py
+++ b/wavefront_api_client/models/paged_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_alert.py b/wavefront_api_client/models/paged_alert.py
index a02b58d..fbe86b1 100644
--- a/wavefront_api_client/models/paged_alert.py
+++ b/wavefront_api_client/models/paged_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_alert_analytics_summary_detail.py b/wavefront_api_client/models/paged_alert_analytics_summary_detail.py
index 2f83e72..d675a41 100644
--- a/wavefront_api_client/models/paged_alert_analytics_summary_detail.py
+++ b/wavefront_api_client/models/paged_alert_analytics_summary_detail.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_alert_with_stats.py b/wavefront_api_client/models/paged_alert_with_stats.py
index 7105b8c..a876774 100644
--- a/wavefront_api_client/models/paged_alert_with_stats.py
+++ b/wavefront_api_client/models/paged_alert_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_anomaly.py b/wavefront_api_client/models/paged_anomaly.py
index f8e1926..dd85e04 100644
--- a/wavefront_api_client/models/paged_anomaly.py
+++ b/wavefront_api_client/models/paged_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_api_token_model.py b/wavefront_api_client/models/paged_api_token_model.py
index ae473a8..8499bd6 100644
--- a/wavefront_api_client/models/paged_api_token_model.py
+++ b/wavefront_api_client/models/paged_api_token_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_cloud_integration.py b/wavefront_api_client/models/paged_cloud_integration.py
index e4c8776..9484829 100644
--- a/wavefront_api_client/models/paged_cloud_integration.py
+++ b/wavefront_api_client/models/paged_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_customer_facing_user_object.py b/wavefront_api_client/models/paged_customer_facing_user_object.py
index ea7dd42..957865c 100644
--- a/wavefront_api_client/models/paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/paged_customer_facing_user_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_dashboard.py b/wavefront_api_client/models/paged_dashboard.py
index 085d51d..f89c658 100644
--- a/wavefront_api_client/models/paged_dashboard.py
+++ b/wavefront_api_client/models/paged_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_derived_metric_definition.py b/wavefront_api_client/models/paged_derived_metric_definition.py
index 985deec..18e6e08 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
index 8b2967c..feabf78 100644
--- a/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/paged_derived_metric_definition_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_event.py b/wavefront_api_client/models/paged_event.py
index 44fe0af..76125b9 100644
--- a/wavefront_api_client/models/paged_event.py
+++ b/wavefront_api_client/models/paged_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_external_link.py b/wavefront_api_client/models/paged_external_link.py
index 2f11203..fe25650 100644
--- a/wavefront_api_client/models/paged_external_link.py
+++ b/wavefront_api_client/models/paged_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_ingestion_policy_read_model.py b/wavefront_api_client/models/paged_ingestion_policy_read_model.py
index 9355a9c..c1a1025 100644
--- a/wavefront_api_client/models/paged_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/paged_ingestion_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_integration.py b/wavefront_api_client/models/paged_integration.py
index 0b587ca..bc2dc9b 100644
--- a/wavefront_api_client/models/paged_integration.py
+++ b/wavefront_api_client/models/paged_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_maintenance_window.py b/wavefront_api_client/models/paged_maintenance_window.py
index b7780b5..0d2a2c8 100644
--- a/wavefront_api_client/models/paged_maintenance_window.py
+++ b/wavefront_api_client/models/paged_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_message.py b/wavefront_api_client/models/paged_message.py
index 4d1e130..7baf07c 100644
--- a/wavefront_api_client/models/paged_message.py
+++ b/wavefront_api_client/models/paged_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_monitored_application_dto.py b/wavefront_api_client/models/paged_monitored_application_dto.py
index 43343af..d5f93b4 100644
--- a/wavefront_api_client/models/paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/paged_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_monitored_cluster.py b/wavefront_api_client/models/paged_monitored_cluster.py
index d8379a5..d4340a9 100644
--- a/wavefront_api_client/models/paged_monitored_cluster.py
+++ b/wavefront_api_client/models/paged_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_monitored_service_dto.py b/wavefront_api_client/models/paged_monitored_service_dto.py
index 092d47d..63d627d 100644
--- a/wavefront_api_client/models/paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/paged_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_notificant.py b/wavefront_api_client/models/paged_notificant.py
index 22fbd39..658944f 100644
--- a/wavefront_api_client/models/paged_notificant.py
+++ b/wavefront_api_client/models/paged_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_proxy.py b/wavefront_api_client/models/paged_proxy.py
index 4002e68..35b7786 100644
--- a/wavefront_api_client/models/paged_proxy.py
+++ b/wavefront_api_client/models/paged_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_recent_app_map_search.py b/wavefront_api_client/models/paged_recent_app_map_search.py
index db3d8de..cecde6b 100644
--- a/wavefront_api_client/models/paged_recent_app_map_search.py
+++ b/wavefront_api_client/models/paged_recent_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_recent_traces_search.py b/wavefront_api_client/models/paged_recent_traces_search.py
index 5b6e18b..414e85c 100644
--- a/wavefront_api_client/models/paged_recent_traces_search.py
+++ b/wavefront_api_client/models/paged_recent_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_related_event.py b/wavefront_api_client/models/paged_related_event.py
index f167538..ad3d915 100644
--- a/wavefront_api_client/models/paged_related_event.py
+++ b/wavefront_api_client/models/paged_related_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_report_event_anomaly_dto.py b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
index 68d9876..374a5bb 100644
--- a/wavefront_api_client/models/paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/paged_report_event_anomaly_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_role_dto.py b/wavefront_api_client/models/paged_role_dto.py
index c5e9be4..799458c 100644
--- a/wavefront_api_client/models/paged_role_dto.py
+++ b/wavefront_api_client/models/paged_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_app_map_search.py b/wavefront_api_client/models/paged_saved_app_map_search.py
index cc71dc7..3346a21 100644
--- a/wavefront_api_client/models/paged_saved_app_map_search.py
+++ b/wavefront_api_client/models/paged_saved_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_app_map_search_group.py b/wavefront_api_client/models/paged_saved_app_map_search_group.py
index a34fd84..4f86ff4 100644
--- a/wavefront_api_client/models/paged_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/paged_saved_app_map_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_search.py b/wavefront_api_client/models/paged_saved_search.py
index 48024cf..e188a76 100644
--- a/wavefront_api_client/models/paged_saved_search.py
+++ b/wavefront_api_client/models/paged_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_traces_search.py b/wavefront_api_client/models/paged_saved_traces_search.py
index d3e23fe..9ea5c84 100644
--- a/wavefront_api_client/models/paged_saved_traces_search.py
+++ b/wavefront_api_client/models/paged_saved_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_saved_traces_search_group.py b/wavefront_api_client/models/paged_saved_traces_search_group.py
index e6e74c6..f847ea2 100644
--- a/wavefront_api_client/models/paged_saved_traces_search_group.py
+++ b/wavefront_api_client/models/paged_saved_traces_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_service_account.py b/wavefront_api_client/models/paged_service_account.py
index bcb7f27..cb589a2 100644
--- a/wavefront_api_client/models/paged_service_account.py
+++ b/wavefront_api_client/models/paged_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_source.py b/wavefront_api_client/models/paged_source.py
index 07150bf..858943e 100644
--- a/wavefront_api_client/models/paged_source.py
+++ b/wavefront_api_client/models/paged_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_span_sampling_policy.py b/wavefront_api_client/models/paged_span_sampling_policy.py
index caf514b..0f3ebad 100644
--- a/wavefront_api_client/models/paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/paged_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/paged_user_group_model.py b/wavefront_api_client/models/paged_user_group_model.py
index bb49027..c39c90a 100644
--- a/wavefront_api_client/models/paged_user_group_model.py
+++ b/wavefront_api_client/models/paged_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/point.py b/wavefront_api_client/models/point.py
index 403a227..98c4fb8 100644
--- a/wavefront_api_client/models/point.py
+++ b/wavefront_api_client/models/point.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/policy_rule_read_model.py b/wavefront_api_client/models/policy_rule_read_model.py
index 2c0b5ab..997f962 100644
--- a/wavefront_api_client/models/policy_rule_read_model.py
+++ b/wavefront_api_client/models/policy_rule_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/policy_rule_write_model.py b/wavefront_api_client/models/policy_rule_write_model.py
index 323327c..47e99a7 100644
--- a/wavefront_api_client/models/policy_rule_write_model.py
+++ b/wavefront_api_client/models/policy_rule_write_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/proxy.py b/wavefront_api_client/models/proxy.py
index d1efecf..f10180c 100644
--- a/wavefront_api_client/models/proxy.py
+++ b/wavefront_api_client/models/proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/query_event.py b/wavefront_api_client/models/query_event.py
index 26b6aca..db1926a 100644
--- a/wavefront_api_client/models/query_event.py
+++ b/wavefront_api_client/models/query_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/query_result.py b/wavefront_api_client/models/query_result.py
index 307703d..e84444f 100644
--- a/wavefront_api_client/models/query_result.py
+++ b/wavefront_api_client/models/query_result.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/query_type_dto.py b/wavefront_api_client/models/query_type_dto.py
index e2a5b89..f050449 100644
--- a/wavefront_api_client/models/query_type_dto.py
+++ b/wavefront_api_client/models/query_type_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/raw_timeseries.py b/wavefront_api_client/models/raw_timeseries.py
index 47af883..acf2901 100644
--- a/wavefront_api_client/models/raw_timeseries.py
+++ b/wavefront_api_client/models/raw_timeseries.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/recent_app_map_search.py b/wavefront_api_client/models/recent_app_map_search.py
index 635f468..5510a22 100644
--- a/wavefront_api_client/models/recent_app_map_search.py
+++ b/wavefront_api_client/models/recent_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/recent_traces_search.py b/wavefront_api_client/models/recent_traces_search.py
index 7a32c01..e6f8557 100644
--- a/wavefront_api_client/models/recent_traces_search.py
+++ b/wavefront_api_client/models/recent_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_anomaly.py b/wavefront_api_client/models/related_anomaly.py
index 3462d47..4e41964 100644
--- a/wavefront_api_client/models/related_anomaly.py
+++ b/wavefront_api_client/models/related_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_data.py b/wavefront_api_client/models/related_data.py
index be4d838..025fd18 100644
--- a/wavefront_api_client/models/related_data.py
+++ b/wavefront_api_client/models/related_data.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_event.py b/wavefront_api_client/models/related_event.py
index aad029b..1d4050c 100644
--- a/wavefront_api_client/models/related_event.py
+++ b/wavefront_api_client/models/related_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/related_event_time_range.py b/wavefront_api_client/models/related_event_time_range.py
index b93d90f..b60c7c0 100644
--- a/wavefront_api_client/models/related_event_time_range.py
+++ b/wavefront_api_client/models/related_event_time_range.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/report_event_anomaly_dto.py b/wavefront_api_client/models/report_event_anomaly_dto.py
index a69315e..0491184 100644
--- a/wavefront_api_client/models/report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/report_event_anomaly_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container.py b/wavefront_api_client/models/response_container.py
index 132a15f..07f5671 100644
--- a/wavefront_api_client/models/response_container.py
+++ b/wavefront_api_client/models/response_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_access_policy.py b/wavefront_api_client/models/response_container_access_policy.py
index c991d7c..47883c4 100644
--- a/wavefront_api_client/models/response_container_access_policy.py
+++ b/wavefront_api_client/models/response_container_access_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_access_policy_action.py b/wavefront_api_client/models/response_container_access_policy_action.py
index da491db..a7c72f0 100644
--- a/wavefront_api_client/models/response_container_access_policy_action.py
+++ b/wavefront_api_client/models/response_container_access_policy_action.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_account.py b/wavefront_api_client/models/response_container_account.py
index 0ae75a0..8d3423f 100644
--- a/wavefront_api_client/models/response_container_account.py
+++ b/wavefront_api_client/models/response_container_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_alert.py b/wavefront_api_client/models/response_container_alert.py
index 9b8fa69..6bb3016 100644
--- a/wavefront_api_client/models/response_container_alert.py
+++ b/wavefront_api_client/models/response_container_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_alert_analytics_summary.py b/wavefront_api_client/models/response_container_alert_analytics_summary.py
index bbe0611..31443af 100644
--- a/wavefront_api_client/models/response_container_alert_analytics_summary.py
+++ b/wavefront_api_client/models/response_container_alert_analytics_summary.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_api_token_model.py b/wavefront_api_client/models/response_container_api_token_model.py
index 676cd07..1035943 100644
--- a/wavefront_api_client/models/response_container_api_token_model.py
+++ b/wavefront_api_client/models/response_container_api_token_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_cloud_integration.py b/wavefront_api_client/models/response_container_cloud_integration.py
index 5724dcc..26e983c 100644
--- a/wavefront_api_client/models/response_container_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_cluster_info_dto.py b/wavefront_api_client/models/response_container_cluster_info_dto.py
index c2e1b89..82b6b8f 100644
--- a/wavefront_api_client/models/response_container_cluster_info_dto.py
+++ b/wavefront_api_client/models/response_container_cluster_info_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_dashboard.py b/wavefront_api_client/models/response_container_dashboard.py
index 99533f0..de6312d 100644
--- a/wavefront_api_client/models/response_container_dashboard.py
+++ b/wavefront_api_client/models/response_container_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_default_saved_app_map_search.py b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
index 057363e..58ca95b 100644
--- a/wavefront_api_client/models/response_container_default_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_default_saved_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_default_saved_traces_search.py b/wavefront_api_client/models/response_container_default_saved_traces_search.py
index 39b1115..b6cd453 100644
--- a/wavefront_api_client/models/response_container_default_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_default_saved_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_derived_metric_definition.py b/wavefront_api_client/models/response_container_derived_metric_definition.py
index 9ab5296..915f7bb 100644
--- a/wavefront_api_client/models/response_container_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_event.py b/wavefront_api_client/models/response_container_event.py
index 933c264..64e54ce 100644
--- a/wavefront_api_client/models/response_container_event.py
+++ b/wavefront_api_client/models/response_container_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_external_link.py b/wavefront_api_client/models/response_container_external_link.py
index 803bce3..85eab7d 100644
--- a/wavefront_api_client/models/response_container_external_link.py
+++ b/wavefront_api_client/models/response_container_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_facet_response.py b/wavefront_api_client/models/response_container_facet_response.py
index 00843cc..e27a6a6 100644
--- a/wavefront_api_client/models/response_container_facet_response.py
+++ b/wavefront_api_client/models/response_container_facet_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_facets_response_container.py b/wavefront_api_client/models/response_container_facets_response_container.py
index d743ac2..712a058 100644
--- a/wavefront_api_client/models/response_container_facets_response_container.py
+++ b/wavefront_api_client/models/response_container_facets_response_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_history_response.py b/wavefront_api_client/models/response_container_history_response.py
index 8c8ae64..96d0cfa 100644
--- a/wavefront_api_client/models/response_container_history_response.py
+++ b/wavefront_api_client/models/response_container_history_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
index d173a5b..4e2b6a9 100644
--- a/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_ingestion_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_integration.py b/wavefront_api_client/models/response_container_integration.py
index 500b050..9cc0711 100644
--- a/wavefront_api_client/models/response_container_integration.py
+++ b/wavefront_api_client/models/response_container_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_integration_status.py b/wavefront_api_client/models/response_container_integration_status.py
index 1ef7ccc..89c3fdc 100644
--- a/wavefront_api_client/models/response_container_integration_status.py
+++ b/wavefront_api_client/models/response_container_integration_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
index 8060f0f..f69ae5c 100644
--- a/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
+++ b/wavefront_api_client/models/response_container_list_access_control_list_read_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_alert_error_group_info.py b/wavefront_api_client/models/response_container_list_alert_error_group_info.py
index a144aaa..fd532c7 100644
--- a/wavefront_api_client/models/response_container_list_alert_error_group_info.py
+++ b/wavefront_api_client/models/response_container_list_alert_error_group_info.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_api_token_model.py b/wavefront_api_client/models/response_container_list_api_token_model.py
index f8919b5..a843f8b 100644
--- a/wavefront_api_client/models/response_container_list_api_token_model.py
+++ b/wavefront_api_client/models/response_container_list_api_token_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_integration.py b/wavefront_api_client/models/response_container_list_integration.py
index 887adf5..0c12b61 100644
--- a/wavefront_api_client/models/response_container_list_integration.py
+++ b/wavefront_api_client/models/response_container_list_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_integration_manifest_group.py b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
index 851f7f4..72d1b92 100644
--- a/wavefront_api_client/models/response_container_list_integration_manifest_group.py
+++ b/wavefront_api_client/models/response_container_list_integration_manifest_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_notification_messages.py b/wavefront_api_client/models/response_container_list_notification_messages.py
index f131314..36ac057 100644
--- a/wavefront_api_client/models/response_container_list_notification_messages.py
+++ b/wavefront_api_client/models/response_container_list_notification_messages.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_service_account.py b/wavefront_api_client/models/response_container_list_service_account.py
index 4e811bb..579a7b7 100644
--- a/wavefront_api_client/models/response_container_list_service_account.py
+++ b/wavefront_api_client/models/response_container_list_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_string.py b/wavefront_api_client/models/response_container_list_string.py
index 578936b..bc7289c 100644
--- a/wavefront_api_client/models/response_container_list_string.py
+++ b/wavefront_api_client/models/response_container_list_string.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_user_api_token.py b/wavefront_api_client/models/response_container_list_user_api_token.py
index 42bb29c..ac6d36d 100644
--- a/wavefront_api_client/models/response_container_list_user_api_token.py
+++ b/wavefront_api_client/models/response_container_list_user_api_token.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_list_user_dto.py b/wavefront_api_client/models/response_container_list_user_dto.py
index f8cc6a7..8850125 100644
--- a/wavefront_api_client/models/response_container_list_user_dto.py
+++ b/wavefront_api_client/models/response_container_list_user_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_maintenance_window.py b/wavefront_api_client/models/response_container_maintenance_window.py
index e816804..ae5d258 100644
--- a/wavefront_api_client/models/response_container_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_map.py b/wavefront_api_client/models/response_container_map.py
index 80616c4..8ccbf38 100644
--- a/wavefront_api_client/models/response_container_map.py
+++ b/wavefront_api_client/models/response_container_map.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_map_string_integer.py b/wavefront_api_client/models/response_container_map_string_integer.py
index 1a166f5..92eb3fd 100644
--- a/wavefront_api_client/models/response_container_map_string_integer.py
+++ b/wavefront_api_client/models/response_container_map_string_integer.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_map_string_integration_status.py b/wavefront_api_client/models/response_container_map_string_integration_status.py
index 8666542..b008766 100644
--- a/wavefront_api_client/models/response_container_map_string_integration_status.py
+++ b/wavefront_api_client/models/response_container_map_string_integration_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_message.py b/wavefront_api_client/models/response_container_message.py
index dabd90f..137a574 100644
--- a/wavefront_api_client/models/response_container_message.py
+++ b/wavefront_api_client/models/response_container_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_metrics_policy_read_model.py b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
index 0fb6b7e..ddc1e0e 100644
--- a/wavefront_api_client/models/response_container_metrics_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_metrics_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_monitored_application_dto.py b/wavefront_api_client/models/response_container_monitored_application_dto.py
index e4b834d..ff0a8af 100644
--- a/wavefront_api_client/models/response_container_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_monitored_cluster.py b/wavefront_api_client/models/response_container_monitored_cluster.py
index 76723c7..f5f1404 100644
--- a/wavefront_api_client/models/response_container_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_monitored_service_dto.py b/wavefront_api_client/models/response_container_monitored_service_dto.py
index 3f8ff3b..4f14f45 100644
--- a/wavefront_api_client/models/response_container_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_notificant.py b/wavefront_api_client/models/response_container_notificant.py
index 15677f4..4859505 100644
--- a/wavefront_api_client/models/response_container_notificant.py
+++ b/wavefront_api_client/models/response_container_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_account.py b/wavefront_api_client/models/response_container_paged_account.py
index 048e2ca..33cd0b6 100644
--- a/wavefront_api_client/models/response_container_paged_account.py
+++ b/wavefront_api_client/models/response_container_paged_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_alert.py b/wavefront_api_client/models/response_container_paged_alert.py
index 70bbca4..11c2827 100644
--- a/wavefront_api_client/models/response_container_paged_alert.py
+++ b/wavefront_api_client/models/response_container_paged_alert.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py b/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
index 6049fd7..78363ed 100644
--- a/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
+++ b/wavefront_api_client/models/response_container_paged_alert_analytics_summary_detail.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_alert_with_stats.py b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
index e45b06e..fb5aeb6 100644
--- a/wavefront_api_client/models/response_container_paged_alert_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_alert_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_anomaly.py b/wavefront_api_client/models/response_container_paged_anomaly.py
index 0d11f18..9d58271 100644
--- a/wavefront_api_client/models/response_container_paged_anomaly.py
+++ b/wavefront_api_client/models/response_container_paged_anomaly.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_api_token_model.py b/wavefront_api_client/models/response_container_paged_api_token_model.py
index 5c5b913..1eaa047 100644
--- a/wavefront_api_client/models/response_container_paged_api_token_model.py
+++ b/wavefront_api_client/models/response_container_paged_api_token_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_cloud_integration.py b/wavefront_api_client/models/response_container_paged_cloud_integration.py
index c49c867..c190bba 100644
--- a/wavefront_api_client/models/response_container_paged_cloud_integration.py
+++ b/wavefront_api_client/models/response_container_paged_cloud_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
index 6efe517..a261d53 100644
--- a/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
+++ b/wavefront_api_client/models/response_container_paged_customer_facing_user_object.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_dashboard.py b/wavefront_api_client/models/response_container_paged_dashboard.py
index d8c7b69..ec0e050 100644
--- a/wavefront_api_client/models/response_container_paged_dashboard.py
+++ b/wavefront_api_client/models/response_container_paged_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
index fb9981f..e716d9b 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
index 0bcac0e..ca9453e 100644
--- a/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
+++ b/wavefront_api_client/models/response_container_paged_derived_metric_definition_with_stats.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_event.py b/wavefront_api_client/models/response_container_paged_event.py
index 9adc264..72cdb30 100644
--- a/wavefront_api_client/models/response_container_paged_event.py
+++ b/wavefront_api_client/models/response_container_paged_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_external_link.py b/wavefront_api_client/models/response_container_paged_external_link.py
index c917f16..05e959c 100644
--- a/wavefront_api_client/models/response_container_paged_external_link.py
+++ b/wavefront_api_client/models/response_container_paged_external_link.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
index 03db970..3dd9698 100644
--- a/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
+++ b/wavefront_api_client/models/response_container_paged_ingestion_policy_read_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_integration.py b/wavefront_api_client/models/response_container_paged_integration.py
index 265a7db..d21f16e 100644
--- a/wavefront_api_client/models/response_container_paged_integration.py
+++ b/wavefront_api_client/models/response_container_paged_integration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_maintenance_window.py b/wavefront_api_client/models/response_container_paged_maintenance_window.py
index f70893b..bc7ea3c 100644
--- a/wavefront_api_client/models/response_container_paged_maintenance_window.py
+++ b/wavefront_api_client/models/response_container_paged_maintenance_window.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_message.py b/wavefront_api_client/models/response_container_paged_message.py
index d7a4bd5..ca9c7c4 100644
--- a/wavefront_api_client/models/response_container_paged_message.py
+++ b/wavefront_api_client/models/response_container_paged_message.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
index 7807c00..14fc5c3 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_application_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_monitored_cluster.py b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
index d166b4c..a2f5464 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_cluster.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_cluster.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
index c07cee6..5e253b6 100644
--- a/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
+++ b/wavefront_api_client/models/response_container_paged_monitored_service_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_notificant.py b/wavefront_api_client/models/response_container_paged_notificant.py
index 8c635f1..31f8e33 100644
--- a/wavefront_api_client/models/response_container_paged_notificant.py
+++ b/wavefront_api_client/models/response_container_paged_notificant.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_proxy.py b/wavefront_api_client/models/response_container_paged_proxy.py
index ddae276..f60a436 100644
--- a/wavefront_api_client/models/response_container_paged_proxy.py
+++ b/wavefront_api_client/models/response_container_paged_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
index 7118b67..906bb06 100644
--- a/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
+++ b/wavefront_api_client/models/response_container_paged_recent_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_recent_traces_search.py b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
index 8dc10ab..36646ee 100644
--- a/wavefront_api_client/models/response_container_paged_recent_traces_search.py
+++ b/wavefront_api_client/models/response_container_paged_recent_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_related_event.py b/wavefront_api_client/models/response_container_paged_related_event.py
index e9130cd..fee4617 100644
--- a/wavefront_api_client/models/response_container_paged_related_event.py
+++ b/wavefront_api_client/models/response_container_paged_related_event.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
index 7c1f678..74fa4db 100644
--- a/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
+++ b/wavefront_api_client/models/response_container_paged_report_event_anomaly_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_role_dto.py b/wavefront_api_client/models/response_container_paged_role_dto.py
index d9869ed..6a1a946 100644
--- a/wavefront_api_client/models/response_container_paged_role_dto.py
+++ b/wavefront_api_client/models/response_container_paged_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
index dda84a7..895e8dc 100644
--- a/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
index 56ae938..15f1e02 100644
--- a/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/response_container_paged_saved_app_map_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_search.py b/wavefront_api_client/models/response_container_paged_saved_search.py
index 57df344..8ae1312 100644
--- a/wavefront_api_client/models/response_container_paged_saved_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search.py b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
index 4ba676c..29909e8 100644
--- a/wavefront_api_client/models/response_container_paged_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
index 9727445..bcce7e7 100644
--- a/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
+++ b/wavefront_api_client/models/response_container_paged_saved_traces_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_service_account.py b/wavefront_api_client/models/response_container_paged_service_account.py
index 057d25c..c478515 100644
--- a/wavefront_api_client/models/response_container_paged_service_account.py
+++ b/wavefront_api_client/models/response_container_paged_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_source.py b/wavefront_api_client/models/response_container_paged_source.py
index 364a39f..dfdf39f 100644
--- a/wavefront_api_client/models/response_container_paged_source.py
+++ b/wavefront_api_client/models/response_container_paged_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
index ba13b3f..76f4e37 100644
--- a/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_paged_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_paged_user_group_model.py b/wavefront_api_client/models/response_container_paged_user_group_model.py
index deb6b22..cdc389f 100644
--- a/wavefront_api_client/models/response_container_paged_user_group_model.py
+++ b/wavefront_api_client/models/response_container_paged_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_proxy.py b/wavefront_api_client/models/response_container_proxy.py
index 8d689f8..570cc88 100644
--- a/wavefront_api_client/models/response_container_proxy.py
+++ b/wavefront_api_client/models/response_container_proxy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_query_type_dto.py b/wavefront_api_client/models/response_container_query_type_dto.py
index 98990b4..76c2e8b 100644
--- a/wavefront_api_client/models/response_container_query_type_dto.py
+++ b/wavefront_api_client/models/response_container_query_type_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_recent_app_map_search.py b/wavefront_api_client/models/response_container_recent_app_map_search.py
index 111ebc3..91ff595 100644
--- a/wavefront_api_client/models/response_container_recent_app_map_search.py
+++ b/wavefront_api_client/models/response_container_recent_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_recent_traces_search.py b/wavefront_api_client/models/response_container_recent_traces_search.py
index 5e8d21c..73c15dd 100644
--- a/wavefront_api_client/models/response_container_recent_traces_search.py
+++ b/wavefront_api_client/models/response_container_recent_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_role_dto.py b/wavefront_api_client/models/response_container_role_dto.py
index 3e87fbf..ad8c79a 100644
--- a/wavefront_api_client/models/response_container_role_dto.py
+++ b/wavefront_api_client/models/response_container_role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search.py b/wavefront_api_client/models/response_container_saved_app_map_search.py
index 31a4477..5f66297 100644
--- a/wavefront_api_client/models/response_container_saved_app_map_search.py
+++ b/wavefront_api_client/models/response_container_saved_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_app_map_search_group.py b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
index 08af4ae..9684779 100644
--- a/wavefront_api_client/models/response_container_saved_app_map_search_group.py
+++ b/wavefront_api_client/models/response_container_saved_app_map_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_search.py b/wavefront_api_client/models/response_container_saved_search.py
index c288d98..ae40d86 100644
--- a/wavefront_api_client/models/response_container_saved_search.py
+++ b/wavefront_api_client/models/response_container_saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_traces_search.py b/wavefront_api_client/models/response_container_saved_traces_search.py
index c25f0bd..2bb4070 100644
--- a/wavefront_api_client/models/response_container_saved_traces_search.py
+++ b/wavefront_api_client/models/response_container_saved_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_saved_traces_search_group.py b/wavefront_api_client/models/response_container_saved_traces_search_group.py
index ba7563e..fa0fa5d 100644
--- a/wavefront_api_client/models/response_container_saved_traces_search_group.py
+++ b/wavefront_api_client/models/response_container_saved_traces_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_service_account.py b/wavefront_api_client/models/response_container_service_account.py
index ea216e0..cbca578 100644
--- a/wavefront_api_client/models/response_container_service_account.py
+++ b/wavefront_api_client/models/response_container_service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_set_business_function.py b/wavefront_api_client/models/response_container_set_business_function.py
index 5c3697d..3de8a80 100644
--- a/wavefront_api_client/models/response_container_set_business_function.py
+++ b/wavefront_api_client/models/response_container_set_business_function.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_set_source_label_pair.py b/wavefront_api_client/models/response_container_set_source_label_pair.py
index 3cbd855..f46799c 100644
--- a/wavefront_api_client/models/response_container_set_source_label_pair.py
+++ b/wavefront_api_client/models/response_container_set_source_label_pair.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_source.py b/wavefront_api_client/models/response_container_source.py
index 474be0b..180e51c 100644
--- a/wavefront_api_client/models/response_container_source.py
+++ b/wavefront_api_client/models/response_container_source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_span_sampling_policy.py b/wavefront_api_client/models/response_container_span_sampling_policy.py
index 6fb6260..52a4cc6 100644
--- a/wavefront_api_client/models/response_container_span_sampling_policy.py
+++ b/wavefront_api_client/models/response_container_span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_string.py b/wavefront_api_client/models/response_container_string.py
index 3ba3f3c..a55e4df 100644
--- a/wavefront_api_client/models/response_container_string.py
+++ b/wavefront_api_client/models/response_container_string.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_tags_response.py b/wavefront_api_client/models/response_container_tags_response.py
index efc6da4..c783fa0 100644
--- a/wavefront_api_client/models/response_container_tags_response.py
+++ b/wavefront_api_client/models/response_container_tags_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_user_api_token.py b/wavefront_api_client/models/response_container_user_api_token.py
index 7e88181..2b47179 100644
--- a/wavefront_api_client/models/response_container_user_api_token.py
+++ b/wavefront_api_client/models/response_container_user_api_token.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_user_dto.py b/wavefront_api_client/models/response_container_user_dto.py
index ebcb871..c5270e3 100644
--- a/wavefront_api_client/models/response_container_user_dto.py
+++ b/wavefront_api_client/models/response_container_user_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_user_group_model.py b/wavefront_api_client/models/response_container_user_group_model.py
index 32ec0af..871f99e 100644
--- a/wavefront_api_client/models/response_container_user_group_model.py
+++ b/wavefront_api_client/models/response_container_user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_validated_users_dto.py b/wavefront_api_client/models/response_container_validated_users_dto.py
index 518c578..3f6008b 100644
--- a/wavefront_api_client/models/response_container_validated_users_dto.py
+++ b/wavefront_api_client/models/response_container_validated_users_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_container_void.py b/wavefront_api_client/models/response_container_void.py
index 19d7088..d361e97 100644
--- a/wavefront_api_client/models/response_container_void.py
+++ b/wavefront_api_client/models/response_container_void.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/response_status.py b/wavefront_api_client/models/response_status.py
index ebe2841..0e54d59 100644
--- a/wavefront_api_client/models/response_status.py
+++ b/wavefront_api_client/models/response_status.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/role_create_dto.py b/wavefront_api_client/models/role_create_dto.py
index afe756c..bcb7df7 100644
--- a/wavefront_api_client/models/role_create_dto.py
+++ b/wavefront_api_client/models/role_create_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/role_dto.py b/wavefront_api_client/models/role_dto.py
index 0150bd9..9a458f5 100644
--- a/wavefront_api_client/models/role_dto.py
+++ b/wavefront_api_client/models/role_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/role_update_dto.py b/wavefront_api_client/models/role_update_dto.py
index 373fc2f..08e0cc1 100644
--- a/wavefront_api_client/models/role_update_dto.py
+++ b/wavefront_api_client/models/role_update_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_app_map_search.py b/wavefront_api_client/models/saved_app_map_search.py
index 551b07b..6b5830f 100644
--- a/wavefront_api_client/models/saved_app_map_search.py
+++ b/wavefront_api_client/models/saved_app_map_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_app_map_search_group.py b/wavefront_api_client/models/saved_app_map_search_group.py
index 92c4775..b3124b6 100644
--- a/wavefront_api_client/models/saved_app_map_search_group.py
+++ b/wavefront_api_client/models/saved_app_map_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_search.py b/wavefront_api_client/models/saved_search.py
index 17fafc7..b195869 100644
--- a/wavefront_api_client/models/saved_search.py
+++ b/wavefront_api_client/models/saved_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_traces_search.py b/wavefront_api_client/models/saved_traces_search.py
index ae8602a..49fd239 100644
--- a/wavefront_api_client/models/saved_traces_search.py
+++ b/wavefront_api_client/models/saved_traces_search.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/saved_traces_search_group.py b/wavefront_api_client/models/saved_traces_search_group.py
index a7ae304..213f7e0 100644
--- a/wavefront_api_client/models/saved_traces_search_group.py
+++ b/wavefront_api_client/models/saved_traces_search_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/schema.py b/wavefront_api_client/models/schema.py
index 4b0396f..61c69b5 100644
--- a/wavefront_api_client/models/schema.py
+++ b/wavefront_api_client/models/schema.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/search_query.py b/wavefront_api_client/models/search_query.py
index 6b6527e..24c0ef9 100644
--- a/wavefront_api_client/models/search_query.py
+++ b/wavefront_api_client/models/search_query.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/service_account.py b/wavefront_api_client/models/service_account.py
index 09c6674..fbd9a42 100644
--- a/wavefront_api_client/models/service_account.py
+++ b/wavefront_api_client/models/service_account.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/service_account_write.py b/wavefront_api_client/models/service_account_write.py
index b499a80..fc31599 100644
--- a/wavefront_api_client/models/service_account_write.py
+++ b/wavefront_api_client/models/service_account_write.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/setup.py b/wavefront_api_client/models/setup.py
index 9c13dd8..77115b2 100644
--- a/wavefront_api_client/models/setup.py
+++ b/wavefront_api_client/models/setup.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/snowflake_configuration.py b/wavefront_api_client/models/snowflake_configuration.py
index 49b7104..3f930c8 100644
--- a/wavefront_api_client/models/snowflake_configuration.py
+++ b/wavefront_api_client/models/snowflake_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/sortable_search_request.py b/wavefront_api_client/models/sortable_search_request.py
index 456a76f..472e760 100644
--- a/wavefront_api_client/models/sortable_search_request.py
+++ b/wavefront_api_client/models/sortable_search_request.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/sorting.py b/wavefront_api_client/models/sorting.py
index e551158..3153033 100644
--- a/wavefront_api_client/models/sorting.py
+++ b/wavefront_api_client/models/sorting.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/source.py b/wavefront_api_client/models/source.py
index 06705f9..1e28fc7 100644
--- a/wavefront_api_client/models/source.py
+++ b/wavefront_api_client/models/source.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/source_label_pair.py b/wavefront_api_client/models/source_label_pair.py
index ba286c4..ab6ff02 100644
--- a/wavefront_api_client/models/source_label_pair.py
+++ b/wavefront_api_client/models/source_label_pair.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/source_search_request_container.py b/wavefront_api_client/models/source_search_request_container.py
index e3f1e52..863da15 100644
--- a/wavefront_api_client/models/source_search_request_container.py
+++ b/wavefront_api_client/models/source_search_request_container.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/span.py b/wavefront_api_client/models/span.py
index a91c400..3dd720b 100644
--- a/wavefront_api_client/models/span.py
+++ b/wavefront_api_client/models/span.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/span_sampling_policy.py b/wavefront_api_client/models/span_sampling_policy.py
index c45050a..d2ce013 100644
--- a/wavefront_api_client/models/span_sampling_policy.py
+++ b/wavefront_api_client/models/span_sampling_policy.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/specific_data.py b/wavefront_api_client/models/specific_data.py
index 4243c73..05ab393 100644
--- a/wavefront_api_client/models/specific_data.py
+++ b/wavefront_api_client/models/specific_data.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/stats_model_internal_use.py b/wavefront_api_client/models/stats_model_internal_use.py
index ff37c6c..4e5ab59 100644
--- a/wavefront_api_client/models/stats_model_internal_use.py
+++ b/wavefront_api_client/models/stats_model_internal_use.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/stripe.py b/wavefront_api_client/models/stripe.py
index eeddf94..4b8242c 100644
--- a/wavefront_api_client/models/stripe.py
+++ b/wavefront_api_client/models/stripe.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tags_response.py b/wavefront_api_client/models/tags_response.py
index 2b1c6b3..f108eb4 100644
--- a/wavefront_api_client/models/tags_response.py
+++ b/wavefront_api_client/models/tags_response.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/target_info.py b/wavefront_api_client/models/target_info.py
index 985435f..63a0a3a 100644
--- a/wavefront_api_client/models/target_info.py
+++ b/wavefront_api_client/models/target_info.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/timeseries.py b/wavefront_api_client/models/timeseries.py
index c2efeba..b67b213 100644
--- a/wavefront_api_client/models/timeseries.py
+++ b/wavefront_api_client/models/timeseries.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/trace.py b/wavefront_api_client/models/trace.py
index 5057b68..ddec411 100644
--- a/wavefront_api_client/models/trace.py
+++ b/wavefront_api_client/models/trace.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/triage_dashboard.py b/wavefront_api_client/models/triage_dashboard.py
index e31864e..c18036c 100644
--- a/wavefront_api_client/models/triage_dashboard.py
+++ b/wavefront_api_client/models/triage_dashboard.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tuple_result.py b/wavefront_api_client/models/tuple_result.py
index 245c5b6..50a0d19 100644
--- a/wavefront_api_client/models/tuple_result.py
+++ b/wavefront_api_client/models/tuple_result.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/tuple_value_result.py b/wavefront_api_client/models/tuple_value_result.py
index 102595e..a53a410 100644
--- a/wavefront_api_client/models/tuple_value_result.py
+++ b/wavefront_api_client/models/tuple_value_result.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_api_token.py b/wavefront_api_client/models/user_api_token.py
index 4ce02d2..671a4f4 100644
--- a/wavefront_api_client/models/user_api_token.py
+++ b/wavefront_api_client/models/user_api_token.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_dto.py b/wavefront_api_client/models/user_dto.py
index e8fcb9e..98e0360 100644
--- a/wavefront_api_client/models/user_dto.py
+++ b/wavefront_api_client/models/user_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group.py b/wavefront_api_client/models/user_group.py
index 1591faa..c1b34d6 100644
--- a/wavefront_api_client/models/user_group.py
+++ b/wavefront_api_client/models/user_group.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group_model.py b/wavefront_api_client/models/user_group_model.py
index c1aa7f1..73703b1 100644
--- a/wavefront_api_client/models/user_group_model.py
+++ b/wavefront_api_client/models/user_group_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group_properties_dto.py b/wavefront_api_client/models/user_group_properties_dto.py
index e0f316a..5902a5f 100644
--- a/wavefront_api_client/models/user_group_properties_dto.py
+++ b/wavefront_api_client/models/user_group_properties_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_group_write.py b/wavefront_api_client/models/user_group_write.py
index c73137f..11a3abe 100644
--- a/wavefront_api_client/models/user_group_write.py
+++ b/wavefront_api_client/models/user_group_write.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_model.py b/wavefront_api_client/models/user_model.py
index 0f73cec..df4c6bf 100644
--- a/wavefront_api_client/models/user_model.py
+++ b/wavefront_api_client/models/user_model.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_request_dto.py b/wavefront_api_client/models/user_request_dto.py
index 550ebd4..15bf2f9 100644
--- a/wavefront_api_client/models/user_request_dto.py
+++ b/wavefront_api_client/models/user_request_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/user_to_create.py b/wavefront_api_client/models/user_to_create.py
index 460ea31..0059932 100644
--- a/wavefront_api_client/models/user_to_create.py
+++ b/wavefront_api_client/models/user_to_create.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/validated_users_dto.py b/wavefront_api_client/models/validated_users_dto.py
index d08a00b..1fb8f20 100644
--- a/wavefront_api_client/models/validated_users_dto.py
+++ b/wavefront_api_client/models/validated_users_dto.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/void.py b/wavefront_api_client/models/void.py
index a333d08..daebbb4 100644
--- a/wavefront_api_client/models/void.py
+++ b/wavefront_api_client/models/void.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/vrops_configuration.py b/wavefront_api_client/models/vrops_configuration.py
index 1129db9..6b20324 100644
--- a/wavefront_api_client/models/vrops_configuration.py
+++ b/wavefront_api_client/models/vrops_configuration.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/models/wf_tags.py b/wavefront_api_client/models/wf_tags.py
index e9c128f..83201a7 100644
--- a/wavefront_api_client/models/wf_tags.py
+++ b/wavefront_api_client/models/wf_tags.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com
diff --git a/wavefront_api_client/rest.py b/wavefront_api_client/rest.py
index 7018377..bf00bc7 100644
--- a/wavefront_api_client/rest.py
+++ b/wavefront_api_client/rest.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 """
-    Wavefront REST API Documentation
+    Tanzu Observability REST API Documentation
 
-    <p>The REST API enables you to interact with the Wavefront service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Wavefront REST API.</a></p>  # noqa: E501
+    <p>The REST API enables you to interact with the Tanzu Observability service by using standard REST API tools. You can use the REST API to automate commonly executed operations, for example to tag sources automatically.</p><p>When you make REST API calls outside the REST API documentation UI, to authenticate to the service, you must use an API token associated with a user account or a service account. For information on how to get the API token and examples, see <a href=\"http://docs.wavefront.com/using_wavefront_api.html\">Use the Tanzu Observability REST API.</a></p>  # noqa: E501
 
     OpenAPI spec version: v2
     Contact: chitimba@wavefront.com